0 && !userSelected && ReplacementList.length ==0">
{{'replacementRoll, favorite' | translate}}
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
index 2ff64c1b..ac775fbf 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss
@@ -167,6 +167,9 @@ ion-radio{
.employee-details{
display:inline-block;
margin: 10px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ width: 70%;
}
.empImgeRep{
display: inline-block;
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html
index 56e1f721..09dd07e9 100644
--- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html
+++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html
@@ -437,89 +437,79 @@
-
-
-
- 0">
-
{{ 'general, empty' | translate}}
-
- 0 ">
-
-
-
-
-
-
-
-
-
-
![]()
-

-
-
-
- {{actionHistory.NAME}}
-
-
-
-
-
- Note: {{actionHistory.NOTE}}
-
-
-
-
-
-
-
- Note: {{actionHistory.NOTE}}
-
-
-
-
+
+
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
+
+
+
+
+
+
+
![]()
+
+
+
+
+ {{actionHistory.NAME}}
+
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
+
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
+
+
+
+
+
+ {{actionHistory.ACTION}}
+
+
+
+ {{actionHistory.NOTIFICATION_DATE| dateString }}
+
+
+
+
+
+
+
+
-
-
-
-
-
- {{actionHistory.ACTION}}
-
-
-
- {{actionHistory.NOTIFICATION_DATE| dateString }}
-
-
+
-
-
-
+
-
+
-
-
-
+
+
diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
index b539fa22..61bff403 100644
--- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
+++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss
@@ -1,110 +1,3 @@
-// .itemHISBtn{
-// padding: 5px;
-// color: var(--light);
-// background: var(--darkgray);
-// border-radius: 3px;
-// width: 85%;
-// height: 40px;
-// }
-
-
-// .rowBtn{
-// display: flex;
-// flex-direction: row;
-// justify-content: center;
-// align-items: center;
-// background: white;
-// }
-
-
-
-// .rowBorder{
-// border-bottom: solid 0.03cm var(--grayBG);
-
-// }
-// .colBorder{
-// border-right: solid 0.03cm var(--grayBG);
-
-// }
-
-// .dateActionHistory{
-// text-align: end;
-// // margin-top: -25px;
-// }
-
-
-// .actionBtn{
-// --border-radius: 50% !important;
-// height: 55px;
-// width: 55px;
-// --background: var(--newgreen); // will be dynamic
-// background: transparent;
-// margin:10px;
-// }
-
-// .itemAttch{
-// border-radius: 11px;
-// margin: 8px;
-// --min-height: 60px;
-// --max-height: 60px;
-// }
-
-// .less {
-// max-height: 54px;
-// }
-
-// .noDataDiv{
-// background: #ffffff;
-// height: 11%;
-// text-align: center;
-// padding-top: 1px;
-// border-radius: 10px;
-// margin: 10px;
-// }
-
-// .container {
-// font-size: 14px;
-// line-height: 14px;
-// height: 15px;
-// overflow: hidden;
-// text-align: justify;
-// }
-
-// .show {
-// overflow: visible;
-// height: auto;
-// }
-
-// .showMore{
-// padding: 0px;
-// background: transparent;
-// color: blue;
-// text-decoration: underline;
-// font-size: 14px;
-// }
-// .succssfullMSG{
-// height: 100%;
-// width: 100%;
-// background: var(--newgreen);
-// color: white;
-// font-weight: bold;
-// font-size: 20px;
-// text-align: center;
-// vertical-align: middle;
-// padding-top: 30px;
-// }
-
-// .succssfullIcon{
-// width: 60%;
-// text-align: center;
-// height: 60%;
-// }
-// .subjectNotification{
-// text-align: center;
-// padding-top: 10px;
-// font-weight: bold;
-// }
-
.no-padding-label {
padding: 0px !important;
}
@@ -139,4 +32,18 @@
.action-btn {
white-space: nowrap;
font-size: 10px;
+ }
+ .req_info{
+ width: 25px;
+ height: 25px;
+ display: inline-block;
+ margin: 5px;
+ }
+ .name{
+ color:black !important ;font-weight: bold;
+ }
+ .timeline-item{
+ margin: 0;
+ white-space: nowrap;
+ font-size: 10px;
}
\ No newline at end of file
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 180ef69d..139caa14 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
@@ -112,9 +112,9 @@ export class WorklistMainMRComponent implements OnInit {
public isPostNoLoad = true;
public worklistNotifications: any;
public totalRequestCount = 0;
- approve_label: any ="";
- reject_label: any="";
- reqInfo_label: any="";
+ approve_label: any = "";
+ reject_label: any = "";
+ reqInfo_label: any = "";
close_label: any;
closeDis: boolean = false;
selectedFilter: string;
@@ -142,47 +142,39 @@ export class WorklistMainMRComponent implements OnInit {
ngOnInit() {
this.WorkListAttachObj = new WorkListButtonRequest();
- this.selectedFilter = this.common.sharedService.getSharedData('selectedFilter', false);
+ this.selectedFilter = this.common.sharedService.getSharedData('selectedFilter', false);
this.intializeNotificationDetail();
}
public segmentChanged(event: any) {
this.activeSegment = event.detail.value;
- if(this.activeSegment === 'info')
- {
- this.slides.slideTo(0);
- }
- else if(this.activeSegment === 'item-req')
- {
- this.slides.slideTo(1);
- }
- else if(this.activeSegment === 'action-history')
- {
- this.slides.slideTo(2);
- }
- else if(this.activeSegment === 'attach')
- {
- this.slides.slideTo(3);
- }
+ if (this.activeSegment === 'info') {
+ this.slides.slideTo(0);
+ }
+ else if (this.activeSegment === 'item-req') {
+ this.slides.slideTo(1);
+ }
+ else if (this.activeSegment === 'action-history') {
+ this.slides.slideTo(2);
+ }
+ else if (this.activeSegment === 'attach') {
+ this.slides.slideTo(3);
+ }
}
public slideChanged(event: any) {
this.slides.getActiveIndex().then(index => {
- if(index === 0)
- {
+ if (index === 0) {
this.activeSegment = 'info';
}
- else if(index === 1)
- {
+ else if (index === 1) {
this.activeSegment = 'item-req';
}
- else if(index === 2)
- {
+ else if (index === 2) {
this.activeSegment = 'action-history';
}
- else if(index === 3)
- {
+ else if (index === 3) {
this.activeSegment = 'attach';
}
});
@@ -316,7 +308,7 @@ export class WorklistMainMRComponent implements OnInit {
getNotificationButtons(notificationButtonsObj) {
- this.notificationButtonRes=[];
+ this.notificationButtonRes = [];
this.worklistMainService
.getNotificationButtons(notificationButtonsObj)
.subscribe((result: NotificatonButtonResponse) => {
@@ -332,31 +324,30 @@ export class WorklistMainMRComponent implements OnInit {
this.common.sharedService.setSharedData(this.notificationButtonRes, 'passActionMore');
// console.log('test' + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
- if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED" ) {
- this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL;
-
+ if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") {
+ this.approve_label = this.notificationButtonRes[i].BUTTON_LABEL;
+
this.approveDis = true;
} else
- if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED" ) {
- this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL;
+ if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") {
+ this.reject_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') {
- this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL;
+ this.reqInfo_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true;
} // if result == null
else if // if result == null
- (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
- this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
- this.closeDis = true;
- }
- else if(
- this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE")
- {
- this.moreDisabled = false;
+ (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
+ this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
+ this.closeDis = true;
+ }
+ else if (
+ this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") {
+ this.moreDisabled = false;
- }
+ }
} // valid it
@@ -413,10 +404,10 @@ export class WorklistMainMRComponent implements OnInit {
public nextNotfification() {
//let itemExist = false;
- if( document.getElementById("notificationDynamicFieldsMR") != null){
+ if (document.getElementById("notificationDynamicFieldsMR") != null) {
document.getElementById("notificationDynamicFieldsMR").innerHTML = "";
- }
+ }
let itemNo = this.getPassNotificationDetails.ROW_NUM;
let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo);
let previousRequest = this.notificationArray[index].REQUEST_TYPE;
@@ -438,23 +429,23 @@ export class WorklistMainMRComponent implements OnInit {
}
}
- checkRequestType(index){
- if (this.notificationArray[index].REQUEST_TYPE === 'PO' ) {
+ checkRequestType(index) {
+ if (this.notificationArray[index].REQUEST_TYPE === 'PO') {
this.common.openWorklistMainPOPage();
} else
- if (this.notificationArray[index].REQUEST_TYPE === 'PR' ) {
- this.common.openWorklistMainPRPage();
- } else
- if (this.notificationArray[index].REQUEST_TYPE === 'MO' ) {
- this.intializeNotificationDetail();
- } else {
- this.common.openWorklistMainPage();
- }
+ if (this.notificationArray[index].REQUEST_TYPE === 'PR') {
+ this.common.openWorklistMainPRPage();
+ } else
+ if (this.notificationArray[index].REQUEST_TYPE === 'MO') {
+ this.intializeNotificationDetail();
+ } else {
+ this.common.openWorklistMainPage();
+ }
}
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;
@@ -514,7 +505,7 @@ export class WorklistMainMRComponent implements OnInit {
this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg')
}
- // this.openApplyModal(this.WorkListActionObj);
+ // this.openApplyModal(this.WorkListActionObj);
this.common.confirmAlertDialogAction(
() => {
@@ -682,7 +673,7 @@ export class WorklistMainMRComponent implements OnInit {
getNotificationResAttr(notificationButtonsObj) {
// console.log("getNotificationResAttr");
- this.NotRespondAttributeList=[];
+ this.NotRespondAttributeList = [];
this.worklistMainService
.notificationResponseAttr(notificationButtonsObj)
.subscribe((result: NotificatonButtonResponse) => {
@@ -779,7 +770,7 @@ export class WorklistMainMRComponent implements OnInit {
getAttachmentNotification(WorkListAttachObj) {
- this.attachmentRes=[];
+ this.attachmentRes = [];
this.worklistAttachService.getAttach(WorkListAttachObj).
subscribe((result: NotificationGetAttachResponse) => {
this.handleWorkListAttachResult(result);
@@ -797,7 +788,7 @@ export class WorklistMainMRComponent implements OnInit {
getActionHistory(WorkListActionHistoryObj) {
this.IsReachEnd = true;
- this.actionHistoryRes=[];
+ this.actionHistoryRes = [];
this.worklistService.getActionHistory(WorkListActionHistoryObj).
subscribe((result: WorkListActionHistoryResponse) => {
this.handleWorkListActionHistoryResult(result);
@@ -1105,7 +1096,7 @@ export class WorklistMainMRComponent implements OnInit {
async openReplacementRoll() {
-
+ this.common.sharedService.setSharedData(this.actionHistoryRes, 'actionHistoryData');
const modal = await this.modalCtrl.create({
component: WorkListReplacementRollComponent,
backdropDismiss: false,
@@ -1118,13 +1109,13 @@ export class WorklistMainMRComponent implements OnInit {
if (data.data.data == 'cancel' || data.data.data == undefined) {
return;
- } else if (data.data.data == 'Success') {
+ } else if (data.data.data == 'Success') {
// this.openNotificationsDashboard();
this.messageSuccess = true;
- setTimeout(() => {
- this.messageSuccess = false;
- this.nextNotfification();
- }, 2000);
+ setTimeout(() => {
+ this.messageSuccess = false;
+ this.nextNotfification();
+ }, 2000);
// this.nextNotfification();
}
@@ -1170,17 +1161,17 @@ export class WorklistMainMRComponent implements OnInit {
}
- getMOItemHistory(itemID ,orgID) {
+ getMOItemHistory(itemID, orgID) {
// console.log(itemID);
this.IsReachEnd = false;
const request = new MOItemHistoryReq();
request.P_ITEM_ID = parseInt(itemID);
request.P_PAGE_LIMIT = 100;
request.P_PAGE_NUM = 1;
- request.P_ORG_ID= parseInt(orgID);
-
+ request.P_ORG_ID = parseInt(orgID);
+
+
-
this.worklistMainService.getMOItemHistory(request).
subscribe((result: MOItemHistoryRes) => {
// this.common.sharedService.setSharedData(
@@ -1222,6 +1213,10 @@ export class WorklistMainMRComponent implements OnInit {
}
});
}
+ openRequestInfoDel(userData, flag) {
+ this.common.sharedService.setSharedData(userData, 'requestInfoDelUser');
+ this.actionButton(flag);
+ }
}
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html
index 02711308..d31bd1b1 100644
--- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html
+++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html
@@ -170,6 +170,81 @@
+
+
+
+ 0">
+
{{ 'general, empty' | translate}}
+
+ 0 ">
+
+
+
+
+
+
+
![]()
+
+
+
+
+ {{actionHistory.NAME}}
+
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
+
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
+
+
+
+
+
+ {{actionHistory.ACTION}}
+
+
+
+ {{actionHistory.NOTIFICATION_DATE| dateString }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss
index ffee0278..409f7446 100644
--- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss
+++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss
@@ -1,112 +1,3 @@
-// .itemHISBtn{
-// padding: 5px;
-// color: var(--light);
-// background: var(--darkgray);
-// border-radius: 3px;
-// width: 85%;
-// height: 40px;
-// }
-
-
-// .rowBtn{
-// display: flex;
-// flex-direction: row;
-// justify-content: center;
-// align-items: center;
-// background: white;
-// }
-
-
-
-// .rowBorder{
-// border-bottom: solid 0.03cm var(--grayBG);
-
-// }
-// .colBorder{
-// border-right: solid 0.03cm var(--grayBG);
-
-// }
-
-// .dateActionHistory{
-// text-align: end;
-// // margin-top: -25px;
-// }
-
-
-// .actionBtn{
-// --border-radius: 50% !important;
-// height: 55px;
-// width: 55px;
-// --background: var(--newgreen); // will be dynamic
-// background: transparent;
-// margin:10px;
-// }
-
-// .itemAttch{
-// border-radius: 11px;
-// margin: 8px;
-// --min-height: 60px;
-// --max-height: 60px;
-// }
-
-// .less {
-// max-height: 54px;
-// }
-
-// .noDataDiv{
-// background: #ffffff;
-// height: 11%;
-// text-align: center;
-// padding-top: 1px;
-// border-radius: 10px;
-// margin: 10px;
-// }
-
-
-// .container {
-// font-size: 14px;
-// line-height: 14px;
-// height: 16px;
-// overflow: hidden;
-// text-align: justify;
-// }
-
-// .show {
-// overflow: visible;
-// height: auto;
-// }
-
-// .showMore{
-// padding: 0px;
-// background: transparent;
-// color: blue;
-// text-decoration: underline;
-// font-size: 14px;
-// }
-
-// .succssfullMSG{
-// height: 100%;
-// width: 100%;
-// background: var(--newgreen);
-// color: white;
-// font-weight: bold;
-// font-size: 20px;
-// text-align: center;
-// vertical-align: middle;
-// padding-top: 30px;
-// }
-
-// .succssfullIcon{
-// width: 60%;
-// text-align: center;
-// height: 60%;
-// }
-
-// .subjectNotification{
-// text-align: center;
-// padding-top: 10px;
-// font-weight: bold;
-// }
.no-padding-label {
padding: 0px !important;
@@ -141,4 +32,19 @@
.action-btn {
white-space: nowrap;
font-size: 10px;
- }
\ No newline at end of file
+ }
+ .name{
+ color:black !important ;font-weight: bold;
+ }
+ .timeline-item{
+ margin: 0;
+ white-space: nowrap;
+ font-size: 10px;
+ }
+ .req_info{
+ width: 25px;
+ height: 25px;
+ display: inline-block;
+ margin: 5px;
+ }
+
\ No newline at end of file
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 a37979ef..b9c60828 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
@@ -129,7 +129,7 @@ export class WorklistMainPoComponent implements OnInit {
reqInfo_label: any;
closeDis: boolean = false;
selectedFilter: string;
-;
+ ;
close_label: any;
constructor(
@@ -449,11 +449,11 @@ export class WorklistMainPoComponent implements OnInit {
if (index < this.notificationArray.length) {
this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA);
this.activeSegment = 'line_details';
- if(this.selectedFilter === 'ALL'){
- this.checkRequestType(index);
+ if (this.selectedFilter === 'ALL') {
+ this.checkRequestType(index);
} else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) {
this.checkRequestType(index);
- }else {
+ } else {
this.common.openNotificationPage();
}
} else {
@@ -462,7 +462,7 @@ export class WorklistMainPoComponent implements OnInit {
}
- checkRequestType(index){
+ checkRequestType(index) {
if (this.notificationArray[index].REQUEST_TYPE === 'PO') {
this.intializeNotificationDetail();
} else
@@ -1170,7 +1170,7 @@ export class WorklistMainPoComponent implements OnInit {
async openRepRolModal() {
-
+ this.common.sharedService.setSharedData(this.actionHistoryRes, 'actionHistoryData');
const modal = await this.modalCtrl.create({
component: WorkListReplacementRollComponent,
@@ -1245,5 +1245,8 @@ export class WorklistMainPoComponent implements OnInit {
});
}
-
+ openRequestInfoDel(userData, flag) {
+ this.common.sharedService.setSharedData(userData, 'requestInfoDelUser');
+ this.actionButton(flag);
+ }
}
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html
index b4f6cd3a..ae0d9f95 100644
--- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html
+++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html
@@ -199,44 +199,50 @@
-
+
+
+
0">
{{ 'general, empty' | translate}}
0 ">
-
-
-
+
+
+

-
+ src="../assets/imgs/profile.png">
-
-
+
+
{{actionHistory.NAME}}
-
-
-
-
- Note: {{actionHistory.NOTE}}
-
+
+
+
+
+ Note: {{actionHistory.NOTE}}
-
-
- Note: {{actionHistory.NOTE}}
-
-
+
+
+
+
+
+
+ Note: {{actionHistory.NOTE}}
+
+
+
+
{{actionHistory.NOTIFICATION_DATE| dateString }}
+
+
+
+
+
+
+
+ {{ 'general, load-more' | translate}}
+
+
-
-
+
+
diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss
index c58a5c9b..76877e22 100644
--- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss
+++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss
@@ -1,109 +1,3 @@
-// .itemHISBtn{
-// padding: 5px;
-// color: var(--light);
-// background: var(--darkgray);
-// border-radius: 3px;
-// width: 85%;
-// height: 40px;
-// }
-
-
-// .rowBtn{
-// display: flex;
-// flex-direction: row;
-// justify-content: center;
-// align-items: center;
-// background: white;
-// }
-
-
-
-// .rowBorder{
-// border-bottom: solid 0.03cm var(--grayBG);
-
-// }
-// .colBorder{
-// border-right: solid 0.03cm var(--grayBG);
-
-// }
-
-// .dateActionHistory{
-// text-align: end;
-// // margin-top: -25px;
-// }
-
-
-// .actionBtn{
-// --border-radius: 50% !important;
-// height: 55px;
-// width: 55px;
-// --background: var(--newgreen); // will be dynamic
-// background: transparent;
-// margin:10px;
-// }
-
-// .itemAttch{
-// border-radius: 11px;
-// margin: 8px;
-// --min-height: 60px;
-// --max-height: 60px;
-// }
-
-// .less {
-// max-height: 54px;
-// }
-
-// .noDataDiv{
-// background: #ffffff;
-// height: 11%;
-// text-align: center;
-// padding-top: 1px;
-// border-radius: 10px;
-// margin: 10px;
-// }
-
-// .container {
-// font-size: 14px;
-// line-height: 14px;
-// height: 16px;
-// overflow: hidden;
-// text-align: justify;
-// }
-
-// .show {
-// overflow: visible;
-// height: auto;
-// }
-
-// .showMore{
-// padding: 0px;
-// background: transparent;
-// color: blue;
-// text-decoration: underline;
-// font-size: 14px;
-// }
-// .succssfullMSG{
-// height: 100%;
-// width: 100%;
-// background: var(--newgreen);
-// color: white;
-// font-weight: bold;
-// font-size: 20px;
-// text-align: center;
-// vertical-align: middle;
-// padding-top: 30px;
-// }
-
-// .succssfullIcon{
-// width: 60%;
-// text-align: center;
-// height: 60%;
-// }
-// .subjectNotification{
-// text-align: center;
-// padding-top: 10px;
-// font-weight: bold;
-// }
.no-padding-label {
padding: 0px !important;
@@ -139,4 +33,19 @@
// white-space: pre-wrap;
white-space: nowrap;
font-size: 10px;
- }
\ No newline at end of file
+ }
+
+.name{
+ color:black !important ;font-weight: bold;
+}
+.timeline-item{
+ margin: 0;
+ white-space: nowrap;
+ font-size: 10px;
+}
+.req_info{
+ width: 25px;
+ height: 25px;
+ display: inline-block;
+ margin: 5px;
+}
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 7fa0f6d3..fbb8ad2d 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
@@ -146,22 +146,18 @@ export class WorklistMainPRComponent implements OnInit {
public segmentChanged(event: any) {
this.activeSegment = event.detail.value;
- if(this.activeSegment === 'info')
- {
- this.slides.slideTo(0);
- }
- else if(this.activeSegment === 'item-req')
- {
- this.slides.slideTo(1);
- }
- else if(this.activeSegment === 'action-history')
- {
- this.slides.slideTo(2);
- }
- else if(this.activeSegment === 'attach')
- {
- this.slides.slideTo(3);
- }
+ if (this.activeSegment === 'info') {
+ this.slides.slideTo(0);
+ }
+ else if (this.activeSegment === 'item-req') {
+ this.slides.slideTo(1);
+ }
+ else if (this.activeSegment === 'action-history') {
+ this.slides.slideTo(2);
+ }
+ else if (this.activeSegment === 'attach') {
+ this.slides.slideTo(3);
+ }
console.log(" event.detail.value: " + event.detail.value);
}
@@ -169,20 +165,16 @@ export class WorklistMainPRComponent implements OnInit {
this.slides.getActiveIndex().then(index => {
console.log(index);
console.log(event);
- if(index === 0)
- {
+ if (index === 0) {
this.activeSegment = 'info';
}
- else if(index === 1)
- {
+ else if (index === 1) {
this.activeSegment = 'item-req';
}
- else if(index === 2)
- {
+ else if (index === 2) {
this.activeSegment = 'action-history';
}
- else if(index === 3)
- {
+ else if (index === 3) {
this.activeSegment = 'attach';
}
console.log(this.activeSegment);
@@ -194,7 +186,7 @@ export class WorklistMainPRComponent implements OnInit {
this.approveDis = false;
this.rejectDis = false;
this.requestDis = false;
- this.closeDis =false;
+ this.closeDis = false;
this.moreDisabled = true;
if (this.messageSuccess) {
@@ -362,29 +354,28 @@ export class WorklistMainPRComponent implements OnInit {
console.log('test' + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == 'APPROVE') {
- this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL;
+ this.approve_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == 'REJECT') {
- this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL;
+ this.reject_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == 'REQUEST_INFO') {
- this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL;
+ this.reqInfo_label = this.notificationButtonRes[i].BUTTON_LABEL;
this.requestDis = true;
} // if result == null
else if // if result == null
- (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
- this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
- this.closeDis = true;
- }
+ (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") {
+ this.close_label = this.notificationButtonRes[i].BUTTON_LABEL;
+ this.closeDis = true;
+ }
else if (
- this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE")
- {
- this.moreDisabled = false;
+ this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") {
+ this.moreDisabled = false;
- }
+ }
} // valid it
}
} // valid it
@@ -438,11 +429,11 @@ export class WorklistMainPRComponent implements OnInit {
public nextNotfification() {
//let itemExist = false;
- if( document.getElementById("notificationDynamicFieldsPR") != null){
-
+ if (document.getElementById("notificationDynamicFieldsPR") != null) {
+
document.getElementById("notificationDynamicFieldsPR").innerHTML = "";
- }
+ }
let itemNo = this.getPassNotificationDetails.ROW_NUM;
console.log(itemNo);
let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo);
@@ -454,31 +445,31 @@ export class WorklistMainPRComponent implements OnInit {
if (index < this.notificationArray.length) {
this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA);
this.activeSegment = 'info';
- if(this.selectedFilter === 'ALL'){
+ if (this.selectedFilter === 'ALL') {
this.checkRequestType(index);
} else if (previousRequest === this.notificationArray[index].REQUEST_TYPE) {
this.checkRequestType(index);
- } else {
- this.common.openNotificationPage();
- }
+ } else {
+ this.common.openNotificationPage();
+ }
} else {
this.common.openNotificationPage();
}
}
- checkRequestType(index){
- if (this.notificationArray[index].REQUEST_TYPE === 'PO' ) {
+ checkRequestType(index) {
+ if (this.notificationArray[index].REQUEST_TYPE === 'PO') {
this.common.openWorklistMainPOPage();
} else
- if (this.notificationArray[index].REQUEST_TYPE === 'PR' ) {
- this.intializeNotificationDetail();
- } else
- if (this.notificationArray[index].REQUEST_TYPE === 'MO' ) {
- this.common.openWorklistMainMRPage();
- } else {
- this.common.openWorklistMainPage();
- }
+ if (this.notificationArray[index].REQUEST_TYPE === 'PR') {
+ this.intializeNotificationDetail();
+ } else
+ if (this.notificationArray[index].REQUEST_TYPE === 'MO') {
+ this.common.openWorklistMainMRPage();
+ } else {
+ this.common.openWorklistMainPage();
+ }
}
actionButton(action) {
@@ -755,7 +746,7 @@ export class WorklistMainPRComponent implements OnInit {
for (let i = 0; i < notificationAttr.length; i++) {
if (notificationAttr[i].ATTRIBUTE_TYPE == 'VARCHAR2') {
this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, '', containerId, '', '', '');
- console.log(this.textArea );
+ console.log(this.textArea);
} else if (notificationAttr[i].ATTRIBUTE_TYPE == 'ROLE') {
@@ -1104,7 +1095,7 @@ export class WorklistMainPRComponent implements OnInit {
-
+ this.common.sharedService.setSharedData(this.actionHistoryRes, 'actionHistoryData');
const modal = await this.modalCtrl.create({
component: WorkListReplacementRollComponent,
backdropDismiss: false,
@@ -1176,5 +1167,8 @@ export class WorklistMainPRComponent implements OnInit {
}
});
}
-
+ openRequestInfoDel(userData, flag) {
+ this.common.sharedService.setSharedData(userData, 'requestInfoDelUser');
+ this.actionButton(flag);
+ }
}
\ No newline at end of file