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

Develop #11

Merged
merged 5 commits into from
Apr 6, 2022
Merged

Develop #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cebe0f0
Bump jquery from 3.3.1 to 3.5.0
dependabot[bot] Mar 4, 2022
031ae37
Bump minimist from 1.2.5 to 1.2.6
dependabot[bot] Apr 2, 2022
fa02107
Fixing leaflet marker issue
ucswift Apr 6, 2022
012c274
Merge pull request #9 from Resgrid/dependabot/npm_and_yarn/minimist-1…
ucswift Apr 6, 2022
7f456da
Merge pull request #6 from Resgrid/dependabot/npm_and_yarn/jquery-3.5.0
ucswift Apr 6, 2022
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
14 changes: 12 additions & 2 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/app/features/auth/pages/login/login.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ <h4 class="font-size-18 mt-4">Resgrid Dispatch</h4>
<div class="mt-5 text-center">
<p>Don't have an account? <a herf="https://resgrid.com/Account/Register" class="font-weight-medium text-primary">
Register </a> </p>
<p>© 2021 Resgrid, LLC. Created with <i class="mdi mdi-heart text-danger"></i> in Nevada</p>
<p>© {{currentYear()}} Resgrid, LLC. Created with <i class="mdi mdi-heart text-danger"></i> in Nevada</p>
<p>v{{version}}</p>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/app/features/auth/pages/login/login.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ export class LoginPage implements OnInit {
});
}

public currentYear() {
return new Date().getFullYear();
}

public login() {
this.store.dispatch(new AuthActions.IsLogin());

Expand Down
12 changes: 9 additions & 3 deletions src/app/features/home/actions/home.actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ export enum HomeActionTypes {
UPDATE_PERSONANDUNITS_DISTANCE = '[HOME] UPDATE_PERSONANDUNITS_DISTANCE',
GET_UPDATEDPERSONANDUNITS_DISTANCE = '[HOME] GET_UPDATEDPERSONANDUNITS_DISTANCE',
OPEN_CALLFORMMODAL = '[HOME] OPEN_CALLFORMMODAL',
SET_NEWCALLFORMDATA = '[HOME] SET_NEWCALLFORMDATA'
SET_NEWCALLFORMDATA = '[HOME] SET_NEWCALLFORMDATA',
DONE = '[HOME] DONE'
}

// Home
Expand Down Expand Up @@ -352,7 +353,7 @@ export class UploadCallFileFail implements Action {

export class UpdatePersonnelandUnitsDistancesToCall implements Action {
readonly type = HomeActionTypes.UPDATE_PERSONANDUNITS_DISTANCE;
constructor(public personnel: PersonnelForCallResult[], public units: UnitStatusResultData[]) {}
constructor(public personnel: PersonnelForCallResult[], public units: UnitStatusResult[]) {}
}

export class GetUpdatedPersonnelandUnitsDistancesToCall implements Action {
Expand All @@ -370,6 +371,11 @@ export class SetNewCallFormData implements Action {
constructor(public formData: string) {}
}

export class Done implements Action {
readonly type = HomeActionTypes.DONE;
constructor() {}
}

export type HomeActionsUnion = Loading | LoadingSuccess | LoadingFail | LoadingMap | LoadingMapSuccess | LoadingMapFail |
ShowSetUnitStateModal | OpenSetUnitStateModal | SavingSetUnitState | SavingUnitState | SavingUnitStateSuccess |
SavingUnitStateFail | UpdateUnitStates | UpdateSelectUnit | UpdateSelectedCall | SavingCloseCall |
Expand All @@ -381,4 +387,4 @@ export type HomeActionsUnion = Loading | LoadingSuccess | LoadingFail | LoadingM
ShowCallNotesModal | OpenCallNotesModal | SaveCallNote | SaveCallNoteSuccess | SaveCallNoteFail | ShowCallImagesModal |
OpenCallImagesModal | UploadCallImage | UploadCallImageSuccess | UploadCallImageFail | ShowCallFilesModal |
OpenCallFilesModal | UpdatePersonnelandUnitsDistancesToCall | GetUpdatedPersonnelandUnitsDistancesToCall |
OpenCallFormModal | SetNewCallFormData | IsSavingCall;
OpenCallFormModal | SetNewCallFormData | IsSavingCall | Done;
Loading