fixed forgot password

fixed performance evaluation design
fixed business card design in one line
fixed my profile design
fixed my favourites in a way that nothing should be selected by default​
fixed worklist HR after delegate issue
sultan-q3
enadhilal 4 years ago
parent 090f78df52
commit 06346f6b09

@ -54,7 +54,7 @@
<h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1> <h1 class='font-text-style' style="font-size: 25px !important; margin-left: 20px; margin-top: 5px; margin-bottom: 0px;">{{userInfo.name_en}}</h1>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px; ">{{jobName}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px; ">{{jobName}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; font-size: 18px; margin-bottom: 0px;">{{userInfo.mobile}}</h5> <h5 class='font-text-style' style="margin-left: 20px; font-size: 18px; margin-bottom: 0px;">{{userInfo.mobile}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 5px; font-size: 12px; margin-bottom: 5px;">{{userInfo.email}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 5px; font-size: 12px; margin-bottom: 5px; white-space: nowrap;">{{userInfo.email}}</h5>
<h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px;">{{userInfo.company_url}}</h5> <h5 class='font-text-style' style="margin-left: 20px; margin-top: 0px;">{{userInfo.company_url}}</h5>
</div> </div>

@ -529,7 +529,7 @@ export class HomeComponent implements OnInit {
} }
openNotificationDetail(obj) { openNotificationDetail(obj) {
this.common.sharedService.setSharedData(this.selectedFilter, 'selectedFilter'); this.common.sharedService.setSharedData(this.itemType, 'selectedFilter');
this.common.sharedService.setSharedData(false, 'loadWorkList'); this.common.sharedService.setSharedData(false, 'loadWorkList');
this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA); this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA);
if (obj.REQUEST_TYPE === 'PR') { if (obj.REQUEST_TYPE === 'PR') {

@ -85,7 +85,17 @@
</ion-list> </ion-list>
<div style="font-weight: bold;" *ngIf="searchBy === '4'"> <div style="font-weight: bold;" *ngIf="searchBy === '4' && !isFavoriteLetterActive">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index">
<div>
<p (click)='selectedLetter(favLetter[i])'>{{filter}}</p>
</div>
</ion-slide>
</ion-slides>
</div>
<div style="font-weight: bold;" *ngIf="searchBy === '4' && isFavoriteLetterActive">
<ion-slides [options]="slideOptsOne"> <ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index"> <ion-slide *ngFor="let filter of favLetter; let i=index">
<div [ngClass]="returnIsActiveFunction(i)? 'isFavLetterActive':''"> <div [ngClass]="returnIsActiveFunction(i)? 'isFavLetterActive':''">
@ -170,6 +180,7 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="favoriteUserList.length === 0 && searchBy == '4'"> <div *ngIf="favoriteUserList.length === 0 && searchBy == '4'">
<ion-label> <ion-label>
<p style="text-align: center;"> <p style="text-align: center;">

@ -49,6 +49,7 @@ export class WorkListReplacementRollComponent implements OnInit {
arr = []; arr = [];
favoriteUserList: any = []; favoriteUserList: any = [];
isFilter = true; isFilter = true;
isFavoriteLetterActive = false;
public slideOptsOne = { public slideOptsOne = {
slidesPerView: 6, slidesPerView: 6,
@ -526,7 +527,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.favLetter.forEach((obj, index) => { this.favLetter.forEach((obj, index) => {
if(this.activeSelectedLetter) {} if(this.activeSelectedLetter) {}
if (index === 0) { if (index === 0) {
this.selectedLetter(obj); // this.selectedLetter(obj);
this.favIsActive.push(true); this.favIsActive.push(true);
} else { } else {
this.favIsActive.push(false); this.favIsActive.push(false);
@ -650,6 +651,7 @@ export class WorkListReplacementRollComponent implements OnInit {
} }
selectedLetter(el) { selectedLetter(el) {
this.isFavoriteLetterActive = true;
this.favLetter.forEach((letter, index) => { this.favLetter.forEach((letter, index) => {
if (letter === el) { if (letter === el) {
this.favIsActive[index] = true; this.favIsActive[index] = true;

@ -148,6 +148,7 @@ export class WorklistMainComponent implements OnInit {
false false
); );
this.selectedFilter = this.common.sharedService.getSharedData('selectedFilter', false); this.selectedFilter = this.common.sharedService.getSharedData('selectedFilter', false);
console.log(this.selectedFilter);
if (this.selEmp) { } else { if (this.selEmp) { } else {
this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => {
if (user) { if (user) {

@ -1171,12 +1171,16 @@ $actionBtnSize: 36px;
// width: 89%; // width: 89%;
// left: 10px; // left: 10px;
width: 90%; width: 90%;
left: 0px; left: 5%;
padding-left: 0px;
margin-left: 0px;
} }
.card-size-info-ar{ .card-size-info-ar{
width: 90%; width: 90%;
right: 2%; right: 5%;
padding-right: 0px;
margin-left: 0px;
} }
// .header-label-text-form{ // .header-label-text-form{

@ -37,21 +37,6 @@
</ion-row> </ion-row>
</div> </div>
<!-- <div>
<div *ngFor="let data of performanceData">
<ion-row class="gridvalue">
<ion-col >
<div class="performancecolor" [style.background]="data.color"></div>
<br>
<label class="label"> Your Performance In </label>
<label class="labelvalue"> {{data.value}} </label>
<label class="label"> {{data.name}} </label>
</ion-col>
</ion-row>
</div>
</div> -->
<!-- class="gridvalue" -->
<!-- ///// -->
<div> <div>
<div *ngIf="performanceData"> <div *ngIf="performanceData">

@ -74,7 +74,8 @@
margin-top: 5px; margin-top: 5px;
margin-bottom: 10px; margin-bottom: 10px;
text-align: center; text-align: center;
margin-left: 74px; // margin-left: 74px;
width: 100%;
} }
.Text-ar{ .Text-ar{
margin: 0; margin: 0;
@ -167,9 +168,9 @@
} }
.gauge{ .gauge{
transform: translate(-24px, -65px); // transform: translate(-24px, -65px);
margin-bottom: -187px; margin-bottom: -140px;
margin-top: -20px; margin-top: -70px;
} }
.gauge-ar{ .gauge-ar{

Loading…
Cancel
Save