Merge pull request #194 from AppliedIS/issue103

Issue103

DOL.WHD.Section14c.Business/Services/ApplicationService.cs

@@ -97,6 +97,14 @@ private void SetDefaults(ApplicationSubmission model)
                 {
                     model.Employer.SendMailToParent = null;
                 }
+
+                // default to false if no value was passed
+                model.Employer.HasMailingAddress = model.Employer.HasMailingAddress ?? false;
+                if (!model.Employer.HasMailingAddress.GetValueOrDefault())
+                {
+                    // remove mailing address if hasMailingAddress == false
+                    model.Employer.MailingAddress = null;
+                }
             }
         }
 

DOL.WHD.Section14c.DataAccess/DOL.WHD.Section14c.DataAccess.csproj

@@ -250,6 +250,10 @@
     <Compile Include="Migrations\201611301612331_InitialApplicationRequiredFields.Designer.cs">
       <DependentUpon>201611301612331_InitialApplicationRequiredFields.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\201611301931465_AddEmployerMailingAddress.cs" />
+    <Compile Include="Migrations\201611301931465_AddEmployerMailingAddress.Designer.cs">
+      <DependentUpon>201611301931465_AddEmployerMailingAddress.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repositories\ApplicationRepository.cs" />
@@ -382,6 +386,9 @@
     <EmbeddedResource Include="Migrations\201611301612331_InitialApplicationRequiredFields.resx">
       <DependentUpon>201611301612331_InitialApplicationRequiredFields.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\201611301931465_AddEmployerMailingAddress.resx">
+      <DependentUpon>201611301931465_AddEmployerMailingAddress.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

DOL.WHD.Section14c.DataAccess/Migrations/201611301931465_AddEmployerMailingAddress.cs

@@ -0,0 +1,24 @@
+namespace DOL.WHD.Section14c.DataAccess.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+
+    public partial class AddEmployerMailingAddress : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.EmployerInfoes", "HasMailingAddress", c => c.Boolean());
+            AddColumn("dbo.EmployerInfoes", "MailingAddress_Id", c => c.Guid());
+            CreateIndex("dbo.EmployerInfoes", "MailingAddress_Id");
+            AddForeignKey("dbo.EmployerInfoes", "MailingAddress_Id", "dbo.Addresses", "Id");
+        }
+
+        public override void Down()
+        {
+            DropForeignKey("dbo.EmployerInfoes", "MailingAddress_Id", "dbo.Addresses");
+            DropIndex("dbo.EmployerInfoes", new[] { "MailingAddress_Id" });
+            DropColumn("dbo.EmployerInfoes", "MailingAddress_Id");
+            DropColumn("dbo.EmployerInfoes", "HasMailingAddress");
+        }
+    }
+}

DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs

@@ -25,6 +25,10 @@ public EmployerInfo()
 
         public virtual Address PhysicalAddress { get; set; }
 
+        public bool? HasMailingAddress { get; set; }
+
+        public virtual Address MailingAddress { get; set; }
+
         public bool? HasParentOrg { get; set; }
 
         public string ParentLegalName { get; set; }

DOL.WHD.Section14c.Test/Business/ApplicationServiceTests.cs

@@ -333,5 +333,31 @@ public void ApplicationService_Does_Not_CleanUp_Renewal_Application()
             Assert.IsNotNull(obj.WorkSites.ElementAt(0).NumEmployees);
             Assert.IsNotNull(obj.WorkSites.ElementAt(0).Employees);
         }
+
+        [TestMethod]
+        public void ApplicationService_Defaults_HasMailingAddress_Null()
+        {
+            // Arrange
+            var obj = new ApplicationSubmission { Employer = new EmployerInfo { HasMailingAddress = null } };
+
+            // Act
+            _applicationService.ProcessModel(obj);
+
+            // Assert
+            Assert.IsFalse(obj.Employer.HasMailingAddress.Value);
+        }
+
+        [TestMethod]
+        public void ApplicationService_Defaults_HasMailingAddress_NotNull()
+        {
+            // Arrange
+            var obj = new ApplicationSubmission { Employer = new EmployerInfo { HasMailingAddress = true } };
+
+            // Act
+            _applicationService.ProcessModel(obj);
+
+            // Assert
+            Assert.IsTrue(obj.Employer.HasMailingAddress.Value);
+        }
     }
 }

DOL.WHD.Section14c.Web/src/modules/components/sectionEmployer/sectionEmployerTemplate.html

@@ -111,8 +111,54 @@ <h3>Employer Information</h3>
                 <input id="county" name="county" type="text" ng-model="formData.employer.physicalAddress.county">
             </div>
 
+            <div class="usa-input-grid usa-input-grid-large">
+                <input id="hasMailingAddress" type="checkbox" name="hasMailingAddress" value="true" ng-model="formData.employer.hasMailingAddress">
+                <label for="hasMailingAddress">Mailing Address is different from Physical Address</label>
+            </div>
         </fieldset>
     </div>
+
+    <div class="form-question-block" ng-show="formData.employer.hasMailingAddress === true">
+        <div class="form-question-text">Mailing Address of Employer's Main Establishment</div>
+        <fieldset>
+            <div class="usa-form-large">
+                <div ng-class="validate('employer.mailingAddress.streetAddress') ? 'usa-input-error' : ''">
+                    <label for="mailingAddressStreet">Street Address</label>
+                    <span class="usa-input-error-message" role="alert" ng-show="validate('employer.mailingAddress.streetAddress')">{{ validate('employer.mailingAddress.streetAddress') }}</span>
+                    <input id="mailingAddressStreet" name="mailingAddressStreet" type="text" ng-model="formData.employer.mailingAddress.streetAddress">
+                </div>
+
+                <div class="clearer" ng-class="validate(['employer.mailingAddress.city', 'employer.mailingAddress.state']) ? 'usa-input-error' : ''">
+                    <div class="usa-input-grid usa-input-grid-medium">
+                        <label for="mailingAddressCity">City</label>
+                        <span class="usa-input-error-message" role="alert" ng-show="validate('employer.mailingAddress.city')">{{ validate('employer.mailingAddress.city') }}</span>
+                        <input id="mailingAddressCity" name="mailingAddressCity" type="text" ng-model="formData.employer.mailingAddress.city">
+                    </div>
+
+                    <div class="usa-input-grid usa-input-grid-small">
+                        <label for="mailingAddressState">State</label>
+                        <span class="usa-input-error-message" role="alert" ng-show="validate('employer.mailingAddress.state')">{{ validate('employer.mailingAddress.state') }}</span>
+                        <state-field name="mailingAddressState" selected-state="formData.employer.mailingAddress.state"></state-field>
+                    </div>
+                </div>
+
+                <div ng-class="validate('employer.mailingAddress.zipCode') ? 'usa-input-error' : ''">
+                    <label for="mailingAddressZipCode">Zip Code</label>
+                    <span class="usa-input-error-message" role="alert" ng-show="validate('employer.mailingAddress.zipCode')">{{ validate('employer.mailingAddress.zipCode') }}</span>
+                    <input class="usa-input-medium" id="mailingAddressZipCode" name="mailingAddressZipCode" type="text" mask="99999-?9?9?9?9?" pattern="[\d]{5}(-[\d]{4})?" data-grouplength="5,4" data-delimiter="-" data-politespace  ng-model="formData.employer.mailingAddress.zipCode">
+                </div>
+
+                <div ng-class="validate('employer.mailingAddress.county') ? 'usa-input-error' : ''">
+                    <label for="mailingAddressCounty">County</label>
+                    <span class="usa-input-error-message" role="alert" ng-show="validate('employer.mailingAddress.county')">{{ validate('employer.mailingAddress.county') }}</span>
+                    <input id="mailingAddressCounty" name="mailingAddressCounty" type="text" ng-model="formData.employer.mailingAddress.county">
+                </div>
+            </div>
+
+        </fieldset>
+    </div>
+
+
     <div class="form-question-block" ng-class="validate('employer.hasParentOrg') ? 'usa-input-error' : ''">
         <div class="form-question-text">Does the Employer have a Parent Organization?
             <helplink></helplink>

DOL.WHD.Section14c.Web/src/modules/services/validationService.js

@@ -186,7 +186,7 @@ module.exports = function(ngModule) {
         }
 
         this.checkIsInitial = function() {
-            return this.checkRequiredMultipleChoice("applicationTypeId") === _constants.responses.applicationType.initial;
+            return this.getFormValue("applicationTypeId") === _constants.responses.applicationType.initial;
         }
 
 
@@ -201,7 +201,7 @@ module.exports = function(ngModule) {
             this.checkRequiredDateComponent("signature.date", "Please provide the date");
         }
 
-        /* eslint-disable complexity */
+        /* eslint-disable complexity, max-statements */
         this.validateAppInfo = function() {
             section = "__appinfo";
 
@@ -262,6 +262,19 @@ module.exports = function(ngModule) {
 
             this.checkRequiredString("employer.physicalAddress.county", "Please provide the county for the employer's main establishment");
 
+            let hasMailingAddress = this.getFormValue("employer.hasMailingAddress");
+            if(hasMailingAddress === true) {
+                this.checkRequiredString("employer.mailingAddress.streetAddress", "Please provide the street address for the employer's mailing address");
+                this.checkRequiredString("employer.mailingAddress.city", "Please provide the city for the employer's mailing address");
+                this.checkRequiredValue("employer.mailingAddress.state", "Please select a state or territory for the employer's mailing address");
+
+                if (!this.validateZipCode(this.getFormValue("employer.mailingAddress.zipCode"))) {
+                    this.setValidationError("employer.mailingAddress.zipCode", "Please provide a valid zip code for the employer's mailing address");
+                }
+
+                this.checkRequiredString("employer.mailingAddress.county", "Please provide the county for the employer's mailing address");
+            }
+
             let hasParentOrg = this.checkRequiredMultipleChoice("employer.hasParentOrg", "Please indicate if the employer has a Parent Organization");
             if (hasParentOrg === true) {
                 this.checkRequiredString("employer.parentLegalName", "Please provide the Parent Organization's legal name");
@@ -508,15 +521,13 @@ module.exports = function(ngModule) {
         // main method to be called for application validation
         this.validateForm = function() {
             this.resetState();
-
             this.validateAssurances();
             this.validateAppInfo();
             this.validateEmployer();
 
             if (!this.checkIsInitial()) {
                 this.validateWageData();
             }
-
             this.validateWorkSites();
             this.validateWIOA();