Fixed MOE sprint 1 feedback and issues

MOE-PHASE-2-SPRINT-1
umasoodch 3 years ago
parent 0e27da67c7
commit b15ea892bf

@ -61,15 +61,6 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item lines="none" (click)="openContactUs()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 19px !important;" src="../assets/imgs/help.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('myTeam','help')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="openMyRequestPage()"> <!-- <ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 20px !important;" src="../assets/imgs/hr-request.png" item-left> <img style= "height: 20px !important;" src="../assets/imgs/hr-request.png" item-left>
@ -98,6 +89,15 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item lines="none" (click)="openContactUs()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 19px !important;" src="../assets/imgs/help.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('myTeam','help')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="openChangePassword()"> --> <!-- <ion-item (click)="openChangePassword()"> -->
<!-- <ion-item (click)="openChangePassword()"> <!-- <ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
@ -216,15 +216,6 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item lines="none" (click)="openContactUs()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 19px !important;" src="../assets/imgs/help.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('myTeam','help')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="openMyRequestPage()"> <!-- <ion-item (click)="openMyRequestPage()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left> <img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
@ -252,6 +243,15 @@
{{ts.trPK('general','pending-transaction')}} {{ts.trPK('general','pending-transaction')}}
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item lines="none" (click)="openContactUs()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 19px !important;" src="../assets/imgs/help.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('myTeam','help')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="openChangePassword()"> <!-- <ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb"> <ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left> <img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>

@ -265,6 +265,7 @@ export class AppComponent implements OnInit {
public openEmployeeHierarchy() { public openEmployeeHierarchy() {
this.menu.toggle(); this.menu.toggle();
this.cs.sharedService.getSharedData('employee-hierarchy', true);
this.cs.openEmployeeHierarchy(); this.cs.openEmployeeHierarchy();
} }

@ -7,7 +7,7 @@
[dateFormatter]="calendar.dateFormatter" [dateFormatter]="calendar.dateFormatter"
(onTimeSelected)="onDayClicked($event)"> (onTimeSelected)="onDayClicked($event)">
</calendar> </calendar>
<div class="description-box"> <div class="description-box" [ngStyle]="direction === 'ltr' ? {'left': '-15px'} : {'right': '15px'}">
<ion-row> <ion-row>
<ion-col size="4"> <ion-col size="4">
<div class="icon absence"></div><ion-label class="label-text">{{ts.trPK('home','absence-name')}}</ion-label> <div class="icon absence"></div><ion-label class="label-text">{{ts.trPK('home','absence-name')}}</ion-label>

@ -126,7 +126,7 @@
} }
.description-box{ .description-box{
position: relative; position: relative;
bottom: 15px; bottom: 0;
} }
.label-text{ .label-text{
font-size: 12px; font-size: 12px;

@ -795,7 +795,7 @@ $actionBtnSize : 36px;
.calendar-container { .calendar-container {
background: white; background: white;
margin-bottom: 100px; // margin-bottom: 100px;
margin-top: 10px; margin-top: 10px;
border-radius: 20px; border-radius: 20px;
border: 1px solid #ccc; border: 1px solid #ccc;
@ -812,9 +812,10 @@ $actionBtnSize : 36px;
.calendar-container-ar { .calendar-container-ar {
background: white; background: white;
margin-bottom: 100px; // margin-bottom: 100px;
margin-top: 20px; margin-top: 20px;
border-radius: 20px; border-radius: 20px;
padding-bottom: 15px;
span { span {
text-align: right; text-align: right;

@ -973,7 +973,7 @@ $actionBtnSize: 36px;
.calendar-container { .calendar-container {
background: white; background: white;
margin-bottom: 100px; // margin-bottom: 100px;
margin-top: 10px; margin-top: 10px;
border-radius: 20px; border-radius: 20px;
border: 1px solid #ccc; border: 1px solid #ccc;
@ -990,9 +990,10 @@ $actionBtnSize: 36px;
.calendar-container-ar { .calendar-container-ar {
background: white; background: white;
margin-bottom: 100px; // margin-bottom: 100px;
margin-top: 20px; margin-top: 20px;
border-radius: 20px; border-radius: 20px;
padding-bottom: 15px;
span { span {
text-align: right; text-align: right;

@ -9,25 +9,25 @@
<div class="header"> <div class="header">
<div> <div>
<ion-row *ngIf="direction == 'ltr'"> <ion-row *ngIf="direction == 'ltr'">
<ion-col [size]="2" style="text-align: left;"> <ion-col [size]="2" style="text-align: left;" [ngClass]=" disableNextPreviousSlides == true ? 'disableIcon' : 'enableIcon'">
<ion-icon class="activeArrow" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="previousSlide()"></ion-icon> <ion-icon class="activeArrow" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="previousSlide()"></ion-icon>
</ion-col> </ion-col>
<ion-col [size]="8" style="text-align: center;"> <ion-col [size]="8" style="text-align: center;">
<span class="month-year-span">{{month}} {{year}}</span> <span class="month-year-span">{{month}} {{year}}</span>
</ion-col> </ion-col>
<ion-col [size]="2" style="text-align: right;"> <ion-col [size]="2" style="text-align: right;" [ngClass]=" disableNextPreviousSlides == true ? 'disableIcon' : 'enableIcon'">
<ion-icon class="activeArrow" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon> <ion-icon class="activeArrow" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="nextSlide()"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row *ngIf="direction == 'rtl'"> <ion-row *ngIf="direction == 'rtl'">
<ion-col [size]="2" style="text-align: right;"> <ion-col [size]="2" style="text-align: right;" [ngClass]=" disableNextPreviousSlides == true ? 'disableIcon' : 'enableIcon'">
<ion-icon class="activeArrow" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="previousSlide()"></ion-icon> <ion-icon class="activeArrow" ios="ios-arrow-dropright-circle" md="md-arrow-dropright-circle" (click)="previousSlide()"></ion-icon>
</ion-col> </ion-col>
<ion-col [size]="8" style="text-align: center;"> <ion-col [size]="8" style="text-align: center;">
<span class="month-year-span">{{year}} {{month}}</span> <span class="month-year-span">{{year}} {{month}}</span>
</ion-col> </ion-col>
<ion-col [size]="2" style="text-align: left;"> <ion-col [size]="2" style="text-align: left;" [ngClass]=" disableNextPreviousSlides == true ? 'disableIcon' : 'enableIcon'">
<ion-icon class="activeArrow" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="nextSlide()"></ion-icon> <ion-icon class="activeArrow" ios="ios-arrow-dropleft-circle" md="md-arrow-dropleft-circle" (click)="nextSlide()"></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>

@ -910,9 +910,10 @@ $actionBtnSize : 36px;
} }
.calendar-container{ .calendar-container{
background: white; background: white;
margin-bottom: 100px; // margin-bottom: 100px;
margin-top: 20px; margin-top: 20px;
border-radius: 20px; border-radius: 20px;
padding-bottom: 25px;
span{ span{
text-align: left; text-align: left;
display: block; display: block;
@ -923,9 +924,10 @@ $actionBtnSize : 36px;
} }
.calendar-container-ar{ .calendar-container-ar{
background: white; background: white;
margin-bottom: 100px; // margin-bottom: 100px;
margin-top: 20px; margin-top: 20px;
border-radius: 20px; border-radius: 20px;
padding-bottom: 15px;
span{ span{
text-align: right; text-align: right;
display: block; display: block;
@ -935,6 +937,15 @@ $actionBtnSize : 36px;
} }
} }
.disableIcon {
pointer-events: none;
opacity: .4;
}
.enableIcon {
pointer-events: unset;
}

@ -23,6 +23,7 @@ export class TimeCardDetailsComponent implements OnInit {
preMonth: number; preMonth: number;
nextMonth: any; nextMonth: any;
public direction: string; public direction: string;
public disableNextPreviousSlides = true;
constructor( constructor(
public timeCardService: TimeCardService, public timeCardService: TimeCardService,
public common: CommonService, public common: CommonService,
@ -176,6 +177,9 @@ export class TimeCardDetailsComponent implements OnInit {
} }
this.showData = true; this.showData = true;
this.dayHoursTypeDetailsList = allDays; this.dayHoursTypeDetailsList = allDays;
setTimeout(() => {
this.disableNextPreviousSlides = false;
}, 2000);
} }
public getTimeCardSummaryDetails(month?, year?) { public getTimeCardSummaryDetails(month?, year?) {
@ -218,6 +222,8 @@ export class TimeCardDetailsComponent implements OnInit {
} }
nextSlide() { nextSlide() {
this.disableNextPreviousSlides = true;
// if (this.currentMonthName !== this.month) { // if (this.currentMonthName !== this.month) {
this.common.startLoading(); this.common.startLoading();
this.showData = false; this.showData = false;
@ -233,6 +239,7 @@ export class TimeCardDetailsComponent implements OnInit {
} }
previousSlide() { previousSlide() {
this.disableNextPreviousSlides = true;
this.common.startLoading(); this.common.startLoading();
this.showData = false; this.showData = false;
if (this.preMonth === 0) { if (this.preMonth === 0) {

@ -302,7 +302,8 @@ export class CreateVacationRuleComponent implements OnInit {
handlecreateVacationResult(result) { handlecreateVacationResult(result) {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
//this.navCtrl.pop(); //this.navCtrl.pop();
this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success')) // this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success'))
this.cs.greenToastPK("vacation-rule", "rule-success");
this.goToStart(); this.goToStart();
// this.navCtrl.push("VacationRulePage"); // this.navCtrl.push("VacationRulePage");
// let index= this.navCtrl.indexOf('VacationRulePage'); // let index= this.navCtrl.indexOf('VacationRulePage');

@ -34,7 +34,7 @@ ion-card-header {
.footer-button { .footer-button {
border-radius: 2px; border-radius: 2px;
padding: 0 1.1em; // padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }

@ -14,7 +14,7 @@ ion-item {
.footer-button { .footer-button {
border-radius: 3px; border-radius: 3px;
padding: 0 1.1em; // padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }

@ -16,7 +16,7 @@ ion-item {
} }
.footer-button { .footer-button {
border-radius: 3px; border-radius: 3px;
padding: 0 1.1em; // padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }
@ -31,7 +31,7 @@ button.item-button.button.button-md.button-clear.button-clear-md {
.footer-button { .footer-button {
border-radius: 3px; border-radius: 3px;
padding: 0 1.1em; // padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }

@ -25,7 +25,7 @@ p.smallTip {
.footer-button { .footer-button {
border-radius: 3px; border-radius: 3px;
padding: 0 1.1em; // padding: 0 1.1em;
min-height: 45px; min-height: 45px;
min-width: 200px; min-width: 200px;
} }

@ -708,7 +708,8 @@ ApplyFunc() {
} }
handlecreateVacationResult(result) { handlecreateVacationResult(result) {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success')) // this.cs.JustAlertDialog(this.ts.trPK('general', 'ok'), this.ts.trPK('vacation-rule', 'rule-success'))
this.cs.greenToastPK("vacation-rule", "rule-success");
this.goToStart(); this.goToStart();
} }

@ -2061,7 +2061,7 @@
}, },
"contact-text": { "contact-text": {
"en": "For assistance, you can submit the request on the Saeed system or call the unified call center on 8310200", "en": "For assistance, you can submit the request on the Saeed system or call the unified call center on 8310200",
"ar": "للحصول على المساعدة ، يمكنك تقديم الطلب على نظام سعيد أو الاتصال بمركز الاتصال الموحد على 8310200" "ar": "للمساعدة يمكنك تقديم طلب على نظام ساعد أو الاتصال على مركز الاتصال الموحد 8310200"
}, },
"search-email": { "search-email": {
"en": "Search By Email", "en": "Search By Email",

Loading…
Cancel
Save