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

Merge branch 'master' of bitbucket.org:venbaittech/salespd_pwa

Browse Source
This commit is contained in:
bitbucket 2022-08-25 10:18:01 +05:30
commit abf2bca311
3 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,10 @@
</div> </div>
<div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="20.66" fxFlex.lg="20.66" fxFlex.xl="20.66" class="cell center"> <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="20.66" fxFlex.lg="20.66" fxFlex.xl="20.66" class="cell center">
<button mat-button mat-icon-button (click)="newPortal()" type="button" matTooltip="link" matTooltipPosition="above" color="primary"><mat-icon>link</mat-icon></button> <button mat-button mat-icon-button (click)="newPortal()" type="button" matTooltip="link" matTooltipPosition="above" color="primary"><mat-icon>link</mat-icon></button>
</div>
<div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="20.66" fxFlex.lg="20.66" fxFlex.xl="20.66" class="cell center">
<button [disabled]="details.status !== 'COMPLETED'" mat-button mat-icon-button class=" hover-icon" type="button" color="primary" (click)="uploadDatatoCET(details.sales_pd_id)"
matTooltip="Upload Data To CET" matTooltipPosition="above" ><mat-icon>file_upload</mat-icon></button>
</div> </div>
<div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="20.66" fxFlex.lg="20.66" fxFlex.xl="20.66" class="cell center"> <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="20.66" fxFlex.lg="20.66" fxFlex.xl="20.66" class="cell center">
<button *ngIf="roleID == 30" mat-button mat-icon-button class="hover-icon" type="button" matTooltip="ReGenerate" <button *ngIf="roleID == 30" mat-button mat-icon-button class="hover-icon" type="button" matTooltip="ReGenerate"

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

@ -90,6 +90,19 @@ export class SalesPdComponent implements OnInit {
uploadDatatoCET(salespdid) {
this.SalesPDService.uploadSalesDatatoCET(salespdid).subscribe(res=>{
if(res['dataStatus']){
let user1 = localStorage.getItem('user_details');
let user=(JSON.parse(user1))
this.roleID = localStorage.getItem('user_role')
alert(res['msg']);
}else{ alert(res['msg']); }
},error => {
this.errorMessage.push(error);
alert(error.html_format);
});
}
getListofPD() { getListofPD() {
// this.SalesPDService.getSalesPDList() // this.SalesPDService.getSalesPDList()
// .subscribe( // .subscribe(

29
ng6-seed/src/app/sales-pd/services/sales-pd.service.ts
View File

@ -706,33 +706,4 @@ generatemail(params :any): Observable<any> {
generatesateliteimage(param:any): Observable<any>{ generatesateliteimage(param:any): Observable<any>{
return this._http.post<any>(api_url + 'regenerateSatelliteImg',param ) return this._http.post<any>(api_url + 'regenerateSatelliteImg',param )
} }
loadTemplatelocal() {
// return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/'+form_id+'.json').map(rr=>{
// return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/16.json').map(rr=>{
// if( Formname == 'Business Information'){
// return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json').map(rr=>{
// // return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/LFMP/'+form_id+'.json').map(rr=>{
// let returnValue ={dataStatus:true,status:200,records:{template:JSON.stringify(rr)}}
// // this.raw_credit_pd_template= returnValue.records.template
// return returnValue
// })
// }else{
// return this._http.get<any[]>(this.apiUrl + "formWiseJSONTemplateV2?form_id="+form_id+"&map_id="+mapid+"").map(result=>{
// console.log(result)
// let apivalue ={dataStatus:true,status:200,records:{template:JSON.stringify(result)}}
// console.log(apivalue)
// return apivalue
// })
//return this._http.get('assets/data/SMC_CREDIT_TEMPLATES/all/'+form_id+'.json').map(rr=>{
return this._http.get('assets/data/flyhi.json').map(rr=>{
let returnValue ={dataStatus:true,status:200,records:{template:JSON.stringify(rr)}}
// this.raw_credit_pd_template= returnValue.records.template
console.log("12345")
return returnValue
})
// }
}
} }