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 3c9bd8c3c6

@ -122,6 +122,10 @@ export class AddEitComponent implements OnInit {
EITTransactionsRequest.SUBMIT_EIT_ACTION
);
}
// window.addEventListener('keyboardDidShow', () => {
// document.activeElement.scrollIntoView(false);
// });
}
ngOnInit() {}

@ -11,4 +11,5 @@ export class MenuEntry {
public PROMPT: string;
public REQUEST_TYPE: string;
public ATTACHMENT_REQUIRED: string;
public REQ_ATTACHMENT_TIP: string;
}

@ -1,7 +1,7 @@
<div class="main-container" [ngStyle]="active === true ? {'background': color} : {}">
<div class="main-container-radius" [ngStyle]="active === true ? {'background-color': '#ffffff'} : {'background-color': color}"></div>
<span *ngIf="text != 'All'" class="number-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{value}}</span>
<span class="text-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span>
<span class="text-span text-span-moe" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span>
</div>

@ -1,4 +1,5 @@
import { Component, OnInit, Input } from '@angular/core';
import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
@Component({
selector: 'app-card-filter',
@ -11,8 +12,16 @@ export class CardFilterComponent implements OnInit {
@Input() active: boolean;
@Input() color: string;
direction: string;
constructor() { }
ngOnInit() {}
ngOnInit() {
this.direction = TranslatorService.getCurrentLanguageName();
console.log(this.direction);
if (this.direction == 'ar') {
this.text = 'الموارد البشرية';
}
}
}

@ -49,7 +49,7 @@
<ion-label>{{ts.trPK('vacation-rule','itemType')}}</ion-label>
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
[(ngModel)]="itemType">
<ion-select-option value="HRSSA">HR</ion-select-option>
<ion-select-option value="HRSSA">{{text}}</ion-select-option>
<!-- <ion-select-option value="POAPPRV">PO</ion-select-option>
<ion-select-option value="REQAPPRV">PR</ion-select-option>
<ion-select-option value="INVMOA">MR</ion-select-option>

@ -17,6 +17,7 @@ export class WorklistAdvancedSearchComponent implements OnInit {
public notificationType = '';
public itemType;
public direction: string;
public text = 'HR';
constructor(
public modalController: ModalController,
@ -25,7 +26,9 @@ export class WorklistAdvancedSearchComponent implements OnInit {
this.direction = TranslatorService.getCurrentLanguageName();
}
ngOnInit() {}
ngOnInit() {
this.text = this.direction == 'en' ? 'HR': 'الموارد البشرية';
}
public dismissModal() {
this.modalController.dismiss();

@ -18,6 +18,7 @@
<ion-col>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >
{{'general, addAttach' | translate}}
<span *ngIf="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>
@ -269,7 +270,7 @@
<ion-footer>
<div class="centerDiv">
<ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
<ion-button class="confirmEitOkButton" [disabled] ="isAttachmentGET_MENU ==='Y' && attachListOver.length ===0" color="customnavy" ion-button (click)="openSubmitModal()">
{{ (isDelete ? 'general, delete' : 'general, submit') | translate }}</ion-button>
</div>
</ion-footer>

@ -64,6 +64,8 @@ export class ConfirmAddressComponent 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;
isContact: boolean;
isAttachmentGET_MENU: string = 'N';
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) {
this.direction = TranslatorService.getCurrentLanguageName()
@ -78,6 +80,8 @@ export class ConfirmAddressComponent implements OnInit {
this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false);
this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false);
this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
// this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit;
// if (this.isResubmitEIT) {
// this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING **

@ -19,6 +19,7 @@
<ion-col>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >
{{'general, addAttach' | translate}}
<span *ngIf="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>
@ -131,7 +132,7 @@
<ion-footer>
<div class="centerDiv">
<ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
<ion-button class="confirmEitOkButton" [disabled] ="isAttachmentGET_MENU ==='Y' && attachListOver.length ===0" color="customnavy" ion-button (click)="openSubmitModal()">
{{ 'general, submit' | translate }}</ion-button>
</div>
</ion-footer>

@ -63,7 +63,7 @@ export class ConfirmBasicDetailsComponent implements OnInit {
indexLastObj: any = 0;
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
direction: string;
isAttachmentGET_MENU: string = 'N';
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) {
this.direction = TranslatorService.getCurrentLanguageName()
@ -76,7 +76,7 @@ export class ConfirmBasicDetailsComponent implements OnInit {
this.selEmp = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_EMP, false);
this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false);
this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false);
this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER;
this.menuType = this.selMenu.List_Menu.MENU_TYPE;

@ -13,6 +13,7 @@
<ion-col>
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >
{{'general, addAttach' | translate}}
<span *ngIf="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>
@ -125,7 +126,7 @@
<ion-footer>
<div class="centerDiv">
<ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
<ion-button class="confirmEitOkButton" [disabled] ="isAttachmentGET_MENU ==='Y' && attachListOver.length ===0" color="customnavy" ion-button (click)="openSubmitModal()">
{{ 'general, submit' | translate }}</ion-button>
</div>
</ion-footer>

@ -64,6 +64,7 @@ export class ConfirmContactComponent implements OnInit {
indexLastObj: any = 0;
filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
direction: string;
isAttachmentGET_MENU: string = 'N';
constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService, public profileService: ProfileService) {
@ -79,6 +80,7 @@ export class ConfirmContactComponent implements OnInit {
this.basicRequest = this.cs.sharedService.getSharedData(BasicRequest.SHARED_DATA, false);
this.selEmp = this.basicRequest.P_SELECTED_EMPLOYEE_NUMBER;
this.isAttachmentGET_MENU = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED;
this.menuType = this.selMenu.List_Menu.MENU_TYPE;
this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT;

@ -15,7 +15,7 @@
<ion-radio slot="start" color="secondary" mode='md' value="1"></ion-radio>
</ion-item>
<ion-item lines="none">
<ion-item lines="none" style="pointer-events: none;opacity: .3;">
<ion-label>
<h3 *ngIf="sourceName === 'basicDetails'" style="color: black; font-size: 20px; white-space: break-spaces !important">{{ts.trPK('general','new-info')}}</h3>
<h3 *ngIf="sourceName === 'address'" style="color: black; font-size: 20px; white-space: break-spaces !important">{{ts.trPK('general','new-info-address')}}</h3>

@ -423,7 +423,7 @@
},
"close": {
"en": "Close",
"ar": "إغلق"
"ar": "إغلاق"
},
"back": {
"en": "Back",
@ -2140,16 +2140,16 @@
"ar": "فشل تحميل بعض الملفات المرفقة"
},
"approval-message-success": {
"en": "Your request has been submitted for approvals.",
"ar": "تم إرسال طلبك للحصول على الموافقات."
"en": "Your request has been submitted successfully!",
"ar": "تم تقديم الطلب بنجاح"
},
"basic-approval-message-success": {
"en": "Update Basic details request has been submitted for approvals.",
"ar": "تم إرسال طلب تحديث التفاصيل الأساسية للموافقات."
"en": "Your request has been submitted successfully!",
"ar": "تم تقديم الطلب بنجاح"
},
"contact-approval-message-success": {
"en": "Update Contact details request has been submitted for approvals.",
"ar": "تم إرسال طلب تحديث تفاصيل الاتصال للحصول على الموافقات."
"en": "Your request has been submitted successfully!",
"ar": "تم تقديم الطلب بنجاح"
},
"delete-perm": {
"en": "Are you sure from deleting this file permanently?",

@ -1995,6 +1995,10 @@ ion-app[dir="rtl"] {
z-index: 999;
}
[dir="rtl"] .text-span-moe {
font-size: 8px !important;
}
.toolTip-inside {
position: relative;
left: 0;

Loading…
Cancel
Save