Skip to content

Commit

Permalink
Embcessmod 829 (#1110)
Browse files Browse the repository at this point in the history
* EMBCESSMOD-242 tool tip text

* reverted index order for needs assessment

* Fixed wrong revert change

* EMBCESSMOD-310 Self-Registration - Needs Assessment Fields Wrong Order

* EMBCESSMOD-335 reversed values for Food, Lodging, Clothing, Transportation, Incidentals

* EMBCESSMOD-335 additional fix to reversed values

* EMBCESSMOD-320 Unique Task#

* Fixed unit tests compilation

* Added data protection keys persistent folder setting

* Simplified dependencies for now

* Embcessmod 373 phone email update (#1015)

* Add new checkboxes to self registration

* Add custom validation for no email and phone

* Update review of self reg to show no email/phone number

* Add new validation for email and phone number to registration-maker

* Uncommented code

* Add Strathcona Regional District to communities (#1017)

* Change viewEvacuee to properly include city (#1019)

* Add country to viewEvacuee (#1021)

* Embcessmod 373 fixes (#1022)

* Add required class to Telephone/Email labels

* Add required class to telephone/email in registration-maker

* Change required validation on phone number

* Fix typo in registration summary

* Add CSS to fix layout of checkboxes

* Fix issue where no email/no phone inputs did not save state when editing registration

* Add no email and no phone properties to registration reducer

* Fix bug where telephone number was not actually required

* uncommented code

* Embcessmod 373 fixes (#1024)

* Fix bug with validatiors

* Fixed bug with empty no email/phone checkboxes

* Set ERA version to 1.2

* Set ERA version 1.2 (#1025)

* EMBCESSMOD-242 tool tip text

* reverted index order for needs assessment

* Fixed wrong revert change

* EMBCESSMOD-310 Self-Registration - Needs Assessment Fields Wrong Order

* EMBCESSMOD-335 reversed values for Food, Lodging, Clothing, Transportation, Incidentals

* EMBCESSMOD-335 additional fix to reversed values

* EMBCESSMOD-320 Unique Task#

* Fixed unit tests compilation

* Added data protection keys persistent folder setting

* Simplified dependencies for now

* Set ERA version to 1.2

Co-authored-by: Curtis <[email protected]>
Co-authored-by: Yossi T <[email protected]>
Co-authored-by: Yossi Tamari <[email protected]>

* ERA Release Version 

Added FileVersion and AssemblyVersion

* Embcessmod 306 self reg evac from (#1027)

* Add validators for evacuated from

* Add checkbox for primary addr is same as evac'd from

* Add communities selector

* Text change

* Fixed issue with community component not displaying

* Add evac from to registration summary

* Remove test console.log

* Change wording on email in self-reg confirmation (#1028)

* Add different styles depending on env (#1030)

* Add different styles depending on env

* Fix formatting issue in constants file

* Added new environment variable

* Embcessmod 449 env banner (#1032)

* Add different styles depending on env

* Fix formatting issue in constants file

* Added new environment variable

* Add initial modal popup

* Add styles for different envs to modal

* Add Big Lake to Communities.json (#1034)

* Add environment modal to login link in header (#1035)

* R2 landing page updates

* R2 landing page updates (#1037)

* EMBCESSMOD-242 tool tip text

* reverted index order for needs assessment

* Fixed wrong revert change

* EMBCESSMOD-310 Self-Registration - Needs Assessment Fields Wrong Order

* EMBCESSMOD-335 reversed values for Food, Lodging, Clothing, Transportation, Incidentals

* EMBCESSMOD-335 additional fix to reversed values

* EMBCESSMOD-320 Unique Task#

* Fixed unit tests compilation

* Added data protection keys persistent folder setting

* Simplified dependencies for now

* Set ERA version to 1.2

* R2 landing page updates

Co-authored-by: Curtis <[email protected]>
Co-authored-by: Yossi T <[email protected]>
Co-authored-by: Yossi Tamari <[email protected]>

* R2 landing page image fix

* R2 landing page image fix (#1038)

* EMBCESSMOD-242 tool tip text

* reverted index order for needs assessment

* Fixed wrong revert change

* EMBCESSMOD-310 Self-Registration - Needs Assessment Fields Wrong Order

* EMBCESSMOD-335 reversed values for Food, Lodging, Clothing, Transportation, Incidentals

* EMBCESSMOD-335 additional fix to reversed values

* EMBCESSMOD-320 Unique Task#

* Fixed unit tests compilation

* Added data protection keys persistent folder setting

* Simplified dependencies for now

* Set ERA version to 1.2

* R2 landing page updates

* R2 landing page image fix

Co-authored-by: Curtis <[email protected]>
Co-authored-by: Yossi T <[email protected]>
Co-authored-by: Yossi Tamari <[email protected]>

* Embcessmod 306 updates (#1039)

* Change environment names to be more consistent

* Add function to handle mapping primary address to evacuated from

* Save value of Evac'd From Primary Addr when editing

* Embcessmod 306 updates (#1040)

* Change environment names to be more consistent

* Add function to handle mapping primary address to evacuated from

* Save value of Evac'd From Primary Addr when editing

* Fix issue with changing evacuated from primary address from 'no' to 'yes'

* Change env modal text to match wireframes (#1041)

* Display correct env modal body text (#1043)

* Add migration to fix view (#1042)

* Embcessmod 306 updates (#1049)

* Change environment names to be more consistent

* Add function to handle mapping primary address to evacuated from

* Save value of Evac'd From Primary Addr when editing

* Fix issue with changing evacuated from primary address from 'no' to 'yes'

* Fix bug where evac from in summary is wrong

* Hide env banner for prod self-reg (#1050)

* Embcessmod 494 (#1047)

* Display correct env modal body text

* Add Bulkley-Nechako community

* Add new communities to Communities.json

* Add communities to correct region

* Embcessmod 306 fixes (#1052)

* Add valueChange event to evacFromPrimaryAddr

* Change displayRegistration() to patch evacuatedFrom control outside of from.patchValue function

* Add migration to update babine lake (#1053)

* Embcessmod 490 add contact info (#1055)

* Add contact info for all logged in roles

* Add contact info for 'everyone' role

* Fix alignment of contact info for signed-out roles

* Remove commented code

* Update language on training and material page (#1056)

* EMBCESSMOD-549 URL updates to embc domain for era training and prod

* EMBCESSMOD-549 URL updates to embc domain for era training and prod (#1057)

* EMBCESSMOD-242 tool tip text

* reverted index order for needs assessment

* Fixed wrong revert change

* EMBCESSMOD-310 Self-Registration - Needs Assessment Fields Wrong Order

* EMBCESSMOD-335 reversed values for Food, Lodging, Clothing, Transportation, Incidentals

* EMBCESSMOD-335 additional fix to reversed values

* EMBCESSMOD-320 Unique Task#

* Fixed unit tests compilation

* Added data protection keys persistent folder setting

* Simplified dependencies for now

* Set ERA version to 1.2

* R2 landing page updates

* R2 landing page image fix

* EMBCESSMOD-549 URL updates to embc domain for era training and prod

Co-authored-by: Curtis <[email protected]>
Co-authored-by: Yossi T <[email protected]>
Co-authored-by: Yossi Tamari <[email protected]>

* Update language on training and material page (#1058)

* Embcessmod 441 additional train mats (#1060)

* Add new facilitator links

* Change icon to PowerPoint

* Moved PDF icon to correct link

* Embcessmod 475 release notes (#1059)

* Add era updates release section to useful info page

* Change url of updates pdf

* Change release number to 1.x

* fixed self registration link to use embc.gov.bc.ca domain

* R1.4 update (#1062)

* EMBCESSMOD-242 tool tip text

* reverted index order for needs assessment

* Fixed wrong revert change

* EMBCESSMOD-310 Self-Registration - Needs Assessment Fields Wrong Order

* EMBCESSMOD-335 reversed values for Food, Lodging, Clothing, Transportation, Incidentals

* EMBCESSMOD-335 additional fix to reversed values

* EMBCESSMOD-320 Unique Task#

* Fixed unit tests compilation

* Added data protection keys persistent folder setting

* Simplified dependencies for now

* Set ERA version to 1.2

* R2 landing page updates

* R2 landing page image fix

* EMBCESSMOD-549 URL updates to embc domain for era training and prod

* fixed self registration link to use embc.gov.bc.ca domain

Co-authored-by: Curtis <[email protected]>
Co-authored-by: Yossi T <[email protected]>
Co-authored-by: Yossi Tamari <[email protected]>

* Embcessmod 436 csv export (#1064)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Embcessmod 436 csv export (#1065)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Embcessmod 436 csv export (#1066)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Embcessmod 436 csv export (#1067)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Embcessmod 436 csv export (#1068)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Embcessmod 436 csv export (#1069)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Embcessmod 436 csv export (#1070)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* EMBCESSMOD-592: fixed tasks list search queries and display (#1072)

* Embcessmod 436 csv export (#1071)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* Swap Evacuated_From and Evacuated_To in export

* Change Evac From and To in export query

* EMBCESSMOD-592: fixed tasks list search queries and display  (#1073)

* EMBCESSMOD-592: fixed tasks list search queries and display

* Added active/expired flag to filter api call

* Embcessmod 436 csv export (#1074)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* Swap Evacuated_From and Evacuated_To in export

* Change Evac From and To in export query

* Reversed Evacuated To and From in the search paramters for export

* Embcessmod 436 csv export (#1075)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* Swap Evacuated_From and Evacuated_To in export

* Change Evac From and To in export query

* Reversed Evacuated To and From in the search paramters for export

* Add code to swap Evac_To and From in search params export

* Export fixes (#1076)

* Fix issue when searching by dob

* Remove unused search fields

* Embcessmod 436 csv export (#1077)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* Swap Evacuated_From and Evacuated_To in export

* Change Evac From and To in export query

* Reversed Evacuated To and From in the search paramters for export

* Add code to swap Evac_To and From in search params export

* Fix issue when searching by dob

* Remove unused search fields

* Add code to handle null radio buttons

* Remove commented out code

* Embcessmod 436 csv export (#1078)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* Swap Evacuated_From and Evacuated_To in export

* Change Evac From and To in export query

* Reversed Evacuated To and From in the search paramters for export

* Add code to swap Evac_To and From in search params export

* Fix issue when searching by dob

* Remove unused search fields

* Add code to handle null radio buttons

* Remove commented out code

* Add function for friendly search param names

* Change referral query to strip commas from purchaser column

* Fix issue with comma in Purchaser column

* Remove unecessary cast

* Embcessmod 436 csv export (#1080)

* Add File-Saver package

* Add EvacueeReportItem and query

* Add Where Clause to Evacuee Export

* Removed old download function

* Add export validation for super users

* Change evacuee report routing

* Rename evacuee export function

* Add referrals export with where clauses

* Add click event for referral export

* Update search button styles

* Update Referral Query and manually calculate pdt for file name

* Change the date calculation in title to use TimeZoneInfo

* Change file naming to match supplier

* Change OS switch statement to old style

* Remove unused line

* Add search params to reports

* Fix whitespace that was annoying me

* Fix validation logic for superusers exporting

* Uncommented date of birth field

* Change PK of EvacueeReportItem

* Remove commented out code

* Swap Evacuated_From and Evacuated_To in export

* Change Evac From and To in export query

* Reversed Evacuated To and From in the search paramters for export

* Add code to swap Evac_To and From in search params export

* Fix issue when searching by dob

* Remove unused search fields

* Add code to handle null radio buttons

* Remove commented out code

* Add function for friendly search param names

* Change referral query to strip commas from purchaser column

* Fix issue with comma in Purchaser column

* Remove unecessary cast

* Change reg completed and refs provided search params depending on report

* Change FileVersion location in config controller (#1082)

* Version number fix (#1084)

* Change FileVersion location in config controller

* Undo change to assembly version

* Re-undo the change to assembly version

* Change FileVersion in both Config and ApplicationVersion controllers

* Remove GetAppVersion func

* EMBCESSMOD-745 - Remove Columns with PI Data from Referral Report

* EMBCESSMOD-800 - Add Thompson-Nicola Regional District into the Community List

* EMBCESSMOD-835 - Fixed CORS policy errors

* EMBCESSMOD-829 remove PI data

Co-authored-by: Curtis <[email protected]>
Co-authored-by: Yossi T <[email protected]>
Co-authored-by: Yossi Tamari <[email protected]>
Co-authored-by: Wes R <[email protected]>
  • Loading branch information
5 people authored Nov 11, 2020
1 parent 7caecd9 commit 4465adf
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 39 deletions.
85 changes: 47 additions & 38 deletions embc-app/DataInterfaces/DataInterface.Evacuee.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,26 +196,7 @@ public async Task<IEnumerable<EvacueeReportItem>> GetEvacueeReportAsync(EvacueeS
er.Facility as 'Facility_Name',
CONVERT(datetime, SWITCHOFFSET(er.SelfRegisteredDate, DATEPART(TZOFFSET, er.SelfRegisteredDate AT TIME ZONE 'Pacific Standard Time'))) as 'Self_Registration_Date',
CONVERT(datetime, SWITCHOFFSET(er.RegistrationCompletionDate, DATEPART(TZOFFSET, er.RegistrationCompletionDate AT TIME ZONE 'Pacific Standard Time'))) as 'Registration_Completed_Date',
-- Evacuee Information
evac.LastName as 'Last_Name',
evac.FirstName as 'First_Name',
CAST(evac.Dob AS VARCHAR(10)) as 'Date_Of_Birth',
evac.Gender as 'Gender',
'Is_Head_Of_Household' = CASE WHEN evac.EvacueeTypeCode = 'HOH' THEN 'Y' ELSE 'N' END,
-- Evacuee Contact Information
erap.AddressLine1 as 'Address',
commAddr.Name as 'Community',
erap.Province as 'Province',
erap.PostalCode as 'Postal_Code',
countryAddr.Name as 'Country',
er.PhoneNumber as 'Phone_Number',
er.PhoneNumberAlt as 'Alternate_Phone_Number',
er.Email as 'Email_Address',
ISNULL(eram.AddressLine1, erap.AddressLine1) as 'Mailing_Address',
ISNULL(commAddrM.Name, commAddr.Name) as 'Mailing_Community',
ISNULL(eram.Province, erap.Province) as 'Mailing_Province',
ISNULL(eram.PostalCode, erap.PostalCode) as 'Mailing_Postal_Code',
ISNULL(countryAddrM.Name, countryAddr.Name) as 'Mailing_Country',
-- **** PI data removed from here *****
-- Questions and Services
er.InsuranceCode as 'Insurance',
CASE WHEN er.HasPets = 1 THEN 'Y' ELSE 'N' END as 'Pets',
Expand Down Expand Up @@ -248,26 +229,54 @@ LEFT OUTER JOIN
LEFT OUTER JOIN
Countries countryAddrM ON countryAddrM.CountryCode = eram.CountryCode
");
// Apply Where clauses
if (!string.IsNullOrWhiteSpace(searchQuery.LastName))
{
query = query.Where(e => e.Last_Name.Equals(searchQuery.LastName, StringComparison.OrdinalIgnoreCase));
}

if (!string.IsNullOrWhiteSpace(searchQuery.FirstName))
{
query = query.Where(e => e.First_Name.Equals(searchQuery.FirstName, StringComparison.OrdinalIgnoreCase));
}
//************************************************************************
// * START - PI columns removed as indicated in Jira ticket EMBCESSMOD-829
//************************************************************************
//-- Evacuee Information
//evac.LastName as 'Last_Name',
//evac.FirstName as 'First_Name',
//CAST(evac.Dob AS VARCHAR(10)) as 'Date_Of_Birth',
//evac.Gender as 'Gender',
//'Is_Head_Of_Household' = CASE WHEN evac.EvacueeTypeCode = 'HOH' THEN 'Y' ELSE 'N' END,
//-- Evacuee Contact Information
//erap.AddressLine1 as 'Address',
//commAddr.Name as 'Community',
//erap.Province as 'Province',
//erap.PostalCode as 'Postal_Code',
//countryAddr.Name as 'Country',
//er.PhoneNumber as 'Phone_Number',
//er.PhoneNumberAlt as 'Alternate_Phone_Number',
//er.Email as 'Email_Address',
//ISNULL(eram.AddressLine1, erap.AddressLine1) as 'Mailing_Address',
//ISNULL(commAddrM.Name, commAddr.Name) as 'Mailing_Community',
//ISNULL(eram.Province, erap.Province) as 'Mailing_Province',
//ISNULL(eram.PostalCode, erap.PostalCode) as 'Mailing_Postal_Code',
//ISNULL(countryAddrM.Name, countryAddr.Name) as 'Mailing_Country',
//**********************************************************************
// * END - PI columns removed as indicated in Jira ticket EMBCESSMOD-829
//**********************************************************************

if (!string.IsNullOrWhiteSpace(searchQuery.DateOfBirth))
{
// TryParse means that if it fails to parse a Date, the out value will be set to
// DateTime.MinVal (Midnight @ 0001 AD) Otherwise it throws an exception if it
// fails Letting it blow up might be more correct - Should we throw an exception
// if a bad date string is passed in?
DateTime.TryParse(searchQuery.DateOfBirth, out DateTime dob);
query = query.Where(e => DateTime.Parse(e.Date_Of_Birth).Equals(dob));
}
// Apply Where clauses
//if (!string.IsNullOrWhiteSpace(searchQuery.LastName))
//{
// query = query.Where(e => e.Last_Name.Equals(searchQuery.LastName, StringComparison.OrdinalIgnoreCase));
//}

//if (!string.IsNullOrWhiteSpace(searchQuery.FirstName))
//{
// query = query.Where(e => e.First_Name.Equals(searchQuery.FirstName, StringComparison.OrdinalIgnoreCase));
//}

//if (!string.IsNullOrWhiteSpace(searchQuery.DateOfBirth))
//{
// // TryParse means that if it fails to parse a Date, the out value will be set to
// // DateTime.MinVal (Midnight @ 0001 AD) Otherwise it throws an exception if it
// // fails Letting it blow up might be more correct - Should we throw an exception
// // if a bad date string is passed in?
// DateTime.TryParse(searchQuery.DateOfBirth, out DateTime dob);
// query = query.Where(e => DateTime.Parse(e.Date_Of_Birth).Equals(dob));
//}

if (!string.IsNullOrWhiteSpace(searchQuery.IncidentTaskNumber))
{
Expand Down
3 changes: 2 additions & 1 deletion embc-app/DataInterfaces/EmbcDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
.HasForeignKey("EssFileNumber");

modelBuilder.Entity<EvacueeReportItem>()
.HasKey(e => new { e.Ess_File_Number, e.First_Name, e.Last_Name });
//.HasKey(e => new { e.Ess_File_Number, e.First_Name, e.Last_Name });
.HasKey(e => new { e.Ess_File_Number });

modelBuilder.Entity<ReferralReportItem>()
.HasKey(e => new { e.Referral_Number, e.Ess_File_Number, e.Task_Number });
Expand Down
4 changes: 4 additions & 0 deletions embc-app/Models/Db/EvacueeReportItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ public class EvacueeReportItem
public string Facility_Name { get; set; }
public DateTime? Self_Registration_Date { get; set; }
public DateTime? Registration_Completed_Date { get; set; }
/*****************************************************************
* PI columns removed as indicated in Jira ticket EMBCESSMOD-745
*****************************************************************
public string Last_Name { get; set; }
public string First_Name { get; set; }
public string Date_Of_Birth { get; set; }
Expand All @@ -34,6 +37,7 @@ public class EvacueeReportItem
public string Mailing_Province { get; set; }
public string Mailing_Postal_Code { get; set; }
public string Mailing_Country { get; set; }
***************************************************************/
public string Insurance { get; set; }
public string Pets { get; set; }
public string Service_Recommendation_Inquiry { get; set; }
Expand Down
5 changes: 5 additions & 0 deletions embc-app/Utils/CsvConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ private static void AddSearchParams(StringWriter sw, EvacueeSearchQueryParameter
{
object prop = properties[i].GetValue(searchParams);
string propName = GetFriendlySearchParamName(properties[i].Name);
// do not show parameters with where condition not applied
if (propName == "Last Name" || propName == "First Name" || propName == "Date of Birth")
{
continue;
}
ProcessProperty(prop, propName, sw, isEvacueeExport);
if (IsValidProp(prop, propName))
{
Expand Down

0 comments on commit 4465adf

Please sign in to comment.