Sineedge/salespd_pwa
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

email space issue and roleid 11 complete btn show

Browse Source
This commit is contained in:
venbainfotech 2022-02-08 13:55:26 +05:30
parent 022740c53e
commit 98bea78523
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.html
View File

@ -102,8 +102,16 @@
<div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="16.66" fxFlex.lg="16.66" fxFlex.xl="16.66" class="cell center" style="justify-content:flex-end" *ngIf="details.pd_status != 'BOUNCED' || details.fk_pd_allocated_to == user_id"> <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="16.66" fxFlex.lg="16.66" fxFlex.xl="16.66" class="cell center" style="justify-content:flex-end" *ngIf="details.pd_status != 'BOUNCED' || details.fk_pd_allocated_to == user_id">
<button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PDF Download" [disabled]="details.status != 'COMPLETED'" <button style="float: right" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PDF Download" [disabled]="details.status != 'COMPLETED'"
matTooltipPosition="top" color="primary" (click)="salesPDpdf(details.sales_pd_id)"><mat-icon>file_download</mat-icon></button> matTooltipPosition="top" color="primary" (click)="salesPDpdf(details.sales_pd_id)"><mat-icon>file_download</mat-icon></button>
<button [disabled]="details.status == 'COMPLETED'" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary" (click)="editForm(details)" <button [disabled]="((roleID===11)? false:((details.status === 'COMPLETED')?true:false))" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary" (click)="editForm(details)"
matTooltip="View" matTooltipPosition="top"><mat-icon>visibility</mat-icon></button> matTooltip="View" matTooltipPosition="top"><mat-icon>visibility</mat-icon></button>
<!-- <div *ngIf="roleID == 11">
<button *ngIf="details.status == 'COMPLETED'" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary" (click)="editForm(details)"
matTooltip="View" matTooltipPosition="top"><mat-icon>visibility</mat-icon></button>
</div>
<div *ngIf="roleID != 11">
<button [disabled]="details.status === 'COMPLETED'" mat-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" color="primary" (click)="editForm(details)"
matTooltip="View" matTooltipPosition="top"><mat-icon>visibility</mat-icon></button>
</div> -->
<!-- <a href={{link}} target={{link}}> --> <!-- <a href={{link}} target={{link}}> -->
<button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="newPortal()" type="button" matTooltip="link" matTooltipPosition="above" color="primary"><mat-icon>link</mat-icon></button> <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="newPortal()" type="button" matTooltip="link" matTooltipPosition="above" color="primary"><mat-icon>link</mat-icon></button>
<!-- </a> --> <!-- </a> -->

2
ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts
View File

@ -41,6 +41,7 @@ export class SalesPdComponent implements OnInit {
user_type: string =''; user_type: string ='';
is_sales_login:boolean = false is_sales_login:boolean = false
public finallink: any; public finallink: any;
roleID: any;
constructor(private loaderService:LoaderService,private constantProvider:ConstantsProvider,private dialog:MatDialog,private route: ActivatedRoute, private router: Router,private _creditPdService:ApiServiceService,private SalesPDService:SalesPdService) { constructor(private loaderService:LoaderService,private constantProvider:ConstantsProvider,private dialog:MatDialog,private route: ActivatedRoute, private router: Router,private _creditPdService:ApiServiceService,private SalesPDService:SalesPdService) {
@ -97,6 +98,7 @@ export class SalesPdComponent implements OnInit {
let user1 = localStorage.getItem('user_details'); let user1 = localStorage.getItem('user_details');
let user=(JSON.parse(user1)) let user=(JSON.parse(user1))
this.roleID = localStorage.getItem('user_role')
this.salesPdData = res['records']; this.salesPdData = res['records'];
this.dataLengthTab4 = res['records'].length; this.dataLengthTab4 = res['records'].length;

5
ng6-seed/src/app/session/login/login.component.ts
View File

@ -68,10 +68,11 @@ export class LoginComponent implements OnInit{
* AWS login service * AWS login service
*/ */
login() { login() {
let auth = { 'Username': this.email, 'Password': this.password }; const mailid = this.email.split(/\s/).join('');
let auth = { 'Username': mailid, 'Password': this.password };
this.loaderService.showMatSpinnerDialog(''); this.loaderService.showMatSpinnerDialog('');
this.aws.dologin(auth).subscribe(res => { this.aws.dologin(auth).subscribe(res => {
// console.log("do login",res); // console.log("do login",res)
if (res !== undefined) { if (res !== undefined) {
this.getCommonSettings(); this.getCommonSettings();
// local storage for validate user access // local storage for validate user access