diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index fe589875..b5436fb3 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -142,7 +142,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 3.2; + request.VersionID = 3.3;//3.2; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; diff --git a/Mohem/src/app/notification/service/work-list.main.service.ts b/Mohem/src/app/notification/service/work-list.main.service.ts index c3badf4c..bfd42c63 100644 --- a/Mohem/src/app/notification/service/work-list.main.service.ts +++ b/Mohem/src/app/notification/service/work-list.main.service.ts @@ -31,6 +31,8 @@ export class WorklistMainService { public static getPRNotificationBody = "Services/ERP.svc/REST/GET_PR_NOTIFICATION_BODY"; public static getICNotificationBody = "Services/ERP.svc/REST/GET_ITEM_CREATION_NTF_BODY"; public static getBasicDetailNotificationBody = "Services/ERP.svc/REST/GET_BASIC_DET_NTF_BODY"; + public static getPhoneNotificationBody = "Services/ERP.svc/REST/GET_PHONES_NOTIFICATION_BODY"; + public static getTerminationNotificationBody = "Services/ERP.svc/REST/GET_TERM_NOTIFICATION_BODY"; public static getStampMSNotificationBody = "Services/ERP.svc/REST/GET_STAMP_MS_NOTIFICATION_BODY"; public static getStampNSNotificationBody = "Services/ERP.svc/REST/GET_STAMP_NS_NOTIFICATION_BODY"; public static getAddressNotificationBody = "Services/ERP.svc/REST/GET_ADDRESS_NOTIFICATION_BODY"; @@ -189,6 +191,37 @@ export class WorklistMainService { ); } + public getPhoneNotificationBody( + WorkListBodyRequest: any, + onError?: any, + errorLabel?: string + ): Observable { + const request = WorkListBodyRequest; + this.authService.authenticateRequest(request); + return this.api.post( + WorklistMainService.getPhoneNotificationBody, + request, + onError, + errorLabel + ); + } + + + public getTerminationNotificationBody( + WorkListBodyRequest: any, + onError?: any, + errorLabel?: string + ): Observable { + const request = WorkListBodyRequest; + this.authService.authenticateRequest(request); + return this.api.post( + WorklistMainService.getTerminationNotificationBody, + request, + onError, + errorLabel + ); + } + public getPOItemHistory( POItemHistoryReq: any, onError?: any, diff --git a/Mohem/src/app/notification/service/worklist.service.ts b/Mohem/src/app/notification/service/worklist.service.ts index 1673443f..b35b867d 100644 --- a/Mohem/src/app/notification/service/worklist.service.ts +++ b/Mohem/src/app/notification/service/worklist.service.ts @@ -6,6 +6,7 @@ import { WorkListReplacmentEmployeeRequest } from '../models/ReplacmentEmployeeR import { WorkListActionHistoryRequest } from '../models/ActionHistoryReq'; import { WorKListRFCEmployeeResponse } from '../models/RFC-EmployeeRes'; import { WorkListActionHistoryResponse } from '../models/ActionHistoryRes'; +import { Request } from 'src/app/hmg-common/services/models/request'; @Injectable() @@ -16,6 +17,7 @@ export class WorklistService { public static getRFCEmployeeList = 'Services/ERP.svc/REST/GET_RFC_EMPLOYEE_LIST'; public static getActionHistory = 'Services/ERP.svc/REST/GET_ACTION_HISTORY'; public static getFavorite = 'Services/ERP.svc/REST/Mohemm_GetFavoriteReplacements'; + public static getFavoriteWithoutImage = 'Services/ERP.svc/REST/Mohemm_GetFavoriteReplacementsWithoutImage'; public static saveFavorite = 'Services/ERP.svc/REST/Mohemm_ChangeFavoriteReplacements'; constructor( public api: ConnectorService, @@ -53,6 +55,15 @@ export class WorklistService { public getFavorite(req: any, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(req); + console.log(req); + return this.api.post(WorklistService.getFavorite, req, onError, errorLabel); + } + + public getFavoriteByLetter(letter: string, onError?: any, errorLabel?: string): Observable { + const req = new Request(); + this.authService.authenticateRequest(req); + req['ItgFilter'] = letter; + console.log(letter); return this.api.post(WorklistService.getFavorite, req, onError, errorLabel); } public saveFavoriteList(request: any, onError?: any, errorLabel?: string): Observable { @@ -63,6 +74,11 @@ export class WorklistService { return this.api.post(WorklistService.saveFavorite, req, onError, errorLabel); } + public getFavoriteWithoutImage(req: any, onError?: any, errorLabel?: string): Observable { + this.authService.authenticateRequest(req); + return this.api.post(WorklistService.getFavoriteWithoutImage, req, onError, errorLabel); + } + public getFavoriteMyTeam(req: any, onError?: any, errorLabel?: string): Observable { this.authService.authenticateRequest(req); return this.api.post(WorklistService.getFavorite, req, onError, errorLabel); diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 85e6ad39..dfe64fd4 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -135,6 +135,16 @@ +
+ + +
+

{{filter}}

+
+
+
+
+ - +

{{'worklist, loading'| translate}} Actual Swipe(s)
- +
@@ -180,7 +182,7 @@
- +
@@ -293,7 +295,9 @@ + getPassNotificationDetails?.REQUEST_TYPE == 'ADDRESS' && + getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' && + getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION'">

{{'worklist, loading'| translate}}

@@ -337,8 +341,67 @@
- + + +
+

{{'worklist, loading'| translate}}

+
+ +
+

{{ 'general, empty' | translate}}

+
+
+ + +
+ + + +
+ +
+
+
+
+
+
+
+ + + +
+

{{'worklist, loading'| translate}}

+
+ +
+

{{ 'general, empty' | translate}}

+
+
+ + +
+ + + +
+ +
+
+
+
+
+
+
+ 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 841d91d0..3cfa8951 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -288,6 +288,10 @@ export class WorklistMainComponent implements OnInit { this.getStampMSNotification(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'STAMP_NS') { this.getStampNSNotification(this.WorkListBodyObj); + } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'TERMINATION') { + this.getTerminationNotificationDetails(this.WorkListBodyObj); + } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'PHONE_NUMBERS') { + this.getPhoneNotificationDetails(this.WorkListBodyObj); } } @@ -307,6 +311,22 @@ export class WorklistMainComponent implements OnInit { }); } + getTerminationNotificationDetails(notificationBodyObj) { + this.worklistMainService + .getTerminationNotificationBody(notificationBodyObj) + .subscribe((result: PRNotificatonBodyResponse) => { + this.handleWorkListBodyResult(result, "TERMINATION"); + }); + } + + getPhoneNotificationDetails(notificationBodyObj) { + this.worklistMainService + .getPhoneNotificationBody(notificationBodyObj) + .subscribe((result: PRNotificatonBodyResponse) => { + this.handleWorkListBodyResult(result, "PHONE_NUMBERS"); + }); + } + getBasicDetailsNotification(notificationBodyObj) { this.worklistMainService .getBasicDetailNotificationBody(notificationBodyObj) @@ -421,6 +441,20 @@ export class WorklistMainComponent implements OnInit { console.log(result); } } + else if (Type === "PHONE_NUMBERS"){ + if (result.GetPhonesNotificationBodyList) { + this.notificationBodyRes = + result.GetPhonesNotificationBodyList; + console.log(result); + } + } + else if (Type === "TERMINATION"){ + if (result.GetTermNotificationBodyList) { + this.notificationBodyRes = + result.GetTermNotificationBodyList; + console.log(result); + } + } } } //End handleWorkListBodyResult