diff --git a/Mohem/src/app/authentication/change-password/change-password.component.ts b/Mohem/src/app/authentication/change-password/change-password.component.ts index c7449268..6ad7b9be 100644 --- a/Mohem/src/app/authentication/change-password/change-password.component.ts +++ b/Mohem/src/app/authentication/change-password/change-password.component.ts @@ -21,9 +21,9 @@ import { AuthenticatedUser } from "src/app/hmg-common/services/authentication/mo }) export class ChangePasswordComponent implements OnInit { private loginData = new LoginModel(); - public P_NEW_PASSWORD: string; - public P_Confirm_NEW_PASSWORD : string; - public P_OLD_PASSWORD : string; + public P_NEW_PASSWORD: string = ""; + public P_Confirm_NEW_PASSWORD : string = ""; + public P_OLD_PASSWORD : string = ""; public P_USER_NAME : string; public logo = "assets/icon/login/lock.png"; diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index b4edfb82..0016e66f 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -11,7 +11,7 @@ {{'replacementRoll, searchBy' | translate}} + [(ngModel)]="searchBy" (ionChange)="onChangeSelect($event)"> {{'addAttach, name' | translate}} {{'login, username' | translate}} {{'general, email' | translate}} @@ -19,11 +19,11 @@ - + - + - +
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index 31ba8d46..8212dc68 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -164,4 +164,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: #dedede solid 1px; } +.disabledButton{ + opacity:.5; +} diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts index d136c2a1..731fe21d 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.ts @@ -29,12 +29,18 @@ export class ReplacementListComponent implements OnInit { isAbs: boolean = false; isSave: boolean = false; active: any; + isSelect: boolean =false; + searchKeyEnter: boolean = false; constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, public modalController: ModalController) { } - ngOnInit() { } + ngOnInit() { + + } SearchReplacementList() { + console.log("this.searchKeySelect" + this.searchKeySelect); + this.ReplacementList = []; this.IsReachEnd = false; this.P_PAGE_NUM = 1; @@ -198,4 +204,27 @@ export class ReplacementListComponent implements OnInit { infiniteScroll.target.complete(); } } + + onChangeSelect(select){ + console.log(select.detail.value); + let selectValue= select.detail.value; + + if(selectValue == "1" || selectValue == "2" ||selectValue == "3"){ + this.isSelect=true; + } + else{ + this.isSelect=false; + + } + } + + onChangeInput(){ + if (this.searchKey.length >0) { + this.searchKeyEnter=true; + + }else{ + this.searchKeyEnter=false; + + } + } }