diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 2c2ec5601..3aaba9a19 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,212 +1,162 @@
- - -
- {{dashboardTitle}} - -
-
- -
-
- - - - {{myControl.value != null && myControl.value != '' ? myControl.value[0].name : ''}} - - (+{{myControl.value.length - 1}} {{myControl.value?.length === 2 ? 'other' : 'others'}}) - - - {{ cd.name }} / {{cd.state_name}} - - - - -
-
- - - - - {{myControl2.value != null && myControl2.value != '' ? myControl2.value[0].short_name : ''}} - - (+{{myControl2.value.length - 1}} {{myControl2.value?.length === 2 ? 'other' : 'others'}}) - - - - {{ ld.full_name }} ({{ ld.short_name }}) - - - -
- - - - -
-
- -
Full - {{total1}}
-
- -
- -
Smart - {{total2}}
-
-
- -
Tele - {{total3}}
-
-
- -
- -
-
    -
  •        Draft
    • -
  •        Triggered
    • -
  •        Allocated
    • -
  •        Scheduled
    • -
  •        InProgress
    • -
  •        Completed
    • -
  •        QC Completed
    • -
-
-
- - - - PD Report + {{dashboardTitle}} - +
-
-
-
+
+
+

Full - {{total1}}

+
+ + +

{{doughnutChartDataForFullPD[0]}}

+
Triggered
+ + + + +

{{doughnutChartDataForFullPD[1]}}

+
Allocated
+ + + + +

{{doughnutChartDataForFullPD[2]}}

+
Scheduled
+ + + + +

{{doughnutChartDataForFullPD[3]}}

+
InProgress
+ + + + +

{{doughnutChartDataForFullPD[4]}}

+
Completed
+ + + + +

{{doughnutChartDataForFullPD[5]}}

+
QC Completed
+ + + + + +
+ +
+
+

Smart - {{total2}}

+
- + + + +

{{doughnutChartDataForSmartPD[0]}}

+
Triggered
+ + + + +

{{doughnutChartDataForSmartPD[1]}}

+
Allocated
+ + + + +

{{doughnutChartDataForSmartPD[2]}}

+
Scheduled
+ + + + +

{{doughnutChartDataForSmartPD[3]}}

+
InProgress
+ + + + +

{{doughnutChartDataForSmartPD[4]}}

+
Completed
+ + + + +

{{doughnutChartDataForSmartPD[5]}}

+
QC Completed
+ + - -
-
-
-
- - - -

892

-
Draft
- - - - -

265

-
Triggered
- - - - -

452

-
Allocated
- - - - -

56

-
Scheduled
- - - - -

56

-
InProgress
- - - - -

56

-
Completed
- - - - -

56

-
QC Completed
- - - - -
-
-
-
+
+ +
+
+

Tele - {{total3}}

+
+ + + + +

{{doughnutChartDataForTelePD[0]}}

+
Triggered
+ + + + +

{{doughnutChartDataForTelePD[1]}}

+
Allocated
+ + + + +

{{doughnutChartDataForTelePD[2]}}

+
Scheduled
+ + + + +

{{doughnutChartDataForTelePD[3]}}

+
InProgress
+ + + + +

{{doughnutChartDataForTelePD[4]}}

+
Completed
+ + + + +

{{doughnutChartDataForTelePD[5]}}

+
QC Completed
+ + + + + +
+
+
+
diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index 540704696..dd4db76c5 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -1,74 +1,16 @@ -$red: #f5515f; -$blue: #05abe0; -$grey: #343434; -$p: 12px; - -::ng-deep .ngx-mat-drp-date-input{text-overflow:ellipsis !important;color:#fff !important;} - mat-card-title{ background-color:#E00201 !important; color:#fff; } -.mat-input-wrapper { - background: #fff; -} - -li -{ - display:inline-block; - //float:left; -} - - -.example-full-width { - width: 95%; -} -.oval { - height: 13px; - width: 25px; - border-radius: 50%; -} - -// .ngx-mat-drp-date-input[_ngcontent-c17] { -// text-overflow: ellipsis; -// color: #fff; -// } - -//.lengend-list { - // list-style-type: none; - //margin: 0; - // padding: 0; - // overflow: hidden; - // text-align:justify; -//} - -.lengend-element { - font-size: 1rem !important; - padding-right: 3%; -} - -.donut-inner{ - margin-top: -165px; - // margin-left: 120px; - -} - -.donut-inner h5 { - margin-bottom: 5px; - margin-top: 0; - - } -.donut-inner span{ - font-size:1rems; -} - mat-card-content{ -min-height: 400px; + min-height: 400px; } -.chart{ - padding: 0.8rem; -} -::ng-deep .body-container{ - padding: 0rem !important; + +.ReportTileCard{ + color: #fff; + height: 100px; + width: 125px; + text-align: center; + margin: 1px; } \ No newline at end of file diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index 4817ce7a2..418e9c518 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -15,26 +15,10 @@ import { BaseChartDirective } from 'ng2-charts/ng2-charts'; export class DashboardComponent { - /** Declaration Part Of DataRange Picker */ - range:Range = {fromDate:new Date(), toDate: new Date()}; - options:NgxDrpOptions; - presets:Array = []; - - @ViewChild('dateRangePicker') dateRangePicker; - /* RefLINK: https://www.npmjs.com/package/ngx-mat-daterange-picker */ - /** End Of Date Range Declaration */ - dashboardTitle = 'PD Status'; /** Declaration Part Of Doughnut Chart */ - //@ViewChild('BaseChartDirective') canvas ; - @ViewChild(BaseChartDirective) FullCanvas: BaseChartDirective; - @ViewChild(BaseChartDirective) TeleCanvas: BaseChartDirective; - @ViewChild(BaseChartDirective) SmartCanvas: BaseChartDirective; - //myChart: BaseChartDirective; - - doughnutChartType = 'doughnut'; - doughnutChartLabels: string[] = ['Draft','Triggered','Allocated','Scheduled','InProgress','Completed','QC Completed']; + doughnutChartLabels: string[] = ['Triggered','Allocated','Scheduled','InProgress','Completed','QC Completed']; doughnutChartDataForFullPD:any[]=[]; doughnutChartDataForSmartPD:any[]=[]; @@ -47,150 +31,21 @@ export class DashboardComponent { total1: number = 0; total2: number = 0; total3: number = 0; - flag : number = 0; - evt:Range - - // doughnutChartColors: any[] = [{ - // backgroundColor: ['#f44336', '#3f51b5', '#ffeb3b', '#4caf50', '#2196f3','#673ab7'] - // backgroundColor: ['#c1c1c1','#f44336','#3f51b5','#ffeb3b','#4caf50','#2196f3','#673ab7'] + + // doughnutChartColors: any[] = [{ + // backgroundColor: ['#c1c1c1','#f44336','#ffa500','#ffeb3b','#3f51b5','#00ff00','#4caf50'] // }]; - doughnutChartColors: any[] = [{ - backgroundColor: ['#c1c1c1','#f44336','#ffa500','#ffeb3b','#3f51b5','#00ff00','#4caf50'] - }]; - globalChartOptions: any = { - responsive: false, - legend: { - display: true, - position: 'bottom' - } - }; - - - /** Declaration Part Of Title Section */ - - - /** Declaration Part Of Title Form Section */ - myControl = new FormControl(); - myControl2 = new FormControl(); - myControl3 = new FormControl(); - - lenderData : any[]; - cityData : any[]; - - selectedCity : any=[]; - selectedLender : any=[]; - - constructor(private _dashboardService: DashboardService, - private _masterService: MastersService) { - - /** To Display The City Data For City DropDown */ - this._masterService.getAllCity().subscribe( - dataresult => { - if (dataresult.dataStatus == true) { - this.cityData = dataresult.records; - this.cityData = this.cityData.filter(city=>city.isactive == 1 ); - } - - }); - - /** To Display The Entities Data For Entities DropDown */ - this._masterService.getAllMasterData('ENTITY').subscribe( - dataresult => { - if (dataresult.dataStatus == true) { - this.lenderData = dataresult.records; - this.lenderData = this.lenderData.filter(entity=>entity.isactive == 1 ); - } - }); - - } + constructor(private _dashboardService: DashboardService) {} ngOnInit(){ // console.clear(); this.getDoughnutChartData(); - - - const today = new Date(); - const fromMin = new Date(today.getFullYear(), today.getMonth()-2, 1); - const fromMax = new Date(today.getFullYear(), today.getMonth()+1, 0); - const toMin = new Date(today.getFullYear(), today.getMonth()-1, 1); - const toMax = new Date(today.getFullYear(), today.getMonth()+2, 0); - - const LastDateForPreMonth = new Date(today.getFullYear(), today.getMonth(), 0); - const FirstDateForPreMonth = new Date(today.getFullYear(), today.getMonth()-1, 1); - - // console.log('FromDateMin:',fromMin); - // console.log('FromDateMax:',fromMax); - // console.log('ToDateMin',toMin); - // console.log('ToDateMax',toMax); - // console.log('LastDateForPreMonth',LastDateForPreMonth); - // console.log('FirstDateForPreMonth',FirstDateForPreMonth); - -// const resetRange = {fromDate: today, toDate: today}; -// this.dateRangePicker.resetDates(resetRange); // will trigger selectedDateRangeChanged - - - this.setupPresets(); - this.options = { - presets: this.presets, - format: 'mediumDate', - range: {fromDate: today, toDate: today}, - applyLabel: "Submit", - calendarOverlayConfig: { - shouldCloseOnBackdropClick: false, - hasBackdrop:false, - }, - placeholder: "Date", - cancelLabel: "Cancel", - excludeWeekends:false, - fromMinMax: {fromDate:fromMin, toDate:fromMax}, - toMinMax: {fromDate:toMin, toDate:toMax} - }; } - updateRange(range: Range){ - this.range = range; - - if(range.fromDate != range.toDate){ - // console.log('if from Date',range.fromDate); - // console.log('if to date',range.toDate); - this.onChange(this.range,1); - } - else{ - // console.log('else from Date',range.fromDate); - // console.log('else to date',range.toDate); - // console.log('same'); - } - } - setupPresets() { - - const backDate = (numOfDays) => { - const today = new Date(); - return new Date(today.setDate(today.getDate() - numOfDays)); - } - - const today = new Date(); - const yesterday = backDate(1); - const minus7 = backDate(7) - const minus30 = backDate(30); - const currMonthStart = new Date(today.getFullYear(), today.getMonth(), 1); - const currMonthEnd = new Date(today.getFullYear(), today.getMonth()+1, 0); - const lastMonthStart = new Date(today.getFullYear(), today.getMonth()-1, 1); - const lastMonthEnd = new Date(today.getFullYear(), today.getMonth(), 0); - - this.presets = [ - {presetLabel: "Yesterday", range:{ fromDate:yesterday, toDate:today }}, - {presetLabel: "Last 7 Days", range:{ fromDate: minus7, toDate:today }}, - {presetLabel: "Last 30 Days", range:{ fromDate: minus30, toDate:today }}, - {presetLabel: "This Month", range:{ fromDate: currMonthStart, toDate:currMonthEnd }}, - {presetLabel: "Last Month", range:{ fromDate: lastMonthStart, toDate:lastMonthEnd }} - ] -} - - /** * To Get and Display Doughnut Chart Data Based on PDType **/ @@ -202,10 +57,11 @@ getDoughnutChartData(){ let lenderarr = ''; this._dashboardService.getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr).subscribe(data => { - this.flag = 1; + // console.log('data',data); + // console.log(' ***** Doughnut Chart Data *****',data); - let DraftIndexvalue = this.doughnutChartLabels.indexOf('Draft'); + // let DraftIndexvalue = this.doughnutChartLabels.indexOf('Draft'); let TriggedIndexvalue = this.doughnutChartLabels.indexOf('Triggered'); let AllocatedIndexvalue = this.doughnutChartLabels.indexOf('Allocated'); let ScheduledIndexvalue = this.doughnutChartLabels.indexOf('Scheduled'); @@ -221,19 +77,19 @@ getDoughnutChartData(){ let MonthlySmartPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'SMART' ); let MonthlyTelePDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'TELE' ); - let DraftFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'DRAFT'); - if(DraftFullPDvalue.length != '0'){ - //console.log('console triggered value',TriggerFullPDvalue); - for(let FPD of DraftFullPDvalue){ + // let DraftFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'DRAFT'); + // if(DraftFullPDvalue.length != '0'){ + // //console.log('console triggered value',TriggerFullPDvalue); + // for(let FPD of DraftFullPDvalue){ - this.tempDataFullPD[DraftIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataFullPD[DraftIndexvalue] = 0; - } + // this.tempDataFullPD[DraftIndexvalue] = +FPD.count; + // } + // } + // else{ + // this.tempDataFullPD[DraftIndexvalue] = 0; + // } - let TriggerFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); + let TriggerFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); if(TriggerFullPDvalue.length != '0'){ for(let FPD of TriggerFullPDvalue){ @@ -308,17 +164,17 @@ getDoughnutChartData(){ this.tempDataFullPD[QCCompletedIndexvalue] = 0; } - let DraftSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'DRAFT'); - if(DraftSmartPDvalue.length != '0'){ - //console.log('console triggered value',TriggerFullPDvalue); - for(let FPD of DraftSmartPDvalue){ + // let DraftSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'DRAFT'); + // if(DraftSmartPDvalue.length != '0'){ + // //console.log('console triggered value',TriggerFullPDvalue); + // for(let FPD of DraftSmartPDvalue){ - this.tempDataSmartPD[DraftIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataSmartPD[DraftIndexvalue] = 0; - } + // this.tempDataSmartPD[DraftIndexvalue] = +FPD.count; + // } + // } + // else{ + // this.tempDataSmartPD[DraftIndexvalue] = 0; + // } let TriggerSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); if(TriggerSmartPDvalue.length != '0'){ @@ -373,7 +229,7 @@ getDoughnutChartData(){ for(let FPD of CompletedSmartPDvalue){ this.tempDataSmartPD[CompletedIndexvalue] = +FPD.count; - } + } //let y = +CompletedFullPDvalue.count; } @@ -395,17 +251,17 @@ getDoughnutChartData(){ } - let DraftTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'DRAFT'); - if(DraftTelePDvalue.length != '0'){ + // let DraftTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'DRAFT'); + // if(DraftTelePDvalue.length != '0'){ - for(let FPD of DraftTelePDvalue){ + // for(let FPD of DraftTelePDvalue){ - this.tempDataTelePD[DraftIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataTelePD[DraftIndexvalue] = 0; - } + // this.tempDataTelePD[DraftIndexvalue] = +FPD.count; + // } + // } + // else{ + // this.tempDataTelePD[DraftIndexvalue] = 0; + // } let TriggerTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); if(TriggerTelePDvalue.length != '0'){ @@ -484,393 +340,20 @@ getDoughnutChartData(){ } else{ - this.tempDataFullPD = [0,0,0,0,0,0,0]; - this.tempDataSmartPD = [0,0,0,0,0,0,0]; - this.tempDataTelePD = [0,0,0,0,0,0,0]; + this.tempDataFullPD = [0,0,0,0,0,0]; + this.tempDataSmartPD = [0,0,0,0,0,0]; + this.tempDataTelePD = [0,0,0,0,0,0]; } this.doughnutChartDataForFullPD = this.tempDataFullPD; this.doughnutChartDataForSmartPD = this.tempDataSmartPD; this.doughnutChartDataForTelePD = this.tempDataTelePD; + this.total1 = this.tempDataFullPD.reduce((a, b) => a + b, 0); this.total2 = this.tempDataSmartPD.reduce((a, b) => a + b, 0); this.total3 = this.tempDataTelePD.reduce((a, b) => a + b, 0); - // console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); - // console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); - // console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); - }) } - -doughnutOptions: any = Object.assign({ - elements: { - arc: { - borderWidth: 0 - } - }, - centertext:'One' -},this.globalChartOptions); - -// ngOnChanges(){ -// // this.barChartData=this.chartData; -// this.barChartLabel=this.chartLabel; -// } - - -onChange(e: any,flag: any) { - - let fromdate; - let todate; - - if(flag == 1){ - this.evt = e - fromdate = new Date(this.evt.fromDate); - todate = new Date(this.evt.toDate); - - } - - if(flag == 2){ - let data = e.source.value.city_id; - e.source._selected == true ? this.selectedCity.push(data) - : this.selectedCity.splice(this.selectedCity.indexOf(data),1); - - } - - if(flag == 3){ - let data = e.source.value.entity_id; - e.source._selected == true ? this.selectedLender.push(data) - : this.selectedLender.splice(this.selectedLender.indexOf(data),1); - - - - - } - - - - this._dashboardService.getPDDetailForDoughnut(fromdate,todate,this.selectedCity,this.selectedLender).subscribe(data => { - - // console.log(' *****Updated Date Doughnut Chart Data *****',data); - - if(data.records.current_month.length != 0){ - this.total1 = 0; - this.total2 = 0; - this.total3 = 0; - } - - this.doughnutChartDataForFullPD = []; - this.doughnutChartDataForSmartPD = []; - this.doughnutChartDataForTelePD = []; - this.tempDataFullPD = []; - this.tempDataSmartPD =[]; - this.tempDataTelePD = []; - - - let DraftIndexvalue = this.doughnutChartLabels.indexOf('Draft'); - let TriggedIndexvalue = this.doughnutChartLabels.indexOf('Triggered'); - let AllocatedIndexvalue = this.doughnutChartLabels.indexOf('Allocated'); - let ScheduledIndexvalue = this.doughnutChartLabels.indexOf('Scheduled'); - let InProgressIndexvalue = this.doughnutChartLabels.indexOf('InProgress'); - let CompletedIndexvalue = this.doughnutChartLabels.indexOf('Completed'); - let QCCompletedIndexvalue = this.doughnutChartLabels.indexOf('QC Completed'); - - if(data.records.current_month.length != 0){ - //console.log('If Condition monthLY'); - // console.log('Monthly Status',data.records.current_month); - - let MonthlyFullPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'FULL' ); - let MonthlySmartPDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'SMART' ); - let MonthlyTelePDArr = data.records.current_month.filter(arr=>arr.PDTYPE == 'TELE' ); - - let DraftFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'DRAFT'); - if(DraftFullPDvalue.length != '0'){ - - for(let FPD of DraftFullPDvalue){ - let y = +FPD.count; - this.total1 = this.total1+y; - this.tempDataFullPD[DraftIndexvalue] = y; - } - } - else{ - this.tempDataFullPD[DraftIndexvalue] = 0; - } - - let TriggerFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); - if(TriggerFullPDvalue.length != '0'){ - - for(let FPD of TriggerFullPDvalue){ - - this.tempDataFullPD[TriggedIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataFullPD[TriggedIndexvalue] = 0; - } - - let AllocatedFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'ALLOCATED'); - if(AllocatedFullPDvalue.length != '0'){ - for(let FPD of AllocatedFullPDvalue){ - - this.tempDataFullPD[AllocatedIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataFullPD[AllocatedIndexvalue] = 0; - } - - let ScheduledFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'SCHEDULED'); - if(ScheduledFullPDvalue.length != '0'){ - for(let FPD of ScheduledFullPDvalue){ - - this.tempDataFullPD[ScheduledIndexvalue] = +FPD.count; - } - //let y = +ScheduledFullPDvalue.count; - - } - else{ - this.tempDataFullPD[ScheduledIndexvalue] = 0; - } - - let InProgressFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'INPROGRESS'); - if(InProgressFullPDvalue.length != '0'){ - for(let FPD of InProgressFullPDvalue){ - - this.tempDataFullPD[InProgressIndexvalue] = +FPD.count; - } - //let y = +InProgressFullPDvalue.count; - - } - else{ - this.tempDataFullPD[InProgressIndexvalue] = 0; - } - - let CompletedFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == 'COMPLETED'); - if(CompletedFullPDvalue.length != '0'){ - for(let FPD of CompletedFullPDvalue){ - - this.tempDataFullPD[CompletedIndexvalue] = +FPD.count; - } - //let y = +CompletedFullPDvalue.count; - - } - else{ - this.tempDataFullPD[CompletedIndexvalue] = 0; - } - - let QCCompletedFullPDvalue = MonthlyFullPDArr.filter(arr=>arr.pd_status == "QC_COMPLETED"); - if(QCCompletedFullPDvalue.length != '0'){ - for(let FPD of QCCompletedFullPDvalue){ - - this.tempDataFullPD[QCCompletedIndexvalue] = +FPD.count; - } - //let y = +QCCompletedFullPDvalue.count; - - } - else{ - this.tempDataFullPD[QCCompletedIndexvalue] = 0; - } - - let DraftSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'DRAFT'); - if(DraftSmartPDvalue.length != '0'){ - //console.log('console triggered value',TriggerFullPDvalue); - for(let FPD of DraftSmartPDvalue){ - - this.tempDataSmartPD[DraftIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataSmartPD[DraftIndexvalue] = 0; - } - - let TriggerSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); - if(TriggerSmartPDvalue.length != '0'){ - - for(let FPD of TriggerSmartPDvalue){ - - this.tempDataSmartPD[TriggedIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataSmartPD[TriggedIndexvalue] = 0; - } - - let AllocatedSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'ALLOCATED'); - if(AllocatedSmartPDvalue.length != '0'){ - for(let FPD of AllocatedSmartPDvalue){ - - this.tempDataSmartPD[AllocatedIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataSmartPD[AllocatedIndexvalue] = 0; - } - - let ScheduledSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'SCHEDULED'); - if(ScheduledSmartPDvalue.length != '0'){ - for(let FPD of ScheduledSmartPDvalue){ - - this.tempDataSmartPD[ScheduledIndexvalue] = +FPD.count; - } - //let y = +ScheduledFullPDvalue.count; - - } - else{ - this.tempDataSmartPD[ScheduledIndexvalue] = 0; - } - - let InProgressSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'INPROGRESS'); - if(InProgressSmartPDvalue.length != '0'){ - for(let FPD of InProgressSmartPDvalue){ - - this.tempDataSmartPD[InProgressIndexvalue] = +FPD.count; - } - //let y = +InProgressFullPDvalue.count; - - } - else{ - this.tempDataSmartPD[InProgressIndexvalue] = 0; - } - - let CompletedSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == 'COMPLETED'); - if(CompletedSmartPDvalue.length != '0'){ - for(let FPD of CompletedSmartPDvalue){ - - this.tempDataSmartPD[CompletedIndexvalue] = +FPD.count; - } - //let y = +CompletedFullPDvalue.count; - - } - else{ - this.tempDataSmartPD[CompletedIndexvalue] = 0; - } - - let QCCompletedSmartPDvalue = MonthlySmartPDArr.filter(arr=>arr.pd_status == "QC_COMPLETED"); - if(QCCompletedSmartPDvalue.length != '0'){ - for(let FPD of QCCompletedSmartPDvalue){ - - this.tempDataSmartPD[QCCompletedIndexvalue] = +FPD.count; - } - //let y = +QCCompletedFullPDvalue.count; - - } - else{ - this.tempDataSmartPD[QCCompletedIndexvalue] = 0; - } - - - let DraftTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'DRAFT'); - if(DraftTelePDvalue.length != '0'){ - - for(let FPD of DraftTelePDvalue){ - - this.tempDataTelePD[DraftIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataTelePD[DraftIndexvalue] = 0; - } - - let TriggerTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'TRIGGERED'); - if(TriggerTelePDvalue.length != '0'){ - //console.log('console triggered value',TriggerTelePDvalue); - for(let FPD of TriggerTelePDvalue){ - - this.tempDataTelePD[TriggedIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataTelePD[TriggedIndexvalue] = 0; - } - - let AllocatedTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'ALLOCATED'); - if(AllocatedTelePDvalue.length != '0'){ - for(let FPD of AllocatedTelePDvalue){ - - this.tempDataTelePD[AllocatedIndexvalue] = +FPD.count; - } - } - else{ - this.tempDataTelePD[AllocatedIndexvalue] = 0; - } - - let ScheduledTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'SCHEDULED'); - if(ScheduledTelePDvalue.length != '0'){ - for(let FPD of ScheduledTelePDvalue){ - - this.tempDataTelePD[ScheduledIndexvalue] = +FPD.count; - } - //let y = +ScheduledFullPDvalue.count; - - } - else{ - this.tempDataTelePD[ScheduledIndexvalue] = 0; - } - - let InProgressTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'INPROGRESS'); - if(InProgressTelePDvalue.length != '0'){ - for(let FPD of InProgressTelePDvalue){ - - this.tempDataTelePD[InProgressIndexvalue] = +FPD.count; - } - //let y = +InProgressFullPDvalue.count; - - } - else{ - this.tempDataTelePD[InProgressIndexvalue] = 0; - } - - let CompletedTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == 'COMPLETED'); - if(CompletedTelePDvalue.length != '0'){ - for(let FPD of CompletedTelePDvalue){ - - this.tempDataTelePD[CompletedIndexvalue] = +FPD.count; - } - //let y = +CompletedFullPDvalue.count; - - } - else{ - this.tempDataTelePD[CompletedIndexvalue] = 0; - } - - let QCCompletedTelePDvalue = MonthlyTelePDArr.filter(arr=>arr.pd_status == "QC_COMPLETED"); - if(QCCompletedTelePDvalue.length != '0'){ - for(let FPD of QCCompletedTelePDvalue){ - - this.tempDataTelePD[QCCompletedIndexvalue] = +FPD.count; - } - //let y = +QCCompletedFullPDvalue.count; - - } - else{ - this.tempDataTelePD[QCCompletedIndexvalue] = 0; - } - } - - else{ - this.tempDataFullPD = [0,0,0,0,0,0,0]; - this.tempDataSmartPD = [0,0,0,0,0,0,0]; - this.tempDataTelePD = [0,0,0,0,0,0,0]; - } - - this.doughnutChartDataForFullPD= this.tempDataFullPD; - this.doughnutChartDataForSmartPD = this.tempDataSmartPD; - this.doughnutChartDataForTelePD = this.tempDataTelePD; - this.doughnutChartLabels = this.doughnutChartLabels; - this.total1 = this.tempDataFullPD.reduce((a, b) => a + b, 0); - this.total2 = this.tempDataSmartPD.reduce((a, b) => a + b, 0); - this.total3 = this.tempDataTelePD.reduce((a, b) => a + b, 0); - - this.FullCanvas.chart.update(); - this.SmartCanvas.chart.update(); - this.TeleCanvas.chart.update(); - - // console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); - // console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); - // console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); - - }) - -} } \ No newline at end of file diff --git a/ng6-seed/src/app/error/404/error-404-component.html b/ng6-seed/src/app/error/404/error-404-component.html index 393d8b84a..16c88e4b1 100755 --- a/ng6-seed/src/app/error/404/error-404-component.html +++ b/ng6-seed/src/app/error/404/error-404-component.html @@ -2,7 +2,7 @@
-

SINEEDGE +

PD Genie

diff --git a/ng6-seed/src/app/error/503/error-503-component.html b/ng6-seed/src/app/error/503/error-503-component.html index e24b6d7a5..d7b028024 100755 --- a/ng6-seed/src/app/error/503/error-503-component.html +++ b/ng6-seed/src/app/error/503/error-503-component.html @@ -2,7 +2,7 @@
-

SINEEDGE +

PD Genie

diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index b367c8c37..0b8ee9aaf 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -15,7 +15,9 @@
@@ -32,6 +34,7 @@
+ {{ menuitem.icon }} @@ -103,10 +106,9 @@ --> - + - {{userDep}} - + {{userDep}}
@@ -154,7 +156,6 @@
-
- - + + @@ -34,6 +34,12 @@

+ + Is shown report ? + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts index 03d0ef664..7b52201c6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts @@ -24,17 +24,27 @@ export class ImageCropComponent implements OnInit, OnDestroy { cropflag:boolean = false; isBase64Image:boolean = false; previewflag = false; + address_form_id : any; //this one for constructor( notifier: NotifierService, private dialogRef: MatDialogRef, private sanitizer: DomSanitizer, private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public doc_data: any) { - console.log(this.doc_data); + + if(this.doc_data.hasOwnProperty('form_id')){ + var str = this.doc_data.document_name; + var splitted = str.split("(", 2); + splitted[0] == "Approach to PD Location" + ? this.address_form_id =this.doc_data.hasOwnProperty('form_id') ? this.doc_data.form_id : 0 : 0; + } + + + this.notifier = notifier; this._pd.getBase64ImageFromURL(this.doc_data.document).subscribe(base64 => { if (base64.dataStatus) { - console.log(base64); - console.log('data:image/png;base64,'+base64.records); + + this.baseImage = 'data:image/png;base64,'+base64.records; this.isBase64Image = true; } @@ -48,8 +58,10 @@ export class ImageCropComponent implements OnInit, OnDestroy { ngOnInit() { // this.baseImage = this.data.document; } - - + isshownreport : any; + isshownreportforaddress(e){ + this.isshownreport = e === true ? "1" : "0"; + } @@ -79,17 +91,16 @@ export class ImageCropComponent implements OnInit, OnDestroy { }, getCroppedCanvas(datas) { - console.log(datas); + // console.log(datas); } }); - console.log(that.cropper); + } crop() { var cropcanvas = $('.container > img').cropper('getCroppedCanvas'); var croppng = cropcanvas.toDataURL("image/png") ; - console.log('croppedpng',croppng); this.previewflag = true; this.cropImage = croppng; } @@ -97,11 +108,12 @@ export class ImageCropComponent implements OnInit, OnDestroy { onSubmit(){ // // "fk_updatedby":"25", + let records: any = { "pd_document_id": this.doc_data.document_id, "pd_document_title": this.doc_data.document_title, "pd_document_name": this.doc_data.document_name, - "is_show_report":this.doc_data.is_show_report, + "is_show_report": this.address_form_id != 0 ? this.isshownreport : this.doc_data.is_show_report, "image": this.cropImage, "fk_pd_id":this.doc_data.pdid }; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index b2d9aab11..83c0e147d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -585,6 +585,10 @@ export class EmploymentInfoComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index 4b475b7e9..5270b8ad1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -683,6 +683,10 @@ export class FamilyDetailsComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index f3a3dfd85..c6bc0d410 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -648,6 +648,10 @@ export class FinalRemarksComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index fc4560a46..a0011949a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -104,7 +104,7 @@ export class FinancialInfoComponent implements OnInit { this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; let x = this.customer_segment_abbr.split("-"); this.CustSegAbbr = x[1]; - // console.log('this.CustSegAbbr',this.CustSegAbbr); + } //ViewerOption For Docs Display @@ -210,9 +210,9 @@ export class FinancialInfoComponent implements OnInit { this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('')); this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('')); } - console.log(val); + }); - console.log('check_exist_businees_activity',check_exist_av); + retriveData.select_working_capital_facilities_availed = check_exist_av; } @@ -280,7 +280,7 @@ export class FinancialInfoComponent implements OnInit { retriveData.fk_createdby = this.pdid; this.financialForm.setValue(retriveData); if(this.ServiceDataAvailability == false && retriveData.unsold_stock_lies_in_days == 'NA'){ - console.log('Data Required'); + this.financialForm.controls['unsold_stock_lies_in_days'].setValue(''); } // this.financialForm.patchValue(retriveData); @@ -391,7 +391,7 @@ export class FinancialInfoComponent implements OnInit { } changeWorkingCapitalFacilities(event: any) { - console.log('event',event); + if (event.value.exist_status == true && event.value.id == 2) { this.financialForm.removeControl('bank_guarantee'); } @@ -549,7 +549,7 @@ export class FinancialInfoComponent implements OnInit { } // selectedWorkkingCptl(e){ - // console.log(e); + // const workingCptlControl = this.financialForm.controls['select_working_capital_facilities_availed']; // let CtrlLength = workingCptlControl.controls.length; // if (CtrlLength > 0) { @@ -1178,9 +1178,7 @@ export class FinancialInfoComponent implements OnInit { } } } - // console.log('val.financial_margin_of_profit',val.financial_margin_of_profit); - // console.log('profit_margin',profit_margin); - // console.log('childArray.controls.financial_margin_of_loss',childArray.controls.financial_margin_of_loss.value); + // prev_profit_margin[index] = val.financial_margin_of_profit != '' ? val.financial_margin_of_profit: 0; // prev_loss_margin[index] = val.financial_margin_of_loss !='' ? val.financial_margin_of_loss : 0 ; prev_profit_margin[index] = profit_margin != '' ? profit_margin : 0; @@ -1206,21 +1204,14 @@ export class FinancialInfoComponent implements OnInit { if ((profit_margin != '' || loss_margin != '') && index != 0) { - // console.log('temp_prev_losses',prev_loss_margin); - // console.log('temp_prev_profits',prev_profit_margin); - - // console.log('curr index',index); + loss_margin = loss_margin !== undefined ? loss_margin : 0; profit_margin = profit_margin !== undefined ? profit_margin:0; let temp_prev_loss_margin = prev_loss_margin[index-1] !== undefined ? prev_loss_margin[index-1] : 0 ; let temp_prev_profit_margin = prev_profit_margin[index-1] !== undefined ? prev_profit_margin[index-1] : 0 ; - // console.log('profit_margin',profit_margin); - // console.log('pre year loss_margin',temp_prev_loss_margin); - // console.log('loss_margin',loss_margin); - // console.log('pre year profit_margin',temp_prev_profit_margin); - + if(annual_sale != ''){ @@ -1396,11 +1387,10 @@ export class FinancialInfoComponent implements OnInit { } - // console.log((+estimate_profit_range_to + estimate_profit_range_from)); - // console.log((estimate_profit_range_to + estimate_profit_range_from)/2); + // let a = estimate_profit_range_from+estimate_profit_range_to ; // let b = a/2; - // console.log(a,b); + let consi_profit_percent = (+estimate_profit_range_to + +estimate_profit_range_from)/2; let Profit_Average = ((+consi_profit_percent)*(+sales_average))/100; let difference = ((+estimate_profit_range_to) - (+estimate_profit_range_from)); @@ -1921,11 +1911,11 @@ export class FinancialInfoComponent implements OnInit { // return; // } - console.log('this.financialForm.value',this.financialForm.value); + let records = this.financialForm.value; records.select_working_capital_facilities_availed = records.select_working_capital_facilities_availed.filter(value => value.exist_status == 1); records.select_working_capital_facilities_availed = records.select_working_capital_facilities_availed.filter(value => value.exist_status == 1); - console.log(records.is_there_working_capital_available); + if(records.is_there_working_capital_available == "no"){ records.select_working_capital_facilities_availed = []; if(records.bank_guarantee) delete records.bank_guarantee ; @@ -1937,7 +1927,7 @@ export class FinancialInfoComponent implements OnInit { if(records.other_reason_for_working_capital_facilities_availed) delete records.other_reason_for_working_capital_facilities_availed ; if(records.reason_for_working_capital_facilities_availed) delete records.reason_for_working_capital_facilities_availed ; } - console.log('records',records); + this._pd.saveForm(records).subscribe(data => { if(data.status == 200) { @@ -1972,6 +1962,10 @@ export class FinancialInfoComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts index 3a747e542..b7ae53d47 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts @@ -200,6 +200,10 @@ export class FuturePlansAndBusinessEnvironmentComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 3e956a938..659a7bb89 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -243,7 +243,7 @@ export class GeneralInfoComponent implements OnInit { if (exist_companyWithRelationships.length > 0) { exist_companyWithRelationships.forEach(element => { //individualsControl.push(this.createIndividulas(element)) - console.log('elementValue.applicant_name', element); + // console.log('elementValue.applicant_name', element); companyWithRelationshipsControl.push(this.createCompaniesRelationshipWithData(element)); }); } @@ -370,7 +370,7 @@ export class GeneralInfoComponent implements OnInit { } createPersonsWithRelationships(elementValue: any, indexVal: number) { - console.log('elementValue.applicant_name', elementValue.applicant_name); + // console.log('elementValue.applicant_name', elementValue.applicant_name); return this._fb.group({ pd_co_applicant_id: [elementValue.pd_co_applicant_id], applicant_name: [this.titleCase.transform(elementValue.applicant_name)], @@ -856,6 +856,10 @@ export class GeneralInfoComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index 2d023f6b5..2d66730ac 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -200,6 +200,10 @@ export class LenderRepresentativeComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 0016ccb30..067890fad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -300,7 +300,7 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['sub_product'].setValue(this.pd_all_details.pdmaster_details.fk_subproduct_id); } if(this.lenderShortName == 'CLIX'){ - console.log(this.lenderShortName); + // console.log(this.lenderShortName); this.loanDetailsForm.controls['is_transfer'].setValue("no"); this.selectedBalancesTransferChanges("no") } @@ -330,7 +330,7 @@ export class LoanDetailsComponent implements OnInit { } getM_EndUseForLoan(pdid, subproductid) { - console.log(pdid, subproductid) + // console.log(pdid, subproductid) this._pd.getEndUseForLoan(pdid, subproductid).subscribe( data => { this.m_endUseForLoan = data.records.filter(data => data.isactive == 1); @@ -544,10 +544,10 @@ export class LoanDetailsComponent implements OnInit { /**For Setting Validations */ selectedBalancesTransferChanges(event: any) { - console.log(this.lenderShortName); - console.log(event); + // console.log(this.lenderShortName); + // console.log(event); if (event == 'no') { - console.log('on 2 time -', event); + // console.log('on 2 time -', event); this.loanDetailsForm.controls['source'].setValidators([Validators.required]); this.loanDetailsForm.controls['source'].updateValueAndValidity(); @@ -908,6 +908,10 @@ export class LoanDetailsComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index 71059d256..f1899b65d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -202,8 +202,8 @@ pdf(fileURL){ let stdcodesearch = elementValue.landline.search("-"); let stdcode = elementValue.landline.substr(0,stdcodesearch); let landline = elementValue.landline.substr(+stdcodesearch + 1,8); - console.log('elementValue.landline',elementValue.landline); - console.log('stdcode',stdcode,'landline',landline); + // console.log('elementValue.landline',elementValue.landline); + // console.log('stdcode',stdcode,'landline',landline); return this._fb.group({ reference_name: [elementValue.reference_name != null ?elementValue.reference_name:''], mobile: [elementValue.mobile != null ?elementValue.mobile:'',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], @@ -541,6 +541,10 @@ getOtherOrganisationOwner(value,i) { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index 57a9e182d..64e82cd12 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -328,11 +328,11 @@ export class OtherIncomeComponent implements OnInit { // cancelButtonText:'Cancel And Correct', }).then((result) => { if (result.value) { - console.log('rental data status is true',validateFlag); + // console.log('rental data status is true',validateFlag); this.saveAPI(records); } else{ - console.log('rental data status is true',validateFlag); + // console.log('rental data status is true',validateFlag); // rentOptionCount = 0; // validateFlag = 0 ; return; @@ -342,18 +342,18 @@ export class OtherIncomeComponent implements OnInit { validateFlag = 0 ; } else if(data.dataStatus){ - console.log('rental data status is true',validateFlag); + // console.log('rental data status is true',validateFlag); this.saveAPI(records); } }); } else{ - console.log('now flag is zero',validateFlag); + // console.log('now flag is zero',validateFlag); this.saveAPI(records); } } else{ - console.log('now option is no',validateFlag); + // console.log('now option is no',validateFlag); this.saveAPI(records); } } @@ -452,6 +452,10 @@ export class OtherIncomeComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts index 21f228a8b..c7fbaf645 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts @@ -81,8 +81,8 @@ export class ManageRentalVerificationComponent implements OnInit { this.unitTypeList = this.data.masterData.unitTypeList; this.stateList = this.data.masterData.stateList; this.unitMeasurementList = this.data.masterData.unitMeasurementList; - console.log(this.mergeCompanyApplicant); - console.log(this.data.masterData.mergeCompanyApplicant); + // console.log(this.mergeCompanyApplicant); + // console.log(this.data.masterData.mergeCompanyApplicant); } @@ -90,8 +90,8 @@ export class ManageRentalVerificationComponent implements OnInit { this.initRentalForm(); this.getMasterDetails('RELATIONSHIPS', 1); this.getMasterDetails('COMPANYRELATIONSHIPS', 2); - console.log(this.mergeCompanyApplicant); - console.log(this.data.masterData.mergeCompanyApplicant); + // console.log(this.mergeCompanyApplicant); + // console.log(this.data.masterData.mergeCompanyApplicant); //load form details with data @@ -255,12 +255,12 @@ export class ManageRentalVerificationComponent implements OnInit { // load form data loadFormData(data){ - console.log('data',data); + // console.log('data',data); if(data){ - console.log('data.dataStatus',data); + // console.log('data.dataStatus',data); // let rentalValue = data.records.filter(data=>data.rental_count_id==id); let rentalVal = data; - console.log('rentalVal',rentalVal); + // console.log('rentalVal',rentalVal); rentalVal.pdid = this.pdid; rentalVal.formid = this.form_id; @@ -1041,6 +1041,10 @@ export class ManageRentalVerificationComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 23ddc5058..61c143fc6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -889,6 +889,10 @@ export class StockComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 8772a7163..35ec0a8af 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -600,6 +600,10 @@ export class SupplierInfoComponent implements OnInit { pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, + maxWidth: '100vw', + maxHeight: '100vh', + height: '100%', + width: '100%', }); imageRef.afterClosed() .subscribe(dataresult => { diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/model-edit-pd-report/model-edit-pd-report.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/model-edit-pd-report/model-edit-pd-report.component.ts index bcba582cc..fec9a69ec 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/model-edit-pd-report/model-edit-pd-report.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/model-edit-pd-report/model-edit-pd-report.component.ts @@ -69,7 +69,7 @@ export class ModelEditPdReportComponent implements OnInit { } onChange($event: any): void { - console.log('onChange'); + // console.log('onChange'); // this.log += new Date() + "
"; } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts index 374447e0b..1779dadc0 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts @@ -89,7 +89,7 @@ export class QcPdReportComponent implements OnInit { if(getItem !== null){ - console.log('Dat is value'); + // console.log('Dat is value'); this.pdTrigerService.setHTMLContent(this.startPD,getItem).subscribe(data => { if (data.status == 200) { @@ -150,7 +150,7 @@ export class QcPdReportComponent implements OnInit { }; this.pdTrigerService.getPDReportFinalDocument(data).subscribe(data => { if (data.dataStatus) { - console.log(data.records); + // console.log(data.records); this.notifier.notify('success', 'Done Successfully..!'); this.getPdReportVersionList(); } else { @@ -224,18 +224,18 @@ export class QcPdReportComponent implements OnInit { getPdReportDetails() { this.pdTrigerService.getPdFinalReportDetails(this.startPD).subscribe(data => { if (data.status == 200) { - console.log('getPdReportDetails',data); + // console.log('getPdReportDetails',data); this.pdReportRecords = data.records; this.qcStatus = data.records.pd_status; - console.log(this.qcStatus); + // console.log(this.qcStatus); this.generateBtn = data.records.is_original_report_created == 1 ? false : true; - console.log(this.generateBtn); + // console.log(this.generateBtn); this.reGenerateBtn = data.records.is_original_report_created == 1 ? true : false; - console.log(this.reGenerateBtn); + // console.log(this.reGenerateBtn); } else{ this.generateBtn = true; - console.log('else',this.generateBtn); + // console.log('else',this.generateBtn); this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); } }, err => { @@ -363,7 +363,7 @@ export class QcPdReportComponent implements OnInit { export() { this.pdTrigerService.pdReportExportExcel().subscribe((blob: HttpResponse) => { if (blob) { - console.log(blob); + // console.log(blob); let datass = blob.headers.get('content-disposition'); let fileName = datass.split(/"/)[1]; // this.notifier.notify('success', 'Your Changes Updated.!'); @@ -371,7 +371,7 @@ export class QcPdReportComponent implements OnInit { { type: 'application/vnd.ms-excel' }); const file = new File([blobs], fileName, { type: 'application/vnd.ms-excel' }); - console.log(file); + // console.log(file); importedSaveAs(file); } else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index c273cf2b6..ac424c9a5 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -242,7 +242,7 @@ export class QcViewComponent implements OnInit, OnDestroy { // start pd getPDStart(pdID:any,childData: any){ - console.log('pdData',pdID); + // console.log('pdData',pdID); // console.log('childData',childData); // return; this.destroyType=3; diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 65381e3da..1aabe360c 100755 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -38,40 +38,53 @@ const MENUITEMS : Menu[] = [ // type: 'link', // icon: 'explore' // }, - { - state: '', - name: 'Manage', - type: 'multi', - icon: 'settings', - multichild: [ - { - state:'setting', - name:'Settings', - type:'sub', - icon:'settings', - children:[ - {state:'users',name:'Users'}, - {state:'mastermodule',name:'Master Details'}, - {state:'entity',name:'Entities'}, - {state:'pdteamlist',name:'PD Team'}, + // { + // state: '', + // name: 'Manage', + // type: 'multi', + // icon: 'settings', + // multichild: [ + // { + // state:'setting', + // name:'Settings', + // type:'sub', + // icon:'settings', + // children:[ + // {state:'users',name:'Users'}, + // {state:'mastermodule',name:'Master Details'}, + // {state:'entity',name:'Entities'}, + // {state:'pdteamlist',name:'PD Team'}, - ], - }, - { - state: 'template', - name: 'Template', - type: 'sub', - icon: 'art_track', - children: [ - {state: 'questions', name: 'Questions'}, - {state: 'templates', name: 'Templates'} - ] - } - ] + // ], + // }, + // { + // state: 'template', + // name: 'Template', + // type: 'sub', + // icon: 'art_track', + // children: [ + // {state: 'questions', name: 'Questions'}, + // {state: 'templates', name: 'Templates'} + // ] + // } + // ] + // }, + { + state:'setting', + name:'Manage', + type:'multi', + icon:'settings', + children:[ + {state:'setting/users',name:'Users'}, + {state:'setting/mastermodule',name:'Master Details'}, + {state:'setting/entity',name:'Entities'}, + {state:'setting/pdteamlist',name:'PD Team'}, + // {state:'template/questions', name: 'Questions'}, + {state:'template/templates', name: 'Templates'}, + ] }, - { state:'personal_discussion', name:'Personal Discussion', diff --git a/ng6-seed/src/favicon.ico b/ng6-seed/src/favicon.ico old mode 100755 new mode 100644 index 85d4ef4bc..b9c4a9e13 Binary files a/ng6-seed/src/favicon.ico and b/ng6-seed/src/favicon.ico differ diff --git a/ng6-seed/src/faviconold.ico b/ng6-seed/src/favicon_se.ico similarity index 100% rename from ng6-seed/src/faviconold.ico rename to ng6-seed/src/favicon_se.ico diff --git a/ng6-seed/src/favicon_ssa.ico b/ng6-seed/src/favicon_ssa.ico new file mode 100755 index 000000000..85d4ef4bc Binary files /dev/null and b/ng6-seed/src/favicon_ssa.ico differ diff --git a/ng6-seed/src/favicon_withoutbg.ico b/ng6-seed/src/favicon_withoutbg.ico new file mode 100644 index 000000000..aac65cb24 Binary files /dev/null and b/ng6-seed/src/favicon_withoutbg.ico differ diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html index 44cdcf9d2..5a5db1973 100755 --- a/ng6-seed/src/index.html +++ b/ng6-seed/src/index.html @@ -9,7 +9,7 @@ - SineEdge + PD Genie