From f974cf683769fe6ce93205381146df70f999b406 Mon Sep 17 00:00:00 2001
From: Bianca Corsatea <bicorsat@microsoft.com>
Date: Tue, 12 May 2020 17:55:00 +0100
Subject: [PATCH] Fixed data validation bug on Shifts -> Add, Added
 Localization for data annotation on Add View Model

---
 Project.Zap/Controllers/ShiftsController.cs   |   3 +-
 ...ustBeEqualOrGreaterThanCurrentAttribute.cs |   2 +-
 Project.Zap/Models/ShiftViewModel.cs          |   8 +-
 Project.Zap/Project.Zap.csproj                |  22 +++
 .../Properties/Resources.en-US.Designer.cs    |  80 +++++++++++
 Project.Zap/Properties/Resources.en-US.resx   | 126 ++++++++++++++++++
 Project.Zap/Properties/Resources.fr.resx      | 126 ++++++++++++++++++
 Project.Zap/Views/Shifts/Add.cshtml           |  24 ++--
 8 files changed, 369 insertions(+), 22 deletions(-)
 create mode 100644 Project.Zap/Properties/Resources.en-US.Designer.cs
 create mode 100644 Project.Zap/Properties/Resources.en-US.resx
 create mode 100644 Project.Zap/Properties/Resources.fr.resx

diff --git a/Project.Zap/Controllers/ShiftsController.cs b/Project.Zap/Controllers/ShiftsController.cs
index f272633..f22a267 100644
--- a/Project.Zap/Controllers/ShiftsController.cs
+++ b/Project.Zap/Controllers/ShiftsController.cs
@@ -116,7 +116,7 @@ namespace Project.Zap.Controllers
 
         private async Task<IActionResult> Search(SearchShiftViewModel search, IEnumerable<Location> locations)
         {
-            List<string> locationIds = new List<string>();
+             List<string> locationIds = new List<string>();
 
             if (search.Locations != null && search.Locations.Any())
             {
@@ -346,6 +346,7 @@ namespace Project.Zap.Controllers
             if (!ModelState.IsValid)
             {
                 this.logger.LogError("Add shift view model is not valid");
+                viewModel.LocationNames = this.GetLocationNames(await this.locationService.Get());
                 return View("Add", viewModel);
             }
 
diff --git a/Project.Zap/Filters/DateMustBeEqualOrGreaterThanCurrentAttribute.cs b/Project.Zap/Filters/DateMustBeEqualOrGreaterThanCurrentAttribute.cs
index 4bb07d1..8e6d4b0 100644
--- a/Project.Zap/Filters/DateMustBeEqualOrGreaterThanCurrentAttribute.cs
+++ b/Project.Zap/Filters/DateMustBeEqualOrGreaterThanCurrentAttribute.cs
@@ -18,7 +18,7 @@ namespace Project.Zap.Filters
             ErrorMessage = ErrorMessageString;
             DateTime currentValue = (DateTime)value;
 
-            if (currentValue <= DateTime.Today)
+            if (currentValue <= DateTime.Now)
             {
                 return new ValidationResult(ErrorMessage);
             }
diff --git a/Project.Zap/Models/ShiftViewModel.cs b/Project.Zap/Models/ShiftViewModel.cs
index 0b7f76e..a28c6b8 100644
--- a/Project.Zap/Models/ShiftViewModel.cs
+++ b/Project.Zap/Models/ShiftViewModel.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.ApplicationInsights.AspNetCore;
+using Microsoft.AspNetCore.Mvc;
 using Project.Zap.Filters;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -28,13 +29,12 @@ namespace Project.Zap.Models
         public DateTime End { get; set; } = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0);
 
         [BindProperty]
-        [Required]
+        [Required(ErrorMessageResourceName ="WorkTypeRequired", ErrorMessageResourceType = typeof(Zap.Properties.Resources))]
         [Display(Name = "WorkType")]
         public string WorkType { get; set; }
 
         [BindProperty]
-        [Required]   
-        [Range(1, 200)]
+        [Range(1, 200, ErrorMessageResourceName ="QuantityRange", ErrorMessageResourceType =typeof(Zap.Properties.Resources))]
         [Display(Name = "Quantity")]
         public int Quantity { get; set; }
 
diff --git a/Project.Zap/Project.Zap.csproj b/Project.Zap/Project.Zap.csproj
index 046a7e3..8cd0e8a 100644
--- a/Project.Zap/Project.Zap.csproj
+++ b/Project.Zap/Project.Zap.csproj
@@ -22,6 +22,28 @@
   </ItemGroup>
 
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.en-US.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.en-US.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.en-US.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Models\ShiftViewModel.en-US.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Models\ShiftViewModel.fr.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="http://json.schemastore.org/behat" /></VisualStudio></ProjectExtensions>
 
 </Project>
diff --git a/Project.Zap/Properties/Resources.en-US.Designer.cs b/Project.Zap/Properties/Resources.en-US.Designer.cs
new file mode 100644
index 0000000..9004db5
--- /dev/null
+++ b/Project.Zap/Properties/Resources.en-US.Designer.cs
@@ -0,0 +1,80 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Project.Zap.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Project.Zap.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error quantity.
+        /// </summary>
+        internal static string QuantityRange {
+            get {
+                return ResourceManager.GetString("QuantityRange", resourceCulture);
+            }
+        }
+
+        internal static string WorkTypeRequired
+        {
+            get
+            {
+                return ResourceManager.GetString("WorkTypeRequired", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Project.Zap/Properties/Resources.en-US.resx b/Project.Zap/Properties/Resources.en-US.resx
new file mode 100644
index 0000000..835c02f
--- /dev/null
+++ b/Project.Zap/Properties/Resources.en-US.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="QuantityRange" xml:space="preserve">
+    <value>The field Quantity must be between 1 and 200</value>
+  </data>
+  <data name="WorkTypeRequired" xml:space="preserve">
+    <value>The Work Type field is required</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Project.Zap/Properties/Resources.fr.resx b/Project.Zap/Properties/Resources.fr.resx
new file mode 100644
index 0000000..6cdfee7
--- /dev/null
+++ b/Project.Zap/Properties/Resources.fr.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="QuantityRange" xml:space="preserve">
+    <value>Quantité doit être compris entre 1 et 200</value>
+  </data>
+  <data name="WorkTypeRequired" xml:space="preserve">
+    <value>Type de travail est requis</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Project.Zap/Views/Shifts/Add.cshtml b/Project.Zap/Views/Shifts/Add.cshtml
index 93af36a..559decc 100644
--- a/Project.Zap/Views/Shifts/Add.cshtml
+++ b/Project.Zap/Views/Shifts/Add.cshtml
@@ -42,6 +42,7 @@
 @section Scripts
 {
     <script>
+        
         $.validator.addMethod('datelessthan', function (value, element, params) {
             var compareDateId = "#NewShift_" + params[0].dataset.valDatelessthanProperty;
             var compareValue = $(compareDateId).val()
@@ -55,25 +56,16 @@
         });
 
         $.validator.addMethod("datemustbeequalorgreaterthancurrent", function (value, element, param) {
-            var startDate = $("#NewShift_Start").val();
-            var today;
-            var currentDate = new Date();
-            var year = currentDate.getYear();
-            var month = currentDate.getMonth() + 1;  // added +1 because javascript counts month from 0
-            var day = currentDate.getDate();
-            var hours = currentDate.getHours();
-            var minutes = currentDate.getMinutes();
-            var seconds = currentDate.getSeconds();
 
-            today = month + '/' + day + '/' + year + '  ' + hours + '.' + minutes + '.' + seconds;
+            var today = new Date();
+            var date = today.getFullYear() + '-' + (today.getMonth() + 1) + '-' + today.getDate();
+            var time = today.getHours() + ":" + today.getMinutes() + ":" + today.getSeconds();
+            var dateTime = date + ' ' + time;
+
+            return value < dateTime;
 
-            if (startDate <= today) {
-                return false;
-            }
-            return true;
         });
 
-        $.validator.unobtrusive.adapters.addBool("datemustbeequalorgreaterthancurrent");
-
+       
     </script>
 }
\ No newline at end of file