From d74b491dd9a80baa6d500d3352c9d4a1b184cb23 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Sun, 22 Mar 2020 14:01:23 +0300 Subject: [PATCH 01/10] Fix issu --- .../my-team/details/details.component.html | 13 +++-- .../my-team/details/details.component.scss | 7 ++- .../app/my-team/details/details.component.ts | 48 ++++++++++++++- .../src/app/my-team/home/home.component.html | 5 +- .../src/app/payslip/home/home.component.html | 57 ++++++++++++------ .../src/app/payslip/home/home.component.scss | 58 ++++++++++++++----- .../edit-profile/edit-profile.component.html | 6 +- .../edit-profile/edit-profile.component.scss | 10 +++- Mohem/src/assets/localization/i18n.json | 10 ++-- 9 files changed, 163 insertions(+), 51 deletions(-) diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 6b880c28..00976526 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -79,14 +79,14 @@
- {{ts.trPK('myTeam','checkIn')}} + {{ts.trPK('myTeam','check-in')}}

{{attendanceTrackingList.P_SWIPE_IN | slice:0:-3}}

--:--

- {{ts.trPK('myTeam','checkOut')}} + {{ts.trPK('myTeam','check-out')}}

{{attendanceTrackingList.P_SWIPE_OUT | slice:0:-3}}

--:--

@@ -103,14 +103,19 @@
+ - + {{month}} {{year}} - + + + + +
diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 567a0fe9..76e9c027 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -231,13 +231,16 @@ ion-title{ .activeArrow-ar{ height: 20px; - width: 20px; - color: #22c6b3; + width: 20px; + color: #22c6b3; + margin-right: 275px; } .disabledArrow-ar{ height: 20px; width: 20px; color: gray; + /* margin-left: 136px; */ + margin-right: -251px; } .result-graph { position: relative; diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 087df5da..a3604d0e 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -58,6 +58,7 @@ export class DetailsComponent implements OnInit { public yearTitle: string; public activeMonth: any; public currentMonthName = this.getMonthName(new Date().getMonth() + 1); + public showData = false; public currentYear = new Date().getFullYear(); public attendanceTrackingList: any = []; @@ -67,7 +68,7 @@ export class DetailsComponent implements OnInit { year: any; preMonth: number; nextMonth: any; - + public direction: string; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, @@ -82,6 +83,7 @@ export class DetailsComponent implements OnInit { public searchEmail = ''; public showEmailInput = false; public showUserNameOrNameInput = true; + constructor( public timeCardService: TimeCardService, @@ -93,7 +95,9 @@ export class DetailsComponent implements OnInit { private location: Location, public authService: AuthenticationService, public dashboardService: DashboredService, - ) { } + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() { this.common.startLoading(); @@ -131,7 +135,15 @@ export class DetailsComponent implements OnInit { this.showData = false; this.nextMonth = new Date().getMonth() + 2; this.preMonth = new Date().getMonth(); - this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); + if(this.direction == 'en'){ + this.currentMonthName = this.getMonthName(new Date().getMonth() + 1); + + } + else{ + this.currentMonthName = this.getMonthNameAr(new Date().getMonth() + 1); + + } + this.calendarConfig(this.currentMonthName) , (new Date().getFullYear()); } calendarConfig(month?, year?) { @@ -167,6 +179,7 @@ export class DetailsComponent implements OnInit { }); } + nextSlide() { this.common.startLoading(); if (this.currentMonthName !== this.month) { @@ -310,6 +323,35 @@ export class DetailsComponent implements OnInit { } } + public getMonthNameAr(value: any): any { + switch (value) { + case 1: + return "يناير"; + case 2: + return " فبراير"; + case 3: + return "مارس"; + case 4: + return "أبريل"; + case 5: + return "مايو"; + case 6: + return "يونيو"; + case 7: + return "يوليو"; + case 8: + return "أغسطس"; + case 9: + return "سبتمبر"; + case 10: + return " اكتوبر"; + case 11: + return " نوفمبر"; + case 12: + return "ديسمبر"; + } +} + intializeMemberDetail(userID?) { this.empSubordinate = []; diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 73b200a7..6ce9b0aa 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -2,12 +2,13 @@ {{ts.trPK('myTeam','myTeam-header')}} - - + + +
diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index b3201430..0819e298 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -45,15 +45,30 @@
-
+
-
- +
+ + + @@ -61,13 +76,26 @@ - +
@@ -111,18 +139,15 @@
-->
-

{{GetSummaryOfPaymentList.TOTAL_PAY_AMOUNT}}

{{ts.trPK('payslip','total')}}
{{ts.trPK('payslip','salary')}}
- -
-
+
@@ -132,7 +157,7 @@
-
+
@@ -179,9 +204,7 @@ - - - + diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index f79888be..46a732d0 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -28,6 +28,7 @@ font-size: 15px !important; text-align: center; margin-bottom: 1px; + margin-left: 8px; } .label-bold{ font-size: 13px !important; @@ -124,8 +125,12 @@ color: white; background: transparent !important; --background: transparent !important; - margin-right: 25px; - + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); + margin-right: 38px; + margin-left: -45px; } .slidbtn{ background: transparent; @@ -147,7 +152,12 @@ background: transparent !important; --background: transparent !important; margin-right: 3px; - margin-left: -124px; + // margin-left: -124px; + margin-left: -105px; + -webkit-transform: scaleX(-1); + -moz-transform: scaleX(-1); + -o-transform: scaleX(-1); + transform: scaleX(-1); } .result-graph{ @@ -326,34 +336,54 @@ padding-right: 5px; } .div-green{ + // left: 77%; + // width: 20%; height: 6px; position: relative; - left: 77%; + left: 83%; bottom: 117px; color: black; background-color: #22c6b3; - width: 20%; height: 6px; + width: 16%; + height: 6px; } .div-green-ar{ - position: relative; + // position: relative; // left: 77%; + // bottom: 117px; + // color: black; + // background-color: #22c6b3; + // width: 20%; height: 6px; + position: relative; + left: 4%; bottom: 117px; color: black; background-color: #22c6b3; - width: 20%; height: 6px; + width: 15%; + height: 6px; } .div-blue{ + // left: 77%; + // width: 20%; height: 6px; position: relative; - left: 77%; - bottom: 67px; - color: black; - background-color: #094875; - width: 20%; height: 6px; + left: 83%; + bottom: 67px; + color: black; + background-color: #094875; + width: 16%; + height: 6px; } .div-blue-ar{ - position: relative; + //position: relative; // left: 77%; + // bottom: 67px; + // color: black; + // background-color: #094875; + // width: 20%; height: 6px; + position: relative; + left: 4%; bottom: 67px; color: black; background-color: #094875; - width: 20%; height: 6px; + width: 15%; + height: 6px; } \ No newline at end of file diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index eb770c23..11b91bc2 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -37,15 +37,15 @@
- +
- +
- +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss index 038856d4..294575dc 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.scss +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.scss @@ -95,7 +95,15 @@ padding-top: 19px; padding-bottom: 26px; } - + .columns-ar{ + margin: 10px; + background: #094875; + border-radius: 27px; + padding-left: 7px; + padding-right: 3px; + padding-top: 19px; + padding-bottom: 26px; + } .service{ font-size: 28px; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 010f4334..14f02f64 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1475,17 +1475,17 @@ "en": "Today's Attendance", "ar": "حضور اليوم" }, - "checkIn": { + "check-in":{ "en": "Check-In", - "ar": "CheckIn" + "ar":"وقت الدخول" }, - "checkOut": { + "check-out":{ "en": "Check-Out", - "ar": "CheckOut" + "ar":"وقت الخروج" }, "late": { "en": "Late", - "ar": "Late" + "ar": "التأخير" }, "attendance-statistics": { "en": "Attendance Statistics", From f44ddb6931cc68486e106396a551f1f306fc5f0e Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 22 Mar 2020 16:01:23 +0300 Subject: [PATCH 02/10] added generic header throughout the application --- .../submit-absence.component.html | 12 ++++-------- .../change-password.component.html | 12 ++++-------- .../check-user/check-user.component.html | 12 ++++-------- .../src/app/eit/add-eit/add-eit.component.html | 11 ++++++++--- .../services/common/common.service.ts | 2 +- .../services/connector/connector.service.ts | 1 + .../work-list-main-itg.component.html | 13 +++++-------- .../worklist-main-mr.component.html | 15 ++++++--------- .../worklist-main-po.component.html | 17 ++++++----------- .../worklist-main-pr.component.html | 14 ++++++-------- .../worklist-main/worklist-main.component.html | 15 +++++++-------- .../edit-profile/edit-profile.component.html | 15 ++++----------- 12 files changed, 56 insertions(+), 83 deletions(-) diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index e1a10ef5..62d8901b 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -1,11 +1,7 @@ - - - {{ts.trPK('submitAbsence','submitAbsence')}} - - - - - + + diff --git a/Mohem/src/app/authentication/change-password/change-password.component.html b/Mohem/src/app/authentication/change-password/change-password.component.html index 7f25dbc6..b758a8ce 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.html +++ b/Mohem/src/app/authentication/change-password/change-password.component.html @@ -1,11 +1,7 @@ - - - - - - {{'changePassword,changePassword' | translate}} - - + + diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html index ba3aec50..0f28d541 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.html +++ b/Mohem/src/app/authentication/check-user/check-user.component.html @@ -1,11 +1,7 @@ - - - - - - {{'login,forgot-password' | translate}} - - + + diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.html b/Mohem/src/app/eit/add-eit/add-eit.component.html index 91fde23b..a43e3501 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.html +++ b/Mohem/src/app/eit/add-eit/add-eit.component.html @@ -1,8 +1,7 @@ - + {{headerTitle}} @@ -13,7 +12,13 @@ - + --> + + + +
diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 31f9a7cd..711a8ec5 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -596,7 +596,7 @@ public getMonthNameAr(value: number): string { if (result.MessageStatus === 1) { return true; } else if (result.MessageStatus === 2) { - return this.hasData(result['SameClinicApptList']); + return false; } return false; } diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 1f34b0ad..e1ce2293 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -167,6 +167,7 @@ public static host = 'https://uat.hmgwebservices.com/'; } if (!this.cs.validResponse(result)) { if (result.IsAuthenticated === false) { + this.cs.stopLoading(); this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { this.cs.sharedService.clearAll(); this.cs.openLogin(); diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index c6848fb7..d7ca6888 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -1,11 +1,8 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - + + - - {{ts.trPK('worklistMain','title')}} - - - - - - + +
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index 74f64e09..2303f683 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -1,14 +1,9 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - - - - + +
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index 2546220a..438b15dd 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -1,11 +1,9 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - + +
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 2d6b35f0..e3836ebd 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -1,11 +1,10 @@ - - - {{ts.trPK('worklistMain','title')}} - - - - - + + +
diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.html b/Mohem/src/app/profile/edit-profile/edit-profile.component.html index 06fafaa1..67534708 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.html +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.html @@ -1,14 +1,7 @@ - - - - {{ts.trPK('userProfile','title')}} - - - - - - - + +
From 3f24fa63a79292548a0e9fdee8a4f066f2feb4c4 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 23 Mar 2020 09:01:09 +0300 Subject: [PATCH 03/10] fixing attachment bug and translator issues --- Mohem/package-lock.json | 671 ++++++++++++++++++ Mohem/package.json | 3 +- .../absence-confirm.component.html | 2 +- .../absence-confirm.component.ts | 10 +- .../confirm-add-eit.component.html | 2 +- .../confirm-add-eit.component.ts | 6 + Mohem/src/app/uI-elements/time.input.ts | 61 +- Mohem/src/assets/localization/i18n.json | 6 +- 8 files changed, 727 insertions(+), 34 deletions(-) diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index 6e1eae67..41c61077 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -1252,6 +1252,159 @@ } } }, + "@ionic/cli-framework": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-4.1.1.tgz", + "integrity": "sha512-xaq8MrVUPt4NekLUv+A2ckVNi4stfSGdMk3Dpx0hRGLdgA8IHfVEmkpW5dkqYW6TX4CaWFPYTRMDl+U3uO9w+A==", + "dev": true, + "requires": { + "@ionic/utils-array": "2.1.1", + "@ionic/utils-fs": "3.1.1", + "@ionic/utils-object": "2.1.1", + "@ionic/utils-process": "2.1.1", + "@ionic/utils-stream": "3.1.1", + "@ionic/utils-subprocess": "2.1.1", + "@ionic/utils-terminal": "2.1.1", + "chalk": "^3.0.0", + "debug": "^4.0.0", + "lodash": "^4.17.5", + "log-update": "^4.0.0", + "minimist": "^1.2.0", + "rimraf": "^3.0.0", + "slice-ansi": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "tslib": "^1.9.0", + "untildify": "^4.0.0", + "wrap-ansi": "^6.0.0", + "write-file-atomic": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + } + } + }, "@ionic/core": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.11.8.tgz", @@ -1261,6 +1414,322 @@ "tslib": "^1.10.0" } }, + "@ionic/lab": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@ionic/lab/-/lab-3.1.2.tgz", + "integrity": "sha512-hHhbgrSERgHgU7l/6DMvZ98Xday0wV2jfxRdmV+CH/n/JBeWisCThLfZTNKpfwrj6nGANHlykRGAXM0pQnc4Rw==", + "dev": true, + "requires": { + "@ionic/cli-framework": "4.1.1", + "@ionic/utils-fs": "3.1.1", + "chalk": "^3.0.0", + "express": "^4.16.2", + "tslib": "^1.9.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@ionic/utils-array": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.1.tgz", + "integrity": "sha512-6tdrg0g/w5I2Xn/YeM8khhcKgphNwt9VJ4qJ//nJQrmlwwyV2ULSIBnhEIWfYdWgkSD24JLQzSsoB0ZltCUbNw==", + "dev": true, + "requires": { + "debug": "^4.0.0", + "tslib": "^1.9.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@ionic/utils-fs": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.1.tgz", + "integrity": "sha512-LwfziPHkVata/54dcf8sn/LhShUhgdds411M8v4H6+ugQQO9N+a5TDtFtVnnqSy8Q3uxR15SBWMGyII8i730BA==", + "dev": true, + "requires": { + "debug": "^4.0.0", + "fs-extra": "^8.0.1", + "through2": "^3.0.0", + "tslib": "^1.9.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "through2": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "dev": true, + "requires": { + "readable-stream": "2 || 3" + } + } + } + }, + "@ionic/utils-object": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.1.tgz", + "integrity": "sha512-d9trsuk7EzlgzcoCB3BVkhqG/AEzGVw3QUmsDf+MaAUXTtmXiy8wkIpDFx4sgfEXDTnmJP2HO7ZnDEusLDOWoA==", + "dev": true, + "requires": { + "debug": "^4.0.0", + "tslib": "^1.9.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@ionic/utils-process": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.1.tgz", + "integrity": "sha512-cxQHvoqVEdsAzvI1UmiQNBOzEkag9dHU52L1LsC+FPkiNirNM2tYgKNa3tERcZnZBZwqvKveGIJiiBnFQRnDYw==", + "dev": true, + "requires": { + "@ionic/utils-object": "2.1.1", + "@ionic/utils-terminal": "2.1.1", + "debug": "^4.0.0", + "lodash": "^4.17.5", + "tree-kill": "^1.2.2", + "tslib": "^1.9.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true + } + } + }, + "@ionic/utils-stream": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.1.tgz", + "integrity": "sha512-n2oN+UqQpr0kGFE6JSkQpVyrVFJCSHqhlKMTo4dzuUMgLovmAZkz+qxgNw+8MCkIcdlZURs6arsNVZt9KeZCVg==", + "dev": true, + "requires": { + "debug": "^4.0.0", + "tslib": "^1.9.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@ionic/utils-subprocess": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-2.1.1.tgz", + "integrity": "sha512-DK/KlRslM5t5ZC7SwOmfqFg53XZklWR79YfpNvKoGjBczJFA83y4QMXqtbi2lVZc9g4ojkYOd0EycmzNSq6Q4A==", + "dev": true, + "requires": { + "@ionic/utils-array": "2.1.1", + "@ionic/utils-fs": "3.1.1", + "@ionic/utils-process": "2.1.1", + "@ionic/utils-stream": "3.1.1", + "@ionic/utils-terminal": "2.1.1", + "cross-spawn": "^7.0.0", + "debug": "^4.0.0", + "tslib": "^1.9.0" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", + "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "@ionic/utils-terminal": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.1.1.tgz", + "integrity": "sha512-/7fTr5x3MFL/nm8oV73glyFZ4f4qzHUvV3G/pz/JVoTPokXsDATPkrR3MPbwy2UgCs9awYgaoJ5jBX3IDvQ7bQ==", + "dev": true, + "requires": { + "debug": "^4.0.0", + "tslib": "^1.9.0" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "@ng-bootstrap/ng-bootstrap": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.2.tgz", @@ -1477,6 +1946,12 @@ "d3-time-format": "^2.1.0" } }, + "@types/color-name": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", + "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", + "dev": true + }, "@types/cordova": { "version": "0.0.34", "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", @@ -2131,6 +2606,12 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true + }, "async": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", @@ -8731,6 +9212,125 @@ "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", "dev": true }, + "log-update": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", + "dev": true, + "requires": { + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" + }, + "dependencies": { + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "dev": true, + "requires": { + "type-fest": "^0.11.0" + } + }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + } + } + }, "log4js": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz", @@ -14793,6 +15393,44 @@ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true }, + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + } + } + }, "sliced": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", @@ -16097,6 +16735,12 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + }, "type-func": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/type-func/-/type-func-1.0.3.tgz", @@ -16118,6 +16762,15 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "requires": { + "is-typedarray": "^1.0.0" + } + }, "typescript": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", @@ -16229,6 +16882,12 @@ } } }, + "untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true + }, "upath": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", @@ -16892,6 +17551,18 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, "ws": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", diff --git a/Mohem/package.json b/Mohem/package.json index 883fac4e..764d3105 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -129,6 +129,7 @@ "@angular/compiler-cli": "~7.2.2", "@angular/language-service": "~7.2.2", "@ionic/angular-toolkit": "~1.4.0", + "@ionic/lab": "3.1.2", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "~2.0.3", "@types/node": "~10.12.0", @@ -202,4 +203,4 @@ "android" ] } -} \ No newline at end of file +} diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index 2439bfae..66797465 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -20,7 +20,7 @@
+ (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts index 87c43df9..59a2dec6 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.ts @@ -386,11 +386,17 @@ async openSubmitModal() { }); + onFileSelectedclick(event){ + event.target.value = ''; + } + + onFileSelected(input) { // this.uploader.onWhenAddingFileFailed = function (item: any, filter: any, options: any){ - + console.log("1") if (!(this.filterAllowedType.indexOf(input.target.files[0].type) > -1)) { + console.log("2") let msg: string = ""; msg = this.ts.trPK("general", "notSupport"); this.common.presentAlert(msg); @@ -398,7 +404,7 @@ async openSubmitModal() { } // todo: show alert that you tried uploading wrong files else { - + console.log("3") const file = input.target.files[0]; // console.log(file); diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index a1a18349..05b56ff0 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -15,7 +15,7 @@
+ (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index 576200f4..f744b61e 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -481,6 +481,12 @@ export class ConfirmAddEitComponent implements OnInit { }); + onFileSelectedclick(event){ + event.target.value = ''; + } + + + onFileSelected(input) { // this.uploader.onWhenAddingFileFailed = function (item: any, filter: any, options: any){ diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index ee47fd84..84da28a6 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -1,4 +1,4 @@ -import { UiElement } from "./ui-element"; +import { UiElement } from './ui-element'; // import { TranslatorService } from '../hmg-common/services/translator/translator.service'; export class TimeInput extends UiElement { @@ -18,39 +18,48 @@ export class TimeInput extends UiElement { } formatDate() { - let date = new Date(); + const date = new Date(); this.value = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds(); } public getTemplate() { - - let requiredClass: string = ""; - let disaledClass = ""; - if (this.required == 'Y') - requiredClass = "requiredClass" - if (this.disabled == "N") { this.disabled = "disabled"; disaledClass = "disabled" } else { this.disabled = ""; disaledClass = "" } - if (this.hidden == "N") { this.hidden = "display:none;" } else { this.hidden = "" } - if (this.value == "currentTime") { + + let requiredClass = ''; + let disaledClass = ''; + // tslint:disable-next-line: triple-equals + if (this.required == 'Y') { + requiredClass = 'requiredClass'; + } + // tslint:disable-next-line: max-line-length + if (this.disabled === 'N') { this.disabled = 'disabled'; disaledClass = 'disabled'; } else { this.disabled = ''; disaledClass = ''; } + if (this.hidden === 'N') { this.hidden = 'display:none;'; } else { this.hidden = ''; } + if (this.value === 'currentTime') { this.formatDate(); } const template = - "
" + - " " + - // " "+ - "
"+this.value+"
"+ - "
"; - - - // "" + - // " " + this.label + "" + - // // "
" + this.value + "
" + - // "" + - // // " "+ - // // " "+ - // // " "+ - // "
" + '
' + + ' ' + + // tslint:disable-next-line: max-line-length + // " "+ + // tslint:disable-next-line: max-line-length + '
' + this.value + '
' + + '
'; + + + // "" + + // " " + this.label + "" + + // tslint:disable-next-line: max-line-length + // // "
" + this.value + "
" + + // tslint:disable-next-line: max-line-length + // "" + + // tslint:disable-next-line: max-line-length + // // " "+ + // // " "+ + // tslint:disable-next-line: max-line-length + // // " "+ + // "
" return template; } -} \ No newline at end of file +} diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index abca23ca..c195fd80 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -895,7 +895,7 @@ }, "leave-balance":{ "en":"Leave Balance", - "ar":"رصيد الاجزات" + "ar":"رصيد الإجازات" }, "":{ "en":"", @@ -1788,7 +1788,7 @@ }, "title":{ "en": "Replacement Roll", - "ar":"استبدال لفة" + "ar":"البحث عن موظف" }, "searchForReplacment":{ "en": "Search for an employee", @@ -2377,7 +2377,7 @@ }, "payment-information":{ "en": "Payment Information", - "ar":"معلةمات الدفع " + "ar":"معلومات الدفع " }, "summary-payment":{ "en": "Summary of Payment", From df50c472a03d026580f41e9f3007deda8c0bc084 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 23 Mar 2020 10:15:59 +0300 Subject: [PATCH 04/10] Fixed MM-227 --- Mohem/src/app/my-team/home/home.component.html | 2 +- Mohem/src/assets/localization/i18n.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 18ea1529..8fbdc861 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -16,7 +16,7 @@
- {{ts.trPK('myTeam','todayAttendance')}} + {{ts.trPK('myTeam','team-stats')}}

{{totalEmployees}}

diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 63efad4b..dcff14b5 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1502,6 +1502,10 @@ "team-members": { "en": "TEAM MEMBERS", "ar": "اعضاء الفريق" + }, + "team-stats": { + "en": "Team Statistics", + "ar": "إحصائيات الفريق" } }, "searchForReplacment": { From 196ec6c9e9322542fe55e6b286d3f220719c0fd6 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 23 Mar 2020 13:37:43 +0300 Subject: [PATCH 05/10] Completed MM-212 --- .../absence-confirm.component.html | 13 +++----- .../my-team/details/details.component.scss | 3 +- .../src/app/my-team/home/home.component.html | 8 ----- .../src/app/profile/home/home.component.html | 30 +++---------------- .../performance-evaluation.component.html | 12 +++----- .../vacation-type.component.html | 14 +++------ 6 files changed, 18 insertions(+), 62 deletions(-) diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index 905d542f..a2b49531 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -1,12 +1,7 @@ - - - - {{ts.trPK('submitAbsenceConfirm','submitAbsenceConfirm')}} - - - - - + + diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index 567a0fe9..d27bd468 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -8,9 +8,10 @@ ion-title{ text-align: center; left: 15%; right: 15%; - font-size: 0.42cm; + font-size: 0.5cm; font-weight: bold; height: 100%; + font-family: WorkSans-Regular; } .contentBg{ padding: 0px 20px; diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 8fbdc861..38ce6a4c 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -1,11 +1,3 @@ - - -
- - - - - {{ts.trPK('userProfile','title')}} - -
- --> - - - - {{ts.trPK('userProfile','title')}} - - - - - + +
- - -
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index c6bb1a34..d90e8f6d 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -1,11 +1,7 @@ - - - {{ts.trPK('userProfile','performance')}} - - - - - + +
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index 6d809799..151048f4 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -1,13 +1,7 @@ - - - {{ 'vacation-rule, vacation-type' | translate}} - - - - - - - + + From 050eca72454c5d337c928e03757e4f6957012a5f Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 23 Mar 2020 14:31:24 +0300 Subject: [PATCH 06/10] fix app direction and itg all segment --- Mohem/package.json | 2 +- Mohem/src/app/app.component.ts | 6 ++--- .../authentication/login/login.component.html | 4 +-- .../authentication/login/login.component.ts | 16 ++++++++--- .../app/notification/home/home.component.html | 2 +- .../app/notification/home/home.component.ts | 27 ++++++++++++------- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Mohem/package.json b/Mohem/package.json index 764d3105..49311c3b 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -203,4 +203,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 6021ea82..0a08df19 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -129,8 +129,7 @@ export class AppComponent implements OnInit, AfterViewInit { this.events.subscribe('myTeamFlag', myTeamFlag => { this.TeamFlag = myTeamFlag; }); - // this.TeamFlag = this.cs.sharedService.getSharedData("myTeamFlag",false); - // console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); + console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); } private initializeDirection() { this.direction = TranslatorService.getCurrentDirection(); @@ -156,8 +155,7 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.enable(false); this.logoutFlage=true; this.events.publish('logoutFlage', this.logoutFlage); - this.cs.setUpdateImage("",false); - this.TeamFlag ="false"; + this.getLastLoginInfo(); // this.cs.openLogin(); diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 46cecfb8..6fb821df 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -62,8 +62,8 @@ {{ts.trPK('login','signup')}}
- - + +
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 5736609d..5fdbbd87 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -74,7 +74,7 @@ export class LoginComponent implements OnInit, OnDestroy { public remeberMe: boolean; private iosLink: string; private androidLink: string; - public currentLang: any = 1; + public currentLang = 1; private patientOutSA: boolean; private loginTokenID: string; private isMobileFingerPrint: boolean; @@ -95,14 +95,18 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { - console.log("ENAD TEST!!!") + this.currentLang = TranslatorService.getCurrentLanguageCode(); + console.log(TranslatorService.CURRENT_LANGUAGE) + console.log(TranslatorService.EN) if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { this.language = "US"; + this.changeLanguage('2') } else { this.language = "AR"; + this.changeLanguage('1') } - this.ts.switchLanguage(); - this.currentLang = TranslatorService.getCurrentLanguageCode(); + console.log("current lang: "+this.currentLang) + //this.ts.switchLanguage(); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) @@ -191,7 +195,10 @@ export class LoginComponent implements OnInit, OnDestroy { } public changeLanguage(langNumber) { + console.log("current lang: "+this.currentLang) + console.log("click lang: "+langNumber) if(this.currentLang == langNumber){ + this.currentLang = langNumber; return; }else{ this.ts.switchLanguage(); @@ -202,6 +209,7 @@ export class LoginComponent implements OnInit, OnDestroy { } this.currentLang = TranslatorService.getCurrentLanguageCode(); } + this.currentLang = langNumber; } public forgetPasswordPage() { this.cs.openUserForgot(); diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index e2a26be5..f6c4951a 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -52,7 +52,7 @@ - + {{segment.name}} diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 5997d8ce..6e9631a5 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -151,6 +151,10 @@ export class HomeComponent implements OnInit { slidesPerView: 4.3, spaceBetween: 10 }; + public slideOptsTwo = { + slidesPerView: 1.3, + spaceBetween: 10 + }; constructor( public common: CommonService, public ts: TranslatorService, @@ -497,14 +501,19 @@ export class HomeComponent implements OnInit { Count() { const datas = []; const names = []; - this.ITGSegment[0] = { - name: 'All', - code: 'All', - data: null, - style: false - }; - this.workListService.getITGCount('', '', this.isPostNoLoad) + this.workListService.getITGCount('', '', this.isPostNoLoad) .subscribe((result: any) => { + if(result.RequestType.length > 0){ + this.ITGSegment[0] = { + name: 'All', + code: 'All', + data: null, + style: false + }; + this.ITGSegment[0].data = datas; + this.ITGSegment[0].names = names; + this.setActive(this.ITGSegment[0].code); + } for (let i = 1; i < result.RequestType.length; i++) { this.ITGSegment[i] = { name: result.RequestType[i].RequestTypeName, @@ -515,9 +524,7 @@ export class HomeComponent implements OnInit { datas[i] = result.RequestType[i].RequestDetails; names[i] = result.RequestType[i].RequestTypeCode; } - this.ITGSegment[0].data = datas; - this.ITGSegment[0].names = names; - this.setActive(this.ITGSegment[0].code); + }); } From 3a0d2e7285b86b44ce296f3b5a659c98e35bd08f Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 23 Mar 2020 17:20:21 +0300 Subject: [PATCH 07/10] MM-244 fixed --- .../authentication/login/login.component.ts | 101 ++++-------------- .../my-team/details/details.component.html | 2 +- .../app/notification/home/home.component.scss | 12 +-- .../app/notification/home/home.component.ts | 1 + .../time-card-details.component.html | 4 +- 5 files changed, 31 insertions(+), 89 deletions(-) diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 5736609d..d86b0001 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -95,11 +95,12 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { - console.log("ENAD TEST!!!") + this.cs.stopLoading(); + // tslint:disable-next-line: triple-equals if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = "US"; + this.language = 'US'; } else { - this.language = "AR"; + this.language = 'AR'; } this.ts.switchLanguage(); this.currentLang = TranslatorService.getCurrentLanguageCode(); @@ -118,72 +119,26 @@ export class LoginComponent implements OnInit, OnDestroy { // } - this.events.subscribe('user', user => { - console.log('login compont: ' + user); + this.events.subscribe('user', user => { this.user = user; - }); - - - - - this.deviceToken = localStorage.getItem('devicyeToken'); - console.log('let deviceToken' + this.deviceToken); - - if (this.deviceToken) { - console.log('login enabled first time: ' + this.deviceToken); + this.deviceToken = localStorage.getItem('devicyeToken'); + if (this.deviceToken) { + console.log('login enabled first time: ' + this.deviceToken); } else { console.log('no deviceToken' ); - this.pushService.startReceiving(); - setTimeout(() => { - // alert('login enabled second time: ' + this.deviceToken); - - }, 1000); } - - // setTimeout(() => { - // alert("this.logoutFlage in setTime" +localStorage.getItem('logoutFlage')); - // alert("this.this.user in setTime" + this.user); - - // if(localStorage.getItem('logoutFlage')== "true"){ - // this.getLastLoginInfo(); - - // } - // },1000); - - - - // here will delete below part and depdding on user (response from getMobileInfo) - this.username = localStorage.getItem('user'); - this.password = localStorage.getItem('password'); // ****// - const remember = localStorage.getItem('remember'); // ****// - this.empname = localStorage.getItem('emp-name'); - this.logintype = localStorage.getItem('login-type'); + this.username = localStorage.getItem('user'); + this.password = localStorage.getItem('password'); // ****// + const remember = localStorage.getItem('remember'); // ****// + this.empname = localStorage.getItem('emp-name'); + this.logintype = localStorage.getItem('login-type'); // tslint:disable-next-line: triple-equals - if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; } - - // here will be check on user if exite then s part and depdding on user (response from getMobileInfo) - - if (this.user) { - - // this.loginDiv=false; - // this.welcomeBack=true; - - } else { - // this.user=true; - // this.welcomeBack=false; - } - // alert("user>>" + this.username); - // alert("pass>>>" + this.password); - // alert("remember>>>" + this.remeberMe); - - - /// call getLoginInfo - + if (remember == 'true') { this.remeberMe = true; } else { this.remeberMe = false; } } ngOnDestroy(): void { @@ -191,14 +146,16 @@ export class LoginComponent implements OnInit, OnDestroy { } public changeLanguage(langNumber) { - if(this.currentLang == langNumber){ + // tslint:disable-next-line: triple-equals + if (this.currentLang == langNumber) { return; - }else{ + } else { this.ts.switchLanguage(); + // tslint:disable-next-line: triple-equals if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = "US"; + this.language = 'US'; } else { - this.language = "AR"; + this.language = 'AR'; } this.currentLang = TranslatorService.getCurrentLanguageCode(); } @@ -215,36 +172,20 @@ export class LoginComponent implements OnInit, OnDestroy { } public addValue(e): void { - // console.log(e.currentTarget.checked); - this.remeberMe = true; // e.currentTarget.checked; + this.remeberMe = true; this.remeberMyInfo(); } public remeberMyInfo() { - // if (this.remeberMe) { if (this.username) {localStorage.setItem('user', this.username); } if (this.password) {localStorage.setItem('password', this.password); } localStorage.setItem('remember', 'true'); - // } else { - // localStorage.setItem("user", ""); - // localStorage.setItem("password", ""); - // localStorage.setItem("remember", "false"); - // } } public onLogin() { - console.log('onLogin'); - // this.checkAppUpdated(); - // this.checkUserAuthentication(); - this.deviceToken = localStorage.getItem('deviceToken'); - console.log('let deviceToken' + this.deviceToken); - if (this.deviceToken) { - console.log('login enabled first time: ' + this.deviceToken); this.checkAppUpdated(); } else { - console.log('no deviceToken' ); - this.pushService.startReceiving(); setTimeout(() => { this.deviceToken = localStorage.getItem('deviceToken'); diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 6b880c28..ea9ec035 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -110,7 +110,7 @@ {{month}} {{year}} - +
diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index a8b8716b..a5eb0061 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -418,12 +418,12 @@ p{ } } .no-data-available { -background: white; -font-family: WorkSans-Regular; -padding: 30px; -position: absolute; -left: 85px; -top: 50px; + background: white; + font-family: WorkSans-Regular; + padding: 30px; + position: absolute; + left: 85px; + bottom: 20%; } .disable-filter { pointer-events: none; diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 50be9552..1a2b1100 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -241,6 +241,7 @@ export class HomeComponent implements OnInit { if (filter.key === this.itemType) { filter.disable = false; filter.active = true; + filter.value = 0; this.selectedFilter = filter.name; } else if (this.itemType === '') { filter.disable = false; diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html index 67c7f422..0ee3c5c0 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html @@ -16,7 +16,7 @@ {{month}} {{year}} - + @@ -28,7 +28,7 @@ {{month}} {{year}} - +
From 9138bfe7444416de1cb9d00309258a4134b821c7 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Mon, 23 Mar 2020 17:33:24 +0300 Subject: [PATCH 08/10] handle build --prod issue --- Mohem/src/app/my-team/home/home.component.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 595c1dc0..03ed27de 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -2,12 +2,7 @@ {{ts.trPK('myTeam','myTeam-header')}} -<<<<<<< HEAD - - -======= ->>>>>>> master-newdesign --> From 97f608927208b479f2cb244777a68d238bfb3707 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Mon, 23 Mar 2020 18:05:32 +0300 Subject: [PATCH 09/10] fix conflict in login componemt --- Mohem/src/app/authentication/login/login.component.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index a1e9c6cd..08179d5e 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -95,14 +95,6 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { -<<<<<<< HEAD - this.cs.stopLoading(); - // tslint:disable-next-line: triple-equals - if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = 'US'; - } else { - this.language = 'AR'; -======= this.currentLang = TranslatorService.getCurrentLanguageCode(); console.log(TranslatorService.CURRENT_LANGUAGE) console.log(TranslatorService.EN) @@ -112,7 +104,6 @@ export class LoginComponent implements OnInit, OnDestroy { } else { this.language = "AR"; this.changeLanguage('1') ->>>>>>> master-newdesign } console.log("current lang: "+this.currentLang) //this.ts.switchLanguage(); From 25ada829dfd1fa6b65bb611ae62c30323e18f3f7 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 23 Mar 2020 18:38:50 +0300 Subject: [PATCH 10/10] fixed conflict issues --- .../app/my-team/details/details.component.ts | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index a3604d0e..6de1e116 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -58,7 +58,7 @@ export class DetailsComponent implements OnInit { public yearTitle: string; public activeMonth: any; public currentMonthName = this.getMonthName(new Date().getMonth() + 1); - + public showData = false; public currentYear = new Date().getFullYear(); public attendanceTrackingList: any = []; @@ -83,7 +83,7 @@ export class DetailsComponent implements OnInit { public searchEmail = ''; public showEmailInput = false; public showUserNameOrNameInput = true; - + constructor( public timeCardService: TimeCardService, @@ -95,7 +95,7 @@ export class DetailsComponent implements OnInit { private location: Location, public authService: AuthenticationService, public dashboardService: DashboredService, - ) { + ) { this.direction = TranslatorService.getCurrentLanguageName(); } @@ -135,15 +135,12 @@ export class DetailsComponent implements OnInit { this.showData = false; this.nextMonth = new Date().getMonth() + 2; this.preMonth = new Date().getMonth(); - if(this.direction == 'en'){ + if (this.direction === 'en') { this.currentMonthName = this.getMonthName(new Date().getMonth() + 1); - - } - else{ + } else { this.currentMonthName = this.getMonthNameAr(new Date().getMonth() + 1); - } - this.calendarConfig(this.currentMonthName) , (new Date().getFullYear()); + this.calendarConfig(this.currentMonthName, new Date().getFullYear()); } calendarConfig(month?, year?) { @@ -179,7 +176,7 @@ export class DetailsComponent implements OnInit { }); } - + nextSlide() { this.common.startLoading(); if (this.currentMonthName !== this.month) { @@ -326,29 +323,29 @@ export class DetailsComponent implements OnInit { public getMonthNameAr(value: any): any { switch (value) { case 1: - return "يناير"; + return 'يناير'; case 2: - return " فبراير"; + return ' فبراير'; case 3: - return "مارس"; + return 'مارس'; case 4: - return "أبريل"; + return 'أبريل'; case 5: - return "مايو"; + return 'مايو'; case 6: - return "يونيو"; + return 'يونيو'; case 7: - return "يوليو"; + return 'يوليو'; case 8: - return "أغسطس"; + return 'أغسطس'; case 9: - return "سبتمبر"; + return 'سبتمبر'; case 10: - return " اكتوبر"; + return ' اكتوبر'; case 11: - return " نوفمبر"; + return ' نوفمبر'; case 12: - return "ديسمبر"; + return 'ديسمبر'; } } @@ -526,7 +523,7 @@ doInfinite(infiniteScroll) { sortMenuEntires(list) { const tree = this.common.list_to_tree(list); this.common.sharedService.setSharedData(tree, 'menuEntries'); - this.common.sharedService.setSharedData("myteam", "homemenuentries"); + this.common.sharedService.setSharedData('myteam', 'homemenuentries'); this.common.openEITPage(); }