|
|
|
|
@ -8,36 +8,100 @@
|
|
|
|
|
<ion-content>
|
|
|
|
|
<!-------------------------------Start New design ---------------------------------------->
|
|
|
|
|
<ion-grid>
|
|
|
|
|
<ion-item class="attachmentDiv">
|
|
|
|
|
<ion-row>
|
|
|
|
|
<ion-col>
|
|
|
|
|
<ion-img src="../assets/imgs/attach-icon.png"></ion-img>
|
|
|
|
|
</ion-col>
|
|
|
|
|
</ion-row>
|
|
|
|
|
<ion-row>
|
|
|
|
|
<ion-col>
|
|
|
|
|
<p>{{ 'general, notAttch' | translate}}</p>
|
|
|
|
|
<ion-row style="margin-top: 20px;margin-left: 12px;">
|
|
|
|
|
<ion-col>
|
|
|
|
|
<div size="10" class="approvalTitle">{{'general, addAttach' | translate}}</div>
|
|
|
|
|
</ion-col>
|
|
|
|
|
<ion-col style="padding-left: 7%;" size="2">
|
|
|
|
|
<div class="fileDiv">
|
|
|
|
|
<input end class="inputfile" style="margin-top: 10px;z-index: 99999;position: absolute;opacity: 0;" type="file" ng2FileSelect [uploader]="uploader"
|
|
|
|
|
(change)="onFileSelected($event)" />
|
|
|
|
|
<label end for="file" class="attachLable">
|
|
|
|
|
<ion-icon style="font-size: 22px;" name="add"></ion-icon>
|
|
|
|
|
</label></div>
|
|
|
|
|
</ion-col>
|
|
|
|
|
</ion-row>
|
|
|
|
|
<ion-item class="attachmentDiv" *ngIf="attachListOver?.length == 0">
|
|
|
|
|
<ion-img style="height: 26px;width:100%;margin-top:12px" src="../assets/imgs/attach-icon.png"></ion-img>
|
|
|
|
|
<ion-label style="margin-top: -24px;" position="floating" class="boldTxtNav">{{ 'general, notAttch' | translate}}</ion-label>
|
|
|
|
|
</ion-item>
|
|
|
|
|
</ion-grid>
|
|
|
|
|
|
|
|
|
|
<ion-grid class="attachmentDiv" *ngIf="attachListOver?.length > 0">
|
|
|
|
|
<div *ngFor="let attachList of attachListOver ; let i = index">
|
|
|
|
|
<ion-row>
|
|
|
|
|
<ion-col size="1">
|
|
|
|
|
<ion-label style="color: black !important;">
|
|
|
|
|
{{attachList.AttachmentID +1 }} .
|
|
|
|
|
</ion-label>
|
|
|
|
|
</ion-col>
|
|
|
|
|
<ion-col style="text-align: left;" size="10">
|
|
|
|
|
<ion-label style="color: blue !important;" (click)="OpenAttachFiles(attachList.P_FILE_DATA,attachList.P_FILE_CONTENT_TYPE)">
|
|
|
|
|
{{attachList.P_FILE_NAME }}
|
|
|
|
|
</ion-label>
|
|
|
|
|
</ion-col>
|
|
|
|
|
<ion-col size="1">
|
|
|
|
|
<!-- <button float-end class="attachImgBtn"
|
|
|
|
|
(click)="OpenAttachFiles(attachList.P_FILE_DATA,attachList.P_FILE_CONTENT_TYPE)">
|
|
|
|
|
<img class="attachImg" src="../assets/imgs/view.png">
|
|
|
|
|
</button> -->
|
|
|
|
|
<button float-end [disabled]="attachList.isSuccess" class="attachImgBtn removeLable"
|
|
|
|
|
(click)="removeFile(attachList)">
|
|
|
|
|
<ion-icon style="font-size:22px;margin-left:-7px;margin-top:-2px;" name="close"></ion-icon>
|
|
|
|
|
</button>
|
|
|
|
|
|
|
|
|
|
</ion-col>
|
|
|
|
|
</ion-row>
|
|
|
|
|
</ion-item>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</ion-grid>
|
|
|
|
|
<ion-grid *ngIf="attachmentRes?.length > 0">
|
|
|
|
|
<div *ngFor="let attachRes of attachmentRes">
|
|
|
|
|
<ion-row>
|
|
|
|
|
<ion-col col-8>
|
|
|
|
|
<div> <img float-start class="attachImg" src="../assets/imgs/file.png">
|
|
|
|
|
</div>
|
|
|
|
|
<ion-label>
|
|
|
|
|
{{attachRes.FILE_NAME }} </ion-label>
|
|
|
|
|
|
|
|
|
|
</ion-col>
|
|
|
|
|
<ion-col col-4>
|
|
|
|
|
<button float-end class="attachImgBtn"
|
|
|
|
|
(click)="OpenAttachFiles(attachRes.FILE_DATA,attachRes.FILE_CONTENT_TYPE)">
|
|
|
|
|
<img class="attachImg" src="../assets/imgs/view.png">
|
|
|
|
|
</button>
|
|
|
|
|
<button float-end [disabled]="!isResubmitEIT" class="attachImgBtn" (click)="delelteFile(attachRes)"><img
|
|
|
|
|
class="attachImg" src="../assets/imgs/deletegray.png"></button>
|
|
|
|
|
</ion-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <button [disabled]="!isResubmitEIT" class="iconButton" (click)="addAttachment(false,attachRes)"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/editIcon.png"></button>
|
|
|
|
|
<button (click)="delelteFile(attachRes)" class="iconButton" [disabled]="!isResubmitEIT"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/cancel.png"></button> -->
|
|
|
|
|
</ion-row>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</ion-grid>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ion-grid class="">
|
|
|
|
|
<ion-item class="submitNote">
|
|
|
|
|
<ion-label position="floating" class="boldTxtNav">{{'confirmAddEit, comment' | translate}}</ion-label>
|
|
|
|
|
<div class="approvalTitle">{{'confirmAddEit, comment' | translate}}</div>
|
|
|
|
|
<ion-item class="submitNote" lines="none">
|
|
|
|
|
<!-- <ion-label position="floating" class="boldTxtNav">{{'confirmAddEit, comment' | translate}}</ion-label> -->
|
|
|
|
|
<ion-textarea type="text" [(ngModel)]="eitComments"></ion-textarea>
|
|
|
|
|
</ion-item>
|
|
|
|
|
</ion-grid>
|
|
|
|
|
|
|
|
|
|
<ion-grid class="approvalList">
|
|
|
|
|
<div class="hrTitle">{{'confirmAddEit, approverList' | translate}}</div>
|
|
|
|
|
<!-- <div class="noDataDiv" *ngIf="approversList?.length == 0">
|
|
|
|
|
<div class="approvalTitle">{{'confirmAddEit, approverList' | translate}}</div>
|
|
|
|
|
<div class="noDataDiv" *ngIf="approversList?.length == 0">
|
|
|
|
|
<p>{{ 'general, empty' | translate}}</p>
|
|
|
|
|
</div> -->
|
|
|
|
|
<div *ngIf="approversList?.length > 0">
|
|
|
|
|
</div>
|
|
|
|
|
<div style="background-color: white;border-radius: 32px;border: 1px solid #c8c4c4;" *ngIf="approversList?.length > 0">
|
|
|
|
|
<ion-list class="notification-list ">
|
|
|
|
|
<div class="timeline">
|
|
|
|
|
<ion-item *ngFor="let employee of approversList">
|
|
|
|
|
<ion-item style="padding-left: 4%;" *ngFor="let employee of approversList">
|
|
|
|
|
|
|
|
|
|
<div class="timeline-item" slot="start">
|
|
|
|
|
<div class="timeline-thumb timeline-icon">
|
|
|
|
|
@ -47,10 +111,10 @@
|
|
|
|
|
src="../assets/imgs/profile.png"> </div>
|
|
|
|
|
</div>
|
|
|
|
|
<ion-col>
|
|
|
|
|
<ion-label style="color:black !important ;font-weight: bold;">
|
|
|
|
|
<ion-label style="color:black !important ;font-weight: bold;padding-top: 0%;">
|
|
|
|
|
{{employee.APPROVER}}
|
|
|
|
|
</ion-label>
|
|
|
|
|
<ion-label style="color:black !important ;font-weight: bold;">
|
|
|
|
|
<ion-label style="color:black !important ;padding-top: 4%;">
|
|
|
|
|
{{employee.APPROVER_TYPE}}
|
|
|
|
|
</ion-label>
|
|
|
|
|
|
|
|
|
|
@ -63,13 +127,13 @@
|
|
|
|
|
|
|
|
|
|
</ion-grid>
|
|
|
|
|
<!-------------------------------End New design ---------------------------------------->
|
|
|
|
|
<ion-card>
|
|
|
|
|
<!-- <ion-card>
|
|
|
|
|
<ion-card-header class="boxHdr">
|
|
|
|
|
<div class="hrTitle">{{'confirmAddEit, approverList' | translate}}</div>
|
|
|
|
|
</ion-card-header>
|
|
|
|
|
<ion-card-content>
|
|
|
|
|
|
|
|
|
|
<!-- <ion-item class="itemAH" > -->
|
|
|
|
|
|
|
|
|
|
<ion-grid no-padding class=" gridAH" *ngIf="approversList?.length > 0">
|
|
|
|
|
<ion-row class="rowAH titleH" nowrap>
|
|
|
|
|
<ion-col size="1">
|
|
|
|
|
@ -88,14 +152,10 @@
|
|
|
|
|
<ion-label class="Header" for="">{{'confirmAddEit, status' | translate}}</ion-label>
|
|
|
|
|
</ion-col>
|
|
|
|
|
</ion-row>
|
|
|
|
|
<!-- </ion-grid>
|
|
|
|
|
</ion-item> -->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <ion-list *ngIf="approversList?.length > 0"> -->
|
|
|
|
|
|
|
|
|
|
<!-- <ion-item class="itemAH" *ngFor="let item of approversList" >
|
|
|
|
|
<ion-grid class=" gridAH"> -->
|
|
|
|
|
|
|
|
|
|
<ion-row class="rowAH" *ngFor="let item of approversList" nowrap>
|
|
|
|
|
<ion-col size="1">
|
|
|
|
|
<ion-label class="tbData" for="">{{item.APPROVER_ORDER_NUMBER}}</ion-label>
|
|
|
|
|
@ -114,9 +174,7 @@
|
|
|
|
|
</ion-col>
|
|
|
|
|
</ion-row>
|
|
|
|
|
</ion-grid>
|
|
|
|
|
<!-- </ion-item>
|
|
|
|
|
|
|
|
|
|
</ion-list> -->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</ion-card-content>
|
|
|
|
|
</ion-card>
|
|
|
|
|
@ -125,44 +183,7 @@
|
|
|
|
|
<ion-textarea type="text" [(ngModel)]="eitComments"></ion-textarea>
|
|
|
|
|
</ion-item>
|
|
|
|
|
|
|
|
|
|
<!-- <div padding *ngIf="attachmentRes?.length > 0 || attachListOver?.length > 0">
|
|
|
|
|
<p class="boldTxt"> {{"absenceList.attachList" | translate}}</p>
|
|
|
|
|
</div>
|
|
|
|
|
<div *ngIf="attachListOver?.length > 0">
|
|
|
|
|
<ion-row *ngFor="let attachList of attachListOver ; let i = index">
|
|
|
|
|
|
|
|
|
|
<ion-col col-8 (click)="OpenAttachFiles(attachList.P_FILE_DATA,attachList.P_FILE_CONTENT_TYPE)">
|
|
|
|
|
{{ attachList.P_FILE_NAME }}</ion-col>
|
|
|
|
|
<ion-col col-4>
|
|
|
|
|
|
|
|
|
|
<button [disabled]="attachList.isSuccess" class="iconButton" (click)="removeFile(attachList)"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/cancel.png"></button>
|
|
|
|
|
|
|
|
|
|
</ion-col>
|
|
|
|
|
|
|
|
|
|
</ion-row>
|
|
|
|
|
</div> -->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <div *ngIf="attachmentRes?.length > 0">
|
|
|
|
|
<ion-row *ngFor="let attachRes of attachmentRes">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ion-col col-8 (click)="OpenAttachFiles(attachRes.FILE_DATA,attachRes.FILE_CONTENT_TYPE)">
|
|
|
|
|
{{ attachRes.FILE_NAME }}</ion-col>
|
|
|
|
|
<ion-col col-4>
|
|
|
|
|
|
|
|
|
|
<button [disabled]="!isResubmitEIT" class="iconButton" (click)="addAttachment(false,attachRes)"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/editIcon.png"></button>
|
|
|
|
|
<button (click)="delelteFile(attachRes)" class="iconButton" [disabled]="!isResubmitEIT"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/cancel.png"></button>
|
|
|
|
|
|
|
|
|
|
</ion-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</ion-row>
|
|
|
|
|
</div> -->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div>
|
|
|
|
|
<ion-card>
|
|
|
|
|
@ -225,18 +246,15 @@
|
|
|
|
|
</ion-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <button [disabled]="!isResubmitEIT" class="iconButton" (click)="addAttachment(false,attachRes)"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/editIcon.png"></button>
|
|
|
|
|
<button (click)="delelteFile(attachRes)" class="iconButton" [disabled]="!isResubmitEIT"><img
|
|
|
|
|
class="imgSize" src="../assets/imgs/cancel.png"></button> -->
|
|
|
|
|
|
|
|
|
|
</ion-row>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</ion-grid>
|
|
|
|
|
</ion-card-content>
|
|
|
|
|
</ion-card>
|
|
|
|
|
</ion-card> -->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</ion-content>
|
|
|
|
|
|
|
|
|
|
|