Skip to content
This repository has been archived by the owner on Jan 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #78 from AppliedIS/sprint2-bugfix
Browse files Browse the repository at this point in the history
Sprint2 bugfix
  • Loading branch information
jefferey committed Oct 26, 2016
2 parents 47f8703 + 9432488 commit 060439e
Show file tree
Hide file tree
Showing 6 changed files with 190 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@
<Compile Include="Migrations\201610212140188_RemoveApplicationId.Designer.cs">
<DependentUpon>201610212140188_RemoveApplicationId.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201610252128299_EmployerUpdate.cs" />
<Compile Include="Migrations\201610252128299_EmployerUpdate.Designer.cs">
<DependentUpon>201610252128299_EmployerUpdate.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Repositories\FileRepository.cs" />
Expand Down Expand Up @@ -222,6 +226,9 @@
<EmbeddedResource Include="Migrations\201610212140188_RemoveApplicationId.resx">
<DependentUpon>201610212140188_RemoveApplicationId.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201610252128299_EmployerUpdate.resx">
<DependentUpon>201610252128299_EmployerUpdate.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.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
namespace DOL.WHD.Section14c.DataAccess.Migrations
{
using System;
using System.Data.Entity.Migrations;

public partial class EmployerUpdate : DbMigration
{
public override void Up()
{
AddColumn("dbo.EmployerInfoes", "HasDifferentMailingAddress", c => c.Boolean(nullable: false));
}

public override void Down()
{
DropColumn("dbo.EmployerInfoes", "HasDifferentMailingAddress");
}
}
}

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions DOL.WHD.Section14c.Domain/Models/Submission/EmployerInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public class EmployerInfo
[Required]
public virtual Address PhysicalAddress { get; set; }

[Required]
public bool HasDifferentMailingAddress { get; set; }

[Required]
public bool HasParentOrg { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,13 @@ <h2 class="form-section-header">Employer Information</h2>
<label for="zip">Zip Code</label>
<input class="usa-input-medium" id="zip" name="zip" type="text" pattern="[\d]{5}(-[\d]{4})?" data-grouplength="5,4" data-delimiter="-" data-politespace ng-model="formData.employerInfo.physicalAddress.zipCode">

<div class="usa-input-grid usa-input-grid-medium">
<label for="country">Country</label>
<input id="country" name="country" type="text" ng-model="formData.employerInfo.physicalAddress.country">
</div>
<div class="usa-input-grid usa-input-grid-medium">
<label for="country">Country</label>
<input id="country" name="country" type="text" ng-model="formData.employerInfo.physicalAddress.country">
</div>

<input id="hasDifferentMailingAddress" type="checkbox" name="differentMailingAddress" value="true" ng-model="formData.employerInfo.hasDifferentMailingAddress">
<label for="hasDifferentMailingAddress">Mailing Address is different from Pysical Address</label>

</fieldset>
</div>
Expand Down

0 comments on commit 060439e

Please sign in to comment.