diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 0bf804fb2..9e8d0c5a9 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -46,7 +46,7 @@
-
+
Tele - {{total3}}
-
-
+
+
  •        Draft
  •        Triggered
  • diff --git a/ng6-seed/src/app/dashboard/dashboard.component.scss b/ng6-seed/src/app/dashboard/dashboard.component.scss index 35631b005..28e26b986 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.scss +++ b/ng6-seed/src/app/dashboard/dashboard.component.scss @@ -12,7 +12,7 @@ mat-card-title{ li { - display:inline; + display:inline-block; //float:left; } @@ -30,16 +30,16 @@ li color: #fff; } -.lengend-list { - list-style-type: none; +//.lengend-list { + // list-style-type: none; //margin: 0; // padding: 0; - overflow: hidden; - text-align:justify; -} + // overflow: hidden; + // text-align:justify; +//} .lengend-element { - //font-size: 1rem; + font-size: 1rem !important; padding-right: 3%; } diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index 62c7fdfd0..32233108b 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -1,16 +1,11 @@ //import { Component } from '@angular/core'; import {Component, NgModule, ElementRef, Inject, Injectable, ViewChild} from '@angular/core' import { FormBuilder, FormGroup, Validators , ValidatorFn, AbstractControl, FormControl} from '@angular/forms' -import { HttpClient } from '@angular/common/http'; -import {BrowserModule} from '@angular/platform-browser' import {ChartsModule, Color} from 'ng2-charts'; -import {Observable} from 'rxjs'; -import {map, startWith, debounceTime, distinctUntilChanged, switchMap} from 'rxjs/operators'; import { MastersService } from '../settings/service/masters/masters.service'; import { DashboardService } from './dashboard.service'; import { NgxDrpOptions, PresetItem, Range } from 'ngx-mat-daterange-picker'; import { BaseChartDirective } from 'ng2-charts/ng2-charts'; -//import { DatePipe } from '@angular/common'; @Component({ selector: 'app-dashboard', @@ -52,9 +47,6 @@ export class DashboardComponent { total1: number = 0; total2: number = 0; total3: number = 0; - total4: number = 0; - total5: number = 0; - total6: number = 0; flag : number = 0; // doughnutChartColors: any[] = [{ @@ -74,12 +66,8 @@ export class DashboardComponent { } }; - /** Declaration Part Of SubCard Section */ - - alertMessage : any=[]; + /** Declaration Part Of Title Section */ - selectedCity : any=[]; - selectedLender : any=[]; /** Declaration Part Of Title Form Section */ myControl = new FormControl(); @@ -89,6 +77,8 @@ export class DashboardComponent { lenderData : any[]; cityData : any[]; + selectedCity : any=[]; + selectedLender : any=[]; constructor(private _dashboardService: DashboardService, private _masterService: MastersService) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 084f7105d..f6a5614f5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -117,17 +117,29 @@ - + Yes No - + +
    + +
    +
    + + + + + + +
    +
    diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index c83c49c1e..b007e5558 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -29,9 +29,11 @@ import {ActivatedRoute, Router} from "@angular/router"; }) export class BankingDetailsComponent implements OnInit { @Input() pdid: number; + @Input() pd_all_details:any; public bankingForm: FormGroup; step: number; private notifier: NotifierService; + public pd_cus_segment:string; m_accountType= []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -45,6 +47,11 @@ export class BankingDetailsComponent implements OnInit { this.step = 0; this.initBankingForm(); this.getM_AccountType(); + this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); + // console.log("(0,3): " + this.pd_cus_segment.substring(0,3)); + // console.log(this.pd_all_details.pdmaster_details); + // console.log(this.pd_cus_segment); + this.pd_cus_segment = this.pd_cus_segment.substring(0,3); let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = '7'; @@ -99,7 +106,8 @@ export class BankingDetailsComponent implements OnInit { salary: ['', Validators.compose([Validators.required])], limit: ['', Validators.compose([Validators.required])], is_main: ['', Validators.compose([Validators.required])], - vintage: ['', Validators.compose([Validators.required])], + vintage_year: ['', Validators.compose([Validators.required])], + vintage_month: ['', Validators.compose([Validators.required])], }); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index ef9a5c332..afb0576b1 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -61,7 +61,7 @@ - + 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 2b24e4833..860bad2e9 100644 --- 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 @@ -69,6 +69,7 @@ export class EmploymentInfoComponent implements OnInit { } this.employmentForm.controls['attendance_seen'].setValue(value.records.attendance_seen); this.employmentForm.controls['sal_reg_seen'].setValue(value.records.sal_reg_seen); + this.employmentForm.controls['which_date_the_salary_is_rcv'].setValue(value.records.which_date_the_salary_is_rcv); this.employmentForm.controls['gross_monthly_salary'].setValue(value.records.gross_monthly_salary); this.employmentForm.controls['net_monthly_salary'].setValue(value.records.net_monthly_salary); this.employmentForm.controls['bonus_incentive'].setValue(value.records.bonus_incentive); @@ -100,6 +101,7 @@ export class EmploymentInfoComponent implements OnInit { confirm_salary_amount: [''], attendance_seen: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], sal_reg_seen: [this.pd_cus_segment=='SAL-CHQ' ? 'No' : '', Validators.compose([Validators.required])], + which_date_the_salary_is_rcv:[''], gross_monthly_salary: ['', Validators.compose([Validators.required])], net_monthly_salary: ['', Validators.compose([Validators.required])], bonus_incentive: ['', Validators.compose([Validators.required])], @@ -132,6 +134,7 @@ export class EmploymentInfoComponent implements OnInit { } records.attendance_seen = this.employmentForm.controls['attendance_seen'].value; records.sal_reg_seen = this.employmentForm.controls['sal_reg_seen'].value; + records.which_date_the_salary_is_rcv = this.employmentForm.controls['which_date_the_salary_is_rcv'].value; records.gross_monthly_salary = this.employmentForm.controls['gross_monthly_salary'].value; records.net_monthly_salary = this.employmentForm.controls['net_monthly_salary'].value; records.bonus_incentive = this.employmentForm.controls['bonus_incentive'].value; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 61a3146a5..c7af108fe 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -407,7 +407,7 @@ - + diff --git a/ng6-seed/src/app/settings/users/register/register.component.html b/ng6-seed/src/app/settings/users/register/register.component.html index 4564ad88a..d791fb434 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -55,12 +55,12 @@
    - email Address Required. + Email Address Required. Invalid Email Address. - + Phone Number Required. Invalid Phone Number. diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index 20e3fbe8c..372df5901 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -430,5 +430,14 @@ this.loader = true; delete this.users.localUserId; this.router.navigate(['setting/users/userlist']); } + /** On Key Press Event For Numbers */ + keyPress(event: any) { + const pattern = /[0-9]/; + + let inputChar = String.fromCharCode(event.charCode); + if (event.keyCode != 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } } \ No newline at end of file