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.

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 1930 #1813

Merged
merged 119 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
496ba24
use 20px if safe-area-inset not detectable
yzlucas Dec 13, 2023
ca02ca9
typo on notification title
yzlucas Dec 13, 2023
9492550
commented out in-app notification section
yzlucas Dec 13, 2023
6c4e0fc
Merge branch 'main' into ios-screen
yzlucas Dec 13, 2023
bfaecc8
remove bracket from notifiation message body
yzlucas Dec 13, 2023
4ef3e80
Merge branch 'main' into ios-screen
yzlucas Dec 13, 2023
743302c
try out
yzlucas Dec 13, 2023
ce28d87
Merge branch 'ios-screen' of github.com:yzlucas/nr-bcws-wfnews into i…
yzlucas Dec 13, 2023
6d18911
Merge branch 'main' into ios-screen
yzlucas Dec 13, 2023
dd05e88
safe-area in map screen got ignored
yzlucas Dec 13, 2023
de4b3a7
merge conflict
yzlucas Dec 13, 2023
b6e0c0c
change notification message again. set 10 sec apperance time for noti…
yzlucas Dec 13, 2023
bccb413
Merge branch 'main' into ios-screen
yzlucas Dec 13, 2023
97759b8
more styling tweak
yzlucas Dec 13, 2023
1f37e51
Merge branch 'main' into ios-screen
yzlucas Dec 14, 2023
376080d
remove test
yzlucas Dec 14, 2023
59d13e4
emit location notification if click in app notification
yzlucas Dec 14, 2023
3a2e740
Merge branch 'ios-screen' into main
yzlucas Dec 14, 2023
da91d6e
Merge branch 'bcgov:main' into main
yzlucas Dec 14, 2023
19ee53b
Merge branch 'bcgov:main' into main
yzlucas Dec 15, 2023
62a8031
Merge branch 'bcgov:main' into main
yzlucas Dec 15, 2023
f5b667a
Merge branch 'bcgov:main' into main
yzlucas Dec 20, 2023
e15b154
Merge branch 'bcgov:main' into main
yzlucas Dec 20, 2023
4f4d11a
Merge branch 'bcgov:main' into main
yzlucas Dec 20, 2023
9c2875c
Merge branch 'bcgov:main' into main
yzlucas Dec 21, 2023
bb03b55
Merge branch 'bcgov:main' into main
yzlucas Dec 22, 2023
636f1dd
Merge branch 'bcgov:main' into main
yzlucas Dec 22, 2023
815be1c
Merge branch 'bcgov:main' into main
yzlucas Dec 23, 2023
8f428fb
Merge branch 'bcgov:main' into main
yzlucas Dec 23, 2023
91b73c0
Merge branch 'bcgov:main' into main
yzlucas Jan 2, 2024
f0a3b52
Merge branch 'bcgov:main' into main
yzlucas Jan 9, 2024
a295dc0
Merge branch 'bcgov:main' into main
yzlucas Jan 23, 2024
c02bc65
Merge branch 'bcgov:main' into main
yzlucas Jan 25, 2024
1988359
Merge branch 'bcgov:main' into main
yzlucas Jan 26, 2024
74d084f
Merge branch 'bcgov:main' into main
yzlucas Jan 26, 2024
2b3cbae
Merge branch 'bcgov:main' into main
yzlucas Jan 27, 2024
9a23773
Merge branch 'bcgov:main' into main
yzlucas Jan 30, 2024
c80fb5c
Merge branch 'bcgov:main' into main
yzlucas Jan 31, 2024
aa9ae90
Merge branch 'bcgov:main' into main
yzlucas Jan 31, 2024
5b5d12c
Merge branch 'bcgov:main' into main
yzlucas Feb 2, 2024
a615a80
Merge branch 'bcgov:main' into main
yzlucas Feb 2, 2024
2e454da
Merge branch 'bcgov:main' into main
yzlucas Feb 2, 2024
64e8d6a
Merge branch 'bcgov:main' into main
yzlucas Feb 2, 2024
194caa1
Merge branch 'bcgov:main' into main
yzlucas Feb 2, 2024
f81edb6
Merge branch 'bcgov:main' into main
yzlucas Feb 5, 2024
f390dde
Merge branch 'bcgov:main' into main
yzlucas Feb 6, 2024
065b7c9
Merge branch 'bcgov:main' into main
yzlucas Feb 6, 2024
564b1ac
Merge branch 'bcgov:main' into main
yzlucas Feb 7, 2024
70f1ec5
Merge branch 'bcgov:main' into main
yzlucas Feb 7, 2024
cc10b34
Merge branch 'bcgov:main' into main
yzlucas Feb 9, 2024
f5e92d3
Merge branch 'bcgov:main' into main
yzlucas Feb 10, 2024
f290c15
Merge branch 'bcgov:main' into main
yzlucas Feb 10, 2024
c0a0ace
Merge branch 'bcgov:main' into main
yzlucas Feb 10, 2024
31d8b0a
Merge branch 'bcgov:main' into main
yzlucas Feb 12, 2024
6649156
Merge branch 'bcgov:main' into main
yzlucas Feb 12, 2024
76cbf9a
Merge branch 'bcgov:main' into main
yzlucas Feb 13, 2024
a9cd3ef
Merge branch 'bcgov:main' into main
yzlucas Feb 13, 2024
c4b12cb
Merge branch 'bcgov:main' into main
yzlucas Feb 14, 2024
5b8d2bc
Merge branch 'bcgov:main' into main
yzlucas Feb 14, 2024
9879ec2
Merge branch 'bcgov:main' into main
yzlucas Feb 15, 2024
caf4bdd
Merge branch 'bcgov:main' into main
yzlucas Feb 20, 2024
7762002
Merge branch 'bcgov:main' into main
yzlucas Feb 20, 2024
f7bdf05
Merge branch 'bcgov:main' into main
yzlucas Feb 20, 2024
81baa88
Merge branch 'bcgov:main' into main
yzlucas Feb 21, 2024
752a7e7
Merge branch 'bcgov:main' into main
yzlucas Feb 21, 2024
5ff414a
Merge branch 'bcgov:main' into main
yzlucas Feb 21, 2024
7ec85f3
Merge branch 'bcgov:main' into main
yzlucas Feb 21, 2024
3dc3ca0
Merge branch 'bcgov:main' into main
yzlucas Feb 22, 2024
0e77d41
Merge branch 'bcgov:main' into main
yzlucas Feb 22, 2024
59c2f07
Merge branch 'bcgov:main' into main
yzlucas Feb 22, 2024
ad85b40
Merge branch 'bcgov:main' into main
yzlucas Feb 22, 2024
f7dd95c
Merge branch 'bcgov:main' into main
yzlucas Feb 23, 2024
94134c3
Merge branch 'bcgov:main' into main
yzlucas Feb 23, 2024
8fa2ef6
Merge branch 'bcgov:main' into main
yzlucas Feb 24, 2024
c116b8b
Merge branch 'bcgov:main' into main
yzlucas Feb 26, 2024
52ab373
Merge branch 'bcgov:main' into main
yzlucas Feb 26, 2024
2f26eef
Merge branch 'bcgov:main' into main
yzlucas Feb 26, 2024
ce5cb28
Merge branch 'bcgov:main' into main
yzlucas Feb 27, 2024
af8e5de
Merge branch 'bcgov:main' into main
yzlucas Feb 28, 2024
3262099
Merge branch 'bcgov:main' into main
yzlucas Mar 4, 2024
8e9d114
Merge branch 'bcgov:main' into main
yzlucas Mar 5, 2024
aef016c
Merge branch 'bcgov:main' into main
yzlucas Mar 5, 2024
a74783c
Merge branch 'bcgov:main' into main
yzlucas Mar 5, 2024
08e8b81
Merge branch 'bcgov:main' into main
yzlucas Mar 5, 2024
ff06835
Merge branch 'bcgov:main' into main
yzlucas Mar 5, 2024
8be9c25
Merge branch 'bcgov:main' into main
yzlucas Mar 14, 2024
06f968b
Merge branch 'bcgov:main' into main
yzlucas Mar 15, 2024
959f25f
Merge branch 'bcgov:main' into main
yzlucas Mar 20, 2024
7bf7432
Merge branch 'bcgov:main' into main
yzlucas Mar 25, 2024
d7bc2ef
Merge branch 'bcgov:main' into main
yzlucas Mar 26, 2024
24000aa
Merge branch 'bcgov:main' into main
yzlucas Mar 26, 2024
89bd2d7
Merge branch 'bcgov:main' into main
yzlucas Apr 2, 2024
ac05c1e
Merge branch 'bcgov:main' into main
yzlucas Apr 3, 2024
d2bbc7c
Merge branch 'bcgov:main' into main
yzlucas Apr 5, 2024
84e9d12
Merge branch 'bcgov:main' into main
yzlucas Apr 8, 2024
e66de22
Merge branch 'bcgov:main' into main
yzlucas Apr 8, 2024
68da873
Merge branch 'bcgov:main' into main
yzlucas Apr 8, 2024
65f2cee
Merge branch 'bcgov:main' into main
yzlucas Apr 8, 2024
110f7b0
Merge branch 'bcgov:main' into main
yzlucas Apr 9, 2024
2c0b819
Merge branch 'bcgov:main' into main
yzlucas Apr 9, 2024
99ddefd
Merge branch 'bcgov:main' into main
yzlucas Apr 9, 2024
429a914
Merge branch 'bcgov:main' into main
yzlucas Apr 10, 2024
22d8288
Merge branch 'bcgov:main' into main
yzlucas Apr 11, 2024
47fe8f2
Merge branch 'bcgov:main' into main
yzlucas Apr 11, 2024
decd398
Merge branch 'bcgov:main' into main
yzlucas Apr 11, 2024
ef2c9cc
Merge branch 'bcgov:main' into main
yzlucas Apr 11, 2024
50d7b1f
Merge branch 'bcgov:main' into main
yzlucas Apr 12, 2024
1758090
Merge branch 'bcgov:main' into main
yzlucas Apr 16, 2024
03cba99
Merge branch 'bcgov:main' into main
yzlucas Apr 16, 2024
11d2deb
Merge branch 'bcgov:main' into main
yzlucas Apr 16, 2024
f27f24d
Merge branch 'bcgov:main' into main
yzlucas Apr 16, 2024
7893be0
Merge branch 'bcgov:main' into main
yzlucas Apr 17, 2024
b7eea1d
Merge branch 'bcgov:main' into main
yzlucas Apr 17, 2024
46b127f
Merge branch 'bcgov:main' into main
yzlucas Apr 18, 2024
b8bde2d
Merge branch 'bcgov:main' into main
yzlucas Apr 18, 2024
b99d09e
Merge branch 'bcgov:main' into main
yzlucas Apr 19, 2024
9acc7cc
Merge branch 'bcgov:main' into main
yzlucas Apr 19, 2024
1faf886
view full map in dashboard
yzlucas Apr 19, 2024
a9398a4
Merge branch 'main' into wfnews-1930
yzlucas Apr 19, 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
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<img height="17" width="17" src="/assets/images/svg-icons/under-control.svg" alt="Under Control" class="icon"><span class="checkbox-label">Under Control</span>
</div>
</div>
<div (click)="showViewMapButton = !showViewMapButton" (mouseenter)="showViewMapButton = true" (mouseleave)="showViewMapButton = false" id="dashboard-map" class="dashboard-map-container">
<div (click)="toggleMapView()" (mouseenter)="showViewMapButton = true" (mouseleave)="showViewMapButton = false" id="dashboard-map" class="dashboard-map-container">
<div class="map-overlay" *ngIf="showViewMapButton">
<a class="link" routerLink="../map">View Full Map</a>
<a class="link">View Full Map</a>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import {
import * as L from 'leaflet';
import { AppConfigService } from '@wf1/core-ui';
import { HttpClient } from '@angular/common/http';
import { Router } from '@angular/router';
import { ResourcesRoutes } from '@app/utils';

@Component({
selector: 'overview-widget',
Expand All @@ -24,6 +26,7 @@ export class OverviewWidget implements OnInit, AfterViewInit {
private cdr: ChangeDetectorRef,
private httpClient: HttpClient,
private el: ElementRef,
private router: Router,
) {}

ngOnInit(): void {
Expand Down Expand Up @@ -165,4 +168,9 @@ export class OverviewWidget implements OnInit, AfterViewInit {
console.error('Feature data not loaded. No data found.');
}
}

toggleMapView(){
this.showViewMapButton = !this.showViewMapButton;
this.router.navigate([ResourcesRoutes.ACTIVEWILDFIREMAP]);
}
}
Loading