diff --git a/Mohem/config.xml b/Mohem/config.xml index 55d5ce3c..a4ed058e 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -15,11 +15,15 @@ - + + + + + diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index b2898b2b..9d2845aa 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -13,7 +13,7 @@ - +
@@ -130,7 +130,7 @@
- + diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 2c882ac2..0a08df19 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; TeamFlag :string = "false"; constructor( public ts: TranslatorService, @@ -44,7 +49,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); @@ -80,6 +87,11 @@ export class AppComponent implements OnInit, AfterViewInit { private startReceivingPushService() { console.log("platform.ready") this.pushService.startReceiving(); + setTimeout(() => { + console.log(" in setTimeout startReceiving"); + this.getLastLoginInfo(); + },4000); + } subscribeEvents() { this.events.subscribe("setMenu", () => { @@ -139,8 +151,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(); + } @@ -183,6 +201,86 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.toggle(); } + getLastLoginInfo(){ + + + 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); + } 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); + setTimeout(() => { + this.splashScreen.hide(); + },3000); + + if(this.logoutFlage){ + this.cs.openLogin(); + + } + + } + else{ + this.user = false; + this.events.publish('user', this.user); + + setTimeout(() => { + this.splashScreen.hide(); + },3000); + + 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/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/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/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 7b3ac618..f98f9d03 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -6,7 +6,7 @@ - +
@@ -158,7 +158,7 @@ *ngIf="!getResEITTransactionList || getResEITTransactionList[0]?.Collection_Transaction.length <= 0"> - +

{{'general, noData' | translate}}

@@ -229,12 +229,12 @@
- -
+ -
+ \ No newline at end of file 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)); 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 00480f11..94ab6876 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,6 +1,6 @@
- {{value}} + {{value}} {{text}}
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/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 7922d573..7a4bae63 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -563,7 +563,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.floor(result[key].P_OPEN_MISSING_SWIPES); } } ); @@ -634,7 +634,7 @@ openPeriodDateDashbored() { ITGCountAllNotification() { this.workListService.getITGDetails().subscribe((result: any) => { this.statsButtons[0].statsValue = - this.countAllNotification + result.TotalCount; + Math.floor(this.countAllNotification + result.TotalCount); }); } @@ -714,7 +714,7 @@ getSubordinatesAttStatus() { "HMG Annual Vacation Accrual Plan" ) { this.statsButtons[2].statsValue = - accrualBalance.ACCRUAL_NET_ENTITLEMENT; + Math.floor(accrualBalance.ACCRUAL_NET_ENTITLEMENT); this.common.sharedService.setSharedData( accrualBalance, "leaveAccrualBalance" @@ -732,7 +732,7 @@ getSubordinatesAttStatus() { totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[3].statsValue = totalTicketsLeft; + this.statsButtons[3].statsValue = Math.floor(totalTicketsLeft); } }); } diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index daa10f0d..829e0501 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -3,7 +3,7 @@ - {{'home,worklist' | translate}} + WORK LIST @@ -12,13 +12,18 @@
- {{'work-list,open-analysis' | translate}} + Open Request Analysis
-
-

{{totalRequestCount}}

- {{'work-list,total' | translate}}
{{'work-list,open-reqest' | translate}}
+
+ {{newWorkListResponse.length + ITGCount}} of + {{newWorkListResponse.length}} of +

{{totalRequestCount}}

+

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

+

{{newWorkListResponse[0].NO_OF_ROWS}}

+ TOTAL
OPEN REQUEST
- + +
@@ -37,12 +42,12 @@ - {{'work-list,clear-search' | translate}} + Clear Search - {{'work-list,advanced-search' | translate}} + Advanced Search - + - diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index bf56a8d8..cbc9e358 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -1,460 +1,420 @@ +.bar-stable { + background-color: var(--cusgray) !important; + } + .tabs{ + background-color: var(--cusgray) !important; + } + .icon-size-lg { + font-size: 40px; + } + + /*Timeline*/ + + .pos-absolute-right { + position: absolute; + right: 8px; + } + + .timelineMain { + position: relative; + margin: 15px 0 0 0; + } + + .timelineMain:before { + + content: ''; + position: absolute; + top: 0; + bottom: 0; + width: 1.5%; + height: 99%; + background: #e4e4e4; + z-index: 1; + /* margin-left: -10px; */ + /* z-index: 1; */ + } + + .timelineMain .timelineMain-thumb { + + border-radius: 500px; + width: 50px; + z-index: 2; + position: absolute; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + width: 50px; + float: right; + top: 0px; + } + + .timelineMain .timelineMain-thumb.timelineMain-icon { + height: 50px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + transform: scale(0.3); + } + - .bar-stable { - background-color: var(--cusgray) !important; - } - .tabs{ - background-color: var(--cusgray) !important; - } - .icon-size-lg { - font-size: 40px; - } - - /*Timeline*/ - - .pos-absolute-right { - position: absolute; - right: 8px; - } - - .timelineMain { - position: relative; - margin: 15px 0 0 0; - } - - .timelineMain:before { - - content: ''; - position: absolute; - top: 0; - bottom: 0; - width: 1.5%; - height: 99%; - background: #e4e4e4; - z-index: 1; - /* margin-left: -10px; */ - /* z-index: 1; */ - } - - .timelineMain .timelineMain-thumb { - - border-radius: 500px; - width: 50px; - z-index: 2; + + .timelineMain .timelineMain-item { + width: 50px; + + } + + .timelineMain .timelineMain-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + + } + + + .divider-title { + background: #e4e4e4; + padding: 5px 15px; + } + + + .color-red { + color: var(--danger) !important; + } + + .bg-color-dot { + // background-color: #ff3b30 !important; + background: var(--primary); + background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); + + + } + +.notification-list{ +background: none; +ion-item{ + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + .item-date{ + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + position: absolute; + left: 0; + top: 12%; + } + ion-label , [item-end]{ + + white-space: normal; + font-size: 14px; + padding-top: 15%; // :root[dir="ltr"]{ - // left: 37px; + // margin-left: 10px; // } // :root[dir="rtl"]{ - // right: 37px; + // margin-right: 10px; // } - width: 50px; - float: right; - top: 0px; - } - - .timelineMain .timelineMain-thumb.timelineMain-icon { - height: 50px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - transform: scale(0.3); - } - - - - .timelineMain .timelineMain-item { - width: 50px; - - } - - .timelineMain .timelineMain-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - - } - - - .divider-title { - background: #e4e4e4; - padding: 5px 15px; - } - - - .color-red { - color: var(--danger) !important; - } - - .bg-color-dot { - // background-color: #ff3b30 !important; - background: var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - - } - -.notification-list{ - background: none; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - } + +} } .input-wrapper { - --flex:none; +--flex:none; } ion-input ,ion-datetime{ - border-bottom: #dedede 1px solid; +border-bottom: #dedede 1px solid; } .left { - --background: #f0efef; - .timelineMain:before{ - left: 21px; +--background: #f0efef; +.timelineMain:before{ +left: 21px; +} +.notification-list ion-item{ + padding-left: 3px; + margin-left: -12%; +} +.timelineMain-thumb{ + left: 9%; + top: 30%; +} + +} +.right { + --background: #f0efef; +.timelineMain:before{ + right: 62px; } .notification-list ion-item{ - padding-left: 3px; - margin-left: -12%; + padding-right: 3px; } .timelineMain-thumb{ - left: 9%; - top: 30%; + right: 37px; } - -} -.right { - --background: #f0efef; - .timelineMain:before{ - right: 62px; - } - .notification-list ion-item{ - padding-right: 3px; - } - .timelineMain-thumb{ - right: 37px; - } } .menuList{ - margin-left: -40px; - height: 160%; - padding-top: 370%; - } - .colorBG{ - --background: #f0efef; - } +margin-left: -40px; +height: 160%; +padding-top: 370%; +} +.colorBG{ +--background: #f0efef; +} .menuListCol{ - padding-left: 50px; - margin-left: -33px; +padding-left: 50px; +margin-left: -33px; } .menuListItem{ - padding-top: 9%; - margin: -20%; - padding-left: 13%; +padding-top: 9%; +margin: -20%; +padding-left: 13%; } .menuListBtn{ - width: 100%; - background: white; - --background: white; +width: 100%; +background: white; +--background: white; } .activeTabMenu{ - --background: #ff726f; +--background: #ff726f; } .notifincationList{ - margin-left: 5%; - margin-top: 6%; +margin-left: 5%; +margin-top: 6%; } .itemListNotification{ - padding-bottom: 18px; +padding-bottom: 18px; } .footerSearchBtn{ - padding: 0px !important; - background: #f0efef !important; +padding: 0px !important; +background: #f0efef !important; } .viewAndSearch{ - margin-bottom: 13px; +margin-bottom: 13px; } .toSearchBtn{ - margin-top: 4%; +margin-top: 4%; } .emptyItem{ - white-space: normal; - padding-left: 10%; +white-space: normal; +padding-left: 10%; } ///////////////////////////////////////////NEW DESIGN///////////////////////////////////// .profile-image-container{ - position: relative; - z-index: 999; - img { - width: 32px; - float: right; - border-radius: 20px; - height: 32px; - margin-right: 10px; - } +position: relative; +z-index: 999; +img { + width: 32px; + float: right; + border-radius: 20px; + height: 32px; + margin-right: 10px; +} } ion-title{ - color: white; - position: absolute; - top: 0; - text-align: center; - // left: 15%; - // right: 15%; - font-size: 0.42cm; - font-weight: bold; - height: 100%; +color: white; +position: absolute; +top: 0; +text-align: center; +left: 15%; +right: 15%; +font-size: 0.42cm; +font-weight: bold; +height: 100%; } .contentBg:before { - position: absolute; - content: ""; - background: #22c6b3; - height: 140px; - width: 100%; - left: 0; - top: 0px; - z-index: 1; +position: absolute; +content: ""; +background: #22c6b3; +height: 140px; +width: 100%; +left: 0; +top: 0px; +z-index: 1; } ion-content { - --ion-background-color: whitesmoke; +--ion-background-color: whitesmoke; } .request-heading { - span { - text-align: center; - display: block; - padding-top: 8px; - font-family: workSans-Regular; - } +span { + text-align: center; + display: block; + padding-top: 8px; + font-family: workSans-Regular; +} } .result-graph { - position: relative; - background: white; - margin-right: 20px; - margin-left: 20px; - margin-top: 20px; - padding-bottom: 20px; - border-radius: 20px; - z-index: 1; - } - .result-text-container { - padding: 0; - margin: 0; - position: absolute; - left: 50%; - top: 50%; +position: relative; +background: white; +margin-right: 20px; +margin-left: 20px; +margin-top: 20px; +padding-bottom: 20px; +border-radius: 20px; +z-index: 1; +} +.result-text-container { +padding: 0; +margin: 0; +position: absolute; +left: 50%; +top: 50%; +display: block; +text-align: center; +transform: translate(-50%, -50%); +h2 { + font-size: 38px; + font-family: WorkSans-Bold; + margin: 0 auto; + line-height: 36px; +} +span { + width: 125px; display: block; - text-align: center; - transform: translate(-50%, -50%); - h2 { - font-size: 38px; - font-family: WorkSans-Bold; - margin: 0 auto; - line-height: 36px; - } - span { - width: 125px; - display: block; - margin: 0 auto; - font-size: 12px; - font-family: workSans-Regular; - } - } - .today-graph { - width: 100%; - max-height: 4cm; - } - - .swiper-container { - margin: 0 !important; - width: 100% !important; - } -.filters-row { - margin-top: 10px; - margin-left: 20px; -} -.work-list-container-en { - position: relative; - padding-left: 60px; - clear: both; - min-height: 200px; - margin-bottom: 80px; - padding-top: 15px; -} -.work-list-container-en:before{ - content: ""; - position: absolute; - height: 100%; - width: 4px; - left: 30px; - top: 15px; - background-color: #dddddd; + margin: 0 auto; + font-size: 12px; + font-family: workSans-Regular; } - -.work-list-container-ar { - position: relative; - padding-right: 60px; - clear: both; - min-height: 200px; - margin-bottom: 80px; - padding-top: 15px; -} -.work-list-container-ar:before{ - content: ""; - position: absolute; - height: 100%; - width: 4px; - right: 30px; - top: 15px; - background-color: #dddddd; +} +.today-graph { +width: 100%; +max-height: 4cm; } - +.swiper-container { +margin: 0 !important; +width: 100% !important; +} +.filters-row { +margin-top: 10px; +margin-left: 20px; +} +.work-list-container { +position: relative; +padding-left: 60px; +clear: both; +min-height: 200px; +margin-bottom: 80px; +padding-top: 15px; +} +.work-list-container:before{ +content: ""; +position: absolute; +height: 100%; +width: 4px; +left: 30px; +top: 15px; +background-color: #dddddd; +} .search-container{ - margin-top: 15px; - display: block; - padding: 0 20px; - ion-col{ - background: white; - border-radius: 12px; - padding-right: 10px; - flex: none; - ion-icon{ - margin-right: 3px; - font-size: 14px; - margin-left: 3px; - vertical-align: middle; - } - span{ - font-size: 12px; - vertical-align: middle; - } +margin-top: 15px; +display: block; +padding: 0 20px; +position: relative; +z-index: 99; +ion-col{ + background: white; + border-radius: 12px; + padding-right: 10px; + flex: none; + ion-icon{ + margin-right: 3px; + font-size: 14px; + margin-left: 3px; + vertical-align: middle; + } + span{ + font-size: 12px; + vertical-align: middle; } } +} .date-span { - position: relative; - display: block; - margin-bottom: 10px; +position: relative; +display: block; +margin-bottom: 10px; } .date-span:before{ - content: ""; - position: absolute; - left: -35px; - border-radius: 50%; - width: 15px; - height: 15px; - background-color: #38c9b3; - top: 1px; +content: ""; +position: absolute; +left: -35px; +border-radius: 50%; +width: 15px; +height: 15px; +background-color: #38c9b3; +top: 1px; } - - - .date-data{ - background-color: white; - padding: 1px; - border-radius: 20px; - font-family: WorkSans-Regular; - padding-left: 15px; - margin-right: 20px; - margin-bottom: 15px; - p{ - font-size: 14px; - } +background-color: white; +padding: 1px; +border-radius: 20px; +font-family: WorkSans-Regular; +padding-left: 15px; +margin-right: 20px; +margin-bottom: 15px; +p{ + font-size: 14px; +} } .no-data-available { - background: white; - font-family: WorkSans-Regular; - padding: 30px; - position: absolute; - left: 50%; - margin-left: -100px; - margin-top: 100px; +background: white; +font-family: WorkSans-Regular; +padding: 30px; +position: absolute; +left: 85px; +top: 50px; } .disable-filter { - pointer-events: none; - opacity: .3; +pointer-events: none; +opacity: .3; } .total-result { - margin-top: 55px; - padding-left: 20px; - color: #888; - font-size: 15px; +margin-top: 55px; +padding-left: 20px; +color: #888; +font-size: 15px; } .text-span{ - font-size: 14px; - color: #888; - background-color: white; - width: 93%; - height: 30px; - border: 1px solid; - border-radius: 15px; +font-size: 14px; +color: #888; +background-color: white; +width: 93%; +height: 30px; +border: 1px solid; +border-radius: 15px; } .text-span-active{ - font-size: 14px; - color: #888; - background-color:#22c6b3; - width: 93%; - height: 30px; - border: 1px solid; - border-radius: 15px; +font-size: 14px; +color: #888; +background-color:#22c6b3; +width: 93%; +height: 30px; +border: 1px solid; +border-radius: 15px; } .slideCss{ - width: 200px !important; -} - - -.date-span-ar { - position: relative; - display: block; - margin-bottom: 10px; -} -.date-span-ar:before{ - content: ""; - position: absolute; - right: -35px; - border-radius: 50%; - width: 15px; - height: 15px; - background-color: #38c9b3; - top: 1px; -} +width: 200px !important; +} \ No newline at end of file diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 2d1f172f..d6ce2003 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', @@ -58,10 +60,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 }, @@ -138,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'; @@ -153,56 +165,63 @@ export class HomeComponent implements OnInit { } ngOnInit() { - this.direction = TranslatorService.getCurrentLanguageName()//TranslatorService.getCurrentDirection(); - - console.log(">>>>>>>>>>>>>>>>>>"+this.direction); + this.direction = TranslatorService.getCurrentLanguageName(); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); + this.openNotificationsDashboard(); + } + + callWorkListServices() { this.Details(); this.Count(); - this.assignDataToFilters(); 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() { 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); + } } } @@ -232,13 +251,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; @@ -247,7 +266,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; @@ -270,7 +289,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') { @@ -279,7 +298,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); @@ -288,24 +306,83 @@ 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; + }); + const sortData = this.sortArray(arrayToFilter); + this.showFormattedData = this.categorizeData(sortData); + } + } + + 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() ); } @@ -332,9 +409,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 = []; @@ -342,22 +420,18 @@ 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(); } } - isEmptyObject() { - return (this.showFormattedData && (Object.keys(this.showFormattedData).length > 0) || this.ITGItem.length > 0); - } - resetData() { if (this.infiniteScroll) { this.infiniteScroll.complete(); @@ -368,7 +442,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 = ''; @@ -418,13 +493,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/app/notification/view-replacement-modal/view-replacement-modal.component.html b/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html index 72e7916b..267d0a85 100644 --- a/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html +++ b/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html @@ -25,7 +25,7 @@ --> - + {{RepList.USER_NAME}} {{RepList.EMPLOYEE_DISPLAY_NAME}} diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index af4562cd..b4edfb82 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -8,7 +8,7 @@ - + {{'replacementRoll, searchBy' | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index 1ef4b3dd..12b0d317 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -199,7 +199,6 @@ export class WorkListReplacementRollComponent implements OnInit { } submitAction() { - this.selEmp if (this.selEmp && this.isAnswer == false) { // this.selectedUserInf = this.ReplacementList[this.selEmp]; @@ -212,6 +211,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = this.selectedUserInf.USER_NAME; this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr + this.modalCtrl.dismiss(); this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { @@ -233,6 +233,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = null; this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr + this.modalCtrl.dismiss(); this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { @@ -252,10 +253,15 @@ export class WorkListReplacementRollComponent implements OnInit { handleApplayActionResult(result) { if (this.cs.validResponse(result)) { + if (result.MessageStatus == 1) { + // let msg=this.translate.translate("general.success"); // this.cs.showAlert(msg); // this.navCtrl.push("HomePage"); + // here show succsfull msg this.cs.openNotificationPage(); + } + } // valid it } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html index 708c0462..f07a3e27 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html @@ -22,7 +22,7 @@ - +
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index c22eba21..a257adbb 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -100,6 +100,8 @@ export class WorkListRfcComponent implements OnInit { this.WorkListActionObj.P_ACTION_MODE = "RFC"; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr this.WorkListActionObj.P_APPROVER_INDEX = this.seqNo; + this.modalCtrl.dismiss(); + this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { this.handleApplayActionResult(result); @@ -126,6 +128,8 @@ export class WorkListRfcComponent implements OnInit { // this.common.showAlert(msg); // this.navCtrl.push("HomePage"); // this.cs.openHome(); + // here show succsfull msg + this.cs.openNotificationPage(); } } // valid it diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index 75917b9b..a2afff7b 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -327,7 +327,7 @@ export class WorklistMainMRComponent implements OnInit { actionButton(action) { console.log("actionButton" + action); - alert("don't forget"); + // alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; var responseAttrDic = this.notExampleJsonObject; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index 8f993c14..37aeb479 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -364,7 +364,7 @@ export class WorklistMainPoComponent implements OnInit { actionButton(action) { console.log("actionButton" + action); - alert("don't forget"); + // alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index eed60389..95a1b9af 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -362,7 +362,7 @@ export class WorklistMainPRComponent implements OnInit { actionButton(action) { console.log("actionButton" + action); - alert("don't forget"); + //alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; 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 a673b218..f5464cd0 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -324,6 +324,7 @@ export class WorklistMainComponent implements OnInit { } // End handleWorkListButtonsResult applyAction(WorkListActionObj) { + console.log("MemberLoginList"); this.worklistMainService .actionButton(WorkListActionObj) .subscribe((result: any) => { @@ -413,7 +414,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; this.WorkListActionObj.P_ACTION_MODE = ButtonAction; this.WorkListActionObj.P_COMMENTS = ""; - // this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; + this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; this.common.sharedService.setSharedData( this.getPassNotificationDetails, 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 {} diff --git a/Mohem/src/assets/imgs/box.png b/Mohem/src/assets/imgs/box.png new file mode 100644 index 00000000..a34ee59d Binary files /dev/null and b/Mohem/src/assets/imgs/box.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index ef9fcc82..5c7f7f71 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -767,7 +767,7 @@ "ar": "أنت تحاول حذف صف تم حذفه بالفعل." }, "noData": { - "en": "There are no requests", + "en": "No request found", "ar": "لا توجد طلبات" }, "noFileSelect": { diff --git a/Mohem/src/imgs/box.png b/Mohem/src/imgs/box.png new file mode 100644 index 00000000..a34ee59d Binary files /dev/null and b/Mohem/src/imgs/box.png differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index f6aed74d..fb6321fd 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -952,9 +952,9 @@ div.no-dataDiv{ border-color:var(--cusgray); } h4 { -font-size: 2.2rem; +font-size: 140%; text-align: center; -color: var(--dark); +color: #888888; } .empty-data { @@ -1275,7 +1275,7 @@ border:0px // } .advanced-search-modal { - --height: 9cm !important; + --height: 12cm !important; --width: 88% !important; --border-radius: 0.6cm; } @@ -1361,8 +1361,8 @@ border:0px } -.advanced-search-modal { - --height: 12cm !important; +.advanced-search-modal-custom { + --height: 9cm !important; --width: 80% !important; --border-radius: 0.4cm; }