diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index f40c72d..f8b5c9f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -42,9 +42,9 @@
-
+
+
+
@@ -216,15 +216,16 @@
-
+
-
-
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
index 3db64ba..e807ff5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@@ -358,11 +358,13 @@ export class ViewPdComponent implements OnInit, OnDestroy {
getPDStart(pdDetails: any, status: string) {
// console.log("status = ",status);
- // console.log("pdDetails",pdDetails,pdDetails.fk_pd_id);
+ // console.log("pdDetails",pdDetails,pdDetails.fk_pd_id,this.pdMasterData);
+ let pd_allocated_to = this.pdMasterData[0].pd_allocated_to;
localStorage.setItem('pdid',pdDetails.fk_pd_id)
this.destroyType = 3;
let doSelfAllocated = 0;/** this for flag **/
- if((status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.ALLOCATED_TO_FIA) && (this.userRoleID == 27 || this.userRoleID == 28) && this.userId != pdDetails.fk_pd_allocated_to){
+ if(this.userId != pd_allocated_to && (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.ALLOCATED_TO_FIA) && (this.userRoleID == 27 || this.userRoleID == 28)){
+ console.log(this.userId,pd_allocated_to);
/* console.log("if for flag",status);
doSelfAllocated = 1;*/
this.selfallocate(pdDetails.fk_pd_id);
@@ -753,6 +755,9 @@ dialogRef1.afterClosed().subscribe(rr=>{
"pd_id":pd,
"fk_pd_allocated_to":localStorage.getItem('userid'),
}
+ if((localStorage.getItem('smc_agency_id') != "") && (this.userRoleID==28)){
+ updateData.pd_agency_id =localStorage.getItem('smc_agency_id');
+ }
console.log('updateData obj gotten -> ',updateData);
// return
this._pd.updatePdOfficer(updateData).subscribe(
diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts
index f2e34a7..f21f6b2 100755
--- a/ng6-seed/src/app/session/login/login.component.ts
+++ b/ng6-seed/src/app/session/login/login.component.ts
@@ -103,13 +103,13 @@ export class LoginComponent implements OnInit{
})
}
forgotpassword() {
- this.dashBoardService.generateotp(this.email).subscribe(
+ this.dashBoardService.generateotp(this.email.split(/\s/).join('')).subscribe(
data => {
console.log('data');
console.log(data)
if (data.status == 200) {
this.dialogRef = this.dialog.open(OtpComponent, {
- data: this.email,
+ data: this.email.split(/\s/).join(''),
width: '60%',
disableClose: true
});
@@ -132,7 +132,7 @@ export class LoginComponent implements OnInit{
let dialogRef = this.dialog.open(NewPasswordDialog, this.config);
dialogRef.afterClosed().subscribe(result => {
if (result !== undefined) {
- let auth = { 'Username': this.email, 'Password': this.password, 'newpassword': result };
+ let auth = { 'Username': this.email.split(/\s/).join(''), 'Password': this.password, 'newpassword': result };
this.aws.dologin(auth).subscribe(res => {
this.getCommonSettings();
this.router.navigate(['/']);