Haroon6138
/
mohemm_srca
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed moe issues

Browse Source
MOE_MAIN-COLOR_CHANGES
umasoodch 2 years ago
parent 33affad3bf
commit ede3af37c4
14 changed files with 54 additions and 20 deletions
Show Stats Download Patch File Download Diff File

1
Mohem/src/app/eit/add-eit/add-eit.component.ts
Unescape Escape View File

@ -553,7 +553,6 @@ export class AddEitComponent implements OnInit {
if (obj.FORMAT_TYPE == "N") {
const maxSize = obj.MAXIMUM_SIZE;
const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value;
// this.username = value.length > 8 ? value.substring(0,8) : value;
(document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value;
}

2
Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html
Unescape Escape View File

@ -19,7 +19,7 @@
<div size="10" [ngClass]=" direction === 'en' ? 'approvalTitle' : 'approvalTitle-ar'" >{{'general, addAttach' | translate}} <span *ngIf="isAttachment ==='Y'">*</span></div>
</ion-col>
<ion-col style="padding-left: 7%;" size="2">
<div class="fileDiv">
<div [ngClass]=" direction === 'en' ? 'fileDiv-en' : 'fileDiv-ar'">
<input end class="inputfile" style="margin-top: 10px;z-index: 99999;position: absolute;opacity: 0;" type="file" ng2FileSelect [uploader]="uploader"
(change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" />
<label end for="file" class="attachLable">

8
Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss
Unescape Escape View File

@ -261,3 +261,11 @@
font-size: 16px;
text-align: left;
}
.fileDiv-en {
// float: right;
}
.fileDiv-ar {
float: left;
}

13
Mohem/src/app/eit/eit-list/eit-list.component.html
Unescape Escape View File

@ -200,17 +200,20 @@
<ion-grid>
<div>
<!-- <ion-row>
<!-- <div>
<ion-row>
<ion-col class="colBold">
<label for="">status</label>
</ion-col>
<ion-col>
<label for="">{{EITTransactionList.status}}</label>
</ion-col>
</ion-row> -->
</div>
</ion-row>
</div> -->
<ion-grid class="grids">
<ion-col size="2" *ngIf="getPassMnuEntryObj.UPDATE_BUTTON == 'Y'" (click)="updateEITRrq(i)" >
<img [ngClass]="direction == 'en' ? 'icon-img':'icon-img-ar' " src="../assets/imgs/profile-icons/editing@2x.png" >
</ion-col>
<div *ngFor="let item of EITTransactionList.Collection_Transaction">
<!-- <ion-row *ngIf="item.DISPLAY_FLAG != 'N' ">
<ion-col class="colBold">
@ -246,7 +249,7 @@
</ion-infinite-scroll>
</div>
</ion-content>
<ion-icon class="addClass" name="add" (click)="addEITRrq()"></ion-icon>
<ion-icon *ngIf="addButton == 'Y'" class="addClass" name="add" (click)="addEITRrq()"></ion-icon>
<!-- <ion-footer>
<div class="centerDiv"> -->

13
Mohem/src/app/eit/eit-list/eit-list.component.scss
Unescape Escape View File

@ -332,3 +332,16 @@ z-index: 1;
margin-left: 5px;
}
.icon-img {
width: 20px;
height: 20px;
float: right;
margin-top: 20px;
}
.icon-img-ar {
width: 20px;
height: 20px;
float: left;
margin-top: 20px;
}

5
Mohem/src/app/eit/eit-list/eit-list.component.ts
Unescape Escape View File

@ -49,6 +49,7 @@ export class EitListComponent implements OnInit {
accrualNetInfants: any;
accrualUNetChild: any;
accrualNetAdult: any;
addButton: string = 'Y';
public options = {
cutoutPercentage: 80,
@ -80,6 +81,7 @@ export class EitListComponent implements OnInit {
ngOnInit() {
/////////////
this.addButton = this.selMenu.GetMenuEntriesList.ADD_BUTTON;
this.Sdate = new Date().toISOString();
this.getUserDetails();
////////////////up
@ -227,9 +229,6 @@ export class EitListComponent implements OnInit {
this.pAction = EIT_ACTION.UPDATE;
this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA);
this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION);
// this.fillEitTransactionTable(i);
// this.navCtrl.push("AddEitPage");
// this.openEit(i);
this.openEitNew(i);
}
deleteEIT(i) {

2
Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss
Unescape Escape View File

@ -91,7 +91,7 @@
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
// overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;

6
Mohem/src/app/my-team/home/home.component.html
Unescape Escape View File

@ -39,9 +39,9 @@
<ion-row>
<ion-col >
<div (ionChange)="searchEmployee($event)" class="search-label">
<ion-input *ngIf="showEmailInput" placeholder="Search by Email" [(ngModel)]="searchEmail" pattern="email" ></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" placeholder ="Search by Name" [(ngModel)]="searchNameOrUserName" ></ion-input>
<ion-input *ngIf="showUserNameInput" placeholder ="Search by Username" [(ngModel)]="searchUserName" ></ion-input>
<ion-input *ngIf="showEmailInput" [placeholder]="'myTeam, search-email' | translate" [(ngModel)]="searchEmail" pattern="email" ></ion-input>
<ion-input *ngIf="showUserNameOrNameInput" [placeholder]="'myTeam, search-name' | translate" [(ngModel)]="searchNameOrUserName" ></ion-input>
<ion-input *ngIf="showUserNameInput" [placeholder]="'myTeam, search-username' | translate" [(ngModel)]="searchUserName" ></ion-input>
</div>
<div *ngIf="isSearch" (click)="clearSearch()" [class]="direction =='en' ? 'search-container' : 'search-container-ar'">
<ion-col style="float: right;" >

2
Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss
Unescape Escape View File

@ -173,7 +173,7 @@
width: 100%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
// overflow: hidden;
display: block;
margin-left: -10px;
margin-top: -10px;

4
Mohem/src/app/profile/home/home.component.html
Unescape Escape View File

@ -59,8 +59,8 @@
</div>
</ion-col>
<!-- (click)="selectedSegment('family')" -->
<ion-col [size]="3">
<div class="action-button col-button disabledButton">
<ion-col [size]="3" (click)="selectedSegment('family')">
<div class="action-button col-button">
<img *ngIf="!familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family.svg">
<img *ngIf="familyMemberSegment" style="width: 40px;" src="../assets/imgs/profile-icons/family-g.svg">
<span class="btnTitle">{{ts.trPK('userProfile','family-members')}}</span>

0
Mohem/src/assets/icon/new-design/business-trip.png → Mohem/src/assets/icon/new-design/Business trip.png
Unescape Escape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 668 B

After

Width:  |  Height:  |  Size: 668 B

4
Mohem/src/assets/imgs/profile-icons/family-g.svg
Unescape Escape View File

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="39" height="39" viewBox="0 0 39 39">
<g id="Group_7680" data-name="Group 7680" transform="translate(-111 -245.557)">
<circle id="Ellipse_152" data-name="Ellipse 152" cx="19.5" cy="19.5" r="19.5" transform="translate(111 245.557)" fill="#259cb8"/>
<path id="family_3_" data-name="family (3)" d="M9.537,15.144v.993A3.01,3.01,0,0,1,6.53,19.144H2.647A.344.344,0,0,1,2.3,18.8V16.984A2.186,2.186,0,0,1,4.487,14.8H9.193A.344.344,0,0,1,9.537,15.144ZM6.53,19.831c-2.567,0-3.49.008-3.871,0a.343.343,0,0,0-.355.343v.637a2.977,2.977,0,1,0,5.953-.024v-.852a.343.343,0,0,0-.458-.324A3.674,3.674,0,0,1,6.53,19.831Zm4.753,11.8a3.875,3.875,0,0,1-1.948.006.172.172,0,0,0-.177.274,1.486,1.486,0,0,0,2.3-.007A.171.171,0,0,0,11.283,31.633Zm1.506-.259h-.071a.339.339,0,0,0-.321.237,2.184,2.184,0,0,1-3.968.451,2.276,2.276,0,0,1-.208-.449.344.344,0,0,0-.325-.238H7.806a2.062,2.062,0,0,0-2.062,2.062v.344a.344.344,0,0,0,.344.344h8.42a.344.344,0,0,0,.344-.344v-.344A2.062,2.062,0,0,0,12.789,31.374ZM2.307,30.112H.344A.344.344,0,0,0,0,30.455v3.324a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344V30.455A.344.344,0,0,0,2.307,30.112Zm5.736-5.361a.344.344,0,0,0-.181-.625l-.1,0a.284.284,0,0,0-.266.184,2.33,2.33,0,0,1-2.142,1.547,2.362,2.362,0,0,1-2.182-1.591.208.208,0,0,0-.2-.14A2.976,2.976,0,0,0,0,27.1v1.98a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344v-.144a.351.351,0,0,1,.321-.354.344.344,0,0,1,.366.343v4.854a.344.344,0,0,0,.344.344H4.713a.343.343,0,0,0,.344-.35c0-.089,0-.195,0-.338a2.754,2.754,0,0,1,2-2.644.344.344,0,0,0,.178-.543,3.873,3.873,0,0,1,.813-5.5Zm9.574-.626a.279.279,0,0,0-.265.193,2.209,2.209,0,0,1-2.046,1.526,2.305,2.305,0,0,1-2.07-1.545.277.277,0,0,0-.258-.174c-.077,0-.156,0-.239,0a.344.344,0,0,0-.186.625,3.873,3.873,0,0,1,.81,5.5.344.344,0,0,0,.177.543,2.754,2.754,0,0,1,2,2.645c0,.143,0,.249,0,.338a.343.343,0,0,0,.344.35h1.031a.344.344,0,0,0,.344-.344V28.925a.344.344,0,0,1,.366-.343.351.351,0,0,1,.321.354v.144a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V27.1A2.976,2.976,0,0,0,17.618,24.124Zm.326,6.331v3.324a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.344H18.287A.344.344,0,0,0,17.944,30.455ZM15.374,14.82A4.284,4.284,0,0,0,11.052,19.1V23.36a.344.344,0,0,0,.469.32,3.654,3.654,0,0,1,.567-.166.345.345,0,0,0,.207-.544,3.711,3.711,0,0,1-.722-2.2V19.442a1.031,1.031,0,0,1,1.043-1.031,12.582,12.582,0,0,0,4.157-.649,1.618,1.618,0,0,1,2.133,1.532v1.5a3.678,3.678,0,0,1-.721,2.183.343.343,0,0,0,.2.542,3.63,3.63,0,0,1,.737.242.344.344,0,0,0,.488-.312v-4.3a4.315,4.315,0,0,0-4.237-4.334Zm-5.076,9.9a3.179,3.179,0,1,0,3.179,3.179A3.183,3.183,0,0,0,10.3,24.715Zm4.123-.347a.172.172,0,0,0-.164.285,1.382,1.382,0,0,0,2.176-.062.172.172,0,0,0-.182-.274A3.688,3.688,0,0,1,14.421,24.368Zm2.572-5.954a13.252,13.252,0,0,1-4.385.684.343.343,0,0,0-.348.344v1.326a2.98,2.98,0,1,0,5.959.024v-1.5A.93.93,0,0,0,16.993,18.414ZM4.35,24.35a.172.172,0,0,0-.171.282,1.545,1.545,0,0,0,2.381-.053.172.172,0,0,0-.182-.275A3.669,3.669,0,0,1,4.35,24.35Z" transform="translate(120.203 239.361)" fill="#fff"/>
<circle id="Ellipse_152" data-name="Ellipse 152" cx="19.5" cy="19.5" r="19.5" transform="translate(111 245.557)" fill="#024d71"/>
<path id="family_3_" data-name="family (3)" d="M9.537,15.144v.993A3.01,3.01,0,0,1,6.53,19.144H2.647A.344.344,0,0,1,2.3,18.8V16.984A2.186,2.186,0,0,1,4.487,14.8H9.193a.344.344,0,0,1,.344.344ZM6.53,19.831c-2.567,0-3.49.008-3.871,0a.343.343,0,0,0-.355.343v.637a2.977,2.977,0,1,0,5.953-.024v-.852a.343.343,0,0,0-.458-.324,3.674,3.674,0,0,1-1.269.22Zm4.753,11.8a3.875,3.875,0,0,1-1.948.006.172.172,0,0,0-.177.274,1.486,1.486,0,0,0,2.3-.007.171.171,0,0,0-.175-.271Zm1.506-.259h-.071a.339.339,0,0,0-.321.237,2.184,2.184,0,0,1-3.968.451,2.276,2.276,0,0,1-.208-.449.344.344,0,0,0-.325-.238h-.09a2.062,2.062,0,0,0-2.062,2.062v.344a.344.344,0,0,0,.344.344h8.42a.344.344,0,0,0,.344-.344v-.344a2.062,2.062,0,0,0-2.063-2.061ZM2.307,30.112H.344A.344.344,0,0,0,0,30.455v3.324a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.343Zm5.736-5.361a.344.344,0,0,0-.181-.625h-.1a.284.284,0,0,0-.266.184,2.33,2.33,0,0,1-2.142,1.547,2.362,2.362,0,0,1-2.182-1.591.208.208,0,0,0-.2-.14A2.976,2.976,0,0,0,0,27.1v1.98a.344.344,0,0,0,.344.344H2.307a.344.344,0,0,0,.344-.344v-.144a.351.351,0,0,1,.321-.354.344.344,0,0,1,.366.343v4.854a.344.344,0,0,0,.344.344H4.713a.343.343,0,0,0,.344-.35v-.338a2.754,2.754,0,0,1,2-2.644.344.344,0,0,0,.178-.543,3.873,3.873,0,0,1,.813-5.5Zm9.574-.626a.279.279,0,0,0-.265.193,2.209,2.209,0,0,1-2.046,1.526,2.305,2.305,0,0,1-2.07-1.545.277.277,0,0,0-.258-.174h-.239a.344.344,0,0,0-.186.625,3.873,3.873,0,0,1,.81,5.5.344.344,0,0,0,.177.543,2.754,2.754,0,0,1,2,2.645c0,.143,0,.249,0,.338a.343.343,0,0,0,.344.35h1.031a.344.344,0,0,0,.344-.344V28.925a.344.344,0,0,1,.366-.343.351.351,0,0,1,.321.354v.144a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V27.1a2.976,2.976,0,0,0-2.98-2.976Zm.326,6.331V33.78a.344.344,0,0,0,.344.344h1.964a.344.344,0,0,0,.344-.344V30.455a.344.344,0,0,0-.344-.344H18.287a.344.344,0,0,0-.343.344ZM15.374,14.82a4.284,4.284,0,0,0-4.322,4.28v4.26a.344.344,0,0,0,.469.32,3.654,3.654,0,0,1,.567-.166.345.345,0,0,0,.207-.544,3.711,3.711,0,0,1-.722-2.2V19.442a1.031,1.031,0,0,1,1.043-1.031,12.582,12.582,0,0,0,4.157-.649,1.618,1.618,0,0,1,2.133,1.532v1.5a3.678,3.678,0,0,1-.721,2.183.343.343,0,0,0,.2.542,3.63,3.63,0,0,1,.737.242.344.344,0,0,0,.488-.312v-4.3a4.315,4.315,0,0,0-4.237-4.334ZM10.3,24.72A3.179,3.179,0,1,0,13.477,27.9,3.179,3.179,0,0,0,10.3,24.72Zm4.123-.347a.172.172,0,0,0-.164.285,1.382,1.382,0,0,0,2.176-.062.172.172,0,0,0-.182-.274,3.688,3.688,0,0,1-1.83.046Zm2.572-5.954a13.252,13.252,0,0,1-4.385.684.343.343,0,0,0-.348.344v1.326a2.98,2.98,0,1,0,5.959.024V19.3a.93.93,0,0,0-1.226-.883ZM4.35,24.35a.172.172,0,0,0-.171.282,1.545,1.545,0,0,0,2.381-.053.172.172,0,0,0-.182-.275,3.669,3.669,0,0,1-2.028.046Z" transform="translate(120.203 239.361)" fill="#fff"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

12
Mohem/src/assets/localization/i18n.json
Unescape Escape View File

@ -2011,6 +2011,18 @@
"en": "My Team",
"ar": "فريقي"
},
"search-email": {
"en": "Search By Email",
"ar": "البحث عن طريق البريد الإلكتروني"
},
"search-name": {
"en": "Search By Name",
"ar": "البحث عن طريق الإسم"
},
"search-username": {
"en": "Search By Username",
"ar": "البحث باسم المستخدم"
},
"total": {
"en": "TOTAL",
"ar": "عدد"

2
Mohem/src/theme/worklist.scss
Unescape Escape View File

@ -5,8 +5,8 @@
}
.footerSearchBtn {
padding: 50px !important;
background: #f0efef !important;
height: 15% !important;
}

Write Preview
Loading…
Cancel
Save