fixed loading issue

MOHEMM-Q3-DEV-LATEST
umasoodch 4 years ago
parent f7c23eb8d4
commit 59747d1780

@ -1216,6 +1216,9 @@ export class CommonService {
public openWorklistMainPage() { public openWorklistMainPage() {
this.nav.navigateForward(['/notification/worklist-main']); this.nav.navigateForward(['/notification/worklist-main']);
} }
public openWorklistSettingsPage() {
this.nav.navigateForward(['/notification/worklist-settings']);
}
public openWorklistMainPRPage() { public openWorklistMainPRPage() {
this.nav.navigateForward(['/notification/worklist-main-PR']); this.nav.navigateForward(['/notification/worklist-main-PR']);
} }

@ -41,11 +41,12 @@ export class GenericHeaderComponent implements OnInit {
} }
async openNotifictionSetting() { async openNotifictionSetting() {
const modal = await this.modalController.create({ // const modal = await this.modalController.create({
component: WorklistSettingComponent, // component: WorklistSettingComponent,
cssClass: 'app-update-modal-css', // cssClass: 'app-update-modal-css',
}); // });
return await modal.present(); // return await modal.present();
this.common.openWorklistSettingsPage();
} }
} }

@ -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 { WorkListReplacementItgComponent } from './work-list-replacement-itg/work-list-replacement-itg.component';
import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component'; import { MoItemHistoryComponent } from './mo-item-history/mo-item-history.component';
import { WorklistMainIcComponent } from './worklist-main-ic/worklist-main-ic.component'; import { WorklistMainIcComponent } from './worklist-main-ic/worklist-main-ic.component';
import { WorklistSettingComponent } from './worklist-setting/worklist-setting.component';
const routes: Routes = [ const routes: Routes = [
@ -123,6 +124,10 @@ const routes: Routes = [
{ {
path: 'item-creation-IC', path: 'item-creation-IC',
component: WorklistMainIcComponent component: WorklistMainIcComponent
},
{
path: 'worklist-settings',
component: WorklistSettingComponent
} }
] ]
} }

@ -41,13 +41,6 @@ export class WorklistSettingComponent implements OnInit {
}); });
} }
dismiss() {
this.modalController.dismiss({
dismissed: true
});
}
chnageToggle(toggleValue, type, val) { chnageToggle(toggleValue, type, val) {
if ( val === 'Y') { if ( val === 'Y') {
val = 'N'; val = 'N';
@ -86,4 +79,8 @@ export class WorklistSettingComponent implements OnInit {
}); });
} }
public dismiss() {
this.common.sharedService.setSharedData(false, 'loadWorkList');
this.common.back();
}
} }

Loading…
Cancel
Save