Skip to content

Enhance VRP Facility Details page and add null checks #1096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tom-karasch wants to merge 1 commit into
base: Dev
Choose a base branch
from
+40 −15
Open

Enhance VRP Facility Details page and add null checks #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions FMS/Pages/Facilities/Details.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
<div class="container bg-light-subtle p-3 m-1 rounded-3">
<nav class="navbar navbar-expand-sm">
<ul class="nav nav-tabs active" id="HSINavBar">
@if (Model.FacilityDetail.FacilityType.Name == "HSI")
@if (Model.FacilityDetail.FacilityType.Name == "HSI" || Model.FacilityDetail.FacilityType.Name == "VRP")
{
<li class="nav-item" role="presentation">
<a class="nav-link @(Model.ActiveTab == "HSIProperties" ? "active" : "")" data-bs-toggle="tab" data-bs-target="#HSIProperties" type="text/html" role="tab" aria-controls="HSIProperties" aria-selected="@(Model.FacilityDetail.FacilityType.Name == "VRP" ? "false" : "true")" href="#HSIProperties">HSI Properties</a>
Expand All @@ -407,13 +407,21 @@
</li>
}
<li class="nav-item" role="presentation">
<a class="nav-link @(Model.ActiveTab == "Events" || (((Model.FacilityDetail.FacilityType.Name == "RN" || Model.FacilityDetail.FacilityType.Name == "VRP") && (Model.FacilityDetail.FacilityStatus.Name == "COMPLAINT" || Model.FacilityDetail.FacilityStatus.Name == "Event Tracking On")) || (Model.FacilityDetail.FacilityType.Name == "NPL" && Model.FacilityDetail.FacilityStatus.Name == "EPA Referred")) ? "active" : "")" data-bs-toggle="tab" data-bs-target="#Events" type="text/html" role="tab" aria-controls="Events" aria-selected="@((((Model.FacilityDetail.FacilityType.Name == "RN" || Model.FacilityDetail.FacilityType.Name == "VRP") && (Model.FacilityDetail.FacilityStatus.Name == "COMPLAINT" || Model.FacilityDetail.FacilityStatus.Name == "Event Tracking On")) || (Model.FacilityDetail.FacilityType.Name == "NPL" && Model.FacilityDetail.FacilityStatus.Name == "EPA Referred")) ? "true" : "false")" href="#Events">Events</a>
<a class="nav-link @(Model.ActiveTab == "Events" ? "active" : "")"
@* || (((Model.FacilityDetail.FacilityType.Name= ="RN" || Model.FacilityDetail.FacilityType.Name= ="VRP" ) && (Model.FacilityDetail.FacilityStatus.Name= ="COMPLAINT" || Model.FacilityDetail.FacilityStatus.Name= ="Event Tracking On" )) || (Model.FacilityDetail.FacilityType.Name= ="NPL" && Model.FacilityDetail.FacilityStatus.Name= ="EPA Referred" )) ? "active" : "" )" *@
data-bs-toggle="tab"
data-bs-target="#Events"
type="text/html"
role="tab"
aria-controls="Events"
aria-selected=" @(Model.ActiveTab == "Events" ? "active" : "")"
@* ((((Model.FacilityDetail.FacilityType.Name == "RN" || Model.FacilityDetail.FacilityType.Name == "VRP") && (Model.FacilityDetail.FacilityStatus.Name == "COMPLAINT" || Model.FacilityDetail.FacilityStatus.Name == "Event Tracking On")) || (Model.FacilityDetail.FacilityType.Name == "NPL" && Model.FacilityDetail.FacilityStatus.Name == "EPA Referred")) ? "true" : "false")" *@ href="#Events">Events</a>
</li>
</ul>
</nav>

<div class="tab-content">
@if (Model.FacilityDetail.FacilityType.Name == "HSI")
@if (Model.FacilityDetail.FacilityType.Name == "HSI" || Model.FacilityDetail.FacilityType.Name == "VRP")
{
<div class="tab-pane @(Model.ActiveTab == "HSIProperties" ? "active" : "")" id="HSIProperties" role="tabpanel" aria-labelledby="HSIProperties-tab">
<H3>
Expand Down Expand Up @@ -1413,7 +1421,7 @@
<div class="col-md-4">
@Html.DisplayNameFor(model => model.FacilityDetail.StatusDetails.Lien)
</div>
@if (Model.FacilityDetail.StatusDetails.Lien)
@if (Model.FacilityDetail.StatusDetails != null && Model.FacilityDetail.StatusDetails.Lien)
{
<div class="col-md-3">
<a href="https://gets.sharepoint.com/:f:/s/ResponseandRemediationProgram/EhLSMRi5lEZOquQ6pLKhLUwBEpMsALxr5BHdhIOp6kZYiw?e=5vWBcz" class="btn btn-sm btn-primary" target="_blank">Liens Filed with County</a>
Expand All @@ -1430,7 +1438,7 @@
<div class="col-md-4">
@Html.DisplayNameFor(model => model.FacilityDetail.StatusDetails.FinancialAssurance)
</div>
@if (Model.FacilityDetail.StatusDetails.FinancialAssurance)
@if (Model.FacilityDetail.StatusDetails != null && Model.FacilityDetail.StatusDetails.FinancialAssurance)
{
<div class="col-md-3">
<a href="https://gets.sharepoint.com/:x:/r/sites/ResponseandRemediationProgram/_layouts/15/Doc.aspx?sourcedoc=%7B3A30C17D-62E2-4F54-BB79-F60CAF3EBC98%7D&file=HSRP%20Financial%20Assurance%20List%20of%20Sites%202020.xlsx&action=default&mobileredirect=true" class="btn btn-sm btn-primary" target="_blank">HSRP Financial Assurance Tracker</a>
Expand All @@ -1444,7 +1452,7 @@
<div class="col-md-4">
@Html.DisplayNameFor(model => model.FacilityDetail.StatusDetails.UEC)
</div>
@if (Model.FacilityDetail.StatusDetails.UEC)
@if (Model.FacilityDetail.StatusDetails != null && Model.FacilityDetail.StatusDetails.UEC)
{
<div class="col-md-3">
<a href="https://epd.georgia.gov/properties-subject-uniform-environmental-covenants" class="btn btn-sm btn-primary" target="_blank">EC Online Knack Table</a>
Expand All @@ -1453,7 +1461,11 @@
</div>
</div>
}
<div class="tab-pane @(Model.ActiveTab == "Events" || (((Model.FacilityDetail.FacilityType.Name == "RN" || Model.FacilityDetail.FacilityType.Name == "VRP") && (Model.FacilityDetail.FacilityStatus.Name == "COMPLAINT" || Model.FacilityDetail.FacilityStatus.Name == "Event Tracking On")) || (Model.FacilityDetail.FacilityType.Name == "NPL" && Model.FacilityDetail.FacilityStatus.Name == "EPA Referred")) ? "active" : "")" id="Events" role="tabpanel" aria-labelledby="Events-tab">
<div class="tab-pane @(Model.ActiveTab == "Events" ? "active" : "")"
@* || (((Model.FacilityDetail.FacilityType.Name= ="RN" || Model.FacilityDetail.FacilityType.Name= ="VRP" ) && (Model.FacilityDetail.FacilityStatus.Name= ="COMPLAINT" || Model.FacilityDetail.FacilityStatus.Name= ="Event Tracking On" )) || (Model.FacilityDetail.FacilityType.Name= ="NPL" && Model.FacilityDetail.FacilityStatus.Name= ="EPA Referred" )) ? "active" : "" )" *@
id="Events"
role="tabpanel"
aria-labelledby="Events-tab">
<h3>
<form method="post">
Events
Expand Down
29 changes: 21 additions & 8 deletions FMS/Pages/Facilities/Details.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
private readonly IFacilityRepository _repository;
private readonly IEventRepository _eventRepository;
private readonly Microsoft.Extensions.Configuration.IConfiguration _configuration;
public DetailsModel(IFacilityRepository repository,
IEventRepository eventRepository,
public DetailsModel(IFacilityRepository repository,
IEventRepository eventRepository,
Microsoft.Extensions.Configuration.IConfiguration configuration)
{
_repository = repository;
Expand Down Expand Up @@ -67,7 +67,9 @@

public EventSort SortBy { get; set; }

public async Task<IActionResult> OnGetAsync(Guid? id, Guid? hr, string tab, EventSort sortBy = EventSort.StartDateDesc)
public bool IsVrpTracked { get; set; }

public async Task<IActionResult> OnGetAsync(Guid? id, Guid? hr, string tab, EventSort sortBy = EventSort.StartDateDesc)
{
if (id == null)
{
Expand All @@ -92,11 +94,11 @@
HighlightRecord = hr.Value;
}

if(FacilityDetail.FacilityType.Name == "HSI" || (FacilityDetail.FacilityType.Name == "NPL" && FacilityDetail.FacilityStatus.Name == "EPA Referred"))
if (FacilityDetail.FacilityType.Name == "HSI" || (FacilityDetail.FacilityType.Name == "NPL" && FacilityDetail.FacilityStatus.Name == "EPA Referred"))
{
HSIFolderLink = UrlHelper.GetHSIFolderLink(FacilityDetail.FacilityNumber);
}

if (FacilityDetail.FacilityType.Name == "RN")
{
if (FacilityDetail.DeterminationLetterDate.HasValue && string.IsNullOrEmpty(FacilityDetail.HSInumber))
Expand All @@ -107,14 +109,14 @@
{
PendingNotificationFolderLink = UrlHelper.GetPendingNotificationFolderLink(FacilityDetail.FacilityNumber);
}
if (FacilityDetail.FacilityStatus.Name == "COMPLAINT")
if (FacilityDetail.FacilityStatus.Name == "COMPLAINT")
{
ComplaintsFolderLink = UrlHelper.GetComplaintsFolderLink(FacilityDetail.FacilityNumber);
}
else
{
RNHSIFolderLink = UrlHelper.GetHSIFolderLink(FacilityDetail.HSInumber);
}
}
}

ActiveTab = tab ?? "HSIProperties";
Expand Down Expand Up @@ -187,11 +189,22 @@

public string GetGoogleMapsUrl(FacilityDetailDto facility)
{
if (facility.Latitude != 0 && facility.Longitude != 0)
if (facility.Latitude != 0 && facility.Longitude != 0 && facility.LocationDetails != null)
{
return $"https://maps.googleapis.com/maps/api/staticmap?center={facility.Latitude},{facility.Longitude}&zoom={facility.LocationDetails.MapZoom}&size=250x250&markers=color:red|{facility.Latitude},{facility.Longitude}&maptype={facility.LocationDetails.MapType}&key={GoogleMapsApiKey}&style=feature:poi|visibility:off";
}
return null;
}

public bool GetVrpTrackingStatus(FacilityDetailDto facility)

Check warning on line 199 in FMS/Pages/Facilities/Details.cshtml.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Make 'GetVrpTrackingStatus' a static method. 


See more on https://sonarcloud.io/project/issues?id=gaepdit_FMS&issues=AZ_uH7AORN0cOpZ1-5Xp&open=AZ_uH7AORN0cOpZ1-5Xp&pullRequest=1096
{
if (facility != null &&
facility.HsrpFacilityPropertyDetails.VRPDate != null &&
!facility.HsrpFacilityPropertyDetails.VRPTerminated)
{
return true;
}
return false;
}
}
}
Loading