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 cac80b88..baa6fb21 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1216,6 +1216,9 @@ export class CommonService { public openWorklistMainPage() { this.nav.navigateForward(['/notification/worklist-main']); } + public openWorklistSettingsPage() { + this.nav.navigateForward(['/notification/worklist-settings']); + } public openWorklistMainPRPage() { this.nav.navigateForward(['/notification/worklist-main-PR']); } diff --git a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts index 6589c50d..04758300 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.ts @@ -41,11 +41,12 @@ export class GenericHeaderComponent implements OnInit { } async openNotifictionSetting() { - const modal = await this.modalController.create({ - component: WorklistSettingComponent, - cssClass: 'app-update-modal-css', - }); - return await modal.present(); + // const modal = await this.modalController.create({ + // component: WorklistSettingComponent, + // cssClass: 'app-update-modal-css', + // }); + // return await modal.present(); + this.common.openWorklistSettingsPage(); } } diff --git a/Mohem/src/app/notification/notification.module.ts b/Mohem/src/app/notification/notification.module.ts index d9b5da73..8364c21c 100644 --- a/Mohem/src/app/notification/notification.module.ts +++ b/Mohem/src/app/notification/notification.module.ts @@ -32,6 +32,7 @@ import { MoreActionModalComponent } from './more-action-modal/more-action-modal. import { WorkListReplacementItgComponent } from './work-list-replacement-itg/work-list-replacement-itg.component'; import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component'; import { WorklistMainIcComponent } from './worklist-main-ic/worklist-main-ic.component'; +import { WorklistSettingComponent } from './worklist-setting/worklist-setting.component'; const routes: Routes = [ @@ -123,6 +124,10 @@ const routes: Routes = [ { path: 'item-creation-IC', component: WorklistMainIcComponent + }, + { + path: 'worklist-settings', + component: WorklistSettingComponent } ] } diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts index bd9c607e..1521d3e6 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.ts @@ -41,13 +41,6 @@ export class WorklistSettingComponent implements OnInit { }); } - - dismiss() { - this.modalController.dismiss({ - dismissed: true - }); - } - chnageToggle(toggleValue, type, val) { if ( val === 'Y') { val = 'N'; @@ -86,4 +79,8 @@ export class WorklistSettingComponent implements OnInit { }); } + public dismiss() { + this.common.sharedService.setSharedData(false, 'loadWorkList'); + this.common.back(); + } }