diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 5075bd6d..1856df8d 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -58,6 +58,7 @@ export class HomeComponent implements OnInit { public authService: AuthenticationService ) { this.direction = TranslatorService.getCurrentDirection(); + // this.userData =this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); } ngOnInit() { @@ -69,8 +70,8 @@ export class HomeComponent implements OnInit { private getUserDetails(){ this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { if (user) { - this.emp_no=user.EMPLOYEE_NUMBER; - this.getAccrualBalance(); + // this.emp_no=user.EMPLOYEE_NUMBER; + // this.getAccrualBalance(); } }); @@ -239,7 +240,7 @@ createAbsence() { let todayDate = month + '/' + day + '/' + year; let effectiveDate = todayDate; const request = { - P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, P_EFFECTIVE_DATE: effectiveDate }; diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 5dcc2432..a8762509 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -118,6 +118,15 @@ --> + + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + + + - + --> diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 244012bc..7442330d 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -237,12 +237,12 @@ export class LoginComponent implements OnInit, OnDestroy { console.log("success"); this.cs.stopLoading(); if (this.cs.validResponse(result)) { - // alert("result.MemberLoginList.EMPLOYEE_NAME :" + result.MemberLoginList.EMPLOYEE_NAME); + // alert("result.MemberLoginList.EMPLOYEE_NAME :" + result.MemberLoginList[0].EMPLOYEE_NAME); this.loginData.LogInTokenID = result.LogInTokenID; this.loginData.MobileNumber = result.MemberLoginList.P_MOBILE_NUMBER; this.loginData.P_USER_NAME = this.username; - // this.loginData.EMPLOYEE_NAME =result.MemberLoginList[0].EMPLOYEE_NAME; + // this.loginData.EMPLOYEE_NAME =result.MemberLoginList[0].EMPLOYEE_NAME; this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); this.remeberMyInfo(); @@ -325,7 +325,7 @@ export class LoginComponent implements OnInit, OnDestroy { console.log(result); this.loginData.LogInTokenID = result.LogInTokenID; this.loginData.P_USER_NAME = this.username; - this.loginData.EmployeeName =result.MemberLoginList[0].EMPLOYEE_NAME; + // this.loginData.EmployeeName =result.MemberLoginList[0].EMPLOYEE_NAME; this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); 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 7966ba49..0f83c9d6 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 @@ - + + - + -->

diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index eb7895b3..20a94df0 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -496,9 +496,13 @@ console.log("successful insertMobileLogin" ); const key = e.which; const t = e.target; let sib = t.nextElementSibling; + let sibPre =t.previousElementSibling; if (key !== 9 && (key < 48 || key > 57)) { if (key === 8 || key === 46) { + + + return true; } else { e.preventDefault(); @@ -509,11 +513,13 @@ console.log("successful insertMobileLogin" ); if (key === 9) { return true; } - if (sib) { //sib = document.querySelector('input'); - if (e.target.value) { + if (e.target.value ==="") { + sibPre.setFocus()} + else{ sib.setFocus(); + } } } // } else { @@ -523,6 +529,6 @@ console.log("successful insertMobileLogin" ); - } + } \ No newline at end of file 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/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.html b/Mohem/src/app/hmg-common/ui/circle-calendar/date-info-modal/date-info-modal.component.html index 983bcdc4..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 c078c749..307738f4 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; } @@ -95,7 +64,8 @@ .today-graph{ display: block; height: 127px; - width: 288px; + width: 270px; + margin-left: -60px; } .today-graph-ar{ @@ -105,17 +75,22 @@ margin-left: -18px; } .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; @@ -143,18 +118,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; } .div-ar{ border: 1px solid #a3a3a3 !important; @@ -166,7 +132,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; @@ -182,20 +148,25 @@ 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%; } .p2-ar{ font-weight: bold !important; @@ -228,23 +199,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 85305ec8..f40342f9 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 @@ -100,7 +100,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/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/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts index cd19d7f9..31d50324 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); this.userName = localStorage.getItem("user"); this.password = localStorage.getItem("password"); @@ -96,6 +96,8 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { this.logintype= localStorage.getItem("login-type"); this.lastLoginDate= localStorage.getItem("login-at"); + + // this.lastLoginDate= new Date(this.lastLoginDate).toISOString() @@ -185,7 +187,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { console.log(this.confimLogin.buttons[0]); this.confimLogin.buttons[0].forEach(element => { - if (this.logintype === element.value) { + if (this.user.LoginType === element.value) { console.log(this.logintype ); console.log(element.value); console.log("this.logintype === element.value"); @@ -199,7 +201,7 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { }); } - }, 200); + }, 100); } public moreLoginOptions() {} diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 221901fd..76e163fa 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -64,13 +64,6 @@ [icon]="subMenu.ICON"> - - - - { + this.notBadge = badge; + }); } ionViewWillEnter() { @@ -330,9 +337,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); @@ -385,6 +396,12 @@ export class HomePage implements OnInit { console.log("menu: " + selMenu.List_Menu); this.common.sharedService.setSharedData(selMenu, MenuResponse.SHARED_DATA); this.getMenuEntries(item); + for(let i=0;i
- + 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 bf839752..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(); } } @@ -132,19 +127,11 @@ 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()); } calendarConfig(month?, year?) { - this.arrDaysOff = []; - this.arrDaysAttendance = []; - this.arrDaysAbsent = []; this.month = month; this.year = year; this.getTimeCardSummaryDetails(month, year); @@ -174,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) { @@ -196,7 +181,6 @@ export class DetailsComponent implements OnInit { } previousSlide() { - this.normalDays = []; this.showData = false; if (this.preMonth === 0) { this.currentYear = this.currentYear - 1; @@ -210,6 +194,7 @@ export class DetailsComponent implements OnInit { } + changeMonthTitle(title) { this.monthTitle = title; this.getTimeCardSummaryDetails(); @@ -223,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 162b1c7c..73b200a7 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -70,7 +70,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/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index 92e265f7..a04e90d0 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -260,6 +260,8 @@
{{ts.trPK('payslip','payment-information')}}
+
+
@@ -268,7 +270,7 @@ - + @@ -279,7 +281,7 @@ - + @@ -288,7 +290,7 @@ - + @@ -300,7 +302,7 @@ - + @@ -309,10 +311,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 66942158..b43a3bc6 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -262,7 +262,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 a97d76ee..e57431f8 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,18 +36,20 @@ 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.direction = TranslatorService.getCurrentDirection(); - // 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); - // }); + }); } @@ -64,9 +67,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 4894cbb2..6b1903bb 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -52,8 +52,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 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 eb7b7ec1..6e355081 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 @@ -98,12 +98,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 8be2245b..9b565624 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 @@ -57,9 +57,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; @@ -68,7 +65,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 = { @@ -81,19 +77,11 @@ 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()); } calendarConfig(month?, year?) { - this.arrDaysOff = []; - this.arrDaysAttendance = []; - this.arrDaysAbsent = []; this.month = month; this.year = year; this.getTimeCardSummaryDetails(month, year); @@ -123,7 +111,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; } }); @@ -134,48 +121,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?) { @@ -223,9 +197,7 @@ export class TimeCardDetailsComponent implements OnInit { }); } - nextSlide() { - this.normalDays = []; if (this.currentMonthName !== this.month) { this.showData = false; if (this.nextMonth > 12) { @@ -240,7 +212,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/assets/imgs/my_team_icon.png b/Mohem/src/assets/imgs/my_team_icon.png new file mode 100644 index 00000000..93f0a032 Binary files /dev/null and b/Mohem/src/assets/imgs/my_team_icon.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index dcd3e038..099f55e2 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1445,7 +1445,7 @@ }, "myTeam-header": { "en": "My Team", - "ar": "فريقي" + "ar": "فريقى" }, "total": { "en": "TOTAL", diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index cb74c49d..f6aed74d 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1106,10 +1106,10 @@ color: var(--dark); } .checkOutOkBtn{ - /* margin-left: 50px !important; */ - /* margin-right: 55px !important; */ + margin-left: 50px !important; + margin-right: 55px !important; margin-top: 10px !important; - /* margin-bottom: 10px !important; */ + margin-bottom: 10px !important; border-radius: 5px !important; height: 40px !important; min-height: 40px !important; @@ -1126,10 +1126,10 @@ color: var(--dark); } .checkOutCancelBtn{ - /* margin-left: 55px !important; */ - /* margin-right: 55px !important; */ - /* margin-top: 10px !important; */ - /* margin-bottom: 10px !important; */ + margin-left: 50px !important; + margin-right: 55px !important; + margin-top: 10px !important; + margin-bottom: 10px !important; border-radius: 5px !important; height: 40px !important; min-height: 40px !important; @@ -1368,12 +1368,9 @@ border:0px } .calendar-modal { - --height: 15cm !important; + --height: 13.5cm !important; --width: 88% !important; --border-radius: 0.4cm; - - // height: 544px !important; - // width: 332px !important; } @@ -1496,6 +1493,11 @@ table.monthview-datetable th small { border-radius: 20px !important; } +.disable-phone { + pointer-events: none; + opacity: .3; +} + // .replaceRoll-modal { // padding: 30% 1% !important;