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

Fairoj : sync btn issue and text changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-06-02 17:40:04 +05:30
parent 2bac91ad81
commit c3bce8dfd3
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/sales_pd/pages/sales-p-dlist/sales-p-dlist.ts
View File

@ -69,6 +69,9 @@ export class SalesPDlistPage {
this.localPDs = result_val this.localPDs = result_val
this.sales_displayValue.unshift(...this.localPDs); this.sales_displayValue.unshift(...this.localPDs);
} }
this.loader_access=false
},err=>{
this.loader_access=false
}) })
} }
getListofPD(){ getListofPD(){
@ -92,7 +95,7 @@ export class SalesPDlistPage {
} }
}) })
} }
this.loader_access=false
if(this.sales_displayValue.length > 0){ if(this.sales_displayValue.length > 0){
this.filterMsg = true this.filterMsg = true
let products=[] let products=[]

6
src/pages/sales_pd/pages/section-list/section-list.html
View File

@ -29,12 +29,12 @@
<div class="completed_note" *ngIf ="is_sync_btn && pd_completed.is_synced == false && pd_completed.is_completed && <div class="completed_note" *ngIf ="is_sync_btn && pd_completed.is_synced == false && pd_completed.is_completed &&
pd_completed.pd_complete_request_items != null"> pd_completed.pd_complete_request_items != null">
<p > <p >
PD is Completed. Please click the sync button above to send the data to server. When internet is available</p> PD is completed. Please click the sync button above to send the data to server when internet is available.</p>
</div> </div>
<div class="completed_note" *ngIf ="is_sync_btn && !pd_completed.is_completed"> <!-- <div class="completed_note" *ngIf ="is_sync_btn && !pd_completed.is_completed">
<p > <p >
PD section saved. Click sync to complete</p> PD section saved. Click sync to complete</p>
</div> </div> -->
<mat-card class="card-class" <mat-card class="card-class"
[ngClass]="{'border-disabled': sales_pd_id == null && sec.is_disabled, [ngClass]="{'border-disabled': sales_pd_id == null && sec.is_disabled,
'border-saved-local': sales_pd_id != null && sec.hasOwnProperty('status') && 'border-saved-local': sales_pd_id != null && sec.hasOwnProperty('status') &&

10
src/pages/sales_pd/pages/section-list/section-list.ts
View File

@ -85,8 +85,12 @@ export class SectionListPage {
if(result) { if(result) {
this.pd_completed.is_synced= result.is_pd_completed_sync this.pd_completed.is_synced= result.is_pd_completed_sync
this.pd_completed.is_completed = result.is_pd_completed this.pd_completed.is_completed = result.is_pd_completed
this.pd_completed.pd_complete_request_items = result.pd_complete_request_items // console.clear();
if(this.pd_completed.is_synced == false || (this.pd_completed.is_completed == false && this.pd_completed.pd_complete_request_items != null)) { console.log("#$$4",result.pd_complete_request_items)
this.pd_completed.pd_complete_request_items = result.pd_complete_request_items ? result.pd_complete_request_items : null
// console.log(this.pd_completed.pd_complete_request_items, ((this.pd_completed.is_synced == false) || (this.pd_completed.is_completed == false && this.pd_completed.pd_complete_request_items != null && this.pd_completed.pd_complete_request_items != undefined)));
if((this.pd_completed.is_synced == false) && (this.pd_completed.is_completed == false && this.pd_completed.pd_complete_request_items != null && this.pd_completed.pd_complete_request_items != undefined)) {
console.log("Sync btn true")
this.is_sync_btn = true this.is_sync_btn = true
} }
} }
@ -105,7 +109,7 @@ export class SectionListPage {
this.section_template = mergeById(this.section_template,saved_sections); this.section_template = mergeById(this.section_template,saved_sections);
console.log("##########",this.section_template); console.log("##########",this.section_template);
if(this.section_template.length > 0) { if(this.section_template.length > 0) {
this.is_sync_btn = this.section_template.filter(val=>val.is_synced == false).length > 0 this.is_sync_btn = this.section_template.filter(val=>val.is_synced == false && val.section_id != 'all').length > 0
} }
} }
getTemplate(){ getTemplate(){