-
{{actionHistory.ACTION}}
@@ -429,26 +429,7 @@
-
-
+
@@ -457,6 +438,8 @@
+
+
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 0a2eb0fc..44c227a5 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -138,6 +138,14 @@ export class WorklistMainComponent implements OnInit {
});
}
+ //name=document.getElementById('notificationDynamicFields').value;
+ //removeElement('parentDiv', name);"
+
+
+ //var navbar = document.getElementById("notificationDynamicFields").value;
+ // document.querySelector('svg .gauge.chart > text').remove();
+ // var inputValue = (document.getElementById("notificationDynamicFields")).value;
+
console.log(" this.selEmp" + this.selEmp);
this.intializeNotificationDetail();
@@ -149,9 +157,11 @@ export class WorklistMainComponent implements OnInit {
}
intializeNotificationDetail() {
+
if (this.messageSuccess) {
document.getElementById("notificationDynamicFields").innerHTML = "";
}
+
this.getPassNotificationDetails = this.common.sharedService.getSharedData(
HomeComponent.NOTIFICATION_DATA,
false
@@ -355,6 +365,7 @@ export class WorklistMainComponent implements OnInit {
setTimeout(() => {
this.messageSuccess = false;
this.openNotificationsDashboard();
+
this.nextNotfification();
}, 5000);
@@ -390,6 +401,11 @@ export class WorklistMainComponent implements OnInit {
public nextNotfification() {
//let itemExist = false;
+ if( document.getElementById("notificationDynamicFields") != null){
+
+ document.getElementById("notificationDynamicFields").innerHTML = "";
+
+ }
let itemNo = this.getPassNotificationDetails.ROW_NUM;
console.log(itemNo);
let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo);
@@ -409,6 +425,7 @@ export class WorklistMainComponent implements OnInit {
if(this.notificationArray[index].REQUEST_TYPE == "MR" ){
this.common.openWorklistMainMRPage()
}else{
+
this.intializeNotificationDetail();
}
@@ -444,6 +461,8 @@ export class WorklistMainComponent implements OnInit {
}
this.P_RESPOND_ATTRIBUTES_TBL.push(obj);
}
+ console.log("a"+ this.P_RESPOND_ATTRIBUTES_TBL);
+
let repUserName = this.selEmployeeID;
if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) {
let obj: any = {};
@@ -452,6 +471,8 @@ export class WorklistMainComponent implements OnInit {
obj.ATTRIBUTE_TEXT_VALUE = this.selEmployeeID;
this.P_RESPOND_ATTRIBUTES_TBL.push(obj);
}
+
+ console.log( "b"+ this.P_RESPOND_ATTRIBUTES_TBL);
if (
ButtonAction == "APPROVED" ||
@@ -576,6 +597,8 @@ export class WorklistMainComponent implements OnInit {
this.P_RESPOND_ATTRIBUTES_TBL,
WorklistMainComponent.PASS_RES_ATTR
);
+ console.log("c"+ this.P_RESPOND_ATTRIBUTES_TBL);
+
// this.common.openWorklistRollReplacement();
this.openRepRolModal();
} else if (
@@ -660,6 +683,7 @@ export class WorklistMainComponent implements OnInit {
}
getNotificationResAttr(notificationButtonsObj) {
+ console.log("getNotificationResAttr");
this.worklistMainService
.notificationResponseAttr(notificationButtonsObj)
.subscribe((result: NotificatonButtonResponse) => {
@@ -696,6 +720,7 @@ export class WorklistMainComponent 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 );
} else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") {
} else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") {
diff --git a/Mohem/src/app/uI-elements/text-area.input.ts b/Mohem/src/app/uI-elements/text-area.input.ts
index b16fa4f6..a2e9e07b 100644
--- a/Mohem/src/app/uI-elements/text-area.input.ts
+++ b/Mohem/src/app/uI-elements/text-area.input.ts
@@ -15,6 +15,7 @@ export class TextAreaInput extends UiElement {
}
public getTemplate() {
+ console.log("getTemplate");
let requiredClass: string = "";
if (this.required == 'Y')
requiredClass = "requiredClass"
@@ -30,6 +31,7 @@ export class TextAreaInput extends UiElement {
"" + this.label + "" +
"" + this.value + "" +
"";
+ console.log("template"+ template);
return template;
}
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
index 1706f90d..99e995af 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html
@@ -72,10 +72,10 @@
-
+
{{'vacation-rule, notification' | translate}}
-
{{x.NOTIFICATION_DISPLAY_NAME}}
diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss
index c42fe244..2edaaec8 100644
--- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss
+++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss
@@ -91,6 +91,12 @@ color: black !important;
.stepHeaderLebal{
margin:0;
}
+
+.select-full-width {
+ max-width: 100% !important;
+ width: 100% !important;
+ padding-left: 0 !important;
+}
// .progcontainer {
// margin: auto;
// text-align: center;
diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss
index 8dcf9cc4..e53c9d69 100644
--- a/Mohem/src/theme/styles.scss
+++ b/Mohem/src/theme/styles.scss
@@ -1514,3 +1514,8 @@ table.monthview-datetable th small {
background: #094875;
}
}
+
+.alert-wrapper {
+ min-width: 80px;//what ever you like
+ }
+