fixing worklist design and announcement seacrch function

enad-Q1
enadhilal 4 years ago
parent 332732f619
commit 3b3c704bae

@ -37,11 +37,11 @@
<label class="colItemReq"> {{dataContant.Title}}</label>
<br />
<label *ngIf="dataContant.Value && dataContant.Type != 'table'">{{dataContant.Value}}</label>
<div *ngIf="dataContant.MultipleValue && dataContant.Type == 'list'">
<label *ngFor="let data of dataContant.MultipleValue">{{data}}<br /></label>
</div>
<div *ngIf="dataContant.Value && dataContant.Type =='table'">
<ion-card class="cardContent">
<ion-card-content>
@ -88,8 +88,60 @@
</ion-card-content>
</ion-card>
</ion-slide>
<ion-slide>
<ion-card class="cardContent" *ngIf='activeSegment === "Approval Level"'>
<ion-list style="margin: 25px; border-radius: 16px; width: 340px;" class="notification-list" *ngIf='activeSegment === "Approval Level"'>
<div class="timeline">
<ion-item *ngFor="let approvalInfo of workList">
<div class="timeline-item" slot="start">
<div [class]="direction == 'en'? 'timeline-thumb-en timeline-icon': 'timeline-thumb-ar timeline-icon'">
<img class="empImge" src="../assets/imgs/profile.png">
</div>
</div>
<ion-col size="8">
<ion-label class="name">
{{approvalInfo.Name}}
</ion-label>
<div *ngIf="approvalInfo.Notes != '' ">
<div *ngIf="!approvalInfo.Notes">
<div class="containerNote">
Note: {{approvalInfo.Notes}}
</div>
</div>
<div *ngIf="approvalInfo.Notes">
<div class="containerNote">
Note: {{approvalInfo.Notes}}
</div>
</div>
</div>
<ion-label
[ngClass]="{'bg-blue-txt' : approvalInfo.Action === 'Submit' ,'bg-orange-txt' : approvalInfo.Action === 'Pending' ,'bg-red-txt' : approvalInfo.Action === 'Rejected','bg-green-txt' : approvalInfo.Action != 'Pending' && approvalInfo.Action != 'Rejected' && approvalInfo.Action != 'Submit'}"
class=""> {{approvalInfo.Action}}</ion-label>
<ion-label *ngIf="approvalInfo.Date != ''"
class="dateActionHistory">
{{returnDateTime(approvalInfo.Date) }} </ion-label>
</ion-col>
<ion-col size="4">
<img class="req_info" src="assets/imgs/req info.svg"
(click)="selectAtion('RequestInformation')" />
<img class="req_info deligate" src="assets/imgs/delegate.svg"
(click)="selectAtion('Delegate')" />
</ion-col>
</ion-item>
</div>
<!-- <div class="line"></div> -->
</ion-list>
<!-- <ion-card class="cardContent" *ngIf='activeSegment === "Approval Level"'>
<ion-card-content>
<ion-grid>
<ion-row>
@ -99,17 +151,18 @@
<ion-item>
<div class="timeline-item" slot="start">
<div>
<button ion-button style=" background: none;width: 60%;">
<img src="../assets/imgs/noteSmall.png">
</button>
<div
[ngClass]="{'bg-blue-dot' : approvalInfo.Action === 'Submit', 'bg-green-dot':approvalInfo.Action === 'Approved', 'bg-red-dot':approvalInfo.Action === 'Rejected', 'bg-gray-dot':approvalInfo.Action === 'Pending'}"
[class]="direction == 'en'? 'timeline-thumb-en timeline-icon': 'timeline-thumb-ar timeline-icon'"
[ngClass]="{'bg-gray-dot' : approvalInfo.Action === ''}">
</div>
<p style="margin-left: -0%; font-size: 12px !important; width: 66px;">{{approvalInfo.Action}}</p>
<p style="margin-left: -0%; font-size: 12px !important; width: 66px;">{{approvalInfo.Action}}
</p>
</div>
</div>
<div>
@ -117,10 +170,10 @@
<div *ngIf="approvalInfo.Notes">
<p style="margin-left: 10%;">{{ 'submitAbsence, comments' | translate}}:</p>
<p style="margin-left: 10%;">{{approvalInfo.Notes}}</p>
</div>
</div>
</ion-item>
</div>
</ion-list>
@ -128,8 +181,9 @@
</ion-row>
</ion-grid>
</ion-card-content>
</ion-card>
</ion-card> -->
</ion-slide>
<ion-slide>
<ion-card class="cardContent" *ngIf='activeSegment === "Requester Details"' style="width: 100%;">
<ion-card-content>
@ -139,11 +193,11 @@
<label class="colItemReq"> {{dataContant.Title}}</label>
<br />
<label *ngIf="dataContant.Value && dataContant.Type != 'table'">{{dataContant.Value}}</label>
<div *ngIf="dataContant.MultipleValue && dataContant.Type == 'list'">
<label *ngFor="let data of dataContant.MultipleValue">{{data}}<br /></label>
</div>
<div *ngIf="dataContant.Value && dataContant.Type =='table'">
<ion-card class="cardContent">
<ion-card-content>
@ -191,7 +245,7 @@
</ion-card>
</ion-slide>
</ion-slides>
<!-- <ion-slides #slides (ionSlideDidChange)="slideChanged($event)">
<ion-slide *ngFor='let segmentContant of segmentData'>
<ion-card class="cardContent" *ngIf='activeSegment === segmentContant.name' style="width: 100%;">
@ -297,7 +351,7 @@
</ion-card>
</ion-slide>
</ion-slides> -->
<!-- <div *ngFor='let segmentContant of segmentData'>
<ion-card class="cardContent" *ngIf='activeSegment === segmentContant.name'>
<ion-card-content>
@ -399,7 +453,7 @@
</ion-grid>
</ion-card-content>
</ion-card> -->
<!--
<!--
<ion-card class="cardContent">
<ion-card-content>
<ion-grid>
@ -448,6 +502,7 @@
</ng-container> -->
<!-- END -->
<br>
<ion-label>
<ion-item>
<ion-grid>
@ -467,14 +522,14 @@
</ion-content>
<ion-content *ngIf="messageSuccess">
<div class="succssfullMSG">
<div class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
</ion-col>
<ion-col size="12">
<div style="font-size: 30px !important"> {{'worklistMain, Tran_Succ' | translate}} </div>
<div style="font-size: 30px !important"> {{'worklistMain, Tran_Succ' | translate}} </div>
</ion-col>
</div>
</div>
</ion-content>
@ -490,8 +545,9 @@
<img [src]="action.image" class="footer-btn-img">
<ion-label style="font-size: 10px" *ngIf="action.name !== 'RequestInformation'">{{action.name}}</ion-label>
<ion-label style="font-size: 10px; white-space: nowrap;" *ngIf="action.name === 'RequestInformation'">{{'worklistMain, request' | translate}}</ion-label>
<ion-label style="font-size: 10px; white-space: nowrap;" *ngIf="action.name === 'RequestInformation'">
{{'worklistMain, request' | translate}}</ion-label>
</ion-tab-button>

@ -6,7 +6,7 @@
}
.timeline-icon{
width: 30px !important;
width: 55px !important;
}
.timeline:before{
position: fixed !important;
@ -24,4 +24,20 @@
.footer-btn-img{
max-width: none;
width: 60px;
}
}
.timeline-item{
margin: 0;
white-space: nowrap;
font-size: 10px;
}
.req_info{
width: 25px;
height: 25px;
display: inline-block;
margin: 0;
}
.deligate{
margin-left: 25px;
}

@ -105,8 +105,8 @@ export class WorkListMainItgComponent implements OnInit {
this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length };
this.segmentsArray = [this.segmentsArray[1], this.segmentsArray[2], this.segmentsArray[0]];
this.segmentData = [this.segmentData[1], this.segmentData[0]];
// this.workList = this.request_details.WFHistory.reverse();
this.workList = this.request_details.WFHistory;
;
this.options = this.request_details.AllowedActions;
this.activeSegment = this.segmentsArray[0].name;
for (let i = 0; i < this.options.length; i++) {
@ -534,4 +534,10 @@ export class WorkListMainItgComponent implements OnInit {
}
}
returnDateTime(stringDate: string){
let allDateTime = stringDate.split(' ');
let time = allDateTime[1].split(':', 2);
return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2];
}
}

@ -155,14 +155,15 @@ button.item-button.button.button-md.button-clear.button-clear-md {
}
.radio-label{
margin: 4px;
font-size: 9px;
margin: 4px;
position: relative;
bottom: 4px;
}
ion-radio{
--color-checked: #269db8;
}
.center{text-align: center;padding: 0;}
.center{text-align: center;padding: 5px;}
.boldTxtNav{
font-weight: bold;
padding: 5px;

@ -52,7 +52,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.P_PAGE_LIMIT = 50;
this.getPassActionMode = this.cs.sharedService.getSharedData('passActionMode', false);
console.log(this.getPassActionMode);
this.getFavruite();
// this.getFavruite();
this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo', false);
this.getpassResAttr = this.cs.sharedService.getSharedData('passResAttr', false);
console.log(this.getpassResAttr);
@ -414,7 +414,7 @@ export class WorkListReplacementRollComponent implements OnInit {
if (selectValue == "1" || selectValue == "2" || selectValue == "3") {
this.isSelect = true;
}
} if(selectValue === '4'){this.getFavruite();}
else {
this.isSelect = false;

@ -254,7 +254,7 @@
<ion-label *ngIf="actionHistory.NOTIFICATION_DATE != ''"
class="dateActionHistory">
{{actionHistory.NOTIFICATION_DATE| dateString }} </ion-label>
{{returnDateTime(actionHistory.NOTIFICATION_DATE)}} </ion-label>
</ion-col>
<ion-col size="4">
<img class="req_info" src="assets/imgs/req info.svg" (click)="openRequestInfoDel(actionHistory, 'REQUEST_INFO')" />

@ -1272,4 +1272,10 @@ export class WorklistMainIcComponent implements OnInit {
this.actionButton(flag);
}
returnDateTime(stringDate: string){
let allDateTime = stringDate.split(' ');
let time = allDateTime[1].split(':', 2);
return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2];
}
}

@ -489,7 +489,7 @@
<ion-label *ngIf="actionHistory.NOTIFICATION_DATE != ''"
class="dateActionHistory">
{{actionHistory.NOTIFICATION_DATE| dateString }} </ion-label>
{{returnDateTime(actionHistory.NOTIFICATION_DATE)}} </ion-label>
</ion-col>
<ion-col size="4">
<img class="req_info" src="assets/imgs/req info.svg" (click)="openRequestInfoDel(actionHistory, 'REQUEST_INFO')" />

@ -1217,6 +1217,13 @@ export class WorklistMainMRComponent implements OnInit {
this.common.sharedService.setSharedData(userData, 'requestInfoDelUser');
this.actionButton(flag);
}
returnDateTime(stringDate: string){
let allDateTime = stringDate.split(' ');
let time = allDateTime[1].split(':', 2);
return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2];
}
}

@ -222,7 +222,7 @@
<ion-label *ngIf="actionHistory.NOTIFICATION_DATE != ''"
class="dateActionHistory">
{{actionHistory.NOTIFICATION_DATE| dateString }} </ion-label>
{{returnDateTime(actionHistory.NOTIFICATION_DATE)}} </ion-label>
</ion-col>
<ion-col size="4">
<img class="req_info" src="assets/imgs/req info.svg" (click)="openRequestInfoDel(actionHistory, 'REQUEST_INFO')" />

@ -1249,4 +1249,10 @@ export class WorklistMainPoComponent implements OnInit {
this.common.sharedService.setSharedData(userData, 'requestInfoDelUser');
this.actionButton(flag);
}
returnDateTime(stringDate: string){
let allDateTime = stringDate.split(' ');
let time = allDateTime[1].split(':', 2);
return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2];
}
}

@ -252,7 +252,7 @@
<ion-label *ngIf="actionHistory.NOTIFICATION_DATE != ''"
class="dateActionHistory">
{{actionHistory.NOTIFICATION_DATE| dateString }} </ion-label>
{{returnDateTime(actionHistory.NOTIFICATION_DATE)}} </ion-label>
</ion-col>
<ion-col size="4">
<img class="req_info" src="assets/imgs/req info.svg" (click)="openRequestInfoDel(actionHistory, 'REQUEST_INFO')" />

@ -1171,4 +1171,10 @@ export class WorklistMainPRComponent implements OnInit {
this.common.sharedService.setSharedData(userData, 'requestInfoDelUser');
this.actionButton(flag);
}
returnDateTime(stringDate: string){
let allDateTime = stringDate.split(' ');
let time = allDateTime[1].split(':', 2);
return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2];
}
}

@ -358,7 +358,7 @@
<ion-label *ngIf="actionHistory.NOTIFICATION_DATE != ''"
class="dateActionHistory">
{{actionHistory.NOTIFICATION_DATE| dateString }} </ion-label>
{{returnDateTime(actionHistory.NOTIFICATION_DATE)}} </ion-label>
</ion-col>
<ion-col size="4">
<img class="req_info" src="assets/imgs/req info.svg"

@ -1075,4 +1075,9 @@ export class WorklistMainComponent implements OnInit {
}
console.log(this.arr_hr_req_only);
}
returnDateTime(stringDate: string){
let allDateTime = stringDate.split(' ');
let time = allDateTime[1].split(':', 2);
return allDateTime[0] + ' ' + time[0] + ':' + time[1] + ' ' + allDateTime[2];
}
}

Loading…
Cancel
Save