diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index 9a17288e..f3ffe7d4 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -5,19 +5,20 @@ - - + + + let item of AbsenceType; let i=index; {{item.ABSENCE_ATTENDANCE_TYPE_NAME}} - + --> {{ts.trPK('submitAbsence','startDate')}} diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index 360a5175..95d4ae23 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -51,7 +51,7 @@ export class SubmitAbsenceComponent implements OnInit { private modalFlag: any = false; menuType: any; employeeSel: any; - absenceType: any; + absenceType = 'noType'; absenceTypeName: string = null; absenceTypeList: any; startDate: any; diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 89200ab2..13add5f0 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -76,6 +76,7 @@ export class HomeComponent implements OnInit { public totalPR = 0; public totalMR = 0; public totalIC = 0; + public totalStamp = 0; public showChart = false; @@ -88,16 +89,17 @@ export class HomeComponent implements OnInit { public data = { datasets: [ { - data: [0, 0, 0, 0, 0, 0], + data: [0, 0, 0, 0, 0, 0, 0], backgroundColor: [ '#18a169', '#3cb9d5', '#114475', '#38c9b3', '#cc3232', - '#9e7e97' + '#9e7e97', + '#ff9800' ], - borderWidth: 5 + borderWidth: 6 }] }; public filters = [ @@ -156,6 +158,14 @@ export class HomeComponent implements OnInit { color: '#9e7e97', key: 'INVITEM', disable: false + }, + { + value: 0, + name: 'STAMP', + active: false, + color: '#ff9800', + key: 'STAMP', + disable: false } ]; @@ -264,6 +274,10 @@ export class HomeComponent implements OnInit { this.data.datasets[0].data[5] = 0; } + if (this.totalStamp === 0) { + this.data.datasets[0].data[6] = 0; + } + const openNotificationsArray = this.worklistNotifications.GetOpenNotificationsList; for (const notification of openNotificationsArray) { @@ -282,6 +296,9 @@ export class HomeComponent implements OnInit { } else if (notification.ITEM_TYPE === 'INVITEM') { this.filters[6].value = this.totalIC; this.data.datasets[0].data[5] = notification.OPEN_NTF_NUMBER; + } else if (notification.ITEM_TYPE === 'STAMP') { + this.filters[7].value = this.totalStamp; + this.data.datasets[0].data[6] = notification.OPEN_NTF_NUMBER; } } // this.data.datasets[0].data[4] = this.ITGCount; @@ -440,6 +457,8 @@ export class HomeComponent implements OnInit { this.totalMR = this.totalMR + 1; } else if (workList.ITEM_TYPE === 'INVITEM') { this.totalIC = this.totalIC + 1; + } else if (workList.ITEM_TYPE === 'STAMP') { + this.totalStamp = this.totalStamp + 1; } } diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index fcfaf93e..8212c4fe 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -88,6 +88,7 @@ export class WorklistMainComponent implements OnInit { newArr: any = []; selEmp: any; subordinatesleaveList: any = []; + allSubordinatesleaveList: any = []; private WorkListSubmitterInfoObj: WorkListSubmitterInfoRequest; submitterInfoRes: any; approveDis: boolean = false; @@ -986,7 +987,14 @@ export class WorklistMainComponent implements OnInit { public handleSubordinatesLeavesResult(result) { if (this.common.validResponse(result)) { if (this.common.hasData(result.SubordinatesOnLeavesList)) { - this.subordinatesleaveList = result.SubordinatesOnLeavesList; + this.allSubordinatesleaveList = result.SubordinatesOnLeavesList; + // this.subordinatesleaveList.push(this.allSubordinatesleaveList.find( + // el => el.EMPLOYEE_NUMBER !== this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER)); + this.allSubordinatesleaveList.forEach(element => { + if (element.EMPLOYEE_NUMBER !== this.getPassNotificationDetails.SELECTED_EMPLOYEE_NUMBER) { + this.subordinatesleaveList.push(element); + } + }); } } } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 077e6689..393294e7 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1806,6 +1806,10 @@ "tickets-balance": { "en": "Ticket Balance", "ar": "رصيد التذاكر" + }, + "selectType": { + "en": "Select Type", + "ar": "اختر النوع" } }, "accrualBalances": {