diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html
index 60ff3b33..fd7a5978 100644
--- a/Mohem/src/app/authentication/business-card/business-card.component.html
+++ b/Mohem/src/app/authentication/business-card/business-card.component.html
@@ -52,9 +52,9 @@
{{userInfo.name_en}}
-
{{userInfo.job_en}}
+
{{jobName}}
{{userInfo.mobile}}
{{userInfo.email}}
{{userInfo.company_url}}
@@ -124,4 +124,4 @@
-
\ No newline at end of file
+
diff --git a/Mohem/src/app/authentication/business-card/business-card.component.ts b/Mohem/src/app/authentication/business-card/business-card.component.ts
index 28a3bde3..9b9217c3 100644
--- a/Mohem/src/app/authentication/business-card/business-card.component.ts
+++ b/Mohem/src/app/authentication/business-card/business-card.component.ts
@@ -2,6 +2,8 @@ import { Component, OnInit, Input } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
+import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service';
+import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user';
@Component({
selector: 'app-business-card',
@@ -12,15 +14,27 @@ export class BusinessCardComponent implements OnInit {
public userInfo: any;
public userJobName: any;
+ public jobName: any;
constructor(
public modalCtrl: ModalController,
public ts: TranslatorService,
- public common: CommonService
+ public common: CommonService,
+ public authService: AuthenticationService,
) { }
ngOnInit() {
this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info'));
- console.log(this.userInfo);
+
+ this.authService
+ .loadAuthenticatedUser()
+ .subscribe((user: AuthenticatedUser) => {
+ if (user) {
+ let jobTitle = user.POSITION_NAME.split('.');
+ if (jobTitle && jobTitle.length > 1) {
+ this.jobName = jobTitle[0] + " " + jobTitle[1];
+ }
+ }
+ });
}
@@ -30,4 +44,4 @@ export class BusinessCardComponent implements OnInit {
});
}
-}
+}
\ No newline at end of file
diff --git a/Mohem/src/app/authentication/forgot/forgot.component.html b/Mohem/src/app/authentication/forgot/forgot.component.html
index f363261d..ccc41b2b 100644
--- a/Mohem/src/app/authentication/forgot/forgot.component.html
+++ b/Mohem/src/app/authentication/forgot/forgot.component.html
@@ -24,19 +24,54 @@
- {{'changePassword,newPassword' | translate}}
- {{'changePassword,newPassword' | translate}} -->
+
- {{'changePassword,confirmPassword' | translate}}
+
+
+
+
+ {{recentPasswordNote.text}}
+
+
+
+ {{isLowerCase.text}}
+
+
+
+ {{isUpperCase.text}}
+
+
+
+ {{isHasDigit.text}}
+
+
+
+ {{isMinLength.text}}
+
+
+
+ {{isRepeatedLetter.text}}
+
+
+
+ {{isContainSpecialChar.text}}
+
+
+
+ {{confirmMatchNew.text}}
+
@@ -45,6 +80,8 @@
- {{ts.trPK('login','changepassword')}}
+
\ No newline at end of file
diff --git a/Mohem/src/app/authentication/forgot/forgot.component.scss b/Mohem/src/app/authentication/forgot/forgot.component.scss
index 139597f9..f9421f1c 100644
--- a/Mohem/src/app/authentication/forgot/forgot.component.scss
+++ b/Mohem/src/app/authentication/forgot/forgot.component.scss
@@ -1,2 +1,5 @@
+.disabledButton{
+ opacity:.5;
+}
diff --git a/Mohem/src/app/authentication/forgot/forgot.component.ts b/Mohem/src/app/authentication/forgot/forgot.component.ts
index 8e76d97a..c9688ec5 100644
--- a/Mohem/src/app/authentication/forgot/forgot.component.ts
+++ b/Mohem/src/app/authentication/forgot/forgot.component.ts
@@ -9,7 +9,7 @@ import { SmsReaderService } from 'src/app/hmg-common/services/sms/sms-reader.ser
import { ForgetPassword } from '../models/forget.password';
import { LoginModel } from '../models/LoginModel';
import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service';
-import {LoginComponent} from "src/app/authentication/login/login.component";
+import { LoginComponent } from "src/app/authentication/login/login.component";
@Component({
selector: 'app-forgot',
templateUrl: './forgot.component.html',
@@ -18,10 +18,56 @@ import {LoginComponent} from "src/app/authentication/login/login.component";
export class ForgotComponent implements OnInit {
private loginData = new LoginModel();
- public P_NEW_PASSWORD: string;
- public P_Confirm_NEW_PASSWORD : string;
- public P_USER_NAME : string;
+ public P_NEW_PASSWORD: string = '';
+ public P_Confirm_NEW_PASSWORD: string = '';
+ public P_USER_NAME: string;
public logo = "assets/icon/login/lock.png";
+ public recentPasswordNote = {
+ yellowImg: '../assets/icon/yellow.svg',
+ text: 'Do not user recent password'
+ };
+ public isLowerCase = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'At least one lowercase',
+ isMatch: false
+ };
+ public isUpperCase = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'At least one uppdercase',
+ isMatch: false
+ };
+ public isHasDigit = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'At least one nomeric',
+ isMatch: false
+ };
+ public isMinLength = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'Minimum 8 characters',
+ isMatch: false
+ };
+ public isRepeatedLetter = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'Do not add repeating letters',
+ isMatch: false
+ };
+ public isContainSpecialChar = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'It should contain special character',
+ isMatch: false
+ };
+ public confirmMatchNew = {
+ blankImg: '../assets/icon/blank.svg',
+ greenImg: '../assets/icon/green.svg',
+ text: 'Confirm Password does not match.',
+ isMatch: false
+ };
constructor(
public cs: CommonService,
@@ -35,7 +81,7 @@ export class ForgotComponent implements OnInit {
) {
}
- ngOnInit() {}
+ ngOnInit() { }
public onForgot() {
this.sendSMSForForgotPassword();
@@ -56,7 +102,7 @@ export class ForgotComponent implements OnInit {
});
}
- public forgotpassword(){
+ public forgotpassword() {
const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false);
const forgetPasswordTokenResult = this.sharedData.getSharedData('checkSMSResponse', false);
let forgetPasswordTokenID = '';
@@ -65,11 +111,11 @@ export class ForgotComponent implements OnInit {
}
this.loginData.P_USER_NAME = this.P_USER_NAME;
let request: any = {};
- request.P_Confirm_NEW_PASSWORD=this.P_NEW_PASSWORD;
- request.P_NEW_PASSWORD=this.P_Confirm_NEW_PASSWORD;
+ request.P_Confirm_NEW_PASSWORD = this.P_NEW_PASSWORD;
+ request.P_NEW_PASSWORD = this.P_Confirm_NEW_PASSWORD;
request.P_USER_NAME = data.P_USER_NAME;
- request.ForgetPasswordTokenID = forgetPasswordTokenID;
-
+ request.ForgetPasswordTokenID = forgetPasswordTokenID;
+
this.authService.submitForgetPassword(
request,
() => {
@@ -78,10 +124,98 @@ export class ForgotComponent implements OnInit {
if (this.cs.validResponse(result)) {
this.checkUserResult = result;
console.log(result);
- this.cs.toastPK("changePassword","successChange");
+ this.cs.toastPK("changePassword", "successChange");
this.cs.openLogin();
}
});
-
+
+ }
+
+ checkerFuncation(val) {
+ if (this.P_NEW_PASSWORD === '') {
+ switch (val) {
+ case 1:
+ return this.isLowerCase.blankImg;
+ case 2:
+ return this.isUpperCase.blankImg;
+ case 3:
+ return this.isHasDigit.blankImg;
+ case 4:
+ return this.isMinLength.blankImg;
+ case 5:
+ return this.isRepeatedLetter.blankImg;
+ case 6:
+ return this.isContainSpecialChar.blankImg;
+ case 7:
+ return this.confirmMatchNew.blankImg;
+ }
+ } else {
+ switch (val) {
+ case 1:
+ if (/[a-z]/.test(this.P_NEW_PASSWORD)) {
+ this.isLowerCase.isMatch = true;
+ return this.isLowerCase.greenImg;
+ } else {
+ this.isLowerCase.isMatch = false;
+ return this.isLowerCase.blankImg;
+ }
+ case 2:
+ if (/[A-Z]/.test(this.P_NEW_PASSWORD)) {
+ this.isUpperCase.isMatch = true;
+ return this.isUpperCase.greenImg;
+ } else {
+ this.isUpperCase.isMatch = false;
+ return this.isUpperCase.blankImg;
+ }
+ case 3:
+ if (/[0-9]/.test(this.P_NEW_PASSWORD)) {
+ this.isHasDigit.isMatch = true;
+ return this.isHasDigit.greenImg;
+ } else {
+ this.isHasDigit.isMatch = false;
+ return this.isHasDigit.blankImg;
+ }
+ case 4:
+ if (this.P_NEW_PASSWORD.length >= 8) {
+ this.isMinLength.isMatch = true;
+ return this.isMinLength.greenImg;
+ } else {
+ this.isMinLength.isMatch = false;
+ return this.isMinLength.blankImg;
+ }
+ case 5:
+ if (/([a-z])\1/i.test(this.P_NEW_PASSWORD)) {
+ this.isRepeatedLetter.isMatch = false;
+ return this.isRepeatedLetter.blankImg;
+ } else {
+ this.isRepeatedLetter.isMatch = true;
+ return this.isRepeatedLetter.greenImg;
+ }
+ case 6:
+ if (/[ `!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/.test(this.P_NEW_PASSWORD)) {
+ this.isContainSpecialChar.isMatch = true;
+ return this.isContainSpecialChar.greenImg;
+ } else {
+ this.isContainSpecialChar.isMatch = false;
+ return this.isContainSpecialChar.blankImg;
+ }
+ case 7:
+ if (this.P_NEW_PASSWORD !== this.P_Confirm_NEW_PASSWORD) {
+ this.confirmMatchNew.isMatch = true;
+ return this.confirmMatchNew.blankImg;
+ } else {
+ this.confirmMatchNew.isMatch = false;
+ return this.confirmMatchNew.greenImg;
+ }
+ }
+ }
}
+
+ disabledSubmitBtn() {
+ if (this.isLowerCase.isMatch && this.isUpperCase.isMatch && this.isHasDigit.isMatch && this.isMinLength.isMatch
+ && this.isRepeatedLetter.isMatch && this.P_NEW_PASSWORD !== '' && this.P_NEW_PASSWORD
+ && this.P_Confirm_NEW_PASSWORD && this.isContainSpecialChar) {
+ return false;
+ } else { return true; }
+ }
}
diff --git a/Mohem/src/app/eit/add-cei/add-cei.component.ts b/Mohem/src/app/eit/add-cei/add-cei.component.ts
index 13195626..8d9ef1f6 100644
--- a/Mohem/src/app/eit/add-cei/add-cei.component.ts
+++ b/Mohem/src/app/eit/add-cei/add-cei.component.ts
@@ -1152,11 +1152,11 @@ export class AddCeiComponent implements OnInit {
} else {
if (
this.validateEitObj[i].APPLICATION_COLUMN_NAME ==
- "PEI_OBJECT_VERSION_NUMBER"
+ "CEI_OBJECT_VERSION_NUMBER"
)
obj.peiObjVer = this.validateEitObj[i].NUMBER_VALUE;
else if (
- this.validateEitObj[i].APPLICATION_COLUMN_NAME == "PEI_EXTRA_INFO_ID"
+ this.validateEitObj[i].APPLICATION_COLUMN_NAME == "CONTACT_EXTRA_INFO_ID"
)
obj.peiExtraInfoID = this.validateEitObj[i].NUMBER_VALUE;
}
@@ -1349,60 +1349,60 @@ export class AddCeiComponent implements OnInit {
}
} // end for
- // if (this.getPassdirfromNotifiPage) {
- // let updatedObj1 = this.validateEitObj.find(
- // x => x.APPLICATION_COLUMN_NAME === "PEI_ACTION"
- // );
- // let updatedObj2 = this.validateEitObj.find(
- // x => x.APPLICATION_COLUMN_NAME === "PEI_EXTRA_INFO_ID"
- // );
- // let updatedObj3 = this.validateEitObj.find(
- // x => x.APPLICATION_COLUMN_NAME === "PEI_OBJECT_VERSION_NUMBER"
- // );
- // this.updatedValues.push(updatedObj1);
- // this.updatedValues.push(updatedObj2);
- // this.updatedValues.push(updatedObj3);
- // valuseArr = this.fillExtraInformation(
- // valuseArr,
- // updatedObj1.VARCHAR2_VALUE,
- // updatedObj2.NUMBER_VALUE,
- // updatedObj3.NUMBER_VALUE,
- // transNo
- // );
- // } else {
- // if (this.eitSubmitAction == EIT_ACTION.ADD) {
- // this.updatedValues = this.fillExtraValuesUpdated(
- // this.updatedValues,
- // "NEW_ROW",
- // -1,
- // 0,
- // transNo
- // );
- // valuseArr = this.fillExtraInformation(
- // valuseArr,
- // "NEW_ROW",
- // -1,
- // 0,
- // transNo
- // );
- // } else if (this.eitSubmitAction == EIT_ACTION.UPDATE) {
- // valuseArr = this.fillExtraInformation(
- // valuseArr,
- // "UPDATE_ROW",
- // this.ExtraObj.peiExtraInfoID,
- // this.ExtraObj.peiObjVer,
- // transNo
- // );
- // } else if (this.eitSubmitAction == EIT_ACTION.DELETE) {
- // valuseArr = this.fillExtraInformation(
- // valuseArr,
- // "DELETE_ROW",
- // this.ExtraObj.peiExtraInfoID,
- // this.ExtraObj.peiObjVer,
- // transNo
- // );
- // }
- // }
+ if (this.getPassdirfromNotifiPage) {
+ let updatedObj1 = this.validateEitObj.find(
+ x => x.APPLICATION_COLUMN_NAME === "PEI_ACTION"
+ );
+ let updatedObj2 = this.validateEitObj.find(
+ x => x.APPLICATION_COLUMN_NAME === "CONTACT_EXTRA_INFO_ID"
+ );
+ let updatedObj3 = this.validateEitObj.find(
+ x => x.APPLICATION_COLUMN_NAME === "CEI_OBJECT_VERSION_NUMBER"
+ );
+ this.updatedValues.push(updatedObj1);
+ this.updatedValues.push(updatedObj2);
+ this.updatedValues.push(updatedObj3);
+ valuseArr = this.fillExtraInformation(
+ valuseArr,
+ updatedObj1.VARCHAR2_VALUE,
+ updatedObj2.NUMBER_VALUE,
+ updatedObj3.NUMBER_VALUE,
+ transNo
+ );
+ } else {
+ if (this.eitSubmitAction == EIT_ACTION.ADD) {
+ this.updatedValues = this.fillExtraValuesUpdated(
+ this.updatedValues,
+ "NEW_ROW",
+ -1,
+ 0,
+ transNo
+ );
+ valuseArr = this.fillExtraInformation(
+ valuseArr,
+ "NEW_ROW",
+ -1,
+ 0,
+ transNo
+ );
+ } else if (this.eitSubmitAction == EIT_ACTION.UPDATE) {
+ valuseArr = this.fillExtraInformation(
+ valuseArr,
+ "UPDATE_ROW",
+ this.ExtraObj.peiExtraInfoID,
+ this.ExtraObj.peiObjVer,
+ transNo
+ );
+ } else if (this.eitSubmitAction == EIT_ACTION.DELETE) {
+ valuseArr = this.fillExtraInformation(
+ valuseArr,
+ "DELETE_ROW",
+ this.ExtraObj.peiExtraInfoID,
+ this.ExtraObj.peiObjVer,
+ transNo
+ );
+ }
+ }
return valuseArr;
} // end getElementsValues
@@ -1429,7 +1429,7 @@ export class AddCeiComponent implements OnInit {
};
let obj2 = {
TRANSACTION_NUMBER: 1,
- APPLICATION_COLUMN_NAME: "PEI_OBJECT_VERSION_NUMBER",
+ APPLICATION_COLUMN_NAME: "CEI_OBJECT_VERSION_NUMBER",
VARCHAR2_VALUE: null,
NUMBER_VALUE: peiObjVer,
DATATYPE: "NUMBER",
@@ -1442,7 +1442,7 @@ export class AddCeiComponent implements OnInit {
SEGMENT_PROMPT: ""
};
let obj3 = {
- APPLICATION_COLUMN_NAME: "PEI_EXTRA_INFO_ID",
+ APPLICATION_COLUMN_NAME: "CONTACT_EXTRA_INFO_ID",
DATATYPE: "NUMBER",
DATE_VALUE: null,
DESC_FLEX_CONTEXT_CODE: "",
@@ -1470,22 +1470,22 @@ export class AddCeiComponent implements OnInit {
values.push({
TRANSACTION_NUMBER: transNo,
NAME: "PEI_ACTION",
- VARCHAR2_VALUE: peiAction,
+ VARCHAR2_VALUE: 'NEW_ROW',
NUMBER_VALUE: null,
DATE_VALUE: null
});
values.push({
TRANSACTION_NUMBER: transNo,
- NAME: "PEI_EXTRA_INFO_ID",
+ NAME: "CONTACT_EXTRA_INFO_ID",
VARCHAR2_VALUE: null,
- NUMBER_VALUE: peiExtraInfoID,
+ NUMBER_VALUE: 0,
DATE_VALUE: null
});
values.push({
TRANSACTION_NUMBER: transNo,
- NAME: "PEI_OBJECT_VERSION_NUMBER",
+ NAME: "CEI_OBJECT_VERSION_NUMBER",
VARCHAR2_VALUE: null,
- NUMBER_VALUE: peiObjVer,
+ NUMBER_VALUE: 0,
DATE_VALUE: null
});
return values;
diff --git a/Mohem/src/app/eit/cei-homepage/cei-homepage.component.html b/Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
index c396946a..55aeadb4 100644
--- a/Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
+++ b/Mohem/src/app/eit/cei-homepage/cei-homepage.component.html
@@ -1,8 +1,13 @@
+
+
+
-
+
@@ -49,9 +54,16 @@
-
-
+
+
+
+
\ No newline at end of file
diff --git a/Mohem/src/app/eit/cei-homepage/cei-homepage.component.scss b/Mohem/src/app/eit/cei-homepage/cei-homepage.component.scss
index e69de29b..9bcdab44 100644
--- a/Mohem/src/app/eit/cei-homepage/cei-homepage.component.scss
+++ b/Mohem/src/app/eit/cei-homepage/cei-homepage.component.scss
@@ -0,0 +1,40 @@
+@media screen and (min-width: 300px){
+ .CreateBtn{
+--background: var(--newgreen) !important;
+background: var(--newgreen) !important;
+white-space: normal;
+color: var(--light);
+text-transform: capitalize;
+min-height: 1.0cm;
+--border-radius: 7px !important;
+border-radius: 7px !important;
+--min-height: 1.6cm !important;
+width: 315px;
+font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+}}
+
+@media screen and (min-width: 1px) and (max-width:290px) {
+.CreateBtn{
+--background: var(--newgreen) !important;
+background: var(--newgreen) !important;
+white-space: normal;
+color: var(--light);
+text-transform: capitalize;
+min-height: 1.0cm;
+--border-radius: 7px !important;
+border-radius: 7px !important;
+--min-height: 1.6cm !important;
+width: 257px;
+font-family: var(--fontFamilyPoppins-SemiBold, inherit);
+}}
+
+.footer{
+padding: 15px 0px;
+background-color: var(--light) !important;
+border: 0px !important;
+box-shadow: none !important;
+-webkit-box-shadow: none;
+}
+.Btn{
+margin: auto; text-align: center; display: block;
+}
\ No newline at end of file
diff --git a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
index e69de29b..2ed98379 100644
--- a/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
+++ b/Mohem/src/app/eit/confirm-add-cei/confirm-add-cei.component.scss
@@ -0,0 +1,263 @@
+.footer-button {
+ border-radius: 2px;
+ padding: 0 1.1em;
+ min-height: 45px;
+ min-width: 200px;
+ }
+
+ .imgSize {
+ width: 22px;
+ height: 22px;
+ }
+
+ .Header {
+ font-weight: bold;
+ color: #1a586d !important;
+ font-size: 10px;
+ }
+
+ .tbData {
+ font-size: 10px;
+ }
+
+ .btnBack {
+ background: transparent;
+ float: right;
+ }
+
+ .attachmentDiv{
+ background: #ffffff;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+ }
+
+ .noDataDiv{
+ background: #ffffff;
+ height: 11%;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+ }
+ .submitNote{
+ background: #ffffff;
+ height: 80px;
+ padding-top: 1px;
+ margin: 10px;
+ border-radius: 15px;
+ border: 1px solid grey;
+ }
+
+ .approvalList{
+ --background: #f0efef;
+ height: auto;
+ text-align: center;
+ padding-top: 1px;
+ border-radius: 10px;
+ margin: 10px;
+ border-radius: 5px;
+ }
+
+ /************************New Design**********************************/
+ .notification-list{
+ background: none;
+ background: none;
+ border-radius: 32px;
+ ion-item{
+ // margin-top: 5px;
+ // margin-bottom: 5px;
+
+ background-color: transparent;
+ .item-date{
+ width: 100%;
+ font-size: 16px;
+ font-weight: bold;
+
+ text-align: start;
+ padding: 0;
+ margin: 0;
+
+ position: absolute;
+ left: 0;
+ top: 12%;
+ }
+ ion-label , [item-end]{
+
+ white-space: normal;
+ font-size: 14px;
+ padding-top: 15%;
+ // :root[dir="ltr"]{
+ // margin-left: 10px;
+ // }
+ // :root[dir="rtl"]{
+ // margin-right: 10px;
+ // }
+
+ }
+
+ }
+ }
+
+
+
+
+
+
+ .timeline {
+ position: relative;
+ margin: 15px 0 0 0;
+ // border-bottom: solid 1px var(--cusgray);
+ }
+
+ .timeline:before {
+
+ content: '';
+ position: inherit !important;
+ top: 0;
+ bottom: 0;
+ width: 4px;
+ // background: #e4e4e4;
+ z-index: 1;
+ left: 35px;
+ /* margin-left: -10px; */
+ /* z-index: 1; */
+ }
+
+ .timeline .timeline-thumb {
+
+ border-radius: 500px;
+ width: 70px !important;
+ z-index: 2;
+ position: absolute;
+ left: 0px;
+ // :root[dir="ltr"]{
+ // left: 37px;
+ // }
+ // :root[dir="rtl"]{
+ // right: 37px;
+ // }
+ float: right;
+ top: 9px;
+ }
+
+ .timeline .timeline-thumb.timeline-icon {
+ height: 70px;
+ // text-align: center;
+ // color: white;
+ // border: 5px solid #CBD0D3;
+ // transform: scale(0.2);
+ }
+
+
+
+ .timeline .timeline-item {
+ width: 40px;
+
+ }
+
+ .timeline .timeline-stats {
+ position: relative;
+ font-size: 12px;
+ color: var(--darkgray);
+
+ }
+
+ .empImge{
+ border-radius: 50%;
+ width:100%;
+ height: 100%;
+ border: #dedede solid 1px;
+
+ }
+ .empImgeRep {
+ border-radius: 50% !important;
+ width: 80px;
+ height: 80px;
+ border: #dedede solid 1px;
+ }
+
+ .line{
+ padding-bottom:87px;
+ }
+
+ .attachLable{
+ position: absolute;
+ top: 0px;
+ z-index: 0;
+ background: #30b8c6;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 24px;
+ height: 24px;
+ text-align: center;
+ font-size: 5px;
+ }
+
+ .removeLable{
+ top: 0px;
+ z-index: 0;
+ background: #d8252d;
+ color: #fff;
+ border-radius: 50%;
+ border: 0px;
+ width: 20px;
+ height: 20px;
+ text-align: center;
+ font-size: 5px;
+ }
+
+ .note-modal {
+ // width: 90%;
+ // height: 50%;
+ // top: 20%;
+ // left: 5%;
+ // right: 5%;
+ // bottom: 5%;
+ background: rgba(0, 0, 0, 0.5) !important;
+ padding: 30% 10% !important;
+ --height: 12cm !important;
+ // --width: 80% !important;
+ --border-radius:20px;
+
+ }
+ .header-toolbar-new{
+ --background: #269DB8;
+ }
+ .title{
+ margin-top: -37px;
+ margin-left: 85px;
+ }
+ .title-ar{
+ margin-top: -37px;
+ margin-right: 101px;
+ }
+ .confirmEitOkButton{
+ white-space: normal !important;
+ text-transform: capitalize !important;
+ min-height: 45px !important;
+ min-width: 5px !important;
+ margin: 8px !important;
+ background-color: #269DB8;
+ width: 80% !important;
+ color: white!important;
+ border-radius: 16px !important;
+ }
+
+ .approvalTitle-ar{
+ font-weight: bold;
+ font-size: 16px;
+ text-align: right;
+
+ }
+ .approvalTitle{
+ font-weight: bold;
+ font-size: 16px;
+ text-align: left;
+ }
+
\ No newline at end of file
diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
index 784e92fe..44b886e6 100644
--- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
+++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts
@@ -142,7 +142,7 @@ export class AuthenticationService {
} else {
mobileType = 'android';
}
- request.VersionID = 3.4;//3.2;
+ request.VersionID = 3.4;
request.Channel = 31;
request.LanguageID = TranslatorService.getCurrentLanguageCode();
request.MobileType = mobileType;
diff --git a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
index cd90f7ce..a7b722b4 100644
--- a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
+++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts
@@ -55,6 +55,13 @@ export class WifiModalComponent implements OnInit {
}, 1000);
}
+
+
+ async getConnectedBSSID(ssid:string){
+ let avaialbleSSID = await this.wifiWizard2.getConnectedBSSID();
+ console.log(avaialbleSSID);
+ }
+
async startWifiConnection() {
const isAndroid = this.platform.is("android");
const isIOS = this.platform.is("ios");
diff --git a/Mohem/src/app/itemforsale/home/home.component.html b/Mohem/src/app/itemforsale/home/home.component.html
index 31f9008e..39929ee6 100644
--- a/Mohem/src/app/itemforsale/home/home.component.html
+++ b/Mohem/src/app/itemforsale/home/home.component.html
@@ -150,7 +150,7 @@
-
X
+
X
diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html
index 45af49e2..1d54a0ec 100644
--- a/Mohem/src/app/notification/home/home.component.html
+++ b/Mohem/src/app/notification/home/home.component.html
@@ -24,7 +24,7 @@
-
+
{
+ const request = WorkListBodyRequest;
+ this.authService.authenticateRequest(request);
+ return this.api.post(
+ WorklistMainService.getCEINotificationBody,
+ request,
+ onError,
+ errorLabel
+ );
+ }
+
public getPRNotificationBody(
WorkListBodyRequest: any,
onError?: any,
diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
index 681ea344..58242557 100644
--- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
+++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts
@@ -273,7 +273,7 @@ export class WorkListMainItgComponent implements OnInit {
} else if (result.MessageStatus === 1) {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
@@ -295,7 +295,7 @@ export class WorkListMainItgComponent implements OnInit {
this.common.presentAlert(this.ts.trPK('general', 'error-itg'));
} else if (result.MessageStatus === 1) {
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = true;
this.common.sharedService.setSharedData(true, 'loadWorkList');
@@ -323,7 +323,7 @@ export class WorkListMainItgComponent implements OnInit {
if (result.MessageStatus === 1) {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
@@ -347,7 +347,7 @@ export class WorkListMainItgComponent implements OnInit {
} else if (result.MessageStatus === 1) {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
@@ -372,7 +372,7 @@ export class WorkListMainItgComponent implements OnInit {
} else if (result.MessageStatus === 1) {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
@@ -400,7 +400,7 @@ export class WorkListMainItgComponent implements OnInit {
} else if (result.MessageStatus === 1) {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
@@ -429,7 +429,7 @@ export class WorkListMainItgComponent implements OnInit {
} else if (result.MessageStatus === 1) {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.common.sharedService.setSharedData(true, 'loadWorkList');
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
index dfe64fd4..8dfbc335 100644
--- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
+++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
@@ -135,7 +135,17 @@
-
+
+
+
@@ -238,7 +248,7 @@
0 && !userSelected && ReplacementList.length ==0 && searchKeySelect == '4'">
+ *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchKeySelect == '4' && isFavoriteLetterActive">
{{'replacementRoll, favorite' | translate}}
@@ -269,6 +279,21 @@
+ 0 && searchKeySelect == '4' && favoriteUserList.length === 0">
+
+
+ {{'general, fav-showData' | translate}}
+
+
+
+
+
+
+ {{'general, fav-noData' | translate}}
+
+
+
+
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts
index ffddbe54..e70e8589 100644
--- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts
+++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts
@@ -40,6 +40,7 @@ export class WorkListReplacementItgComponent implements OnInit {
public direction = '';
arr = [];
delegtedEmp;
+ isFavoriteLetterActive = false;
public slideOptsOne = {
slidesPerView: 6,
@@ -341,7 +342,7 @@ export class WorkListReplacementItgComponent implements OnInit {
this.favLetter.forEach((obj, index) => {
if(this.activeSelectedLetter) {}
if (index === 0) {
- this.selectedLetter(obj);
+ // this.selectedLetter(obj);
this.favIsActive.push(true);
} else {
this.favIsActive.push(false);
@@ -412,6 +413,7 @@ export class WorkListReplacementItgComponent implements OnInit {
}
selectedLetter(el) {
+ this.isFavoriteLetterActive = true;
this.favLetter.forEach((letter, index) => {
if (letter === el) {
this.favIsActive[index] = true;
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
index ae54bea2..edb614b4 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
@@ -85,7 +85,17 @@
-
-
+
+
0 && searchBy == '4' && favoriteUserList.length === 0">
+
+
+ {{'general, fav-showData' | translate}}
+
+
+
+
- Sorry there is no data
+ {{'general, fav-noData' | translate}}
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts
index 1da215da..f7052c5f 100644
--- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts
+++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts
@@ -49,13 +49,14 @@ export class WorkListReplacementRollComponent implements OnInit {
arr = [];
favoriteUserList: any = [];
isFilter = true;
+ isFavoriteLetterActive = false;
public slideOptsOne = {
slidesPerView: 6,
spaceBetween: 5
};
- public activeSelectedLetter:string;
+ public activeSelectedLetter: string;
constructor(public worklistService: WorklistService, private cs: CommonService, public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) {
this.P_PAGE_NUM = 1;
@@ -464,7 +465,7 @@ export class WorkListReplacementRollComponent implements OnInit {
// if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) {
this.getFavruite();
// }
- this.isFilter = true;
+ this.isFilter = true;
this.selectedType = 4;
} else if (selectValue === '2' || selectValue === '3' || selectValue === '5') {
this.isSelect = true;
@@ -520,158 +521,156 @@ export class WorkListReplacementRollComponent implements OnInit {
this.favLetter = this.favLetter.filter((elem, index, self) => {
return index === self.indexOf(elem);
});
- if (this.activeSelectedLetter) {
- this.selectedLetter(this.activeSelectedLetter);
- } else {
- this.favLetter.forEach((obj, index) => {
- if(this.activeSelectedLetter) {}
- if (index === 0) {
- this.selectedLetter(obj);
- this.favIsActive.push(true);
- } else {
- this.favIsActive.push(false);
- }
- });
- }
- console.log(this.favLetter);
- console.log(this.favIsActive);
- }
+
+ this.favLetter.forEach((obj, index) => {
+ if (this.activeSelectedLetter) { }
+ if (index === 0) {
+ // this.selectedLetter(obj);
+ this.favIsActive.push(true);
+ } else {
+ this.favIsActive.push(false);
+ }
+ });
+ console.log(this.favLetter);
+ console.log(this.favIsActive);
+ }
});
- // this.worklistService.getFavorite({}, () => {
-
- // }).subscribe((result) => {
- // if (this.cs.validResponse(result)) {
- // this.cs.stopLoading();
- // this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
- // this.listOfFav = this.favoriteUserList;
- // this.favoriteUserList.forEach((obj) => {
- // obj.IsFavorite = true;
- // });
- // }
- // });
- }
+ // this.worklistService.getFavorite({}, () => {
+
+ // }).subscribe((result) => {
+ // if (this.cs.validResponse(result)) {
+ // this.cs.stopLoading();
+ // this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
+ // this.listOfFav = this.favoriteUserList;
+ // this.favoriteUserList.forEach((obj) => {
+ // obj.IsFavorite = true;
+ // });
+ // }
+ // });
+}
- saveUserFavruiteList(request, isFav: boolean) {
- this.worklistService.saveFavoriteList(request, () => {
- }).subscribe((result) => {
- if (this.cs.validResponse(result)) {
- if (isFav) {
- this.cs.greenToastPK("replacementRoll", "favorite-saved");
- } else {
- this.cs.redToastPK("replacementRoll", "favorite-unsaved");
- }
- this.getFavruite();
+saveUserFavruiteList(request, isFav: boolean) {
+ this.worklistService.saveFavoriteList(request, () => {
+ }).subscribe((result) => {
+ if (this.cs.validResponse(result)) {
+ if (isFav) {
+ this.cs.greenToastPK("replacementRoll", "favorite-saved");
+ } else {
+ this.cs.redToastPK("replacementRoll", "favorite-unsaved");
}
- });
- }
+ this.getFavruite();
+ }
+ });
+}
- setFavorite(selEmp) {
- selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME;
- selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : '';
- selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : '';
- selEmp.IsFavorite = !selEmp.IsFavorite;
- let confirmBoxhtml = `
+setFavorite(selEmp) {
+ selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME;
+ selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : '';
+ selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : '';
+ selEmp.IsFavorite = !selEmp.IsFavorite;
+ let confirmBoxhtml = `
Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list
`;
- if (selEmp.EMPLOYEE_IMAGE) {
- confirmBoxhtml += '';
- }
- if (!selEmp.EMPLOYEE_IMAGE) {
- confirmBoxhtml += '';
- }
+ if (selEmp.EMPLOYEE_IMAGE) {
+ confirmBoxhtml += '';
+ }
+ if (!selEmp.EMPLOYEE_IMAGE) {
+ confirmBoxhtml += '';
+ }
- confirmBoxhtml += `
+ confirmBoxhtml += `
` + selEmp.EMPLOYEE_DISPLAY_NAME + `
`;
- const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === selEmp.USER_NAME)
- if (userIndex === -1) {
- this.cs.presentConfirmDialog(
- confirmBoxhtml
- , () => {
- const request =
- [
- {
- 'USER_NAME': selEmp['USER_NAME'],
- 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'],
- 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS,
- 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE,
- 'IsFavorite': selEmp.IsFavorite
- }
- ];
-
- this.saveUserFavruiteList(request, selEmp.IsFavorite);
- }, () => { });
- } else {
- const request =
- [
- {
- 'USER_NAME': selEmp['USER_NAME'],
- 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'],
- 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS,
- 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE,
- 'IsFavorite': false
- }
- ];
- this.saveUserFavruiteList(request, false);
- }
+ const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === selEmp.USER_NAME)
+ if (userIndex === -1) {
+ this.cs.presentConfirmDialog(
+ confirmBoxhtml
+ , () => {
+ const request =
+ [
+ {
+ 'USER_NAME': selEmp['USER_NAME'],
+ 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'],
+ 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS,
+ 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE,
+ 'IsFavorite': selEmp.IsFavorite
+ }
+ ];
+
+ this.saveUserFavruiteList(request, selEmp.IsFavorite);
+ }, () => { });
+ } else {
+ const request =
+ [
+ {
+ 'USER_NAME': selEmp['USER_NAME'],
+ 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'],
+ 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS,
+ 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE,
+ 'IsFavorite': false
+ }
+ ];
+ this.saveUserFavruiteList(request, false);
}
+}
- listOfRealted: any = [];
- listOfFav: any = [];
+listOfRealted: any = [];
+listOfFav: any = [];
- filterList(event) {
- const val = event.target.value;
- if (this.selectedType === 1) {
- if (val === '') {
- this.actionHistory = this.listOfRealted;
- } else {
- this.actionHistory = this.listOfRealted.filter((item) => {
- return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1);
- });
- }
- } else if (this.selectedType === 4) {
- if (val === '') {
- this.favoriteUserList = this.listOfFav;
- } else {
- this.favoriteUserList = this.listOfFav.filter((item) => {
- return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1);
- });
- }
+filterList(event) {
+ const val = event.target.value;
+ if (this.selectedType === 1) {
+ if (val === '') {
+ this.actionHistory = this.listOfRealted;
+ } else {
+ this.actionHistory = this.listOfRealted.filter((item) => {
+ return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1);
+ });
+ }
+ } else if (this.selectedType === 4) {
+ if (val === '') {
+ this.favoriteUserList = this.listOfFav;
} else {
- return;
+ this.favoriteUserList = this.listOfFav.filter((item) => {
+ return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1);
+ });
}
+ } else {
+ return;
}
+}
- selectedLetter(el) {
- this.favLetter.forEach((letter, index) => {
- if (letter === el) {
- this.favIsActive[index] = true;
- this.activeSelectedLetter = el;
- this.worklistService.getFavoriteByLetter(letter,() => {
- }).subscribe((result) => {
- if (this.cs.validResponse(result)) {
- this.cs.stopLoading();
- this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
- this.listOfFav = this.favoriteUserList;
- this.favoriteUserList.forEach((obj) => {
- obj.IsFavorite = true;
- });
- }
- });
- } else {
- this.favIsActive[index] = false;
- }
- });
- }
+selectedLetter(el) {
+ this.isFavoriteLetterActive = true;
+ this.favLetter.forEach((letter, index) => {
+ if (letter === el) {
+ this.favIsActive[index] = true;
+ this.activeSelectedLetter = el;
+ this.worklistService.getFavoriteByLetter(letter, () => {
+ }).subscribe((result) => {
+ if (this.cs.validResponse(result)) {
+ this.cs.stopLoading();
+ this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
+ this.listOfFav = this.favoriteUserList;
+ this.favoriteUserList.forEach((obj) => {
+ obj.IsFavorite = true;
+ });
+ }
+ });
+ } else {
+ this.favIsActive[index] = false;
+ }
+ });
+}
- returnIsActiveFunction(i) {
- return this.favIsActive[i];
- }
+returnIsActiveFunction(i) {
+ return this.favIsActive[i];
+}
}
diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
index 09a818f3..8aa95dfd 100644
--- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
+++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts
@@ -428,7 +428,7 @@ export class WorklistMainIcComponent implements OnInit {
if (result.MessageStatus == 1) {
this.common.sharedService.setSharedData(true, 'loadWorkList');
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
// this.openNotificationsDashboard();
@@ -1214,7 +1214,7 @@ export class WorklistMainIcComponent implements OnInit {
} else if (data.data.data == "Success") {
// this.openNotificationsDashboard();
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.nextNotfification();
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 b481ea5f..0237e6dc 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
@@ -369,7 +369,7 @@ export class WorklistMainMRComponent implements OnInit {
if (result.MessageStatus == 1) {
this.common.sharedService.setSharedData(true, 'loadWorkList');
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
// this.openNotificationsDashboard();
@@ -1115,7 +1115,7 @@ export class WorklistMainMRComponent implements OnInit {
} else if (data.data.data == 'Success') {
// this.openNotificationsDashboard();
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.nextNotfification();
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 eecd523e..ca8179b7 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
@@ -405,7 +405,7 @@ export class WorklistMainPoComponent implements OnInit {
if (result.MessageStatus == 1) {
this.common.sharedService.setSharedData(true, 'loadWorkList');
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
// this.openNotificationsDashboard();
@@ -1182,7 +1182,7 @@ export class WorklistMainPoComponent implements OnInit {
if (data.data.data === 'cancel' || data.data.data === undefined) {
return;
} else if (data.data.data === 'Success') {
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
this.nextNotfification();
}, 2000);
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 71b038cc..2d558b5b 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
@@ -394,7 +394,7 @@ export class WorklistMainPRComponent implements OnInit {
// tslint:disable-next-line: triple-equals
if (result.MessageStatus == 1) {
this.common.sharedService.setSharedData(true, 'loadWorkList');
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
// show succsfull popup
// this.messageSuccess = true;
// setTimeout(() => {
@@ -1115,7 +1115,7 @@ export class WorklistMainPRComponent implements OnInit {
} else if (data.data.data == 'Success') {
// this.openNotificationsDashboard();
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.nextNotfification();
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
index c093dc71..4ff66b17 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html
@@ -51,7 +51,8 @@
getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS' &&
getPassNotificationDetails?.REQUEST_TYPE != 'CONTACT' &&
getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' &&
- getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION'">
+ getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
+ getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
{{'worklist, loading'| translate}}
+ getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
+ getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
{{'worklist, loading'| translate}} 
@@ -348,7 +350,8 @@
+ getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
+ getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
{{'worklist, loading'| translate}} 
@@ -378,7 +381,40 @@
+ getPassNotificationDetails?.REQUEST_TYPE == 'TERMINATION' &&
+ getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
+
+
{{'worklist, loading'| translate}} 
+
+
+
+
{{ 'general, empty' | translate}}
+
+ 0'>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{'worklist, loading'| translate}} 
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 5fcabd74..f02e2fdf 100644
--- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
+++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts
@@ -148,6 +148,7 @@ export class WorklistMainComponent implements OnInit {
false
);
this.selectedFilter = this.common.sharedService.getSharedData('selectedFilter', false);
+ console.log(this.selectedFilter);
if (this.selEmp) { } else {
this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
if (user) {
@@ -224,7 +225,8 @@ export class WorklistMainComponent implements OnInit {
false
);
console.log(this.selectedFilter);
- if (this.selectedFilter === 'HRSSA') {
+ if (this.selectedFilter === 'HRSSA' || this.selectedFilter === 'STAMP') {
+ console.log("ENAD")
this.arr_hr_req_only = [];
this.sortRequests();
}
@@ -294,6 +296,8 @@ export class WorklistMainComponent implements OnInit {
this.getPhoneNotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'CONTACT') {
this.getContactNotificationDetails(this.WorkListBodyObj);
+ } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'CEI') {
+ this.getCEINotification(this.WorkListBodyObj);
}
}
@@ -352,6 +356,14 @@ export class WorklistMainComponent implements OnInit {
});
}
+ getCEINotification(notificationBodyObj) {
+ this.worklistMainService
+ .getCEINotificationBody(notificationBodyObj)
+ .subscribe((result: MONotificatonBodyResponse) => {
+ this.handleWorkListBodyResult(result, "CEI");
+ });
+ }
+
getPRNotificationDetails(notificationBodyObj) {
this.worklistMainService
.getPRNotificationBody(notificationBodyObj)
@@ -436,6 +448,12 @@ export class WorklistMainComponent implements OnInit {
result.GetBasicDetNtfBodyList;
console.log(result);
}
+ } else if (Type === "CEI"){
+ if (result.GetCEICollectionNotificationBodyList) {
+ this.notificationBodyRes =
+ result.GetCEICollectionNotificationBodyList[0].Collection_Notification;
+ console.log(result.GetCEICollectionNotificationBodyList[0].Collection_Notification);
+ }
}
else if (Type === "STAMP_MS"){
if (result.GetStampMsNotificationBodyList) {
@@ -541,7 +559,7 @@ export class WorklistMainComponent implements OnInit {
// }
// }
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
// this.openNotificationsDashboard();
@@ -1124,7 +1142,7 @@ export class WorklistMainComponent implements OnInit {
return;
} else if (data.data.data == "Success") {
// this.messageSuccess = true;
- this.common.greenToastPK('worklist', 'save-successfully');
+ this.common.greenToastPK('worklist', 'done-successfully');
setTimeout(() => {
// this.messageSuccess = false;
this.nextNotfification();
@@ -1218,7 +1236,7 @@ export class WorklistMainComponent implements OnInit {
}
sortRequests() {
for (let i = 0; i < this.notificationArray.length; i++) {
- if (this.notificationArray[i].ITEM_TYPE === 'HRSSA') {
+ if (this.notificationArray[i].ITEM_TYPE === 'HRSSA' || this.notificationArray[i].ITEM_TYPE === 'STAMP') {
this.arr_hr_req_only.push(this.notificationArray[i]);
}
}
diff --git a/Mohem/src/app/pending-transaction/home/home.component.html b/Mohem/src/app/pending-transaction/home/home.component.html
index 2f577610..1aff4ba1 100644
--- a/Mohem/src/app/pending-transaction/home/home.component.html
+++ b/Mohem/src/app/pending-transaction/home/home.component.html
@@ -45,7 +45,7 @@
{{ 'general,to-date' | translate}}
-
-
-
diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
index c824c8a6..090524b4 100644
--- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
+++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.scss
@@ -74,7 +74,8 @@
margin-top: 5px;
margin-bottom: 10px;
text-align: center;
- margin-left: 74px;
+ // margin-left: 74px;
+ width: 100%;
}
.Text-ar{
margin: 0;
@@ -167,9 +168,9 @@
}
.gauge{
- transform: translate(-24px, -65px);
- margin-bottom: -187px;
- margin-top: -20px;
+ // transform: translate(-24px, -65px);
+ margin-bottom: -140px;
+ margin-top: -70px;
}
.gauge-ar{
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json
index e4f237f9..7108cc18 100644
--- a/Mohem/src/assets/localization/i18n.json
+++ b/Mohem/src/assets/localization/i18n.json
@@ -209,6 +209,14 @@
}
},
"general": {
+ "fav-showData": {
+ "en": "Please select an alphabet to see your favourites",
+ "ar": "الرجاء تحديد الأبجدية لرؤية المفضلة لديك"
+ },
+ "fav-noData": {
+ "en": "No data available for favourites",
+ "ar": "لا توجد بيانات متاحة للمفضلة"
+ },
"concurrent-report": {
"en": "Concurrent Report",
"ar": "تقرير متزامن"
@@ -2619,6 +2627,10 @@
"ar": "تم حفظ التغيير بنجاح",
"en": "Your change has been saved successfully"
},
+ "done-successfully": {
+ "ar": "تم تنفيذ الإجراء الخاص بك بنجاح!",
+ "en": "Your action has been executed successfully!"
+ },
"save-error": {
"ar": "هناك شئ خاطئ، يرجى المحاولة فى وقت لاحق",
"en": "Something went wrong please try again later"