From 28846867dff38cdd39a8d756fc4b1a4bf6c1dce6 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 1 Nov 2022 12:17:27 +0300 Subject: [PATCH] fixed moe issues --- Mohem/config.xml | 2 -- .../android/xml/network_security_config.xml | 4 ++-- .../src/app/eit/add-eit/add-eit.component.ts | 21 +++++++++++++++++++ .../services/common/common.service.ts | 9 ++++++-- .../app/notification/home/home.component.ts | 8 +++++-- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index 59b7d9e1..418008f2 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -4,8 +4,6 @@ An app created by cloud Solutions Cloud Solutions - - diff --git a/Mohem/resources/android/xml/network_security_config.xml b/Mohem/resources/android/xml/network_security_config.xml index 14144c66..cb3e247f 100644 --- a/Mohem/resources/android/xml/network_security_config.xml +++ b/Mohem/resources/android/xml/network_security_config.xml @@ -1,7 +1,7 @@ - + localhost - hmg.com + hrmsys.moenergy.gov.sa \ No newline at end of file diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 2e626b59..2a65a9a7 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -556,6 +556,24 @@ export class AddEitComponent implements OnInit { }); } + scrollTopMOE(e: any) { + let total = 0; + let container = null; + + const _rec = (obj) => { + + total += obj.offsetTop; + const par = obj.offsetParent; + if (par && par.localName !== 'ion-content') { + _rec(par); + } else { + container = par; + } + } + _rec(event.target); + container.scrollToPoint(0, total - 50, 400); + } + bindHtmlElemEvents(id, obj) { const elem = document.getElementById(id); console.log(elem); @@ -575,6 +593,9 @@ export class AddEitComponent implements OnInit { // isEmpty=true; //emptyChildElement + if (obj.FORMAT_TYPE == "N" || obj.FORMAT_TYPE == "C") { + this.scrollTopMOE(e); + } if (obj.FORMAT_TYPE == "N") { const maxSize = obj.MAXIMUM_SIZE; 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 6be358f7..43893ec6 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1616,9 +1616,14 @@ export class CommonService { } public setFilterValues(data) { - for (const notification of data) { - this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER + if (data.length > 0) { + for (const notification of data) { + this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER + } + } else { + this.filterKeys['HRSSA'] = 0; } + } diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index d56827ab..f92f63d8 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -207,7 +207,9 @@ export class HomeComponent implements OnInit { this.data = values.data; this.filters = values.filters; - const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); + // const loadWorkList = this.common.sharedService.getSharedData('loadWorkList', false); + const loadWorkList = true; + if (loadWorkList) { this.receivedITGCount = false; this.showChart = false; @@ -227,7 +229,9 @@ export class HomeComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName(); this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false); - var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED); + // var isWorklistChanged = this.common.sharedService.getSharedData(HomeComponent.COUNT_CHANGED); + var isWorklistChanged = true; + if (isWorklistChanged) { this.openNotificationsDashboard() }