Skip to content

Commit

Permalink
Merge branch 'PublishingChanges'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tom-karasch
tom-karasch committed Jan 31, 2024
2 parents 7885cbc + 07b3617 commit b227655
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 122 deletions.
31 changes: 1 addition & 30 deletions FMS.Domain/Entities/Facility.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,7 @@ public Facility(FacilityCreateDto newFacility)
State = newFacility.State;
PostalCode = newFacility.PostalCode;
Latitude = newFacility.Latitude ?? 0;
Longitude = newFacility.Longitude ?? 0;
HSInumber = newFacility.HSInumber;
NonHSILetterDate = newFacility.NonHSILetterDate;
Comments = newFacility.Comments;
PreRQSMcleanup = newFacility.PreRQSMcleanup;
ImageChecked = newFacility.ImageChecked;
DeferredOnSiteScoring = newFacility.DeferredOnSiteScoring;
AdditionalDataRequested = newFacility.AdditionalDataRequested;
VRPReferral = newFacility.VRPReferral;
Longitude = newFacility.Longitude ?? 0;
}

// Existing ID for Facility May be used by Programs - System Generated, but not a Guid
Expand Down Expand Up @@ -96,27 +88,6 @@ public Facility(FacilityCreateDto newFacility)

public bool IsRetained { get; set; } = true;

[StringLength(5)]
public string HSInumber { get; set; }

[NotMapped]
[Column(TypeName = "DateOnly")]
public DateOnly NonHSILetterDate { get; set; }

[StringLength(200)]
public string Comments { get; set; }

public bool PreRQSMcleanup { get; set; } = true;

public bool ImageChecked { get; set; } = true;

public bool DeferredOnSiteScoring { get; set; } = true;

public bool AdditionalDataRequested { get; set; } = true;

public bool VRPReferral { get; set; } = true;


// List of retention records for this Facility
public ICollection<RetentionRecord> RetentionRecords { get; set; }
}
Expand Down
20 changes: 2 additions & 18 deletions FMS/Platform/DevHelpers/SeedData/FacilitySeedData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,7 @@ private static IEnumerable<Facility> GetFacilities()
Latitude = 34.086774m,
Longitude = -84.505922m,
CountyId = 243,
IsRetained = true,
HSInumber = "10234",
NonHSILetterDate = new DateOnly(2018, 2, 13),
Comments = "Just some comments about this facility",
PreRQSMcleanup = false,
ImageChecked = true,
DeferredOnSiteScoring = true,
AdditionalDataRequested = false,
VRPReferral = false
IsRetained = true
},
new()
{
Expand All @@ -348,15 +340,7 @@ private static IEnumerable<Facility> GetFacilities()
Latitude = 34.086774m,
Longitude = -84.506122m,
CountyId = 243,
IsRetained = true,
HSInumber = "10251",
NonHSILetterDate = new DateOnly(2020, 11, 17),
Comments = "Strip that looks like every other strip mall",
PreRQSMcleanup = false,
ImageChecked = false,
DeferredOnSiteScoring = true,
AdditionalDataRequested = true,
VRPReferral = false
IsRetained = true
}
};
}
Expand Down
73 changes: 38 additions & 35 deletions FMS/Properties/PublishProfiles/Publish-Development.pubxml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>https://dev-fms.gaepd.org</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<ProjectGuid>67eebcce-acdd-435b-926b-1a2620d248c5</ProjectGuid>
<MSDeployServiceURL>dev-fms.gaepd.org</MSDeployServiceURL>
<DeployIisAppPath>fms.gaepd.org</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName />
<_SavePWD>False</_SavePWD>
</PropertyGroup>
<ItemGroup>
<MsDeploySkipRules Include="SkipAppSettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>appsettings.*.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipLibrarySettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>libman.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipWebConfig">
<ObjectName>filePath</ObjectName>
<AbsolutePath>web.config</AbsolutePath>
</MsDeploySkipRules>
</ItemGroup>
</Project>
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>https://dev-fms.gaepd.org</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<ProjectGuid>67eebcce-acdd-435b-926b-1a2620d248c5</ProjectGuid>
<MSDeployServiceURL>dev-fms.gaepd.org</MSDeployServiceURL>
<DeployIisAppPath>fms</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<UserName>SOG\akarasch</UserName>
<_SavePWD>true</_SavePWD>
<TargetFramework>net8.0</TargetFramework>
<SelfContained>false</SelfContained>
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
</PropertyGroup>
<ItemGroup>
<MsDeploySkipRules Include="SkipAppSettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>appsettings.*.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipLibrarySettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>libman.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipWebConfig">
<ObjectName>filePath</ObjectName>
<AbsolutePath>web.config</AbsolutePath>
</MsDeploySkipRules>
</ItemGroup>
</Project>
11 changes: 6 additions & 5 deletions FMS/Properties/PublishProfiles/Publish-Production.pubxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<SiteUrlToLaunchAfterPublish>https://fms.gaepd.org</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<ProjectGuid>67eebcce-acdd-435b-926b-1a2620d248c5</ProjectGuid>
<MSDeployServiceURL>sei3.gaepd.org</MSDeployServiceURL>
<DeployIisAppPath>fms.gaepd.org</DeployIisAppPath>
<MSDeployServiceURL>fms.gaepd.org</MSDeployServiceURL>
<DeployIisAppPath>fms</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>true</SkipExtraFilesOnServer>
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<UserName>D0300V1WWEB0006/tkarasch</UserName>
<UserName>SOG\akarasch</UserName>
<_SavePWD>false</_SavePWD>
<SelfContained>false</SelfContained>
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<MsDeploySkipRules Include="SkipAppSettings">
Expand All @@ -37,4 +38,4 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<AbsolutePath>web.config</AbsolutePath>
</MsDeploySkipRules>
</ItemGroup>
</Project>
</Project>
71 changes: 37 additions & 34 deletions FMS/Properties/PublishProfiles/Publish-Staging.pubxml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>https://uat-fms.gaepd.org</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<ProjectGuid>67eebcce-acdd-435b-926b-1a2620d248c5</ProjectGuid>
<MSDeployServiceURL>uat-fms.gaepd.org</MSDeployServiceURL>
<DeployIisAppPath>fms.gaepd.org</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName />
<_SavePWD>False</_SavePWD>
</PropertyGroup>
<ItemGroup>
<MsDeploySkipRules Include="SkipAppSettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>appsettings.*.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipLibrarySettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>libman.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipWebConfig">
<ObjectName>filePath</ObjectName>
<AbsolutePath>web.config</AbsolutePath>
</MsDeploySkipRules>
</ItemGroup>
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish>https://uat-fms.gaepd.org</SiteUrlToLaunchAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<ProjectGuid>67eebcce-acdd-435b-926b-1a2620d248c5</ProjectGuid>
<MSDeployServiceURL>uat-fms.gaepd.org</MSDeployServiceURL>
<DeployIisAppPath>fms</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<UserName>SOG\akarasch</UserName>
<_SavePWD>true</_SavePWD>
<TargetFramework>net8.0</TargetFramework>
<SelfContained>false</SelfContained>
<EnableMsDeployAppOffline>true</EnableMsDeployAppOffline>
</PropertyGroup>
<ItemGroup>
<MsDeploySkipRules Include="SkipAppSettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>appsettings.*.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipLibrarySettings">
<ObjectName>filePath</ObjectName>
<AbsolutePath>libman.json</AbsolutePath>
</MsDeploySkipRules>
<MsDeploySkipRules Include="SkipWebConfig">
<ObjectName>filePath</ObjectName>
<AbsolutePath>web.config</AbsolutePath>
</MsDeploySkipRules>
</ItemGroup>
</Project>

0 comments on commit b227655

Please sign in to comment.