Skip to content
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

Wfnews 2101 #1814

Merged
merged 4 commits into from
Apr 22, 2024
Merged

Wfnews 2101 #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
defcca9
add out-fires into preview panel
yzlucas Apr 22, 2024
56f5f19
pop up preview panel on mobile as list
yzlucas Apr 22, 2024
bb4054c
fix dashboard page totals this year number
yzlucas Apr 22, 2024
539bd57
Merge branch 'main' into wfnews-2101
yzlucas Apr 22, 2024
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
10 changes: 9 additions & 1 deletion ...ashboard-component/widgets/fire-centre-stats-widget/fire-centre-stats-widget.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,22 @@ export class FireCentreStatsWidget implements AfterViewInit {
n,
{
activeBeingHeldFires,
activeBeingHeldFiresOfNote,
activeOutOfControlFires,
activeOutOfControlFiresOfNote,
activeUnderControlFires,
activeUnderControlFiresOfNote,
outFires,
},
) =>
n +
activeBeingHeldFires +
activeBeingHeldFiresOfNote +
activeOutOfControlFires +
activeUnderControlFires,
activeOutOfControlFiresOfNote +
activeUnderControlFires +
activeUnderControlFiresOfNote +
outFires,
0,
) || 0;

Expand Down
8 changes: 7 additions & 1 deletion ...components/dashboard-component/widgets/fire-totals-widget/fire-totals-widget.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,20 @@ export class FireTotalsWidget implements AfterViewInit {
n,
{
activeBeingHeldFires,
activeBeingHeldFiresOfNote,
activeOutOfControlFires,
activeOutOfControlFiresOfNote,
activeUnderControlFires,
activeUnderControlFiresOfNote
},
) =>
n +
activeBeingHeldFires +
activeBeingHeldFiresOfNote +
activeOutOfControlFires +
activeUnderControlFires,
activeOutOfControlFiresOfNote +
activeUnderControlFires +
activeUnderControlFiresOfNote,
0,
) || 0;
const currentYearOut =
Expand Down
6 changes: 6 additions & 0 deletions ...-component/widgets/historical-comparison-widget/historical-comparison-widget.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,21 @@ export class HistoricalComparisonWidget implements AfterViewInit {
n,
{
activeBeingHeldFires,
activeBeingHeldFiresOfNote,
activeOutOfControlFires,
activeOutOfControlFiresOfNote,
activeUnderControlFires,
activeUnderControlFiresOfNote,
outFires,
},
) =>
n +
activeBeingHeldFires +
activeBeingHeldFiresOfNote +
activeOutOfControlFires +
activeOutOfControlFiresOfNote +
activeUnderControlFires +
activeUnderControlFiresOfNote +
outFires,
0,
) || 0;
Expand Down
2 changes: 1 addition & 1 deletion ...ws-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<div class="draggable-panel" *ngIf="showPanel && currentIncidentRefs && currentIncidentRefs.length > 1">
<div class="draggable-panel" *ngIf="showPanel && currentIncidentRefs && currentIncidentRefs.length >= 1">
<div class="panel-container" >
<div class="draggable-panel-title">
{{currentIncidentRefs.length}} Results <mat-icon svgIcon="cancel" (click)="closePanel()"></mat-icon>
Expand Down
2 changes: 1 addition & 1 deletion ...ws-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
height: 22px;
}
}
&.bcws-activefires-publicview-inactive {
&.bcws-activefires-publicview-inactive, &.active-wildfires-out {
background-color: #5c6671;
border: 1px solid black;
border-radius: 50%;
Expand Down
7 changes: 6 additions & 1 deletion ...news-war/src/main/angular/src/app/components/draggable-panel/draggable-panel.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export class DraggablePanelComponent implements OnInit, OnChanges, OnDestroy {
'active-wildfires-under-control',
'bcws-activefires-publicview-inactive',
'fire-perimeters',
"active-wildfires-out"
];
convertToDateYear = convertToDateYear;
convertToDateTime = convertToDateTime;
Expand Down Expand Up @@ -155,7 +156,9 @@ export class DraggablePanelComponent implements OnInit, OnChanges, OnDestroy {
}
}
}
if (this.currentIncidentRefs.length === 1) {
if (this.currentIncidentRefs.length === 1 && this.allowBackToIncidentsPanel) {
// only show preview detial if it is through openPreviewPanel(). We will always the preview list page by clicking on map, even there is only single item.
this.showPanel = true;
const viewer = getActiveMap().$viewer;
for (const polygon of this.highlightPolygons) {
viewer.map.removeLayer(polygon);
Expand Down Expand Up @@ -384,6 +387,7 @@ export class DraggablePanelComponent implements OnInit, OnChanges, OnDestroy {
case 'active-wildfires-under-control':
case 'bcws-activefires-publicview-inactive':
case 'active-wildfires-holding':
case 'active-wildfires-out':
return 'Wildfire';
}
}
Expand Down Expand Up @@ -677,6 +681,7 @@ return 'Unknown';
case 'active-wildfires-out-of-control':
case 'active-wildfires-holding':
case 'active-wildfires-under-control':
case 'active-wildfires-out':
if (
item.properties.fire_year &&
item.properties.incident_number_label
Expand Down
Loading