From cebe0f0962c3c79929e89d373c3d0529ab8f2444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Mar 2022 16:21:34 +0000 Subject: [PATCH 1/3] Bump jquery from 3.3.1 to 3.5.0 Bumps [jquery](https://github.com/jquery/jquery) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.3.1...3.5.0) --- updated-dependencies: - dependency-name: jquery dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index af15b78..7135e4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7736,9 +7736,9 @@ } }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz", + "integrity": "sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==" }, "jquery-ui-sortable": { "version": "1.0.0", diff --git a/package.json b/package.json index aefde61..44568ec 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "firebase": "7.16.0", "formBuilder": "3.7.3", "howler": "2.2.3", - "jquery": "3.3.1", + "jquery": "3.5.0", "jquery-ui-sortable": "1.0.0", "jssip": "3.8.0", "leaflet": "1.7.1", From 031ae3749beb3d92bf59edfe0db0d8b095cd37fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Apr 2022 06:32:08 +0000 Subject: [PATCH 2/3] Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index af15b78..c3fc63a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8591,9 +8591,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "minipass": { "version": "3.1.6", From fa0210775856bd372a15cae639991c284c0bf991 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Tue, 5 Apr 2022 19:38:57 -0700 Subject: [PATCH 3/3] Fixing leaflet marker issue --- angular.json | 14 ++++++- .../features/auth/pages/login/login.page.html | 2 +- .../features/auth/pages/login/login.page.ts | 4 ++ .../home/pages/dashboard/dashboard.page.ts | 37 ++++++++++++++----- .../voice-footer/voice-footer.component.html | 2 +- src/assets/scss/app.scss | 1 - src/styles.scss | 1 + 7 files changed, 47 insertions(+), 14 deletions(-) diff --git a/angular.json b/angular.json index 7abc3f6..68c9d1d 100644 --- a/angular.json +++ b/angular.json @@ -24,7 +24,12 @@ "tsConfig": "tsconfig.app.json", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + { + "glob": "**/*", + "input": "./node_modules/leaflet/dist/images", + "output": "./assets/" + } ], "styles": [ "src/assets/scss/bootstrap.scss", @@ -101,7 +106,12 @@ "karmaConfig": "karma.conf.js", "assets": [ "src/favicon.ico", - "src/assets" + "src/assets", + { + "glob": "**/*", + "input": "./node_modules/leaflet/dist/images", + "output": "./assets/" + } ], "styles": [ "src/styles.scss" diff --git a/src/app/features/auth/pages/login/login.page.html b/src/app/features/auth/pages/login/login.page.html index 5c91c62..158074e 100644 --- a/src/app/features/auth/pages/login/login.page.html +++ b/src/app/features/auth/pages/login/login.page.html @@ -67,7 +67,7 @@

Resgrid Dispatch

Don't have an account? Register

-

© 2021 Resgrid, LLC. Created with in Nevada

+

© {{currentYear()}} Resgrid, LLC. Created with in Nevada

v{{version}}

diff --git a/src/app/features/auth/pages/login/login.page.ts b/src/app/features/auth/pages/login/login.page.ts index 44c8720..e099543 100644 --- a/src/app/features/auth/pages/login/login.page.ts +++ b/src/app/features/auth/pages/login/login.page.ts @@ -47,6 +47,10 @@ export class LoginPage implements OnInit { }); } + public currentYear() { + return new Date().getFullYear(); + } + public login() { this.store.dispatch(new AuthActions.IsLogin()); diff --git a/src/app/features/home/pages/dashboard/dashboard.page.ts b/src/app/features/home/pages/dashboard/dashboard.page.ts index c7e0f91..e615dac 100644 --- a/src/app/features/home/pages/dashboard/dashboard.page.ts +++ b/src/app/features/home/pages/dashboard/dashboard.page.ts @@ -29,6 +29,21 @@ import { Call } from "src/app/core/models/call"; import { AuthState } from "src/app/features/auth/store/auth.store"; import { HomeProvider } from "../../providers/home"; +const iconRetinaUrl = './assets/marker-icon-2x.png'; +const iconUrl = './assets/marker-icon.png'; +const shadowUrl = './assets/marker-shadow.png'; +const iconDefault = L.icon({ +iconRetinaUrl, +iconUrl, +shadowUrl, +iconSize: [25, 41], +iconAnchor: [12, 41], +popupAnchor: [1, -34], +tooltipAnchor: [16, -28], +shadowSize: [41, 41] +}); +L.Marker.prototype.options.icon = iconDefault; + @Component({ selector: "app-dashboard", templateUrl: "dashboard.page.html", @@ -511,13 +526,15 @@ export class DashboardPage implements AfterViewInit { that.newCallMarker.setLatLng(new L.LatLng(position.lat, position.lng)); that.newCallMap.panTo(new L.LatLng(position.lat, position.lng)); - this.form["latitude"].setValue(position.lat); - this.form["latitude"].patchValue(position.lat); + if (that && that.form) { + that.form["latitude"].setValue(position.lat); + that.form["latitude"].patchValue(position.lat); - this.form["longitude"].setValue(position.lng); - this.form["longitude"].patchValue(position.lng); + that.form["longitude"].setValue(position.lng); + that.form["longitude"].patchValue(position.lng); + } - this.updatePersonnelDistances( + that.updatePersonnelDistances( new GpsLocation(position.lat, position.lng) ); @@ -531,11 +548,13 @@ export class DashboardPage implements AfterViewInit { // new HomeActions.UpdateNewCallLocation(lat, lng) //); - this.form["latitude"].setValue(lat); - this.form["latitude"].patchValue(lat); + if (this.form) { + this.form["latitude"].setValue(lat); + this.form["latitude"].patchValue(lat); - this.form["longitude"].setValue(lng); - this.form["longitude"].patchValue(lng); + this.form["longitude"].setValue(lng); + this.form["longitude"].patchValue(lng); + } this.updatePersonnelDistances(new GpsLocation(lat, lng)); } diff --git a/src/app/features/voice/shared/voice-footer/voice-footer.component.html b/src/app/features/voice/shared/voice-footer/voice-footer.component.html index 34d18c8..2ec0ff4 100644 --- a/src/app/features/voice/shared/voice-footer/voice-footer.component.html +++ b/src/app/features/voice/shared/voice-footer/voice-footer.component.html @@ -15,7 +15,7 @@
-
diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss index e0da24f..a55f351 100644 --- a/src/assets/scss/app.scss +++ b/src/assets/scss/app.scss @@ -59,7 +59,6 @@ // icons @import "custom/plugins/icons"; - // RTL // @import "custom/rtl/general-rtl"; // @import "custom/rtl/bootstrap-rtl"; diff --git a/src/styles.scss b/src/styles.scss index 80e3063..62c2e51 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -2,3 +2,4 @@ /* Importing Bootstrap SCSS file. */ // @import '~bootstrap/scss/bootstrap'; +@import "../node_modules/leaflet/dist/leaflet.css";