diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html index 8337a63..9013ef7 100644 --- a/src/app/pages/mytasks/mytasks.page.html +++ b/src/app/pages/mytasks/mytasks.page.html @@ -50,7 +50,7 @@ {{item.job_description}} {{item.price*0.01}} {{item.currency}} - Due : {{item.delivery_date}} + Due : {{item.delivery_date |date}}
diff --git a/src/app/pages/resetpass/resetpass.page.ts b/src/app/pages/resetpass/resetpass.page.ts index b6fa78a..09ddccc 100644 --- a/src/app/pages/resetpass/resetpass.page.ts +++ b/src/app/pages/resetpass/resetpass.page.ts @@ -1,6 +1,8 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {NavController} from "@ionic/angular"; import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; @Component({ selector: 'app-resetpass', @@ -17,7 +19,9 @@ export class ResetpassPage implements OnInit { constructor( private navctr: NavController, - private router: Router + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService ) { } ngOnInit() { @@ -28,11 +32,54 @@ export class ResetpassPage implements OnInit { } onResetPass() { - // this.router.navigate(['mentor']); + if( this.curr_pass !='' && + this.new_pass !='' && + this.confirm_new_pass !='' && + this.new_pass.length > 7 && + this.curr_pass.length > 5 && + (this.confirm_new_pass==this.new_pass) + ){ + this.sendPassReset(); + } + else { + return; + } + } - onEnroll() { - this.router.navigate(['enroll']); +/* + 'member_id' => int 1 + 'sessionid' => string '936571FD2E081B667930E7FFDF4D819938171883CA0CC951DC6C4FB184280EB3' (length=64) + 'uid' => string '3119b744-42ad-4834-bb83-b737588754ca' (length=36) + 'current_pass' => string 'valid_current_pass' (length=18) + 'new_pass' => string 'valid_new_pass' (length=14) + 'action' => int 11005 + */ + //profilePassChange(reqData) + reqData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + current_pass:string, + new_pass:string + }; + + passResetResult:any; + sendPassReset(){ + this.reqData = {action:11005, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + current_pass:this.curr_pass, new_pass:this.new_pass} + + this.wrenchService.profilePassChange(this.reqData).subscribe( + passResetResult => { + this.passResetResult = passResetResult; + console.log("passResetResult RETURN->", this.passResetResult); + } + ); + } } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 7cd2e0c..4f6058c 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -145,6 +145,9 @@ export class WrenchService { return this.getPostData("activejobmsglist", contractData); } + profilePassChange(reqData){ + return this.getPostData("profilepasschange", reqData); + } /*