bug fixes

sultan26April
Sultan Khan 5 years ago
parent 79a8fd1743
commit af34fda486

@ -37,7 +37,7 @@
<ion-label class="boldTxtNav">{{'replacementRoll, searchBy' | translate}}</ion-label> <ion-label class="boldTxtNav">{{'replacementRoll, searchBy' | translate}}</ion-label>
</ion-list-header> </ion-list-header>
<ion-radio-group [(ngModel)]="searchKeySelect"> <ion-radio-group [(ngModel)]="searchKeySelect">
<ion-row> <ion-row class="top-radio-row">
<ion-col class="center"> <ion-col class="center">
<ion-radio value="1" checked></ion-radio> <ion-radio value="1" checked></ion-radio>
<ion-label class="radio-label">{{'addAttach, name' | translate}}</ion-label> <ion-label class="radio-label">{{'addAttach, name' | translate}}</ion-label>
@ -50,6 +50,10 @@
<ion-radio value="3" ></ion-radio> <ion-radio value="3" ></ion-radio>
<ion-label class="radio-label">{{'general, email' | translate}}</ion-label> <ion-label class="radio-label">{{'general, email' | translate}}</ion-label>
</ion-col> </ion-col>
<ion-col>
<ion-radio value="4" ></ion-radio>
<ion-label class="radio-label">{{'replacementRoll, favorite' | translate}}</ion-label>
</ion-col>
</ion-row> </ion-row>
@ -92,7 +96,7 @@
</div> </div>
<br/> <br/>
<ion-item lines="none"> <!-- <ion-item lines="none"> -->
<div class="square-container" > <div class="square-container" >
@ -101,7 +105,7 @@
<!-- <img class="profileImage" src="../assets/imgs/profile.png"> --> <!-- <img class="profileImage" src="../assets/imgs/profile.png"> -->
<img *ngIf="employee.EMPLOYEE_IMAGE" class="empImgeRep" [src]="'data:image/png;base64,'+employee.EMPLOYEE_IMAGE"> <img *ngIf="employee.EMPLOYEE_IMAGE" class="empImgeRep" [src]="'data:image/png;base64,'+employee.EMPLOYEE_IMAGE">
<img *ngIf="employee.EMPLOYEE_IMAGE == null" class="empImgeRep" src="../assets/imgs/profile.png"> <img *ngIf="employee.EMPLOYEE_IMAGE == null || employee.EMPLOYEE_IMAGE == ''" class="empImgeRep" src="../assets/imgs/profile.png">
<ion-label class="employee-details"> <ion-label class="employee-details">
<span (click)="select(employee,i)">{{employee.EMPLOYEE_DISPLAY_NAME}}</span> <span (click)="select(employee,i)">{{employee.EMPLOYEE_DISPLAY_NAME}}</span>
@ -119,11 +123,11 @@
</div> </div>
</div> </div>
<!--
</ion-item> -->
</ion-item>
</div> </div>
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0"> <div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchKeySelect ==4">
<div class="uk-margin"> <div class="uk-margin">
{{'replacementRoll, favorite' | translate}} {{'replacementRoll, favorite' | translate}}
</div> </div>
@ -147,13 +151,13 @@
</div> </div>
</div> </div>
<div class="succssfullMSG"> <!-- <div class="succssfullMSG" *ngIf="messageSuccess">
<ion-col size="12"> <ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon> <ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled--> filled-->
</ion-col> <!-- </ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col> <ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div> </div> -->
</ion-content> </ion-content>
<ion-footer> <ion-footer>

@ -62,4 +62,6 @@
.square{ .square{
clear: both; clear: both;
} }
.top-radio-row{
font-size: 12px;
}

@ -19,7 +19,7 @@
<ion-label class="boldTxtNav">{{'replacementRoll, searchBy' | translate}}</ion-label> <ion-label class="boldTxtNav">{{'replacementRoll, searchBy' | translate}}</ion-label>
</ion-list-header> </ion-list-header>
<ion-radio-group [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)"> <ion-radio-group [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)">
<ion-row> <ion-row class="top-radio-row">
<ion-col class="center"> <ion-col class="center">
<ion-radio value="1" checked></ion-radio> <ion-radio value="1" checked></ion-radio>
<ion-label class="radio-label">{{'addAttach, name' | translate}}</ion-label> <ion-label class="radio-label">{{'addAttach, name' | translate}}</ion-label>
@ -32,6 +32,11 @@
<ion-radio value="3" ></ion-radio> <ion-radio value="3" ></ion-radio>
<ion-label class="radio-label">{{'general, email' | translate}}</ion-label> <ion-label class="radio-label">{{'general, email' | translate}}</ion-label>
</ion-col> </ion-col>
<ion-col>
<ion-radio value="4" ></ion-radio>
<ion-label class="radio-label">{{'replacementRoll, favorite' | translate}}</ion-label>
</ion-col>
</ion-row> </ion-row>
@ -59,7 +64,7 @@
<ion-textarea [(ngModel)]="userNote"></ion-textarea> <ion-textarea [(ngModel)]="userNote"></ion-textarea>
</ion-item> </ion-item>
</div> </div>
<div [hidden]="isAnswer==true" *ngIf="actionHistory.length >0 && !userSelected && ReplacementList.length==0"> <div [hidden]="isAnswer==true" *ngIf="actionHistory.length >0 && !userSelected && ReplacementList.length==0 && searchBy != 4">
<div class="uk-margin"> <div class="uk-margin">
{{'replacementRoll, related' | translate}} {{'replacementRoll, related' | translate}}
</div> </div>
@ -84,7 +89,7 @@
</div> </div>
<br/> <br/>
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0"> <div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchBy ==4">
<div class="uk-margin"> <div class="uk-margin">
{{'replacementRoll, favorite' | translate}} {{'replacementRoll, favorite' | translate}}
</div> </div>
@ -94,7 +99,7 @@
<div class="profileImageDiv"> <div class="profileImageDiv">
<img *ngIf="employee.EMPLOYEE_IMAGE" class="empImgeRep" [src]="'data:image/png;base64,'+employee.EMPLOYEE_IMAGE"> <img *ngIf="employee.EMPLOYEE_IMAGE" class="empImgeRep" [src]="'data:image/png;base64,'+employee.EMPLOYEE_IMAGE">
<img *ngIf="employee.EMPLOYEE_IMAGE == null" class="empImgeRep" src="../assets/imgs/profile.png"> <img *ngIf="employee.EMPLOYEE_IMAGE == null || employee.EMPLOYEE_IMAGE==''" class="empImgeRep" src="../assets/imgs/profile.png">
<ion-label class="employee-details"> <ion-label class="employee-details">
<span (click)="select(employee,i)">{{employee.EMPLOYEE_DISPLAY_NAME}}</span> <span (click)="select(employee,i)">{{employee.EMPLOYEE_DISPLAY_NAME}}</span>
@ -135,9 +140,9 @@
</div> </div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)"> <!-- <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content> <ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll> </ion-infinite-scroll> -->
</div> </div>

@ -197,4 +197,6 @@ ion-radio{
float: left; float: left;
margin: 10px 5px; margin: 10px 5px;
} }
.top-radio-row{
font-size: 12px;
}

@ -38,15 +38,16 @@ export class HomeComponent implements AfterViewInit {
ionEnter() { ionEnter() {
this.direction = TranslatorService.getCurrentDirection(); this.direction = TranslatorService.getCurrentDirection();
let activeClass = this.cs.sharedService.getSharedData(OfferDiscountService.selected_filters); let activeClass = this.cs.sharedService.getSharedData(OfferDiscountService.selected_filters);
if (activeClass) {
this.filterOffers(activeClass);
}
this.getCategories();
// if (activeClass) {
// this.filterOffers(activeClass);
// }
this.getCategories();
this.tempSearch = JSON.parse(JSON.stringify(this.offersData));
} }
getCategories() { getCategories() {
this.offersService.getCategories().subscribe((result) => { this.offersService.getCategories(() => { }, this.ts.trPK('general', 'retry')).subscribe((result) => {
this.categories = result.result.data; this.categories = JSON.parse(result.Mohemm_ITG_ResponseItem).result.data;
this.cs.sharedService.setSharedData(this.categories, OfferDiscountService.categories); this.cs.sharedService.setSharedData(this.categories, OfferDiscountService.categories);
}); });
} }
@ -102,8 +103,8 @@ export class HomeComponent implements AfterViewInit {
// }; // };
filterOffers(key) { filterOffers(key) {
this.activeClass = key.categoryName_en; this.activeClass = key.categoryName_en;
this.offersData = this.categoriesObj[key.name]; //this.offersData = this.categoriesObj[key.name];
// this.tempSearch = JSON.parse(JSON.stringify(this.offersData)); this.tempSearch = JSON.parse(JSON.stringify(this.offersData));
} }
checkDate(date) { checkDate(date) {
return new Date(date) >= new Date() return new Date(date) >= new Date()

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save