fixing business card design and worklist basic info & address info

MOHEMM-HUAWEI-RELEASE
enadhilal 4 years ago
parent 138f75a9af
commit beda780d50

@ -11,7 +11,7 @@
<ion-row> <ion-row>
<ion-col size='6'> <ion-col size='6'>
<ion-label> <ion-label>
<h1 class='font-text-style' style="font-size: 25px !important; width: 400px;">{{userInfo.name_en}}</h1> <h1 class='font-text-style' style="font-size: 20px !important; width: 200%;">{{userInfo.name_en}}</h1>
</ion-label> </ion-label>
</ion-col> </ion-col>
<ion-col size='6'> <ion-col size='6'>

@ -38,14 +38,15 @@
// CS // CS
.card-size{ .card-size{
transform: rotate(90deg) !important; transform: rotate(90deg) !important;
padding: 10px !important; padding: 5% !important;
padding-right: 0px !important; padding-right: 0px !important;
} }
.qr-style{ .qr-style{
left: 410px !important; left: 260% !important;
} }
.name-ar-style{ .name-ar-style{
left: 320px !important; left: 175% !important;
padding: 0%;
} }
// HMG // HMG
.logo-img-hmg-style{ .logo-img-hmg-style{
@ -60,14 +61,15 @@
// CS // CS
.card-size{ .card-size{
transform: rotate(90deg) !important; transform: rotate(90deg) !important;
padding: 10px !important; padding: 6% !important;
padding-right: 0px !important; padding-right: 2% !important;
} }
.qr-style{ .qr-style{
left: 324px !important; width: 80%;
left: 220% !important;
} }
.name-ar-style{ .name-ar-style{
left: 230px !important; left: 140% !important;
} }
// HMG // HMG
@ -83,14 +85,14 @@
// CS // CS
.card-size{ .card-size{
transform: rotate(90deg) !important; transform: rotate(90deg) !important;
padding: 5px !important; padding: 3% !important;
padding-right: 0px !important; padding-right: 0px !important;
} }
.qr-style{ .qr-style{
left: 400px !important; left: 280% !important;
} }
.name-ar-style{ .name-ar-style{
left: 310px !important; left: 205%!important;
} }
// HMG // HMG
.logo-img-hmg-style{ .logo-img-hmg-style{
@ -125,14 +127,14 @@
@media screen and (min-width: 325px) and (max-width:399px) and (max-height: 699px){ @media screen and (min-width: 325px) and (max-width:399px) and (max-height: 699px){
.card-size{ .card-size{
transform: rotate(90deg) !important; transform: rotate(90deg) !important;
padding: 5px !important; padding: 3% !important;
padding-right: 0px !important; padding-right: 0% !important;
} }
.qr-style{ .qr-style{
left: 280px !important; left: 200% !important;
} }
.name-ar-style{ .name-ar-style{
left: 190px !important; left: 116% !important;
} }
// HMG // HMG
.logo-img-hmg-style{ .logo-img-hmg-style{
@ -146,26 +148,26 @@
.card-size{ .card-size{
transform: rotate(90deg) !important; transform: rotate(90deg) !important;
position: relative; position: relative;
bottom: 30px; bottom: 3%;
left: 26px; left: 8%;
} }
.qr-style{ .qr-style{
width: 80px !important; width: 70% !important;
margin-top: 50px !important; margin-top: 30% !important;
position: relative !important; position: relative !important;
left: 265px !important; left: 200% !important;
} }
.name-ar-style{ .name-ar-style{
font-size: 15px !important; font-size: 15px !important;
position: relative !important; position: relative !important;
left: 130px !important; left: 115% !important;
text-align: end !important; text-align: end !important;
padding: 10px !important; padding: 1% !important;
width: 225px !important; width: 170% !important;
} }
.logo-img-style{ .logo-img-style{
width: 80px !important; width: 60% !important;
margin-top: 50px !important; margin-top: 35% !important;
} }
// HMG // HMG
@ -193,23 +195,24 @@
.card-size{ .card-size{
transform: rotate(90deg); transform: rotate(90deg);
padding: 6%;
} }
.qr-style{ .qr-style{
width: 130px; width: 70%;
margin-top: 0px; margin-top: 0px;
position: relative; position: relative;
left: 410px; left: 200%;
} }
.name-ar-style{ .name-ar-style{
font-size: 25px; font-size: 20px;
position: relative; position: relative;
left: 314px; left: 120%;
text-align: end; text-align: end;
padding: 10px; padding: 1%;
width: 225px; width: 145%;
} }
.logo-img-style{ .logo-img-style{
width: 120px; width: 70%;
} }
.logo-img-hmg-style{ .logo-img-hmg-style{

@ -100,8 +100,14 @@
<ion-item lines="none" class="search-box" *ngIf='!isFilter && !userSelected'> <ion-item lines="none" class="search-box" *ngIf='!isFilter && !userSelected'>
<ion-input (ionInput)="onChangeInput()" [ngClass]="direction == 'ltr'? 'filterInput':'filterInput-ar'" <!-- <ion-input (ionInput)="onChangeInput()" [ngClass]="direction == 'ltr'? 'filterInput':'filterInput-ar'"
[(ngModel)]="searchKey" [placeholder]='getPlaceHolder()' clearInput="true"></ion-input> [(ngModel)]="searchKey" [placeholder]='getPlaceHolder()' clearInput="true"></ion-input> -->
<ion-input class='replacmentSearchBar'
style="height: 45px; border: 1px solid lightgray; border-radius: 50px; width: 350px;"
[(ngModel)]="searchKey"
[placeholder]='"replacementRoll, searchbyname" | translate' clearInput="true">
<ion-button (click)='onChangeInput()' style="--background: transparent; background: transparent; color: black"><ion-icon name="search"></ion-icon></ion-button>
</ion-input>
</ion-item> </ion-item>

@ -211,12 +211,13 @@ export class WorkListReplacementItgComponent implements OnInit {
} }
onChangeInput() { onChangeInput() {
this.ReplacementList = []; this.ReplacementList = [];
clearTimeout(this.typingTimer); this.SearchReplacementList();
this.typingTimer = setTimeout(() => { // clearTimeout(this.typingTimer);
if (this.searchKey.length > 2) { // this.typingTimer = setTimeout(() => {
this.SearchReplacementList(); // if (this.searchKey.length > 2) {
} // this.SearchReplacementList();
}, 3000); // }
// }, 3000);
} }
select(selectEmp, index) { select(selectEmp, index) {
this.selEmp = selectEmp this.selEmp = selectEmp

@ -60,10 +60,21 @@
<div style="padding: 5px;" *ngIf="!isFilter"> <div style="padding: 5px;" *ngIf="!isFilter">
<!-- <ion-input (ionInput)="onChangeInput()" [ngClass]="direction == 'en'? 'filterInput':'filterInput-ar'" [(ngModel)]="inputSearch" [placeholder]='getPlaceHolder()' clearInput="true"></ion-input> --> <!-- <ion-input (ionInput)="onChangeInput()" [ngClass]="direction == 'en'? 'filterInput':'filterInput-ar'" [(ngModel)]="inputSearch" [placeholder]='getPlaceHolder()' clearInput="true"></ion-input> -->
<ion-input class='replacmentSearchBar' (ionInput)="onChangeInput()" style="height: 45px; --padding-start: 20px;" <ion-grid>
class="searchbar-input sc-ion-searchbar-md" [(ngModel)]="inputSearch" <ion-row style="height: 45px; border: 1px solid lightgray; border-radius: 50px;">
[placeholder]='"replacementRoll, searchbyname" | translate' clearInput="true"></ion-input> <ion-col size='9'>
<ion-input class='replacmentSearchBar' style="height: 35px;"
[(ngModel)]="inputSearch" [placeholder]='"replacementRoll, searchbyname" | translate' clearInput="true">
<ion-icon style="width: 50px; height: 21px;" name="search"></ion-icon>
</ion-input>
</ion-col>
<ion-col size='3'>
<ion-button [disabled]='inputSearch == undefined || 3 > inputSearch.length' (click)='onChangeInput()' style="--background: transparent; background: transparent; padding-bottom: 20px;">
<ion-label><p style="color: #269db8;">{{"general, search" | translate}}</p></ion-label>
</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</div> </div>
<div *ngIf="isFilter"> <div *ngIf="isFilter">

@ -340,17 +340,17 @@ export class WorkListReplacementRollComponent implements OnInit {
this.messageSuccess = true; this.messageSuccess = true;
setTimeout(() => { // setTimeout(() => {
this.messageSuccess = false; this.messageSuccess = false;
//this.modalCtrl.dismiss(succ); //this.modalCtrl.dismiss(succ);
this.modalCtrl.dismiss({ this.modalCtrl.dismiss({
'dismissed': true, 'dismissed': true,
data: "Success" data: "Success"
}); });
if (this.selEmp && this.isAnswer == false) { // if (this.selEmp && this.isAnswer == false) {
this.setFavorite(this.selEmp); // this.setFavorite(this.selEmp);
} // }
}, 5000); // }, 5000);
this.cs.openNotificationPage(); this.cs.openNotificationPage();
// this.messageSuccess = true; // this.messageSuccess = true;
@ -441,9 +441,19 @@ export class WorkListReplacementRollComponent implements OnInit {
this.isFilter = true; this.isFilter = true;
this.selectedType = 1; this.selectedType = 1;
this.listOfRealted = this.actionHistory; this.listOfRealted = this.actionHistory;
if(this.favoriteUserList.length > 0){
this.actionHistory.forEach((obj, i) => {
if(this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) {
this.actionHistory[i].IsFavorite = true;
}else{
this.actionHistory[i].IsFavorite = false;
}
console.log(this.actionHistory);
});
}
} else if (selectValue === '4') { } else if (selectValue === '4') {
// if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) { // if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) {
this.getFavruite(); this.getFavruite();
// } // }
this.isFilter = true; this.isFilter = true;
this.selectedType = 4; this.selectedType = 4;
@ -461,11 +471,11 @@ export class WorkListReplacementRollComponent implements OnInit {
onChangeInput() { onChangeInput() {
this.ReplacementList = []; this.ReplacementList = [];
clearTimeout(this.typingTimer); clearTimeout(this.typingTimer);
this.typingTimer = setTimeout(() => { // this.typingTimer = setTimeout(() => {
if (this.inputSearch.length > 2) { // if (this.inputSearch.length > 2) {
this.getreplacmentemployee(); this.getreplacmentemployee();
} // }
}, 3000); // }, 3000);
// if (this.inputSearch.length > 0) { // if (this.inputSearch.length > 0) {
@ -509,12 +519,12 @@ export class WorkListReplacementRollComponent implements OnInit {
this.worklistService.saveFavoriteList(request, () => { this.worklistService.saveFavoriteList(request, () => {
}).subscribe((result) => { }).subscribe((result) => {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
if(isFav){ if (isFav) {
this.cs.toastPK("replacementRoll", "favorite-saved"); this.cs.greenToastPK("replacementRoll", "favorite-saved");
} else{ } else {
this.cs.toastPK("replacementRoll", "favorite-unsaved"); this.cs.redToastPK("replacementRoll", "favorite-unsaved");
} }
this.getFavruite();
} }
}) })
} }

@ -47,9 +47,11 @@
<ion-row> <ion-row>
<!-- NOT ADDRESS & BASIC_DETAILS --> <!-- NOT ADDRESS & BASIC_DETAILS -->
<ion-col *ngIf="getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' && getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS' "> <ion-col
*ngIf="getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS' && getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS' ">
<div *ngIf="notificationBodyRes?.length > 0 "> <div *ngIf="notificationBodyRes?.length > 0 ">
<ion-card *ngFor="let item of notificationBodyRes;let i=index; " style="width: 91%;"> <ion-card *ngFor="let item of notificationBodyRes;let i=index; "
style="width: 91%;">
<ion-card-content *ngIf="item.Collection_Notification.length > 0"> <ion-card-content *ngIf="item.Collection_Notification.length > 0">
<div> <div>
<ion-row *ngIf=" item.Collection_Notification.DISPLAY_FLAG != 'N' "> <ion-row *ngIf=" item.Collection_Notification.DISPLAY_FLAG != 'N' ">
@ -119,36 +121,33 @@
</ion-col> </ion-col>
<!-- IF BASIC_DETAILS --> <!-- IF BASIC_DETAILS -->
<ion-col *ngIf="getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS'"> <ion-col *ngIf="getPassNotificationDetails?.REQUEST_TYPE == 'BASIC_DETAILS' ||
getPassNotificationDetails?.REQUEST_TYPE == 'ADDRESS'">
<div *ngIf='notificationBodyRes.length > 0'> <div *ngIf='notificationBodyRes.length > 0'>
<ion-card style="width: 91%;"> <ion-card style="width: 91%;">
<ion-card-content > <ion-card-content>
<div> <div>
<ion-row> <ion-row>
<ion-col class="rowBorder" <ion-col class="rowBorder" style="background: #269db8;">
*ngFor="let item of notificationBodyRes;let i=index;" <ion-label>
size="6" [hidden]="item.UPDATED_FLAG == 'N'"> <p style="color: white;">Current</p>
</ion-label>
</ion-col>
<ion-col class="rowBorder" style="background: #269db8;">
<ion-label>
<p style="color: white;">Proposed</p>
</ion-label>
</ion-col>
</ion-row>
<ion-row *ngFor="let item of notificationBodyRes;let i=index;">
<ion-col class="rowBorder" size="6"
[hidden]="item.UPDATED_FLAG == 'N'">
<label class="colItemReq">{{item.SEGMENT_PROMPT}}</label> <label class="colItemReq">{{item.SEGMENT_PROMPT}}</label>
<br /> <br />
<label>{{item.SEGMENT_VALUE_DSP}}</label> <label>{{item.PREV_SEGMENT_VALUE_DSP}}</label>
</ion-col> </ion-col>
</ion-row> <ion-col class="rowBorder" size="6"
</div> [hidden]="item.UPDATED_FLAG == 'N'">
</ion-card-content>
</ion-card>
</div>
</ion-col>
<!-- IF ADDRESS -->
<ion-col *ngIf="getPassNotificationDetails?.REQUEST_TYPE != 'ADDRESS'">
<div *ngIf='notificationBodyRes.length > 0'>
<ion-card style="width: 91%;">
<ion-card-content >
<div>
<ion-row>
<ion-col class="rowBorder"
*ngFor="let item of notificationBodyRes;let i=index;"
size="6" [hidden]="item.UPDATED_FLAG == 'N'">
<label class="colItemReq">{{item.SEGMENT_PROMPT}}</label> <label class="colItemReq">{{item.SEGMENT_PROMPT}}</label>
<br /> <br />
<label>{{item.SEGMENT_VALUE_DSP}}</label> <label>{{item.SEGMENT_VALUE_DSP}}</label>
@ -346,7 +345,7 @@
<ion-slide> <ion-slide>
<ng-container *ngIf="activeSegment === 'action-history'"> <ng-container *ngIf="activeSegment === 'action-history'">
<ion-card class="cardContent action-history" style="width: 100%;"> <ion-card class="cardContent action-history" style="width: 100%;">
<ion-card-content> <ion-card-content>
<div class="noDataDiv" [hidden]="actionHistoryRes && actionHistoryRes.length > 0"> <div class="noDataDiv" [hidden]="actionHistoryRes && actionHistoryRes.length > 0">
@ -387,7 +386,8 @@
</div> </div>
<button class="showMore" <button class="showMore"
(click)="actionHistory.visible = !actionHistory.visible"> (click)="actionHistory.visible = !actionHistory.visible">
{{actionHistory.visible ? 'Show less': 'Show More' }}</button> {{actionHistory.visible ? 'Show less': 'Show More'
}}</button>
</div> </div>
</div> </div>
<ion-label <ion-label

@ -274,9 +274,9 @@ export class WorklistMainComponent implements OnInit {
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR") { } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR") {
this.getPRNotificationDetails(this.WorkListBodyObj); this.getPRNotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'ADDRESS') { } else if (this.getPassNotificationDetails.REQUEST_TYPE === 'ADDRESS') {
this.getBasicDetailsNotification(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'BASIC_DETAILS') {
this.getAddressNotification(this.WorkListBodyObj); this.getAddressNotification(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE === 'BASIC_DETAILS') {
this.getBasicDetailsNotification(this.WorkListBodyObj)
} }
} }

@ -2202,11 +2202,11 @@
"ar": "أدخل ملاحظة" "ar": "أدخل ملاحظة"
}, },
"favorite-saved": { "favorite-saved": {
"en": "Your Favorite saved successfully", "en": "Your Favorite has been saved successfully",
"ar": "تم حفظ مفضلتك بنجاح" "ar": "تم حفظ مفضلتك بنجاح"
}, },
"favorite-unsaved": { "favorite-unsaved": {
"en": "Your Favorite had been deleted successfully", "en": "Your Favorite has been deleted successfully",
"ar": "تم حفظ مفضلتك بنجاح" "ar": "تم حفظ مفضلتك بنجاح"
}, },
"msg": { "msg": {

@ -612,3 +612,10 @@ left: 66px;
font-size: 16px; font-size: 16px;
text-align: left; text-align: left;
} }
ion-input .replacmentSearchBar .native-input{
position: absolute !important;
}
ion-input .replacmentSearchBar .input-clear-icon{
display: none !important;
}
Loading…
Cancel
Save