Merge branch 'MOHEMM-Q2-DEV' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April

Fatima-Q2-June
Sultan Khan 5 years ago
commit a03e879395

@ -147,7 +147,7 @@
<div class="my-ads" *ngIf="segment =='2'"> <div class="my-ads" *ngIf="segment =='2'">
<ion-row> <ion-row>
<ion-item button (click)="testClick()"> <ion-item button>
<ion-thumbnail slot="start"> <ion-thumbnail slot="start">
<img src="https://ii1.pepperfry.com/media/catalog/product/r/o/568x625/royal-wing-chair-in-blue-color-by-dreamzz-furniture-royal-wing-chair-in-blue-color-by-dreamzz-furnit-6hcjya.jpg" /> <img src="https://ii1.pepperfry.com/media/catalog/product/r/o/568x625/royal-wing-chair-in-blue-color-by-dreamzz-furniture-royal-wing-chair-in-blue-color-by-dreamzz-furnit-6hcjya.jpg" />
</ion-thumbnail> </ion-thumbnail>

@ -39,6 +39,7 @@ export class MyRequestComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.cs.startLoading();
this.getTicketsByEmployee(); this.getTicketsByEmployee();
} }

@ -31,10 +31,17 @@
<ion-input placeholder="Search by" class="search-label"[(ngModel)]="searchKeySelect" (ionChange)="showSelectedField($event)" ></ion-input> <ion-input placeholder="Search by" class="search-label"[(ngModel)]="searchKeySelect" (ionChange)="showSelectedField($event)" ></ion-input>
</ion-row> --> </ion-row> -->
<ion-row> <ion-row>
<ion-col class="search-label"> <ion-col class="search-label">
<ion-input *ngIf="showEmailInput" placeholder="Search by Email" [(ngModel)]="searchEmail" pattern="email"></ion-input> <div style="margin-right: 60px !important;" (click)="searchEmployee()">
<ion-input *ngIf="showUserNameOrNameInput" placeholder ="Search by Name or Username" [(ngModel)]="searchNameOrUserName"></ion-input> <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>
</div>
<div *ngIf="isSearch" (click)="clearSearch()" class="search-container">
<ion-col style="float: right;" >
<ion-icon name="close" ></ion-icon>
</ion-col>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
@ -104,14 +111,14 @@
</ion-row> </ion-row>
</div> --> </div> -->
<div *ngIf="isSearch"> <!-- <div *ngIf="isSearch">
<ion-row class="search-container"> <ion-row class="search-container">
<ion-col style="float: left;" size=[6] (click)="clearSearch()"> <ion-col style="float: left;" size=[6] (click)="clearSearch()">
<span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span> <span style="margin-left: 5px;">{{ts.trPK('work-list','clear-search')}}</span>
<ion-icon name="close" ></ion-icon> <ion-icon name="close" ></ion-icon>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div> -->
<ng-container *ngFor="let subordinate of empSubordinate;let i=index"> <ng-container *ngFor="let subordinate of empSubordinate;let i=index">
<app-employee-information <app-employee-information

@ -161,11 +161,13 @@ ion-content {
} }
.search-container{ .search-container{
margin-top: 15px; // margin-top: 15px;
margin-top: -35px;
margin-left: 262px;
ion-col{ ion-col{
background: white; // background: white;
border-radius: 12px; // border-radius: 12px;
padding-right: 10px; // padding-right: 10px;
flex: none; flex: none;
ion-icon{ ion-icon{
margin-right: 3px; margin-right: 3px;

@ -84,9 +84,11 @@ export class HomeComponent implements OnInit {
public previousActiveIndex = 0; public previousActiveIndex = 0;
public currentActiveIndex = 0; public currentActiveIndex = 0;
public searchNameOrUserName = ''; public searchNameOrUserName = '';
public searchUserName = '';
public searchEmail = ''; public searchEmail = '';
public showEmailInput = false; public showEmailInput = false;
public showUserNameOrNameInput = true; public showUserNameOrNameInput = true;
public showUserNameInput = false;
constructor( constructor(
public ts: TranslatorService, public ts: TranslatorService,
@ -140,7 +142,7 @@ export class HomeComponent implements OnInit {
getEmpSubordinate() { getEmpSubordinate() {
this.pageNum = 1; this.pageNum = 1;
this.isReachEnd = false; this.isReachEnd = false;
const searchEmpNum = (this.searchKeySelect === 'User Name') ? this.searchNameOrUserName : ''; const searchEmpNum = (this.searchKeySelect === 'User Name') ? this.searchUserName : '';
const searchEmpName = (this.searchKeySelect === 'Name') ? this.searchNameOrUserName : ''; const searchEmpName = (this.searchKeySelect === 'Name') ? this.searchNameOrUserName : '';
const searchEmpEmail = (this.searchKeySelect === 'Email') ? this.searchEmail : ''; const searchEmpEmail = (this.searchKeySelect === 'Email') ? this.searchEmail : '';
@ -220,6 +222,7 @@ export class HomeComponent implements OnInit {
this.empSubordinate = []; this.empSubordinate = [];
this.isReachEnd = false; this.isReachEnd = false;
this.searchNameOrUserName = ''; this.searchNameOrUserName = '';
this.searchUserName = '';
this.searchEmail = ''; this.searchEmail = '';
this.getEmpSubordinate(); this.getEmpSubordinate();
} }
@ -235,12 +238,18 @@ export class HomeComponent implements OnInit {
} }
showSelectedField(value: any) { showSelectedField(value: any) {
if (this.searchKeySelect === 'User Name' || this.searchKeySelect === 'User Name') { if (this.searchKeySelect === 'Name') {
this.showEmailInput = false; this.showEmailInput = false;
this.showUserNameInput = false;
this.showUserNameOrNameInput = true; this.showUserNameOrNameInput = true;
} else if (this.searchKeySelect === 'Email') { } else if (this.searchKeySelect === 'Email') {
this.showUserNameOrNameInput = false; this.showUserNameOrNameInput = false;
this.showUserNameInput = false;
this.showEmailInput = true; this.showEmailInput = true;
} else if (this.searchKeySelect === 'User Name') {
this.showUserNameOrNameInput = false;
this.showEmailInput = false;
this.showUserNameInput = true;
} }
} }

@ -147,7 +147,7 @@
</div> </div>
</div> </div>
<div *ngIf="messageSuccess" class="succssfullMSG"> <div class="succssfullMSG">
<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-->
@ -156,7 +156,7 @@
</div> </div>
</ion-content> </ion-content>
<ion-footer *ngIf="!messageSuccess"> <ion-footer>
<div class="noteInput" *ngIf="isAnswer== false && userSelected ==true"> <div class="noteInput" *ngIf="isAnswer== false && userSelected ==true">

@ -34,11 +34,14 @@ export class WorkListReplacementItgComponent implements OnInit {
isAnswer: boolean = false; isAnswer: boolean = false;
favoriteUserList: [] = []; favoriteUserList: [] = [];
userNote: any; userNote: any;
public direction = '';
constructor(public vacationRuleService: VacationRuleServiceService, constructor(public vacationRuleService: VacationRuleServiceService,
public ts: TranslatorService, public ts: TranslatorService,
public cs: CommonService, public cs: CommonService,
public worklistService: WorklistService, public worklistService: WorklistService,
public modalController: ModalController) { } public modalController: ModalController) {
this.direction = TranslatorService.getCurrentDirection();
}
ngOnInit() { ngOnInit() {
this.getFavruite(); this.getFavruite();

@ -78,7 +78,7 @@ export class AddAddressComponent implements OnInit {
constructor( constructor(
public modalController: ModalController, public modalController: ModalController,
public cs: CommonService, public cs: CommonService,
private ts: TranslatorService, public ts: TranslatorService,
private eitService: EitService, private eitService: EitService,
public datePicker: DatePicker, public datePicker: DatePicker,
public profileService: ProfileService public profileService: ProfileService

@ -36,7 +36,7 @@
<ion-footer> <ion-footer>
<div class="centerDiv"> <div class="centerDiv">
<ion-button class="addEitOkButton" color="customnavy" ion-button (click)="validateEITTransaction()"> <ion-button class="addEitOkButton" color="customnavy" ion-button>
{{'vacation-rule, next-label' | translate}}</ion-button> {{'vacation-rule, next-label' | translate}}</ion-button>
</div> </div>
</ion-footer> </ion-footer>

@ -193,8 +193,8 @@
<h1 class="header-label-text-form">{{ts.trPK('general','main-address')}}</h1> <h1 class="header-label-text-form">{{ts.trPK('general','main-address')}}</h1>
</ion-label> </ion-label>
</ion-col> </ion-col>
<!-- *ngIf="addressSubMenu && addressSubMenu.UPDATE_BUTTON === 'Y'" -->
<ion-col size="2" (click)="allowEdit('address')"> <ion-col size="2" *ngIf="addressSubMenu && addressSubMenu.UPDATE_BUTTON === 'Y'" (click)="allowEdit('address')">
<img style="width: 70%;" src="../assets/imgs/profile-icons/editing@2x.png" <img style="width: 70%;" src="../assets/imgs/profile-icons/editing@2x.png"
(click)="allowEdit('address')"> (click)="allowEdit('address')">
</ion-col> </ion-col>

@ -100,23 +100,36 @@ export class HomeComponent implements OnInit {
public setMenuEntries() { public setMenuEntries() {
let personalInformationChildren: any; let personalInformationChildren: any;
let personalInfoNestedChildren: any; let personalInfoNestedChildren: any;
for( let i = 0; i < this.menuEntries.length; i++ ) {
if (this.menuEntries[i].MENU_NAME === 'MBL_E_PROFESSIONALS_01') { if (this.targetValue === 'sideMenu') {
personalInformationChildren = this.menuEntries[i].children; for( let i = 0; i < this.menuEntries.length; i++ ) {
for( let j = 0; j < personalInformationChildren.length; j++ ) { if (this.menuEntries[i].MENU_NAME === 'MBL_E_PROFESSIONALS_01') {
if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 15) { personalInformationChildren = this.menuEntries[i].children;
personalInfoNestedChildren = personalInformationChildren[j].children; for( let j = 0; j < personalInformationChildren.length; j++ ) {
for( let k = 0; k < personalInfoNestedChildren.length; k++ ) { if (personalInformationChildren[j].MENU_NAME = 'MBL_PERINFO_SS' && personalInformationChildren[j].ENTRY_SEQUENCE === 15) {
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') { personalInfoNestedChildren = personalInformationChildren[j].children;
this.basicDetailsSubMenu = personalInfoNestedChildren[k]; for( let k = 0; k < personalInfoNestedChildren.length; k++ ) {
} if (personalInfoNestedChildren[k].REQUEST_TYPE === 'BASIC_DETAILS') {
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'ADDRESS') { this.basicDetailsSubMenu = personalInfoNestedChildren[k];
this.addressSubMenu = personalInfoNestedChildren[k]; }
if (personalInfoNestedChildren[k].REQUEST_TYPE === 'ADDRESS') {
this.addressSubMenu = personalInfoNestedChildren[k];
}
} }
} }
} }
} }
} }
} else {
const menuEntriesLocalArray: any = this.menuEntries.children;
for( let i = 0; i < menuEntriesLocalArray.length; i++ ) {
if (menuEntriesLocalArray[i].REQUEST_TYPE === 'BASIC_DETAILS') {
this.basicDetailsSubMenu = menuEntriesLocalArray[i];
}
if (menuEntriesLocalArray[i].REQUEST_TYPE === 'ADDRESS') {
this.addressSubMenu = menuEntriesLocalArray[i];
}
}
} }
console.log(this.basicDetailsSubMenu); console.log(this.basicDetailsSubMenu);
console.log(this.addressSubMenu); console.log(this.addressSubMenu);

@ -22,6 +22,7 @@ import { AddAddressComponent } from './add-address/add-address.component';
import { ConfirmAddressComponent } from './confirm-address/confirm-address.component'; import { ConfirmAddressComponent } from './confirm-address/confirm-address.component';
import { SubmitAddressModalComponent } from './submit-eit-modal/submit-address-modal.component'; import { SubmitAddressModalComponent } from './submit-eit-modal/submit-address-modal.component';
import { ConfirmBasicDetailsComponent } from './confirm-basic-details/confirm-basic-details.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
@ -38,6 +39,11 @@ const routes: Routes = [
{ {
path: 'confirm-add-address', path: 'confirm-add-address',
component: ConfirmAddressComponent component: ConfirmAddressComponent
},
{
path: 'confirm-basic',
component: ConfirmBasicDetailsComponent
} }
], ],
}, },
@ -107,8 +113,12 @@ const routes: Routes = [
PerformanceEvaluationComponent, PerformanceEvaluationComponent,
ConfirmAddressComponent, ConfirmAddressComponent,
SubmitAddressModalComponent, SubmitAddressModalComponent,
AddBasicDetailsComponent,
ConfirmAddressComponent,
ConfirmBasicDetailsComponent,
AddBasicDetailsComponent], AddBasicDetailsComponent],
entryComponents: [EditDetailProfileComponent, SubmitAddressModalComponent], entryComponents: [EditDetailProfileComponent, SubmitAddressModalComponent],
providers: [DatePicker] providers: [DatePicker]
}) })
export class ProfilePageModule { } export class ProfilePageModule { }

Loading…
Cancel
Save