PR Part 2

MOHEMM-Q3-DEV-LATEST
ashwaq 6 years ago
parent 524b29193a
commit 20de05a7b4

@ -1,4 +1,4 @@
<ion-header>
<!-- <ion-header>
<ion-toolbar class="header-toolbar">
<ion-title color="light">{{'worklist, note' | translate}}</ion-title>
<ion-buttons slot="primary">
@ -8,9 +8,28 @@
</ion-buttons>
</ion-toolbar>
</ion-header>
</ion-header> -->
<ion-content padding>
<ion-row>
<ion-col col-1>
<img style="width:50%" src="../assets/imgs/noteLarge.png">
</ion-col>
<ion-col col-10>
<p class="">{{getSenderNote}}</p>
</ion-col>
<ion-col col-1>
<ion-button class="closeIcon" (click)="closeModal()">
<!-- <ion-icon slot="icon-only" name="close"></ion-icon> -->
<img src="../assets/imgs/close.png">
</ion-button>
</ion-col>
</ion-row>
<div>
<p class="">{{getTextNote}}</p>

@ -6,4 +6,9 @@ left: 5%;
right: 5%;
bottom: 5%;
border: solid 1px red;
}
.closeIcon{
--background: transparent !important;
background: transparent;
}

@ -32,7 +32,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<ion-content class="colorBG">
<ion-slides pager="true" class="slides-gray-bullets">
@ -130,7 +130,7 @@
<div *ngFor="let header of PRHeader">
<ion-row>
<ion-row *ngIf="header.HDR_ATTRIBUTE_NAME != 'Requisition Total' && header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'">
<!-- *ngIf="header.HDR_ATTRIBUTE_NAME != 'Requisition Total' && header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'"> -->
<ion-col>
@ -146,42 +146,26 @@
<!-- <ion-grid>
<div *ngFor="let header of PRHeader">
<ion-row >
<ion-col *ngIf="header.HDR_ATTRIBUTE_NAME == 'Requisition Total' || header.HDR_ATTRIBUTE_NAME == 'Non-Recoverable Tax' ">
<div class="colItemReq">{{header.HDR_ATTRIBUTE_NAME}}</div>
<div class="labelTotal">{{header.HDR_ATTRIBUTE_VALUE}}</div>
<ion-grid>
<div >
<ion-row style="text-align: center !important" >
<ion-col *ngIf="totalH">
<div class="colItemReq" style="text-align: center !important">{{totalH}}</div>
<div class="labelTotal">{{valueH}}</div>
</ion-col>
<ion-col *ngIf="taxH ">
<div class="colItemReq" style="text-align: center !important">{{taxH}}</div>
<div class="labelTotal">{{taxvalueH}}</div>
</ion-col>
</ion-row>
</div>
</ion-grid> -->
</ion-grid>
<!--
<ion-row>
<ion-col class="greenTxt" col-4>
<button ion-button block class="notColBtn" (click)="openNotificationBody()">
<p>{{ts.trPK('worklistMain','notfDetails')}} </p>
<ion-img class="serviceItemImg" src="../assets/imgs/details.png"></ion-img>
</button>
</ion-col>
<ion-col class="greenTxt" col-4>
<button ion-button block class="notColBtn" (click)="openActionHistory()">
<p>{{ts.trPK('worklistMain','actionHis')}}</p>
<ion-img class="serviceItemImg" src="../assets/imgs/actionHistory.png"></ion-img>
</button>
</ion-col>
<ion-col class="greenTxt" col-4>
<button ion-button block class="notColBtn" (click)="openSupportDocuments()">
<p>{{ts.trPK('worklistMain','suppDoc')}}</p>
<ion-img class="serviceItemImg" src="../assets/imgs/documents.png"></ion-img>
</button>
</ion-col>
</ion-row>
-->
</ion-grid>
</ion-card-content>
@ -308,13 +292,12 @@
<div>
<button (click)="openNoteDetail(actionHistory.NOTE,actionHistory.NAME)"
style=" background: none;"
[hidden]="actionHistory.NOTE == '' || actionHistory.NOTE == null">
<!-- <img src="../assets/imgs/more.png"> -->
<!-- <img src="../assets/imgs/noteSmall.png"> -->
<button ion-button (click)="openNoteDetail('actionHistory.NOTE ,actionHistory.NAME)" style=" background: none;width: 60%;"
[hidden]="actionHistory.NOTE == '' || actionHistory.NOTE == null">
<img src="../assets/imgs/noteSmall.png">
<ion-icon name="bookmark"></ion-icon>
<!-- <ion-icon name="bookmark"></ion-icon> -->
</button>
</div>
<div class="timeline-thumb bg-color-dot timeline-icon">
@ -351,12 +334,17 @@
<ion-grid>
<div *ngFor="let attachList of attachmentRes">
<ion-row>
<ion-col col-10>
<div> <img float-start class="attachImg" src="../assets/imgs/file.png">
<ion-col col-12>
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'"> <img float-start class="attachImg" src="../assets/imgs/pdf.png">
</div>
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'txt'"> <img float-start class="attachImg" src="../assets/imgs/doc.png">
</div>
<div *ngIf="attachList.FILE_CONTENT_TYPE != 'txt' || attachList.FILE_CONTENT_TYPE != 'PDF' || attachList.FILE_CONTENT_TYPE != 'pdf' || attachList.FILE_CONTENT_TYPE != 'png' || attachList.FILE_CONTENT_TYPE != 'jpeg' || attachList.FILE_CONTENT_TYPE != 'jpg'|| attachList.FILE_CONTENT_TYPE != 'PNG' || attachList.FILE_CONTENT_TYPE != 'JPEG'|| attachList.FILE_CONTENT_TYPE != 'JPG'"> <img float-start class="attachImg" src="../assets/imgs/nonfile.png">
</div>
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'png' || attachList.FILE_CONTENT_TYPE === 'jpeg' || attachList.FILE_CONTENT_TYPE === 'jpg'|| attachList.FILE_CONTENT_TYPE === 'PNG' || attachList.FILE_CONTENT_TYPE === 'JPEG'|| attachList.FILE_CONTENT_TYPE === 'JPG'"> <img float-start class="attachImg" src="../assets/imgs/img.png">
</div>
<ion-label>
{{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} </ion-label>
</ion-col>
<ion-col col-2>
<button float-end class="attachImgBtn"

@ -1,3 +1,6 @@
.colorBG{
--background: #f0efef;
}
.cardContent{
width:100%;
@ -35,6 +38,11 @@ font-weight:bold;
// --color: rgba(--primary);
--color-checked: var(--secondary);
--indicator-color-checked: var(--secondary);
--background: #f0efef;
--background-activated: #f0efef;
--background-hover:#f0efef;
--background-activated:#f0efef;
--background-checked:#f0efef;
@ -58,14 +66,14 @@ font-weight:bold;
.swiper-pagination.swiper-pagination-bullets {
top: 6px !important;
bottom: 0px !important;
}
// .swiper-pagination.swiper-pagination-bullets {
// top: 6px !important;
// bottom: 0px !important;
// }
.swiper-pagination {
top: 6px;
}
// .swiper-pagination {
// top: 6px;
// }
.bar-stable {

@ -73,6 +73,11 @@ export class WorklistMainPRComponent implements OnInit {
IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 50;
headerTotal: any;
totalH: any;
valueH: any;
taxH: any;
taxvalueH: any;
constructor(
@ -251,7 +256,21 @@ export class WorklistMainPRComponent implements OnInit {
this.PRHeader=result.GetPrNotificationBodyList.PRHeader;
this.PRLines=result.GetPrNotificationBodyList.PRLines;
for( var i = 0; i < this.PRHeader.length; i++){
if(this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total'){
this.totalH=this.PRHeader[i].HDR_ATTRIBUTE_NAME;
this.valueH=this.PRHeader[i].HDR_ATTRIBUTE_VALUE;
//this. header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'"
}
if(this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Non-Recoverable Tax'){
this.taxH=this.PRHeader[i].HDR_ATTRIBUTE_NAME;
this.taxvalueH=this.PRHeader[i].HDR_ATTRIBUTE_VALUE;
}
// HDR_ATTRIBUTE_VALUE
}
this.notificationBodyRes =
result.GetPrNotificationBodyList;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 764 B

After

Width:  |  Height:  |  Size: 764 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

@ -778,8 +778,28 @@ color: var(--dark);
.slides-gray-bullets .swiper-pagination {
top: 0.4cm !important;
}
.swiper-container-horizontal>.swiper-pagination-bullets {
width: initial;
top: 34%;
right: 0;
bottom: inherit;
// left: inherit;
}
.swiper-container-horizontal>.swiper-pagination-bullets .swiper-pagination-bullet {
margin: 5px;
}
.slides-gray-bullets .swiper-wrapper {
margin-top: 14px !important;
}
// .slides-gray-bullets .swiper-wrapper {
// margin-top: 14px !important;
// }
// .swiper-container-horizontal>.swiper-pagination-bullets, .swiper-pagination-custom, .swiper-pagination-fraction {
// /* bottom: 10px; */
// left: 0;
// width: 100%;
// }
Loading…
Cancel
Save