diff --git a/ng6-seed/icon.png b/ng6-seed/icon.png new file mode 100755 index 0000000..dcf74cd Binary files /dev/null and b/ng6-seed/icon.png differ diff --git a/ng6-seed/src/app/app.component.ts b/ng6-seed/src/app/app.component.ts index 3e20000..264d073 100755 --- a/ng6-seed/src/app/app.component.ts +++ b/ng6-seed/src/app/app.component.ts @@ -6,11 +6,17 @@ import { TranslateService} from '@ngx-translate/core'; template: '' }) export class AppComponent { + promptEvent: Event; constructor(translate: TranslateService) { translate.addLangs(['en', 'fr']); translate.setDefaultLang('en'); const browserLang: string = translate.getBrowserLang(); translate.use(browserLang.match(/en|fr/) ? browserLang : 'en'); + window.addEventListener('beforeinstallprompt', event => { + this.promptEvent = event; + // this.Pwa.promptEvent=event + alert(event); + }); } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 0322e98..3fcc909 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -1126,21 +1126,23 @@ searchFun(control:any,i:number,option){ dialogRef.afterClosed().subscribe(result=>{ this.excel_file_id = result.excel_file_id console.log(result,JSON.stringify(result)); - let formValues = {} + // let formValues = {} let records = result.records - if(records && records.length > 0) { - records.forEach(val=>{ - if(val) { - if(val.key_name == "fk_customer_segment") { - let temp = this.customerSegmentList.filter(vv=>(vv.abbr).split(' ').join('') == (val.value).split(' ').join('') ) + if(records ) { + // records.forEach(val=>{ + Object.keys(records).forEach(key_name=>{ + console.log(records,key_name,records[key_name]) + if(records && records[key_name]) { + if(key_name == "fk_customer_segment") { + let temp = this.customerSegmentList.filter(vv=>(vv.abbr).split(' ').join('') == (records[key_name]).split(' ').join('') ) if(temp && temp.length > 0 && temp[0].customer_segment_id) { - val.value = temp[0].customer_segment_id + records[key_name] = temp[0].customer_segment_id } } - formValues[val.key_name] = val.value + // formValues[val.key_name] = val.value } }) - this._PDtriggerForm.patchValue(formValues) + this._PDtriggerForm.patchValue(records) } }) } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index 843ca58..8fdb54e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -46,7 +46,7 @@ export class AllPdComponent implements OnInit, OnChanges { length = 5; pageIndex = 0; pageSize = 10; - pageEvent: PageEvent; + pageEvent: any; todaydate:Date = new Date(); user_role_name: string; limitMsg: boolean = false; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 2a5a523..d17aefa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -45,7 +45,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { length = 5; pageIndex = 0; pageSize = 10; - pageEvent: PageEvent; + pageEvent: any; todaydate:Date = new Date(); user_role_name: string; limitMsg: boolean = false; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index 70480a2..00eb12f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -43,7 +43,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { length = 5; pageIndex = 0; pageSize = 10; - pageEvent: PageEvent; + pageEvent: any; searchForm:FormGroup; user_role_name: string; limitMsg: boolean = false; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index d8774c7..b3a7243 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -3,7 +3,7 @@
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index ebc3d9b..0e86e83 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -45,7 +45,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { length = 5; pageIndex = 0; pageSize = 10; - pageEvent: PageEvent; + pageEvent: any; user_role_name: string; limitMsg: boolean = false; common: any; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index 0f61813..d434c90 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -44,7 +44,7 @@ export class ScheduledPdComponent implements OnInit, OnChanges { length = 5; pageIndex = 0; pageSize = 10; - pageEvent: PageEvent; + pageEvent: any; user_role_name: string; limitMsg: boolean = false; common: any; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts index bb7c441..37ca308 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts @@ -141,13 +141,15 @@ export class FormComponent implements OnInit { if(result['dataStatus']) { let records = result['records'] let formValues:any ={}; - if(records && records.length > 0) { - records.forEach(val=>{ - if(val) { - formValues[val.key_name] = val.value - } - }) - // console.log(this.form) + if(records ) { + formValues = records + // records.forEach(val=>{ + // if(val) { + // formValues[val.key_name] = val.value + // } + // }) + console.log(formValues) + // debugger; this.form_answers= formValues setTimeout(()=>{ this.form_answers = null diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd.component.html index 514fbe9..35a711c 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd.component.html +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.html @@ -2,7 +2,7 @@
- +
diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/6.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/6.json index 9c4fddb..64a2420 100644 --- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/6.json +++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/6.json @@ -81,7 +81,7 @@ } ], "is_repeatable":"1", - "group_title":"Details of Key Stakeholders in the Business", + "group_title":"Key Products and Business Contribution", "group_key":"key_stakeholders" } ] diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/9.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/9.json index c731e0a..776f695 100644 --- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/9.json +++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/9.json @@ -156,7 +156,7 @@ } ], "is_repeatable":"1", - "group_title":"Details of Key Stakeholders in the Business", + "group_title":"Banking Details", "group_key":"banking_details" } ] diff --git a/ng6-seed/src/assets/icons/icon-128x128.png b/ng6-seed/src/assets/icons/icon-128x128.png index 9f9241f..a72a82f 100644 Binary files a/ng6-seed/src/assets/icons/icon-128x128.png and b/ng6-seed/src/assets/icons/icon-128x128.png differ diff --git a/ng6-seed/src/assets/icons/icon-144x144.png b/ng6-seed/src/assets/icons/icon-144x144.png index 4a5f8c1..a8da674 100644 Binary files a/ng6-seed/src/assets/icons/icon-144x144.png and b/ng6-seed/src/assets/icons/icon-144x144.png differ diff --git a/ng6-seed/src/assets/icons/icon-152x152.png b/ng6-seed/src/assets/icons/icon-152x152.png index 34a1a8d..7296e25 100644 Binary files a/ng6-seed/src/assets/icons/icon-152x152.png and b/ng6-seed/src/assets/icons/icon-152x152.png differ diff --git a/ng6-seed/src/assets/icons/icon-192x192.png b/ng6-seed/src/assets/icons/icon-192x192.png index 9172e5d..85f8675 100644 Binary files a/ng6-seed/src/assets/icons/icon-192x192.png and b/ng6-seed/src/assets/icons/icon-192x192.png differ diff --git a/ng6-seed/src/assets/icons/icon-384x384.png b/ng6-seed/src/assets/icons/icon-384x384.png index e54e8d3..8da5972 100644 Binary files a/ng6-seed/src/assets/icons/icon-384x384.png and b/ng6-seed/src/assets/icons/icon-384x384.png differ diff --git a/ng6-seed/src/assets/icons/icon-512x512.png b/ng6-seed/src/assets/icons/icon-512x512.png index 51ee297..7b5eec1 100644 Binary files a/ng6-seed/src/assets/icons/icon-512x512.png and b/ng6-seed/src/assets/icons/icon-512x512.png differ diff --git a/ng6-seed/src/assets/icons/icon-72x72.png b/ng6-seed/src/assets/icons/icon-72x72.png index 2814a3f..8b4c619 100644 Binary files a/ng6-seed/src/assets/icons/icon-72x72.png and b/ng6-seed/src/assets/icons/icon-72x72.png differ diff --git a/ng6-seed/src/assets/icons/icon-96x96.png b/ng6-seed/src/assets/icons/icon-96x96.png index d271025..facc5ca 100644 Binary files a/ng6-seed/src/assets/icons/icon-96x96.png and b/ng6-seed/src/assets/icons/icon-96x96.png differ diff --git a/ng6-seed/src/manifest.json b/ng6-seed/src/manifest.json index 79cd311..3a73491 100644 --- a/ng6-seed/src/manifest.json +++ b/ng6-seed/src/manifest.json @@ -1,11 +1,11 @@ { - "name": "optima", - "short_name": "optima", + "name": "PD Genie Lender", + "short_name": "Lender - PD Genie", "theme_color": "#1976d2", "background_color": "#fafafa", "display": "standalone", - "scope": "/", - "start_url": "/", + "scope": "./", + "start_url": "/lenderdemo", "icons": [ { "src": "assets/icons/icon-72x72.png",