From 536e8a9c5a80dd53753225aaaeb5b0c08e8014d9 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 2 Mar 2020 14:20:00 +0300 Subject: [PATCH 01/12] handled multiple shifts and added slider. --- .../circle-calendar.component.scss | 37 ++---- .../date-info-modal.component.html | 112 +++++++++--------- .../date-info-modal.component.scss | 110 ++++++----------- .../date-info-modal.component.ts | 2 +- .../app/my-team/details/details.component.ts | 8 +- .../time-card-details.component.ts | 8 +- Mohem/src/theme/styles.scss | 5 +- 7 files changed, 104 insertions(+), 178 deletions(-) diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss index f265cb6e..67a8ab9d 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.scss @@ -1,11 +1,3 @@ - - - -// .modalCss .modal-Wrapper { -// width: 600px; -// height: 300px; -// } - .chart-modal .modal-Wrapper { --background: rgb(116, 108, 108) !important; --border-color:white!important ; @@ -18,12 +10,9 @@ font-size: 10px !important; --background: #22C6B3 !important; color: aliceblue !important; -// margin-top: 10px !important; - } - .menu{ - // margin-left:330px !important; + .menu { margin-top: 0px !important; font-size: 35px !important; background: #22C6B3; @@ -33,7 +22,6 @@ } .person{ - margin-left:100px !important; margin-top: 0px !important; font-size: 23px !important; @@ -43,20 +31,19 @@ } .grid{ -margin-bottom: 550px !important; -margin-top: 20px !important; -margin-left: 15px !important; -margin-right: 15px !important; -background-color:white !important; -border-radius: 20px !important; -height: 250px !important; + margin-bottom: 550px !important; + margin-top: 20px !important; + margin-left: 15px !important; + margin-right: 15px !important; + background-color:white !important; + border-radius: 20px !important; + height: 250px !important; } -.ionSliders{ - margin: 0px !important; - padding: 0px !important; - -} + .ionSliders{ + margin: 0px !important; + padding: 0px !important; + } .ionSlide{ diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 5c57f654..1715fb1c 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html @@ -1,104 +1,100 @@ - - - - - - -
-
-
-

{{percentage}}

- Completed



+ + + + + + +
+
+
+

{{percentage}}

+ Completed



+
+
- -
-
- - -
+
+ + +
+ +

{{nameDay}}

+ + +

{{day}}

+ -

{{nameDay}}

- +

{{nameMonth}}

+ -

{{day}}

- - -

{{nameMonth}}

- - -

{{year}}

- - -

{{ts.trPK('attendance','present')}}

- -
- - - - -
- +

{{year}}

+ + +

{{ts.trPK('attendance','present')}}

+ +
+ + - +

{{shiftTime}}

{{ts.trPK('attendance-tracking','shift-time')}}

 - + +

{{scheduled}}

{{ts.trPK('attendance-tracking','regular')}}

 - - - + + +

{{startDate}}

{{ts.trPK('attendance-tracking','check-in')}}

 - + + +

{{endDate}}

{{ts.trPK('attendance-tracking','check-out')}}

- - - + +

{{lateIn}}

{{ts.trPK('attendance-tracking','late-in')}}

 - + +

{{excess}}

{{ts.trPK('attendance-tracking','excess')}}

 - - - + +

{{shortage}}

{{ts.trPK('attendance-tracking','shortage')}}

 - + +

{{earlyOut}}

{{ts.trPK('attendance-tracking','early-out')}}

 - -
- - - + + + + diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 53ea08a2..10600f8b 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -1,54 +1,23 @@ .result-text-container { - - // padding: 0; - - // margin: 0; - - // position: absolute; - - // left: 50%; - - // top: 50%; - - // display: block; - - // text-align: center; - - // transform: translate(-50%, -50%); -//////////////////////////here padding: 0; margin: 0; position: absolute; - left: 58%; - top: 67%; + left: 42%; + top: 60%; display: block; text-align: center; - -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); - h2 { - font-size: 25px; - - // font-family: WorkSans-Bold; font-weight: bold; - margin: 0 auto; - line-height: 36px; - } - span { - width: 125px; - display: block; - margin: 0 auto; - font-size: 12px; - font-family: workSans-Regular; color: rgb(163, 163, 163) !important; } @@ -57,20 +26,26 @@ .today-graph{ display: block; height: 127px; - width: 288px; + width: 270px; + margin-left: -60px; } .amountlabel{ - color: black !important; - font-weight: bold !important; - font-size: 13px !important; -// border-top: 1px solid rgb(163, 163, 163) !important; - margin-left: 0px !important; - margin-bottom: -29px !important; + color: black !important; + font-weight: bold !important; + font-size: 13px !important; + margin-bottom: -29px !important; + width: 100%; + display: block; + text-align: center; } .rowlabel{ -color: rgb(163, 163, 163) !important; -font-size: 13px !important; -font-family: WorkSans-Bold; + color: #a3a3a3 !important; + font-size: 13px !important; + font-family: WorkSans-Bold; + display: block; + width: 100%; + text-align: center; + padding: 1px; } .grid{ padding-bottom: -20px !important; @@ -95,18 +70,9 @@ height: 360px !important; } .div{ - // border: 1px solid #a3a3a3 !important; - // text-align: center; - // width: 274%; - // border-radius: 8%; - // height: 40%; - // margin-right: -11px; border: 1px solid #a3a3a3 !important; - border-radius: 9px; - width: 241%; - margin-right: -226px; - - + border-radius: 10px; + margin-bottom:10px; } .p0{ margin-bottom: -13px !important; @@ -128,22 +94,28 @@ height: 360px !important; display: block; width: 100%; } - .p2{ font-weight: bold !important; + .p2{ + font-weight: bold !important; font-size: 17px !important; margin-bottom: 43px !important; margin-top: 0px !important; color: black !important; font-weight: bold !important; - margin-left: 33px; - } - .p3{ /* margin-bottom: -72px !important; */ + text-align: center; + display: block; + width: 100%; + } + .p3{ color: black !important; font-weight: bold !important; font-size: 19px; margin-top: -43px; - margin-left: 27px; + text-align: center; + display: block; + width: 100%; } - .p4{ margin-bottom: 56px !important; + .p4{ + margin-bottom: 56px !important; margin-top: -26px !important; color: black !important; } @@ -158,23 +130,7 @@ height: 360px !important; height: 21px; width: 110px; padding-top: 7px; - /* font-family: WorkSans-Bold !important; */ padding-bottom: 21px; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; - } - // .less{ background-color: #22C6B3; - // background-color: #22C6B3; - // border: none; - // color: white; - // text-align: center; - // text-decoration: none; - // display: inline-block; - // font-size: 12px; - // border-radius: 30px; - // height: 26px; - // padding: 6px 24px; - // margin-left: 123px; - // /* margin-top: -19px; */ - // margin-bottom: 17px; - // } \ No newline at end of file + } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts index 001b4b25..1cc15754 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.ts @@ -98,7 +98,7 @@ export class DateInfoModalComponent implements OnInit { slideChanged(ev) { this.slides.getActiveIndex().then(index => { - const shiftDetails = this.SHIFTDETAILS[index]; + const shiftDetails = this.SHIFTDETAILS.GetScheduleShiftsDetailsList[index]; this.assignData(shiftDetails); }); } diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index bf839752..ae4acf22 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -132,12 +132,7 @@ export class DetailsComponent implements OnInit { this.currentDate = new Date(); this.showData = false; this.nextMonth = new Date().getMonth() + 2; - this.preMonth = new Date().getMonth() - 2; - if (this.preMonth < 0) { - this.preMonth = this.preMonth * - 1; - } else { - this.preMonth = this.preMonth * - 1; - } + this.preMonth = new Date().getMonth(); this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); } @@ -210,6 +205,7 @@ export class DetailsComponent implements OnInit { } + changeMonthTitle(title) { this.monthTitle = title; this.getTimeCardSummaryDetails(); diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 8383911a..7b2230aa 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -76,12 +76,7 @@ export class TimeCardDetailsComponent implements OnInit { ngOnInit() { this.showData = false; this.nextMonth = new Date().getMonth() + 2; - this.preMonth = new Date().getMonth() - 2; - if (this.preMonth < 0) { - this.preMonth = this.preMonth * - 1; - } else { - this.preMonth = this.preMonth * - 1; - } + this.preMonth = new Date().getMonth(); this.calendarConfig(this.getMonthName(new Date().getMonth() + 1) , new Date().getFullYear()); } @@ -218,7 +213,6 @@ export class TimeCardDetailsComponent implements OnInit { }); } - nextSlide() { this.normalDays = []; if (this.currentMonthName !== this.month) { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index c3380444..1e791c08 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1284,12 +1284,9 @@ border:0px } .calendar-modal { - --height: 15cm !important; + --height: 13cm !important; --width: 88% !important; --border-radius: 0.4cm; - - // height: 544px !important; - // width: 332px !important; } From d26cea9024c0cdb53e3ebfa3a3486d8a3865ba19 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 2 Mar 2020 18:08:33 +0300 Subject: [PATCH 02/12] fixed attendance and calendar issues --- .../circle-calendar.component.ts | 29 ++++---- .../date-info-modal.component.scss | 2 +- .../employee-information.component.html | 6 +- .../employee-information.component.ts | 9 ++- .../my-team/details/details.component.html | 8 +-- .../app/my-team/details/details.component.ts | 66 ++++++------------- .../src/app/my-team/home/home.component.html | 2 +- .../time-card-details.component.html | 4 -- .../time-card-details.component.ts | 65 ++++++------------ Mohem/src/theme/styles.scss | 7 +- 10 files changed, 77 insertions(+), 121 deletions(-) diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts index c664d3dc..842cbd83 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/circle-calendar.component.ts @@ -17,11 +17,6 @@ import { GetSwipesRequest } from 'src/app/time-card/service/models/get-swipes-re styleUrls: ['./circle-calendar.component.scss'] }) export class CircleCalendarComponent implements OnInit { - - @Input() eventsdateDayOff: any = []; - @Input() eventsdateAttend: any = []; - @Input() eventsdateAbsent: any = []; - @Input() normalDays: any = []; @Input() dayHoursTypeDetailsList: any = []; @Input() currentDateParent: string; @Output() monthTitle = new EventEmitter(); @@ -86,10 +81,7 @@ export class CircleCalendarComponent implements OnInit { } reRenderCalendar() { - this.renderDate(this.eventsdateAbsent, 'absent'); - this.renderDate(this.eventsdateAttend, 'present'); - this.renderDate(this.eventsdateDayOff, 'dayoff'); - this.renderDate(this.normalDays, 'scheduleDay'); + this.renderDate(this.dayHoursTypeDetailsList); } public async dateModal(shiftDetails) { @@ -106,14 +98,23 @@ export class CircleCalendarComponent implements OnInit { await modal.present(); } - public renderDate(arrayDays, cssClass) { + public renderDate(arrayDays) { const td = document.querySelectorAll('.swiper-slide-active .monthview-datetable td:not(.text-muted)'); arrayDays.forEach(dateObj => { - const date = dateObj.startTime; + const date = dateObj.customScheduleDate; td.forEach(element => { // tslint:disable-next-line: triple-equals - if (date.getDate() == element.textContent.trim()) { - element.classList.add(cssClass); + if (date.getDate() == element.textContent.trim() && dateObj.customPresent === true) { + element.classList.add('present'); + // tslint:disable-next-line: triple-equals + } else if (date.getDate() == element.textContent.trim() && dateObj.customAbsent === true) { + element.classList.add('absent'); + // tslint:disable-next-line: triple-equals + } else if (date.getDate() == element.textContent.trim() && dateObj.customDaysOff === true) { + element.classList.add('dayoff'); + // tslint:disable-next-line: triple-equals + } else if (date.getDate() == element.textContent.trim() && dateObj.customSchedule === true) { + element.classList.add('scheduleDay'); } }); }); @@ -124,7 +125,7 @@ export class CircleCalendarComponent implements OnInit { console.log(event.selectedTime.getDate()); const selectedIndex = event.selectedTime.getDate(); this.selectedIndexData = this.dayHoursTypeDetailsList[selectedIndex - 1]; - if (this.selectedIndexData.present) { + if (this.selectedIndexData.customPresent) { const rtpID = this.selectedIndexData.RTP_ID; this.getScheduleShiftDetails(rtpID); } diff --git a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss index 10600f8b..7f648459 100644 --- a/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss +++ b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.scss @@ -78,7 +78,7 @@ height: 360px !important; margin-bottom: -13px !important; color: black !important; font-weight: bold !important; - font-size: 15px !important; + font-size: 14px !important; margin-top: 8px; text-align: center; display: block; diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html index f3099eaa..a90e4704 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.html @@ -1,6 +1,6 @@
- +
Team Member Image @@ -9,11 +9,11 @@
- +

{{name}}

{{title}} - +
diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts index 47d44bb7..47fe4440 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; @Component({ selector: 'app-employee-information', @@ -12,10 +12,15 @@ export class EmployeeInformationComponent implements OnInit { @Input() title: string; @Input() employeeImage: string; @Input() employeePhoneNumber: string; - + // tslint:disable-next-line: no-output-on-prefix + @Output() onGetDetails = new EventEmitter(); constructor() { } ngOnInit() {} + getDetails() { + this.onGetDetails.emit(); + } + } diff --git a/Mohem/src/app/my-team/details/details.component.html b/Mohem/src/app/my-team/details/details.component.html index 3e0c7759..af154d2f 100644 --- a/Mohem/src/app/my-team/details/details.component.html +++ b/Mohem/src/app/my-team/details/details.component.html @@ -23,7 +23,7 @@
- + Call @@ -174,12 +174,8 @@
{{ts.trPK('attendance','monthly-attendance-calendar')}} @@ -223,7 +219,7 @@ [title]="subordinate.POSITION_NAME" [employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'" [employeePhoneNumber]="subordinate.EMPLOYEE_MOBILE_NUMBER" - (click)="getDetails(i)"> + (onGetDetails)="getDetails(i)"> diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index ae4acf22..a5e58229 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -54,10 +54,6 @@ export class DetailsComponent implements OnInit { public attendedDays: number; public futrueDays = 0; public totalAttendancePrecentage = 0; - public arrDaysAttendance: any = []; - public arrDaysAbsent: any = []; - public arrDaysOff: any = []; - public normalDays: any = []; public monthTitle: string = moment().format('MMMM'); public yearTitle: string; public activeMonth: any; @@ -120,7 +116,6 @@ export class DetailsComponent implements OnInit { public segmentChanged(event: any) { this.activeSegment = event.detail.value; if (this.activeSegment === 'Attendance') { - this.normalDays = []; this.initAttendance(); } } @@ -137,9 +132,6 @@ export class DetailsComponent implements OnInit { } calendarConfig(month?, year?) { - this.arrDaysOff = []; - this.arrDaysAttendance = []; - this.arrDaysAbsent = []; this.month = month; this.year = year; this.getTimeCardSummaryDetails(month, year); @@ -169,14 +161,12 @@ export class DetailsComponent implements OnInit { console.log(result.GetDayHoursTypeDetailsList); this.common.sharedService.setSharedData(result.GetDayHoursTypeDetailsList, 'RTP_IDs'); this.countAllAttendDays(result.GetDayHoursTypeDetailsList); - this.dayHoursTypeDetailsList = result.GetDayHoursTypeDetailsList; } }); } nextSlide() { - this.normalDays = []; if (this.currentMonthName !== this.month) { this.showData = false; if (this.nextMonth > 12) { @@ -191,7 +181,6 @@ export class DetailsComponent implements OnInit { } previousSlide() { - this.normalDays = []; this.showData = false; if (this.preMonth === 0) { this.currentYear = this.currentYear - 1; @@ -219,48 +208,35 @@ export class DetailsComponent implements OnInit { for (let i = 0; i < allDays.length; i++) { // tslint:disable-next-line: triple-equals if (allDays[i].ATTENDED_FLAG == 'Y') { - allDays[i].present = true; - allDays[i].absent = false; - allDays[i].daysOff = false; - allDays[i].schedule = false; - this.arrDaysAttendance.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE) - }); + allDays[i].customPresent = true; + allDays[i].customAbsent = false; + allDays[i].customDaysOff = false; + allDays[i].customSchedule = false; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); // tslint:disable-next-line: triple-equals } else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].ABSENT_FLAG == 'Y') { - allDays[i].present = false; - allDays[i].absent = true; - allDays[i].daysOff = false; - allDays[i].schedule = false; - this.arrDaysAbsent.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE), - isoTime: '09:00:00', - allDay: false - }); + allDays[i].customPresent = false; + allDays[i].customAbsent = true; + allDays[i].customDaysOff = false; + allDays[i].customSchedule = false; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); // tslint:disable-next-line: triple-equals } else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].DAY_TYPE === 'OFF') { - allDays[i].present = false; - allDays[i].absent = false; - allDays[i].daysOff = true; - allDays[i].schedule = false; - this.arrDaysOff.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE) - }); + allDays[i].customPresent = false; + allDays[i].customAbsent = false; + allDays[i].customDaysOff = true; + allDays[i].customSchedule = false; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); } else { - allDays[i].present = false; - allDays[i].absent = false; - allDays[i].daysOff = false; - allDays[i].schedule = true; - this.normalDays.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE) - }); + allDays[i].customPresent = false; + allDays[i].customAbsent = false; + allDays[i].customDaysOff = false; + allDays[i].customSchedule = true; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); } } this.showData = true; + this.dayHoursTypeDetailsList = allDays; } public getTimeCardSummaryDetails(month?, year?) { diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 1a297ab0..76a56be7 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -69,7 +69,7 @@ [title]="subordinate.POSITION_NAME" [employeeImage]="subordinate.EMPLOYEE_IMAGE ? 'data:image/png;base64,'+subordinate.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'" [employeePhoneNumber]="subordinate.EMPLOYEE_MOBILE_NUMBER" - (click)="getDetails(i)"> + (onGetDetails)="getDetails(i)"> 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 d2f9d80d..9eb7fe15 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 @@ -84,12 +84,8 @@
{{ts.trPK('attendance','monthly-attendance-calendar')}} diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 7b2230aa..377dfbd3 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -53,9 +53,6 @@ export class TimeCardDetailsComponent implements OnInit { public attendedDays: number; public futrueDays = 0; public totalAttendancePrecentage = 0; - public arrDaysAttendance: any = []; - public arrDaysAbsent: any = []; - public arrDaysOff: any = []; public monthTitle: string = moment().format('MMMM'); public yearTitle: string; public isChange = false; @@ -64,7 +61,6 @@ export class TimeCardDetailsComponent implements OnInit { public showData = false; public currentYear = new Date().getFullYear(); public dayHoursTypeDetailsList = []; - public normalDays: any = []; public currentDate = new Date(); public options = { cutoutPercentage: 80, @@ -81,9 +77,6 @@ export class TimeCardDetailsComponent implements OnInit { } calendarConfig(month?, year?) { - this.arrDaysOff = []; - this.arrDaysAttendance = []; - this.arrDaysAbsent = []; this.month = month; this.year = year; this.getTimeCardSummaryDetails(month, year); @@ -113,7 +106,6 @@ export class TimeCardDetailsComponent implements OnInit { console.log(result.GetDayHoursTypeDetailsList); this.common.sharedService.setSharedData(result.GetDayHoursTypeDetailsList, 'RTP_IDs'); this.countAllAttendDays(result.GetDayHoursTypeDetailsList); - this.dayHoursTypeDetailsList = result.GetDayHoursTypeDetailsList; } }); @@ -124,48 +116,35 @@ export class TimeCardDetailsComponent implements OnInit { for (let i = 0; i < allDays.length; i++) { // tslint:disable-next-line: triple-equals if (allDays[i].ATTENDED_FLAG == 'Y') { - allDays[i].present = true; - allDays[i].absent = false; - allDays[i].daysOff = false; - allDays[i].schedule = false; - this.arrDaysAttendance.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE) - }); + allDays[i].customPresent = true; + allDays[i].customAbsent = false; + allDays[i].customDaysOff = false; + allDays[i].customSchedule = false; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); // tslint:disable-next-line: triple-equals } else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].ABSENT_FLAG == 'Y') { - allDays[i].present = false; - allDays[i].absent = true; - allDays[i].daysOff = false; - allDays[i].schedule = false; - this.arrDaysAbsent.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE), - isoTime: '09:00:00', - allDay: false - }); + allDays[i].customPresent = false; + allDays[i].customAbsent = true; + allDays[i].customDaysOff = false; + allDays[i].customSchedule = false; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); // tslint:disable-next-line: triple-equals } else if (allDays[i].ATTENDED_FLAG == 'N' && allDays[i].DAY_TYPE === 'OFF') { - allDays[i].present = false; - allDays[i].absent = false; - allDays[i].daysOff = true; - allDays[i].schedule = false; - this.arrDaysOff.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE) - }); + allDays[i].customPresent = false; + allDays[i].customAbsent = false; + allDays[i].customDaysOff = true; + allDays[i].customSchedule = false; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); } else { - allDays[i].present = false; - allDays[i].absent = false; - allDays[i].daysOff = false; - allDays[i].schedule = true; - this.normalDays.push({ - startTime: new Date(allDays[i].SCHEDULE_DATE), - endTime: new Date(allDays[i].SCHEDULE_DATE) - }); + allDays[i].customPresent = false; + allDays[i].customAbsent = false; + allDays[i].customDaysOff = false; + allDays[i].customSchedule = true; + allDays[i].customScheduleDate = new Date(allDays[i].SCHEDULE_DATE); } } this.showData = true; + this.dayHoursTypeDetailsList = allDays; } public getTimeCardSummaryDetails(month?, year?) { @@ -214,7 +193,6 @@ export class TimeCardDetailsComponent implements OnInit { } nextSlide() { - this.normalDays = []; if (this.currentMonthName !== this.month) { this.showData = false; if (this.nextMonth > 12) { @@ -229,7 +207,6 @@ export class TimeCardDetailsComponent implements OnInit { } previousSlide() { - this.normalDays = []; this.showData = false; if (this.preMonth === 0) { this.currentYear = this.currentYear - 1; diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 1e791c08..b2768650 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1284,7 +1284,7 @@ border:0px } .calendar-modal { - --height: 13cm !important; + --height: 13.5cm !important; --width: 88% !important; --border-radius: 0.4cm; } @@ -1409,6 +1409,11 @@ table.monthview-datetable th small { border-radius: 20px !important; } +.disable-phone { + pointer-events: none; + opacity: .3; +} + // .replaceRoll-modal { // padding: 30% 1% !important; From f00e63f49dabd821dd32d440f9aa0d14c9218c7c Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Tue, 3 Mar 2020 15:50:22 +0300 Subject: [PATCH 03/12] remove image from confirmlogin and sms --- .../confirm-login/confirm-login.component.html | 4 ++-- Mohem/src/app/authentication/login/login.component.html | 6 +++--- Mohem/src/app/authentication/sms-page/sms-page.page.html | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index 931f7349..5ab6a2b0 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -13,11 +13,11 @@ [ngClass]="{'content-class':accessFromOutSide, 'ion-padding': !accessFromOutSide}" has-bouncing="false" forceOverscroll="false" scrollY="false" class="ion-no-padding"> - + + - + --> diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 725130e9..f2811d6a 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -9,13 +9,13 @@ - + + - + -->

From 8d1ad091e937e84d849039b745576f1479ab41e2 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 4 Mar 2020 08:45:57 +0300 Subject: [PATCH 04/12] add image and fix text and chaneg the BG color for any page did not have data --- Mohem/src/app/absence/home/home.component.html | 4 ++-- .../src/app/eit/eit-list/eit-list.component.html | 12 ++++++------ Mohem/src/app/home/home.page.ts | 8 ++++---- Mohem/src/assets/imgs/box.png | Bin 0 -> 9470 bytes Mohem/src/assets/localization/i18n.json | 2 +- Mohem/src/imgs/box.png | Bin 0 -> 9470 bytes Mohem/src/theme/styles.scss | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 Mohem/src/assets/imgs/box.png create mode 100644 Mohem/src/imgs/box.png diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 86fd1dcc..07feaeaf 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -13,7 +13,7 @@ - +
@@ -148,7 +148,7 @@
- + diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index b442044d..36b2b14c 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -5,7 +5,7 @@ - +
@@ -157,7 +157,7 @@ *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0"> - +

{{'general, noData' | translate}}

@@ -228,12 +228,12 @@
- -
+ -
+ \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 02bde739..9fcfad65 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -542,7 +542,7 @@ export class HomePage implements OnInit { (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { const key = "GetOpenMissingSwipesList"; - this.statsButtons[1].statsValue = result[key].P_OPEN_MISSING_SWIPES; + this.statsButtons[1].statsValue = Math.ceil(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -613,7 +613,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails().subscribe((result: any) => { this.statsButtons[0].statsValue = - this.countAllNotification + result.TotalCount; + Math.ceil(this.countAllNotification + result.TotalCount); }); } @@ -693,7 +693,7 @@ getSubordinatesAttStatus() { "HMG Annual Vacation Accrual Plan" ) { this.statsButtons[2].statsValue = - accrualBalance.ACCRUAL_NET_ENTITLEMENT; + Math.ceil(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData( accrualBalance, "leaveAccrualBalance" @@ -711,7 +711,7 @@ getSubordinatesAttStatus() { totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = totalTicketsLeft; + this.statsButtons[3].statsValue = Math.ceil(totalTicketsLeft); } }); } diff --git a/Mohem/src/assets/imgs/box.png b/Mohem/src/assets/imgs/box.png new file mode 100644 index 0000000000000000000000000000000000000000..a34ee59df1856409ffefb0d4670bea7106c0e9f3 GIT binary patch literal 9470 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 QeE Date: Wed, 4 Mar 2020 14:31:15 +0300 Subject: [PATCH 05/12] edit payment info & employee profile update --- Mohem/src/app/app.component.ts | 5 +++++ Mohem/src/app/home/home.page.ts | 4 ++++ Mohem/src/app/payslip/home/home.component.html | 12 +++++++----- Mohem/src/app/payslip/home/home.component.ts | 2 +- .../edit-profile/edit-profile.component.ts | 17 ++++++++++++----- Mohem/src/app/profile/home/home.component.ts | 3 +-- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 9cdfc021..2c882ac2 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -57,6 +57,7 @@ export class AppComponent implements OnInit, AfterViewInit { ngOnInit() { this.initializeApp(); + } ngAfterViewInit() {} initializeApp() { @@ -94,9 +95,13 @@ export class AppComponent implements OnInit, AfterViewInit { ? user.CompanyImageDescription : "Powered By Cloud Solutions"; this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME; + if(this.cs.getUpdateImage().status){ + this.user_image =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.cs.getUpdateImage().img); + }else{ this.user_image = user.EMPLOYEE_IMAGE ? "data:image/png;base64," + user.EMPLOYEE_IMAGE : "../assets/imgs/profile.png"; + } this.User_Job_name=user.JOB_NAME; console.log(user); diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 02bde739..64d54133 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -320,9 +320,13 @@ export class HomePage implements OnInit { this.userData, AuthenticatedUser.SHARED_DATA ); + if(this.common.getUpdateImage().status){ + this.userImage =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.common.getUpdateImage().img); + }else{ this.userImage = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : this.userImage; + } this.callDashboardServices(); } else { console.log(user); diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 142a36a5..cb9a57a0 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -257,6 +257,7 @@
{{ts.trPK('payslip','payment-information')}}
+
@@ -265,7 +266,7 @@ - + @@ -276,7 +277,7 @@ - + @@ -285,7 +286,7 @@ - + @@ -297,7 +298,7 @@ - + @@ -306,10 +307,11 @@ - +
+
 \ No newline at end of file diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 7fd9b363..8f826d99 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -257,7 +257,7 @@ getPaymentInfo(ActionContextID){ handleGetPaymentInfoResult(result){ if (result.GetPaymentInformationList != null) { - this.GetPaymentInformationList = result.GetPaymentInformationList[0]; + this.GetPaymentInformationList = result.GetPaymentInformationList; } } diff --git a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts index 58c888f3..61b0d210 100644 --- a/Mohem/src/app/profile/edit-profile/edit-profile.component.ts +++ b/Mohem/src/app/profile/edit-profile/edit-profile.component.ts @@ -7,6 +7,7 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo import { PerformanceAppraisalResponse } from 'src/app/hmg-common/services/dashbored/performance-appraisal.response'; import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; +import { DomSanitizer } from '@angular/platform-browser'; // import { DomSanitizer } from '@angular/platform-browser'; @@ -35,17 +36,19 @@ export class EditProfileComponent implements OnInit { public cs: CommonService, public authService: AuthenticationService, public DS :DashboredService, - public sharedData: SharedDataService + public sharedData: SharedDataService, + public events: Events, + private sanitizer: DomSanitizer, // private events: Events, // private sanitizer: DomSanitizer, ) { - // this.events.subscribe("img-change", displayImg => { - // console.log("app compont: "+displayImg); - // this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); + this.events.subscribe("img-change", displayImg => { + console.log("app compont: "+displayImg); + this.user_image = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+displayImg); - // }); + }); } @@ -63,9 +66,13 @@ export class EditProfileComponent implements OnInit { this.personalInfo = user; this.User_name_Emp=this.personalInfo.EMPLOYEE_NAME; this.User_Job_name=this.personalInfo.JOB_NAME; + if(this.cs.getUpdateImage().status){ + this.user_image =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.cs.getUpdateImage().img); + }else{ this.user_image = user.EMPLOYEE_IMAGE ? "data:image/png;base64," + user.EMPLOYEE_IMAGE : "../assets/imgs/profile.png"; + } console.log("name: "+ this.personalInfo.EMPLOYEE_NAME); console.log("user name: "+ user.EMPLOYEE_NAME); console.log("name: "+ this.personalInfo.JOB_NAME); diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 2e192b1f..25192f94 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -51,8 +51,7 @@ export class HomeComponent implements OnInit { if(this.cs.getUpdateImage().status){ // this.imageSrc = this.sanitizer.bypassSecurityTrustUrl("data:Image/*;base64,"+this.cs.getUpdateImage().img); - this.imageSrc = "data:image/png;base64,"+this.cs.getUpdateImage().img; - // alert("this.imageSrc"+ this.imageSrc); + this.imageSrc =this.sanitizer.bypassSecurityTrustUrl("data:image/png;base64,"+this.cs.getUpdateImage().img); }else{ this.imageSrc = user.EMPLOYEE_IMAGE ? "data:image/png;base64," + user.EMPLOYEE_IMAGE From 68357f35b25dc478a4dd32da743cf99b8ceec255 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Wed, 4 Mar 2020 18:02:14 +0300 Subject: [PATCH 06/12] fixed worklist flow --- .../home/home.component.html | 10 +- .../ui/card-filter/card-filter.component.html | 2 +- .../app/notification/home/home.component.html | 46 +++--- .../app/notification/home/home.component.scss | 7 +- .../app/notification/home/home.component.ts | 143 ++++++++++++------ Mohem/src/theme/styles.scss | 6 +- 6 files changed, 140 insertions(+), 74 deletions(-) diff --git a/Mohem/src/app/attendance-tracking/home/home.component.html b/Mohem/src/app/attendance-tracking/home/home.component.html index 48d2c99c..1a4ae913 100644 --- a/Mohem/src/app/attendance-tracking/home/home.component.html +++ b/Mohem/src/app/attendance-tracking/home/home.component.html @@ -67,19 +67,19 @@ {{ts.trPK('attendance-tracking','check-in')}} - 08:00 + {{attendanceTrackingList.P_SWIPE_IN | slice:0:-3}} - + {{ts.trPK('attendance-tracking','check-out')}} - 08:00 + {{attendanceTrackingList.P_SWIPE_OUT | slice:0:-3}} {{ts.trPK('attendance-tracking','late-in')}} - 08:00 + {{attendanceTrackingList.P_LATE_IN_HOURS | slice:0:-3}} - + {{ts.trPK('attendance-tracking','regular')}} {{attendanceTrackingList.P_SCHEDULED_HOURS | slice:0:-3}} diff --git a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html index fb3f1a49..3865efe3 100644 --- a/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html +++ b/Mohem/src/app/hmg-common/ui/card-filter/card-filter.component.html @@ -1,5 +1,5 @@
- {{value}} + {{value}} {{text}}
diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 3a4e61fb..37797f78 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -14,11 +14,16 @@
Open Request Analysis
-
-

{{totalRequestCount}}

+
+ {{newWorkListResponse.length + ITGCount}} of + {{newWorkListResponse.length}} of +

{{totalRequestCount}}

+

{{newWorkListResponse[0].NO_OF_ROWS + ITGCount}}

+

{{newWorkListResponse[0].NO_OF_ROWS}}

TOTAL
OPEN REQUEST
- + +
@@ -61,32 +66,35 @@ -
-
- {{data.key}} -
+
+
+
+ {{formattedData.date}} +

{{workList.SUBJECT}}

-
- +
-
-
- {{segmentInfo.ModifiedDate |date}} -
-

{{segmentInfo.Title}}

+
+
+ {{segmentInfo.ModifiedDate |date}} +
+

{{segmentInfo.Title}}

+
-
+
+ +
+ No Data Available +
+ -
- No Data Available -
- + diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 19ac087d..9c0e235d 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -333,6 +333,8 @@ ion-content { margin-top: 15px; display: block; padding: 0 20px; + position: relative; + z-index: 99; ion-col{ background: white; border-radius: 12px; @@ -382,9 +384,8 @@ ion-content { font-family: WorkSans-Regular; padding: 30px; position: absolute; - left: 50%; - margin-left: -100px; - margin-top: 100px; + left: 85px; + top: 50px; } .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 7b9e3d72..ed68d94e 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -58,10 +58,18 @@ export class HomeComponent implements OnInit { public worklistNotifications: any; public totalRequestCount = 0; public newWorkListResponse = []; - public showFormattedData = {}; + public showFormattedData = []; + public allFormattedData = []; public selectedFilter = 'ALL'; public showSearchButton = false; public itemType = ''; + + public totalHR = 0; + public totalPO = 0; + public totalPR = 0; + public totalMR = 0; + + public showChart = false; public options = { cutoutPercentage: 80, tooltips: { enabled: false }, @@ -153,11 +161,9 @@ export class HomeComponent implements OnInit { } ngOnInit() { - // this.direction = TranslatorService.getCurrentDirection(); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); this.Details(); this.Count(); - this.assignDataToFilters(); this.getAllPushNotificationFun(); this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; } @@ -165,42 +171,38 @@ export class HomeComponent implements OnInit { assignDataToFilters() { this.filters[0].value = this.worklistNotifications.P_OPEN_NTF_NUMBER; const openNotificationsArray = this.worklistNotifications.GetOpenNotificationsList; + for (const notification of openNotificationsArray) { if (notification.ITEM_TYPE === 'HRSSA') { - this.filters[1].value = notification.OPEN_NTF_NUMBER; + this.filters[1].value = this.totalHR; this.data.datasets[0].data[0] = notification.OPEN_NTF_NUMBER; } else if (notification.ITEM_TYPE === 'POAPPRV') { - this.filters[2].value = notification.OPEN_NTF_NUMBER; + this.filters[2].value = this.totalPO; this.data.datasets[0].data[1] = notification.OPEN_NTF_NUMBER; } else if (notification.ITEM_TYPE === 'REQAPPRV') { - this.filters[3].value = notification.OPEN_NTF_NUMBER; + this.filters[3].value = this.totalPR; this.data.datasets[0].data[2] = notification.OPEN_NTF_NUMBER; } else if (notification.ITEM_TYPE === 'INVMOA') { - this.filters[4].value = notification.OPEN_NTF_NUMBER; + this.filters[4].value = this.totalMR; this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER; } else if (notification.ITEM_TYPE === 'ITG') { this.filters[5].value = notification.OPEN_NTF_NUMBER; this.data.datasets[0].data[4] = notification.OPEN_NTF_NUMBER; + } } - } + this.showChart = true; } - - activeFilter(index: number) { if (this.currentActiveIndex !== index) { - this.showFormattedData = {}; this.previousActiveIndex = this.currentActiveIndex; this.currentActiveIndex = index; this.filters[this.previousActiveIndex].active = false; this.filters[this.currentActiveIndex].active = true; - if (this.filters[this.currentActiveIndex].value !== 0) { - const selectedKey = this.filters[this.currentActiveIndex].key; - this.resetData(); - this.itemType = (selectedKey !== 'ITG' && selectedKey !== 'ALL') ? this.filters[this.currentActiveIndex].key : ''; - this.getAllPushNotificationFun(); - } this.selectedFilter = this.filters[this.currentActiveIndex].key; + if (this.selectedFilter !== 'ITG') { + this.getFilteredData(this.selectedFilter); + } } } @@ -230,13 +232,13 @@ export class HomeComponent implements OnInit { async openSearchModal() { const modal = await this.modalController.create({ component: WorklistAdvancedSearchComponent, - cssClass: 'advanced-search-modal', + cssClass: 'advanced-search-modal-custom', backdropDismiss: false, componentProps: {} }); modal.onDidDismiss().then(result => { if (result.data) { - if (result.data.notificationType !== '' || result.data.selectedValue !== '' || result.data.itemType !== '') { + if (result.data.notificationType !== '' || result.data.selectedValue !== '' || result.data.itemType !== '') { this.showSearchButton = true; this.itemType = result.data.itemType; this.notificationType = result.data.notificationType; @@ -245,7 +247,7 @@ export class HomeComponent implements OnInit { this.inputSearch = result.data.inputSearch; this.WorkListObj.P_PAGE_NUM = 1; this.newWorkListResponse = []; - this.showFormattedData = {}; + this.showFormattedData = []; this.selectedFilter = 'ALL'; this.filters[this.currentActiveIndex].active = false; this.currentActiveIndex = 0; @@ -268,7 +270,7 @@ export class HomeComponent implements OnInit { this.WorkListObj.P_SEARCH_SUBJECT = this.selectedValue === '2' ? this.inputSearch : ''; this.WorkListObj.P_SEARCH_SENT_DATE = (this.inputDate && this.selectedValue === '3') ? moment(this.inputDate).format('DD-MMM-YYYY') : ''; - this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = this.selectedValue === '4' ? this.inputSearch : ''; ; + this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = this.selectedValue === '4' ? this.inputSearch : ''; this.WorkListObj.P_ITEM_TYPE = this.itemType !== '' ? this.itemType : ''; this.WorkListObj.P_NOTIFICATION_TYPE = this.notificationType !== '' ? this.notificationType : '1'; if (this.selectedValue === '5') { @@ -277,7 +279,6 @@ export class HomeComponent implements OnInit { this.WorkListObj.P_SEARCH_SENT_DATE = ''; this.WorkListObj.P_SEARCH_SUBJECT = ''; } - this.WorklistService.getWorkList(this.WorkListObj).subscribe((result) => { if (this.common.validResponse(result)) { this.handleWorkListResult(result.GetWorkList); @@ -286,24 +287,82 @@ export class HomeComponent implements OnInit { ); } - categorizeData(arrayToCategorize: any) { - const datePipe = new DatePipe('en-US'); - const formattedData = {}; - for (const workList of arrayToCategorize) { - workList.FORMATTED_DATE = datePipe.transform(new Date(workList.BEGIN_DATE), 'MMMM dd, y'); - if (!(workList.FORMATTED_DATE in formattedData)) { - formattedData[workList.FORMATTED_DATE] = new Array(); - formattedData[workList.FORMATTED_DATE].push(workList); - } else { - formattedData[workList.FORMATTED_DATE].push(workList); + getFilteredData(filter: string) { + if (filter === 'ALL') { + this.showFormattedData = this.allFormattedData; + } else { + let arrayToFilter; + arrayToFilter = this.newWorkListResponse.filter((workList) => { + return workList.ITEM_TYPE === filter; + }); + this.showFormattedData = this.categorizeData(arrayToFilter); + } + } + + checkDateExistance(currentDate: any, formattedData: any) { + let existsBefore = false; + let index = 0; + for (let i = 0; i < formattedData.length; i++) { + if (formattedData[i].date === currentDate) { + existsBefore = true; + index = i; + break; } + } + return { + exists: existsBefore, + indexNumber: index + }; + } + + addCountInFilters(workList: any) { + if (workList.ITEM_TYPE === 'HRSSA') { + this.totalHR = this.totalHR + 1; + } else if (workList.ITEM_TYPE === 'POAPPRV') { + this.totalPO = this.totalPO + 1; + } else if (workList.ITEM_TYPE === 'REQAPPRV') { + this.totalPR = this.totalPR + 1; + } else if (workList.ITEM_TYPE === 'INVMOA') { + this.totalMR = this.totalMR + 1; + } + } + + categorizeData(arrayToCategorize: any) { + this.totalHR = 0; + this.totalPO = 0; + this.totalPR = 0; + this.totalMR = 0; + + const datePipe = new DatePipe('en-US'); + const formattedData = []; + for (const workList of arrayToCategorize) { + this.addCountInFilters(workList); + const currentDate = datePipe.transform(new Date(workList.BEGIN_DATE), 'MMMM dd, y'); + const currentObject = { + date: '', + data: [] + }; + if (formattedData.length === 0) { + currentObject.date = currentDate; + currentObject.data.push(workList); + formattedData.push(currentObject); + } else { + const existsBefore = this.checkDateExistance(currentDate, formattedData); + if (existsBefore.exists) { + formattedData[existsBefore.indexNumber].data.push(workList); + } else { + currentObject.date = currentDate; + currentObject.data.push(workList); + formattedData.push(currentObject); + } + } } - return formattedData; + return formattedData; } sortArray(arrayToSort: any) { return arrayToSort.sort((a: any, b: any) => - new Date(b.BEGIN_DATE).getTime() - new Date(a.BEGIN_DATE).getTime() + new Date(b.date).getTime() - new Date(a.date).getTime() ); } @@ -330,9 +389,10 @@ export class HomeComponent implements OnInit { } else { this.newWorkListResponse = this.newWorkListResponse.concat(result); } - this.newWorkListResponse = this.sortArray(this.newWorkListResponse); - console.log(this.newWorkListResponse); - this.showFormattedData = this.categorizeData(this.newWorkListResponse); + const categorizedWorkListResponse = this.categorizeData(this.newWorkListResponse); + this.assignDataToFilters(); + this.showFormattedData = this.sortArray(categorizedWorkListResponse); + this.allFormattedData = this.showFormattedData; this.common.sharedService.setSharedData(this.newWorkListResponse, HomeComponent.NOTIFICATION_ARR); } else { this.newWorkListResponse = []; @@ -352,10 +412,6 @@ export class HomeComponent implements OnInit { } } - isEmptyObject() { - return (this.showFormattedData && (Object.keys(this.showFormattedData).length > 0) || this.ITGItem.length > 0); - } - resetData() { if (this.infiniteScroll) { this.infiniteScroll.complete(); @@ -366,7 +422,8 @@ export class HomeComponent implements OnInit { this.inputDate = ''; this.inputSearch = ''; this.newWorkListResponse = []; - this.showFormattedData = {}; + this.showFormattedData = []; + this.allFormattedData = []; this.WorkListObj.P_SEARCH_FROM_USER = ''; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = ''; this.WorkListObj.P_SEARCH_SENT_DATE = ''; @@ -413,13 +470,13 @@ export class HomeComponent implements OnInit { Details() { this.workListService.getITGDetails() .subscribe((result: any) => { + this.ITGCount = result.TotalCount; this.totalRequestCount = this.totalRequestCount + result.TotalCount; this.filters[5].value = result.TotalCount; }); } ITGNotification() { - // this.Details(); this.isAll = false; this.isPR = false; this.isPO = false; diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index c3380444..5a57f192 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1191,7 +1191,7 @@ border:0px // } .advanced-search-modal { - --height: 9cm !important; + --height: 12cm !important; --width: 88% !important; --border-radius: 0.6cm; } @@ -1277,8 +1277,8 @@ border:0px } -.advanced-search-modal { - --height: 12cm !important; +.advanced-search-modal-custom { + --height: 9cm !important; --width: 80% !important; --border-radius: 0.4cm; } From 5f24329ef9e5a2d2e486db99c29409398f349cda Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 5 Mar 2020 12:05:06 +0300 Subject: [PATCH 07/12] orienttion --- Mohem/config.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Mohem/config.xml b/Mohem/config.xml index 55d5ce3c..0943daff 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -20,6 +20,7 @@ + From 14e2654ae49b87587278a70dd3b7d886d7086728 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Thu, 5 Mar 2020 12:41:26 +0300 Subject: [PATCH 08/12] fix login --- Mohem/src/app/app.component.ts | 88 ++++++++++++++++++- .../authentication/login/login.component.ts | 73 ++++++++++++--- .../ui/welcome-login/welcome.component.ts | 2 +- Mohem/src/app/pipes/pipes.module.ts | 5 +- 4 files changed, 152 insertions(+), 16 deletions(-) diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 01c88780..fd62f41e 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -10,6 +10,9 @@ import { SMSCheckResponse } from "src/app/hmg-common/services/authentication/mod import { PushService } from '../../src/app/hmg-common/services/push/push.service'; import { LazyLoadingService } from "./hmg-common/services/lazy-loading/lazy-loading.service"; import { DomSanitizer } from '@angular/platform-browser'; +// import { SplashScreen } from '@ionic-native/splash-screen'; +import { SplashScreen } from '@ionic-native/splash-screen/ngx'; + @Component({ selector: "app-root", @@ -29,10 +32,12 @@ export class AppComponent implements OnInit, AfterViewInit { companyDesc: string = "Powered By Cloud Solutions"; public direction = "ltr"; User_Job_name: string; + public logoutFlage: any =false; requestGetLoginInfo: { DeviceType: string; DeviceToken: string; //this.deviceToken }; user: boolean; + deviceToken: string; constructor( public ts: TranslatorService, private cs: CommonService, @@ -43,7 +48,9 @@ export class AppComponent implements OnInit, AfterViewInit { private menu: MenuController, private authService: AuthenticationService, private sanitizer: DomSanitizer, - public pushService: PushService + public pushService: PushService, + private splashScreen: SplashScreen + ) { this.events.subscribe("img-change", displayImg => { console.log("app compont: "+displayImg); @@ -78,6 +85,11 @@ export class AppComponent implements OnInit, AfterViewInit { private startReceivingPushService() { console.log("platform.ready") this.pushService.startReceiving(); + setTimeout(() => { + + this.getLastLoginInfo(); + },5000); + } subscribeEvents() { this.events.subscribe("setMenu", () => { @@ -128,8 +140,14 @@ export class AppComponent implements OnInit, AfterViewInit { } logout() { this.cs.sharedService.clearAll(); - this.menu.toggle(); - this.cs.openLogin(); + //this.menu.toggle(); + this.menu.enable(false); + this.logoutFlage=true; + this.events.publish('logoutFlage', this.logoutFlage); + + this.getLastLoginInfo(); + // this.cs.openLogin(); + } // profile() { @@ -166,6 +184,70 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.toggle(); } + getLastLoginInfo(){ + this.deviceToken= localStorage.getItem('devicyeToken'); + console.log("let deviceToken app" + this.deviceToken); + + if (this.deviceToken) { + console.log('login enabled first time: ' + this.deviceToken); + } else { + console.log("no deviceToken" ); + + this.pushService.startReceiving(); + setTimeout(() => { + this.deviceToken= localStorage.getItem('deviceToken'); + console.log('login enabled second time: ' + this.deviceToken); + + }, 1000); + } + + + this.requestGetLoginInfo= { + DeviceType:this.cs.getDeviceType(),//'Android', + DeviceToken:this.deviceToken//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken + } + this.authService.getLoginInfo(this.requestGetLoginInfo,() => {}, this.ts.trPK('general', 'ok')).subscribe(res => { + + if (this.cs.validResponse(res)) { + + if(res.Mohemm_GetMobileLoginInfoList.length > 0){ + + this.cs.sharedService.setSharedData( + // res.Patient_SELECTDeviceIMEIbyIMEIList[0], + res.Mohemm_GetMobileLoginInfoList[0], + AuthenticationService.IMEI_USER_DATA + ); + this.user = true; + this.events.publish('user', this.user); + + this.splashScreen.hide(); + if(this.logoutFlage){ + this.cs.openLogin(); + + } + + } + else{ + this.user = false; + this.events.publish('user', this.user); + this.splashScreen.hide(); + if(this.logoutFlage){ + this.cs.openLogin(); + + } + + } + + + }else{ + // this.user = false; + // this.splashScreen.hide(); + // if(this.logoutFlage){ + // this.cs.openLogin(); + // } + } + }); + } } diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 7442330d..aa8ad0a2 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, NgZone, OnDestroy } from "@angular/core"; import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; import { Router } from "@angular/router"; -import { AlertController, Platform } from "@ionic/angular"; +import { AlertController, Platform, Events } from "@ionic/angular"; import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { CheckUserAuthenticationResponse } from "src/app/hmg-common/services/authentication/models/check-user-auth.response"; import { SmsReaderService } from "src/app/hmg-common/services/sms/sms-reader.service"; @@ -49,6 +49,8 @@ export class LoginComponent implements OnInit, OnDestroy { user: boolean =false; DeviceType: string; requestGetLoginInfo:any; + logoutFlage: boolean ; + getuser:any=""; constructor( public cs: CommonService, @@ -58,40 +60,89 @@ export class LoginComponent implements OnInit, OnDestroy { public ts: TranslatorService, public smsService: SmsReaderService, private faio: FingerprintAIO, + public events:Events, public ngZone: NgZone, public device: Device, public splash: SplashScreen, public sharedData: SharedDataService, public plt: Platform, public pushService: PushService - ) { } + ) { + this.events.subscribe("logoutFlage", logoutFlage => { + console.log("login compont logoutFlage: "+logoutFlage); + if(logoutFlage == true){ + console.log(" subscribe check logoutFlage: "+logoutFlage); + this.logoutFlage = logoutFlage; + localStorage.setItem('logoutFlage',logoutFlage); + } + }); + + this.getuser = this.cs.sharedService.getSharedData( + AuthenticationService.IMEI_USER_DATA, + false + ); + // alert(" this.getuser "+this.getuser); + if(this.getuser){ + this.user = true; + + } + else{ + this.user = false; + + } + } ngOnInit() { // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) + + + // this.getuser = this.cs.sharedService.getSharedData( + // AuthenticationService.IMEI_USER_DATA, + // false + // ); + + // if(this.getuser){ + // console.log("this.getuser"+this.getuser); + // this.logoutFlage = true; + + // } + + this.events.subscribe("user", user => { + console.log("login compont: "+user); + this.user = user; + + }); + + + this.deviceToken= localStorage.getItem('devicyeToken'); - console.log("let deviceToken" + this.deviceToken); + console.log("let deviceToken" + this.deviceToken); if (this.deviceToken) { - console.log('login enabled first time: ' + this.deviceToken); + console.log('login enabled first time: ' + this.deviceToken); } else { console.log("no deviceToken" ); this.pushService.startReceiving(); setTimeout(() => { - this.deviceToken= localStorage.getItem('deviceToken'); - console.log('login enabled second time: ' + this.deviceToken); + // alert('login enabled second time: ' + this.deviceToken); }, 1000); } - setTimeout(() => { + // setTimeout(() => { + // alert("this.logoutFlage in setTime" +localStorage.getItem('logoutFlage')); + // alert("this.this.user in setTime" + this.user); + + // if(localStorage.getItem('logoutFlage')== "true"){ + // this.getLastLoginInfo(); - this.getLastLoginInfo(); - },5000); + // } + // },1000); @@ -355,12 +406,14 @@ export class LoginComponent implements OnInit, OnDestroy { getLastLoginInfo(){ this.requestGetLoginInfo= { - DeviceType:this.cs.getDeviceType(), + DeviceType:this.cs.getDeviceType(),//"Android",//this.cs.getDeviceType(), DeviceToken:this.deviceToken//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36"//this.deviceToken } this.authService.getLoginInfo(this.requestGetLoginInfo,() => {}, this.ts.trPK('general', 'ok')).subscribe(res => { if (this.cs.validResponse(res)) { + if(res.Mohemm_GetMobileLoginInfoList.length > 0){ + this.cs.sharedService.setSharedData( // res.Patient_SELECTDeviceIMEIbyIMEIList[0], res.Mohemm_GetMobileLoginInfoList[0], diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts index 31d50324..aa5abdec 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts @@ -87,7 +87,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { false ); - console.log( this.user); + console.log( "this.user in welcome login"+ this.user); this.userName = localStorage.getItem("user"); this.password = localStorage.getItem("password"); diff --git a/Mohem/src/app/pipes/pipes.module.ts b/Mohem/src/app/pipes/pipes.module.ts index c754645c..3a3a580a 100644 --- a/Mohem/src/app/pipes/pipes.module.ts +++ b/Mohem/src/app/pipes/pipes.module.ts @@ -2,12 +2,13 @@ import { NgModule } from '@angular/core'; import { DateStringPipe } from './date-string/date-string'; import { FilterLangPipe } from './filter-lang/filter-lang'; import { TurncatePipe } from './turncate/turncate.pipe'; +import{ JsonDatePipe} from './json-date/json-date' @NgModule({ - declarations: [DateStringPipe, + declarations: [DateStringPipe,JsonDatePipe, FilterLangPipe, TurncatePipe], imports: [], exports: [DateStringPipe, - FilterLangPipe,TurncatePipe] + FilterLangPipe,TurncatePipe,JsonDatePipe] }) export class PipesModule {} From 3651f5a04a622998f732945fcbfd6c1d62491030 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 5 Mar 2020 12:52:06 +0300 Subject: [PATCH 09/12] edit math floor --- Mohem/src/app/home/home.page.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 9fcfad65..f23aec0e 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -542,7 +542,7 @@ export class HomePage implements OnInit { (result: OpenMissingSwipesResponse) => { if (this.common.validResponse(result)) { const key = "GetOpenMissingSwipesList"; - this.statsButtons[1].statsValue = Math.ceil(result[key].P_OPEN_MISSING_SWIPES); + this.statsButtons[1].statsValue = Math.floor(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -613,7 +613,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails().subscribe((result: any) => { this.statsButtons[0].statsValue = - Math.ceil(this.countAllNotification + result.TotalCount); + Math.floor(this.countAllNotification + result.TotalCount); }); } @@ -693,7 +693,7 @@ getSubordinatesAttStatus() { "HMG Annual Vacation Accrual Plan" ) { this.statsButtons[2].statsValue = - Math.ceil(accrualBalance.ACCRUAL_NET_ENTITLEMENT); + Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData( accrualBalance, "leaveAccrualBalance" @@ -711,7 +711,7 @@ getSubordinatesAttStatus() { totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = Math.ceil(totalTicketsLeft); + this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); } }); } From 289e5f14526072d54ef24a86ecf0807a1ecc02f1 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Thu, 5 Mar 2020 15:11:12 +0300 Subject: [PATCH 10/12] enhance login --- Mohem/config.xml | 5 +++- Mohem/src/app/app.component.ts | 28 +++++++++++++++---- .../services/common/common.service.ts | 10 ++++++- .../hmg-common/services/push/push.service.ts | 5 ++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index 55d5ce3c..866ace59 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -15,11 +15,14 @@ - + + + + diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index ee77b995..0a08df19 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -88,9 +88,9 @@ export class AppComponent implements OnInit, AfterViewInit { console.log("platform.ready") this.pushService.startReceiving(); setTimeout(() => { - + console.log(" in setTimeout startReceiving"); this.getLastLoginInfo(); - },5000); + },4000); } subscribeEvents() { @@ -202,8 +202,18 @@ export class AppComponent implements OnInit, AfterViewInit { } getLastLoginInfo(){ - this.deviceToken= localStorage.getItem('devicyeToken'); - console.log("let deviceToken app" + this.deviceToken); + + + console.log(" getLastLoginInfo"); + console.log("get method :"+this.cs.getDeviceToken()); + this.deviceToken= this.cs.getDeviceToken(); + //this.cs.sharedService.getSharedData("new-device-token",false);// localStorage.getItem('devicyeToken'); + console.log("let deviceToken app" + this.cs.sharedService.getSharedData("new-device-token",false)); + console.log("localStorage.getItem app" + localStorage.getItem('devicyeToken')); + console.log("sheard DEVICE_TOKEN" + this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false)); + + + if (this.deviceToken) { console.log('login enabled first time: ' + this.deviceToken); @@ -236,8 +246,10 @@ export class AppComponent implements OnInit, AfterViewInit { ); this.user = true; this.events.publish('user', this.user); + setTimeout(() => { + this.splashScreen.hide(); + },3000); - this.splashScreen.hide(); if(this.logoutFlage){ this.cs.openLogin(); @@ -247,7 +259,11 @@ export class AppComponent implements OnInit, AfterViewInit { else{ this.user = false; this.events.publish('user', this.user); - this.splashScreen.hide(); + + setTimeout(() => { + this.splashScreen.hide(); + },3000); + if(this.logoutFlage){ this.cs.openLogin(); 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 660e0b80..08163c91 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -80,6 +80,7 @@ export class CommonService { private loadingProgress: any; public updateImage:boolean=false; public setUpdateImg:any; + DT: any; constructor( public nav: NavController, public router: Router, @@ -1412,6 +1413,13 @@ public getMonthNameAr(value: number): string { return objImg; } - + setDeviceToken(deviceToken){ + this.DT=deviceToken; + } + + getDeviceToken(){ + return this.DT; + } + } diff --git a/Mohem/src/app/hmg-common/services/push/push.service.ts b/Mohem/src/app/hmg-common/services/push/push.service.ts index 95d50785..c1b5ed3f 100644 --- a/Mohem/src/app/hmg-common/services/push/push.service.ts +++ b/Mohem/src/app/hmg-common/services/push/push.service.ts @@ -222,7 +222,12 @@ export class PushService { this.firebasex.getToken().then(token => { // alert("token: "+ token); + this.cs.sharedService.setSharedData(token, "new-device-token"); + localStorage.setItem('deviceToken', token); + this.cs.setDeviceToken(token); //last way to set the device Token to get it through getDeviceToken + this.registerInBackend(token); + }).catch(error => console.error('Error getting token', error)); From 9c9b85db3ca7746946469d4d34a340bb4359a55c Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 5 Mar 2020 15:58:08 +0300 Subject: [PATCH 11/12] fixed count issue --- .../app/notification/home/home.component.ts | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index ed68d94e..717d8e8f 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -9,6 +9,8 @@ import { IonInfiniteScroll } from '@ionic/angular'; import { WorklistMainService } from '../service/work-list.main.service'; import { WorklistAdvancedSearchComponent } from '../worklist-advanced-search/worklist-advanced-search.component'; import { DatePipe } from '@angular/common'; +import { GetOpenNotificationsResponse } from 'src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse'; +import { DashboredService } from 'src/app/hmg-common/services/dashbored/dashbored.service'; @Component({ selector: 'app-home', @@ -146,9 +148,11 @@ export class HomeComponent implements OnInit { constructor( public common: CommonService, public ts: TranslatorService, + // tslint:disable-next-line: no-shadowed-variable public WorklistService: WorklistService, public workListService: WorklistMainService, - public modalController: ModalController + public modalController: ModalController, + public DS: DashboredService ) { this.WorkListObj = new WorkListRequest(); this.WorkListObj.P_NOTIFICATION_TYPE = '1'; @@ -161,11 +165,24 @@ export class HomeComponent implements OnInit { } ngOnInit() { - this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); + this.openNotificationsDashboard(); + } + + callWorkListServices() { this.Details(); this.Count(); this.getAllPushNotificationFun(); - this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; + } + + openNotificationsDashboard() { + this.DS.getOpenNotifications().subscribe((result: GetOpenNotificationsResponse) => { + if (this.common.validResponse(result)) { + this.worklistNotifications = result; + this.totalRequestCount = this.worklistNotifications.P_OPEN_NTF_NUMBER; + this.common.sharedService.setSharedData(result, 'worklistNotifications'); + this.callWorkListServices(); + } + }); } assignDataToFilters() { From 470e1c7d8e5539384e9acdc55bb663c7e07e6f7c Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 5 Mar 2020 17:07:42 +0300 Subject: [PATCH 12/12] fixed worklist issues --- Mohem/src/app/notification/home/home.component.html | 4 ++-- Mohem/src/app/notification/home/home.component.ts | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 37797f78..546dc045 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -70,8 +70,8 @@
{{formattedData.date}} -
-

{{workList.SUBJECT}}

+
+

{{workList.SUBJECT}}

diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 717d8e8f..790b2ac3 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -312,7 +312,8 @@ export class HomeComponent implements OnInit { arrayToFilter = this.newWorkListResponse.filter((workList) => { return workList.ITEM_TYPE === filter; }); - this.showFormattedData = this.categorizeData(arrayToFilter); + const sortData = this.sortArray(arrayToFilter); + this.showFormattedData = this.categorizeData(sortData); } } @@ -417,12 +418,12 @@ export class HomeComponent implements OnInit { } openNotificationDetail(obj) { - this.common.sharedService.setSharedData(obj[0], HomeComponent.NOTIFICATION_DATA); + this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA); if (obj.REQUEST_TYPE === 'PR') { this.common.openWorklistMainPRPage(); - } else if (obj[0].REQUEST_TYPE === 'PO') { + } else if (obj.REQUEST_TYPE === 'PO') { this.common.openWorklistMainPOPage(); - } else if (obj[0].REQUEST_TYPE === 'MO') { + } else if (obj.REQUEST_TYPE === 'MO') { this.common.openWorklistMainMRPage(); } else { this.common.openWorklistMainPage();