Merge branch 'MOE_MAIN-COLOR_CHANGES' of https://gitlab.com/Cloud_Solution/mohemm_moe into MOE_MAIN-COLOR_CHANGES

MOE_MAIN-COLOR_CHANGES
Sultan khan 3 years ago
commit 67fdf0808c

@ -18,7 +18,7 @@
<ion-col>
<div style="position: relative" size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >
{{'general, addAttach' | translate}}
<span *ngIf="isAttachment ==='Y'">*</span>
<span *ngIf="isAttachment =='Y' || isAttachmentGET_MENU === 'Y'">*</span>
<div *ngIf="selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP" (click)="showToolTip(selMenu.GetMenuEntriesList.REQ_ATTACHMENT_TIP)" class='toolTip-inside'><ion-icon style='font-size: 20px' name='information-circle-outline'></ion-icon> </div>
</div>
</ion-col>

@ -63,6 +63,7 @@ export class ConfirmAddEitComponent implements OnInit {
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
direction: string;
isAttachment: string = 'N';
isAttachmentGET_MENU: string = 'N';
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) {
this.direction = TranslatorService.getCurrentLanguageName()
@ -78,7 +79,7 @@ export class ConfirmAddEitComponent implements OnInit {
this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit;
// this.isAttachment = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
if (this.isResubmitEIT) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING **
// console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails);

@ -30,7 +30,8 @@
<label [ngClass]=" direction == 'ltr' ? 'label' : 'label-ar'"> {{ts.trPK('userProfile','your-performance')}} </label>
<label [ngClass]=" direction == 'ltr' ? 'label' : 'label-ar'"> {{data.name}} </label>
<br>
<label [ngClass]=" direction == 'ltr' ? 'labelvalue' : 'labelvalue-ar'"> {{data.value}} </label>
<label *ngIf="data.value == 0" [ngClass]=" direction == 'ltr' ? 'labelvalue' : 'labelvalue-ar'"> - </label>
<label *ngIf="data.value > 0" [ngClass]=" direction == 'ltr' ? 'labelvalue' : 'labelvalue-ar'"> {{data.value}} </label>
<label [ngClass]=" direction == 'ltr' ? 'percentage' : 'percentage-ar'"></label>
</ion-col>
</ion-row>

@ -112,7 +112,6 @@ export class PerformanceEvaluationComponent implements OnInit {
}
this.performanceData.push({ name: this.appraisalArr[i].APPRAISAL_YEAR, value: parseFloat(this.appraisalArr[i].APPRAISAL_SCORE)});
}
console.log('PerformanceAppraisalResponse');
this.cs.sharedService.setSharedData(this.performanceData, PerformanceAppraisalResponse.PERFORMANCE_DATA);
this.cs.openPerformanceevaluation();
} else {

Loading…
Cancel
Save