diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 7119b427d..f30e1a2fb 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4294,12 +4294,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4314,17 +4316,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4441,7 +4446,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4453,6 +4459,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4467,6 +4474,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4474,12 +4482,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4498,6 +4508,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4578,7 +4589,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4590,6 +4602,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4711,6 +4724,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index d02b0aefb..27e02bdc9 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,4 +1,5 @@ -
+ +
@@ -118,47 +118,68 @@
- -
-
+======= + + +
+
+
- Lender - PD Triggered Today + Personal Discussion Details + +
+ +
+ + +
+ + +
+
+ + + \ 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 d22f38292..f260b7b7c 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; + @Component({ selector: 'app-dashboard', @@ -6,60 +7,151 @@ import { Component } from '@angular/core'; styleUrls: ['./dashboard.component.scss'] }) export class DashboardComponent { + //public single: any[]; + //public multi: any[]; + + public showXAxis = true; + public showYAxis = true; + public gradient = false; + public showLegend = false; + public showXAxisLabel = true; + public xAxisLabel = 'Type'; + public showYAxisLabel = true; + public yAxisLabel = 'Application'; + public colorScheme = { + domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3', '#ffd740 ', '#eb35bb '] + }; constructor() { - + } - //Lender wise PD Triggered - lenderpd: Object[] = [{ - lendername:'ICICI', - billingaddr:'Bangalore', - fullpd:'9', - smartpd:'6', - }, { - lendername:'IOB', - billingaddr:'Chennai', - fullpd:'10', - smartpd:'5', - }, { - lendername:'SBI', - billingaddr:'Pune', - fullpd:'16', - smartpd:'3', - }, ]; - //City Wise PD Triggered - citywisepd: Object[] = [{ - cityname: 'Bangalore', - fullpd:'45', - smartpd:'17', - }, { - cityname: 'Chennai', - fullpd:'33', - smartpd:'16', - }, { - cityname: 'Salem', - fullpd:'22', - smartpd:'12', - }, ]; + // //Lender wise PD Triggered + // lenderpd: Object[] = [{ + // lendername:'ICICI', + // billingaddr:'Bangalore', + // fullpd:'9', + // smartpd:'6', + // }, { + // lendername:'IOB', + // billingaddr:'Chennai', + // fullpd:'10', + // smartpd:'5', + // }, { + // lendername:'SBI', + // billingaddr:'Pune', + // fullpd:'16', + // smartpd:'3', + // }, ]; - //Same status - message: Object[] = [{ - applicantname: 'Saravana', - applicantid:'ICICITN0118000354', - lendername:'ICICI', - status:'Allocated', - photo: 'assets/images/face3.jpg', - }, { - applicantname: 'Kumaran', - applicantid:'IOBKA0418000578', - lendername:'IOB', - status:'Allocated', - photo: 'assets/images/face6.jpg', - }, { - applicantname: 'Priya', - applicantid:'SBIGA0118000241', - lendername:'SBI', - status:'Triggered', - photo: 'assets/images/face4.jpg', - }, ]; + // multi: Object[] = [ + // { + // name: 'Full', + // series: [ + // { + // name: 'Triggered', + // value: 50 + // }, + // { + // name: 'Allocated', + // value: 29 + // }, + // { + // name: 'Schudled', + // value: 45 + // }, + // { + // name: 'InProgress', + // value: 67 + // }, + // { + // name: 'Completed', + // value: 34 + // },{ + // name: 'QC Completed', + // value: 22 + // } + // ] + // }, + // { + // name: 'Smart', + // series: [ + // { + // name: 'Triggred', + // value: 60 + // }, + // { + // name: 'Allocated', + // value: 33 + // }, + // { + // name: 'Schudled', + // value: 76 + // }, + // { + // name: 'InProgress', + // value: 34 + // },{ + // name: 'Completed', + // value: 56 + // },{ + // name: 'QC Completed', + // value: 45 + // } + // ] + // }, + // ]; + + // //Lender wise PD Triggered + // lenderpd: Object[] = [{ + // lendername:'ICICI', + // billingaddr:'Bangalore', + // fullpd:'9', + // smartpd:'6', + // }, { + // lendername:'IOB', + // billingaddr:'Chennai', + // fullpd:'10', + // smartpd:'5', + // }, { + // lendername:'SBI', + // billingaddr:'Pune', + // fullpd:'16', + // smartpd:'3', + // }, ]; + + // //City Wise PD Triggered + // citywisepd: Object[] = [{ + // cityname: 'Bangalore', + // fullpd:'45', + // smartpd:'17', + // }, { + // cityname: 'Chennai', + // fullpd:'33', + // smartpd:'16', + // }, { + // cityname: 'Salem', + // fullpd:'22', + // smartpd:'12', + // } ]; + + // //Same status + // message: Object[] = [{ + // applicantname: 'Saravana', + // applicantid:'ICICITN0118000354', + // lendername:'ICICI', + // status:'Allocated', + // photo: 'assets/images/face3.jpg', + // }, { + // applicantname: 'Kumaran', + // applicantid:'IOBKA0418000578', + // lendername:'IOB', + // status:'Allocated', + // photo: 'assets/images/face6.jpg', + // }, { + // applicantname: 'Priya', + // applicantid:'SBIGA0118000241', + // lendername:'SBI', + // status:'Triggered', + // photo: 'assets/images/face4.jpg', + // } ]; } diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts index 4b051e7fc..aa157394c 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts @@ -58,7 +58,7 @@ export class BranchDialogComponent implements OnInit { } }, error => this.errorMessage = error); - + } /** Branch Form Datas*/ diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html index b548f6251..fcdbc2c68 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html @@ -26,17 +26,17 @@ - Branch Name + Branch {{row.name}} - City Name + City {{row.city_name}} - Actions + Action @@ -44,7 +44,7 @@ - Is Active + Active - + diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts index edd6fd2d5..5fea0b7ff 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts @@ -150,7 +150,7 @@ active(){ Swal({ title: 'Are you sure?', type: 'warning', - showCancelButton: true, + showCancelButton: true, confirmButtonColor: '#3085d6', cancelButtonColor: '#d33', confirmButtonText: 'Yes, activate it!' diff --git a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html index ad8dec250..728a52b03 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html @@ -100,12 +100,12 @@ - City Name + City {{row.name}} - State Name + State {{row.state_name}} diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html index 860e77df7..78aafa8a6 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html @@ -94,7 +94,7 @@ - Comments On Locality Rating + Locality Rating {{row.rating}} @@ -107,7 +107,7 @@ --> - Actions + Action @@ -115,7 +115,7 @@ - Is Active + Active - \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/component/company/company.component.ts b/ng6-seed/src/app/settings/masters/component/company/company.component.ts index 17b2f760f..310dcfe96 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company.component.ts +++ b/ng6-seed/src/app/settings/masters/component/company/company.component.ts @@ -9,6 +9,7 @@ import { FormBuilder, /** Service */ import { MastersService } from '../../../service/masters/masters.service'; +import { NotifierService } from 'angular-notifier'; @Component({ @@ -21,14 +22,15 @@ export class CompanyComponent implements OnInit { public _companyForm: FormGroup; public companyData: any = []; + private notifier: NotifierService; stateDatas: any[]; citydatas: any[]; errorMessage:string; - constructor(private _formBuilder: FormBuilder, - private _mastersService: MastersService) { } + constructor(private _formBuilder: FormBuilder,notifier: NotifierService, + private _mastersService: MastersService) { this.notifier = notifier; } FetchFormValue() { this._mastersService.getAllCompany().subscribe( @@ -139,11 +141,12 @@ export class CompanyComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ - - alert("Data Saved Successfully"); + //alert("Data Saved Successfully"); + this.notifier.notify('success', 'Record Saved Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); @@ -153,11 +156,12 @@ export class CompanyComponent implements OnInit { this._mastersService.editMasterDetails(CompanyFormValue,'COMPANY').subscribe( dataresult=>{ if (dataresult.dataStatus == true){ - - alert("Data Edited Successfully"); + //alert("Data Edited Successfully"); + this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + //alert("SomeThing Wents Wrong Try Again !"); + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } } diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html index 1c738a32b..e422a9d8e 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html @@ -105,7 +105,7 @@ --> - Actions + Action @@ -113,7 +113,7 @@ - Is Active + Active diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html index 4a701354a..a11e5ff36 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html @@ -94,13 +94,13 @@ - Customer Segment + Segment {{row.name}} - Actions + Action @@ -109,7 +109,7 @@ - Is Active + Active diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html index c7ba7e2d7..0909e1c7d 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html @@ -96,12 +96,12 @@ - Designation Name + Designation {{row.name}} - Is Active + Active @@ -124,7 +124,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html index ee86a9249..53fd768ea 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html @@ -105,12 +105,12 @@ - Frequency Name + Frequency {{row.name}} - Is Active + Active - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html index 5925987f3..29f81a42a 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html @@ -34,16 +34,16 @@ - Industry Classification Name + Classification {{row.name}} - Is Active + Active - + diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html index 669e3cb9d..d29cbfe6e 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html @@ -90,17 +90,17 @@ - Lender Hierarchy + Hierarchy {{row.lender_hierarchy}} - State Name + State {{row.cityname}} - Is Active + Active - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html index 00da6e7cc..c37bbfac3 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html @@ -109,14 +109,14 @@ - Occupation Non Earning Member + Occupation {{row.name}} - Is Active + Active - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html index a0b0d17a2..8d2a4fee3 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html @@ -28,12 +28,12 @@ - PD Allocation Type + Type {{row.pd_allocation_type_name}} - PD Allocation Logic + Logic {{row.pd_allocation_logic}} diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html index 7cc5879cf..d65b8cde4 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html @@ -33,7 +33,7 @@ fxLayoutAlign="center">
- + Description Required. diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html index 69b6028a0..fc9991cd7 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html @@ -90,12 +90,12 @@ - PD Location + Location {{row.description}} - Is Active + Active - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html index 0f5bbdbe5..08a08a66d 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-notification/pd-notification-list.component.html @@ -36,7 +36,7 @@ - PD Status + Status {{row.pd_status_name}} diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html index 45815f287..ed7ac372d 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html @@ -90,12 +90,12 @@ - PD Type + Type {{row.type_name}} - Is Active + Active diff --git a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html index 59d48ad1c..677912f7f 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html @@ -36,7 +36,7 @@ - Product Name + Product {{row.name}} @@ -46,7 +46,7 @@ - Is Active + Active @@ -69,7 +69,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html index b54a9f9fd..770a4570f 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html @@ -1,4 +1,4 @@ - +
@@ -15,14 +15,14 @@ fxLayoutAlign="center">
- - Category Name Required. + + Category Name Required.
- + diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts index f276c315f..6959b2127 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.ts @@ -31,8 +31,8 @@ export class QuestionCategoryDialogComponent implements OnInit { formfunction(){ this._questionCategoryForm = this._formBuilder.group({ - question_categroy_id: [this.data.question_categroy_id], - categroy_name: [this.data.categroy_name, Validators.compose([Validators.required])], + question_category_id: [this.data.question_category_id], + category_name: [this.data.category_name, Validators.compose([Validators.required])], }); } @@ -44,7 +44,7 @@ export class QuestionCategoryDialogComponent implements OnInit { /** To Save/Edited Popup Data */ onSubmit() { var QuestionFormValues = this._questionCategoryForm.value; - if(isNaN(this.data.question_categroy_id)) { + if(isNaN(this.data.question_category_id)) { Object.keys(QuestionFormValues).forEach((key) => ( QuestionFormValues[key] == null) && delete QuestionFormValues[key]); @@ -82,7 +82,7 @@ export class QuestionCategoryDialogComponent implements OnInit { } /** To Reset Popup Data */ onReset(){ - this._questionCategoryForm.reset({ id: this.data.question_categroy_id }); + this._questionCategoryForm.reset({ id: this.data.question_category_id }); } onResetedited(){ diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html index 23d77bb4d..96272fc1b 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html @@ -35,19 +35,25 @@ {{row.serialno}} - +<<<<<<< HEAD + Question Category Name + {{row.category_name}} +======= + + Category {{row.categroy_name}} +>>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff - Is Active + Active @@ -55,14 +61,14 @@ class="example-margin" matTooltip="Inactive" matTooltipPosition="above" checked="false" [color]="color" - (change)="isactiveQuestionCategory(row.question_categroy_id,row.isactive)" + (change)="isactiveQuestionCategory(row.question_category_id,row.isactive)" (click)="active()"> - Actions + Action @@ -76,7 +82,7 @@
- + diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts index fd3169758..0e1bfe851 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts @@ -35,8 +35,8 @@ export class QuestionCategoryListComponent implements OnInit { public dataLength: number; public dataSource = new MatTableDataSource(); - // - displayedColumns = ['serialno','categroy_name','actions', 'isactive']; + // + displayedColumns = ['serialno','category_name','actions', 'isactive']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -102,7 +102,7 @@ export class QuestionCategoryListComponent implements OnInit { //To inactive the data deleteQuestionCategory(id: number) { - var PrimaryKeyWithValue ={'question_categroy_id':id}; + var PrimaryKeyWithValue ={'question_category_id':id}; this._MasterService.deleteMasterDetails(PrimaryKeyWithValue,'QUESTIONCATEGORY') .subscribe( data => { }); this.getQuestionCategory(); @@ -112,8 +112,8 @@ export class QuestionCategoryListComponent implements OnInit { isactiveQuestionCategory(id: number,isactive : number) { let ActiveDatas = isactive == 0 - ? { 'question_categroy_id':id,'isactive': '1'} - : { 'question_categroy_id':id,'isactive': '0'} + ? { 'question_category_id':id,'isactive': '1'} + : { 'question_category_id':id,'isactive': '0'} this._MasterService.editMasterDetails(ActiveDatas,'QUESTIONCATEGORY') .subscribe(dataresult=>{ diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html index 721a29181..716f3fcd0 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html @@ -21,12 +21,12 @@ - Region Name + Region {{row.name}} - Is Active + Active - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html index 47ac9f9b0..ca7f53328 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html @@ -112,13 +112,13 @@ - Relationship Name + Relationship {{row.name}} - Is Active + Active @@ -141,7 +141,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html index 22983dd36..197920973 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html @@ -131,17 +131,17 @@ - State Name + State {{row.name}} - Region Name + Region {{row.region_name}} - Is Active + Active @@ -164,7 +164,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html index 8ddf1791e..590ea0f63 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html @@ -120,17 +120,17 @@ - Product Name + Product {{row.product_name}} - Sub-Product Name + Sub-Product {{row.name}} - Is Active + Active @@ -153,7 +153,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html index 216b2fa5b..fcca0155c 100644 --- a/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html @@ -109,12 +109,12 @@ - Title Name + Title {{row.name}} - Is Active + Active @@ -137,7 +137,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html index 478f72eef..aabc465a8 100644 --- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html @@ -103,12 +103,12 @@ - Activity Name + Activity {{row.name}} - Is Active + Active @@ -131,7 +131,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html index dc2e9ab0f..ca7892d3c 100644 --- a/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html @@ -29,13 +29,13 @@ - UOM Name + UOM {{row.name}} - Is Active + Active @@ -58,7 +58,7 @@ - Actions + Action diff --git a/ng6-seed/src/app/settings/masters/masters.component.html b/ng6-seed/src/app/settings/masters/masters.component.html index c1825639c..9b24cc3a0 100644 --- a/ng6-seed/src/app/settings/masters/masters.component.html +++ b/ng6-seed/src/app/settings/masters/masters.component.html @@ -11,94 +11,174 @@ [placeholderLabel]="'Find Masters...'" [noEntriesFoundLabel]="'no matching found'"> - + + + {{master.master_name}} - You must Pickup Master Name. +
-
+<<<<<<< HEAD +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+======= +
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+ + +
-
- -
-
- -
-
- -
-
- -
-
- - -
-
- -
-
- -
-
+
-
- - +
+
-
- +
+
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+>>>>>>> f40b8b4997c74fe358c25b41f5e1e558c66841ff - - \ No newline at end of file diff --git a/ng6-seed/src/app/settings/masters/masters.component.ts b/ng6-seed/src/app/settings/masters/masters.component.ts index 3c840fa23..642bae1e0 100644 --- a/ng6-seed/src/app/settings/masters/masters.component.ts +++ b/ng6-seed/src/app/settings/masters/masters.component.ts @@ -17,6 +17,12 @@ name: string; } + + export interface Dbmaster{ + master_id: number; + master_name: string; + constant_name: string; + } // export interface Master { // master_id: string; // master_name: string; @@ -35,9 +41,16 @@ styleUrls: ['./masters.component.scss'] }) export class MastersComponent implements OnInit { - + + private dbmasters: Dbmaster[]; + + + //public dbmasters: Dbmaster = new Dbmaster(); + + //public arr: Array<{master_id: number, master_name: string}>; + /* Normal Search Code - pickUpMasterData : string; + pickUpMasterData : string constructor() {} @@ -86,7 +99,7 @@ export class MastersComponent implements OnInit { /** control for the MatSelect filter keyword */ public masterFilterCtrl: FormControl = new FormControl(); - + //masters: Master[]; constructor(private _MastersService: MastersService) @@ -98,38 +111,42 @@ export class MastersComponent implements OnInit { } /** list of masters */ - - private masters: Master[] = [ - {id: 'master-1',name: 'Industry Classfication'}, - {id: 'master-2',name: 'Branch'}, - {id: 'master-3',name: 'Title'}, - {id: 'master-4',name: 'City'}, - {id: 'master-5',name: 'States'}, - {id: 'master-6',name: 'Regions'}, - {id: 'master-7',name: 'Relation Ship'}, - {id: 'master-8',name: 'Product'}, - {id: 'master-9',name: 'Sub Product'}, - {id: 'master-10',name: 'Occupation of Non earning members'}, - {id: 'master-11',name: 'Type of activity'}, - {id: 'master-12',name: 'Unit of Measurement'}, - {id: 'master-13',name: 'Frequency'}, - {id: 'master-14',name: 'Comments on locality'}, - {id: 'master-15',name: 'Customer Behaviour'}, - {id: 'master-16',name: 'Customer Segment'}, - {id: 'master-17',name: 'Designation'}, - {id: 'master-18',name: 'Lender Hierarchy'}, - {id: 'master-19',name: 'Company Details'}, - {id: 'master-20',name: 'Question Category'}, - {id: 'master-21',name: 'PD Type'}, - {id: 'master-22',name: 'Approach to PD location'}, - {id: 'master-23',name: 'PD Allocation Type'}, - {id: 'master-24',name: 'PD Notification'}, - // {id: 'master-25',name: 'PD Office Lender'}, - // {id: 'master-25',name: 'PD Team'}, - ]; + + // private masters: Master[] = [ + // {id: 'master-1',name: 'Industry Classfication'}, + // {id: 'master-2',name: 'Branch'}, + // {id: 'master-3',name: 'Title'}, + // {id: 'master-4',name: 'City'}, + // {id: 'master-5',name: 'States'}, + // {id: 'master-6',name: 'Regions'}, + // {id: 'master-7',name: 'Relation Ship'}, + // {id: 'master-8',name: 'Product'}, + // {id: 'master-9',name: 'Sub Product'}, + // {id: 'master-10',name: 'Occupation of Non earning members'}, + // {id: 'master-11',name: 'Type of activity'}, + // {id: 'master-12',name: 'Unit of Measurement'}, + // {id: 'master-13',name: 'Frequency'}, + // {id: 'master-14',name: 'Comments on locality'}, + // {id: 'master-15',name: 'Customer Behaviour'}, + // {id: 'master-16',name: 'Customer Segment'}, + // {id: 'master-17',name: 'Designation'}, + // {id: 'master-18',name: 'Lender Hierarchy'}, + // {id: 'master-19',name: 'Company Details'}, + // {id: 'master-20',name: 'Question Category'}, + // {id: 'master-21',name: 'PD Type'}, + // {id: 'master-22',name: 'Approach to PD location'}, + // {id: 'master-23',name: 'PD Allocation Type'}, + // {id: 'master-24',name: 'PD Notification'}, + // // {id: 'master-25',name: 'PD Office Lender'}, + // // {id: 'master-25',name: 'PD Team'}, + // ]; /** list of masters filtered by search keyword */ - public filteredMasters: ReplaySubject = new ReplaySubject(1); + + //public filteredMasters: ReplaySubject = new ReplaySubject(1); + + + public filteredMasters: ReplaySubject = new ReplaySubject(1); @ViewChild('singleSelect') singleSelect: MatSelect; @@ -139,14 +156,35 @@ export class MastersComponent implements OnInit { ngOnInit() { + // this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe((data:Master[]) => { // this.masters = data; // console.log(this.masters); // }); - console.log(this.masters); + //console.log(this.masters); + + this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => { + this.dbmasters = data.records; + this.dbmasters = this.dbmasters.sort((a, b) => { + if (a.master_name > b.master_name) { + return 1; + } + if (a.master_name < b.master_name) { + return -1; + } + return 0; + }); + this.filteredMasters.next(this.dbmasters.slice()); + }); + // load the initial master list - this.filteredMasters.next(this.masters.slice()); + //this.filteredMasters.next(this.masters.slice()); + + //console.log(this.dbmasters.master_id); + + // load the initial master list + // listen for search field value changes this.masterFilterCtrl.valueChanges .pipe(takeUntil(this._onDestroy)) @@ -158,6 +196,7 @@ export class MastersComponent implements OnInit { ngAfterViewInit() { //this.setInitialValue(); + //console.log('ngafterViewInit',this.dbmasters); } ngOnDestroy() { @@ -182,21 +221,64 @@ export class MastersComponent implements OnInit { // } private filterMasters() { - if (!this.masters) { + + if (!this.dbmasters) { return; + + // this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => { + // this.dbmasters = data.records; + // if (!this.dbmasters) { + // return; + // } + //console.log(this.dbmasters); } + + // get the search keyword let search = this.masterFilterCtrl.value; if (!search) { - this.filteredMasters.next(this.masters.slice()); + + this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => { + this.dbmasters = data.records; + this.dbmasters = this.dbmasters.sort((a, b) => { + if (a.master_name > b.master_name) { + return 1; + } + if (a.master_name < b.master_name) { + return -1; + } + return 0; + }); + this.filteredMasters.next(this.dbmasters.slice()); + }); + + + //this.filteredMasters.next(this.masters.slice()); + return; } else { search = search.toLowerCase(); } // filter the masters + this._MastersService.getAllMasterData('LISTOFMASTERS').subscribe(data => { + this.dbmasters = data.records; + this.dbmasters = this.dbmasters.sort((a, b) => { + if (a.master_name > b.master_name) { + return 1; + } + if (a.master_name < b.master_name) { + return -1; + } + return 0; + }); + this.filteredMasters.next( - this.masters.filter(master => master.name.toLowerCase().indexOf(search) > -1) + //this.masters.filter(master => master.name.toLowerCase().indexOf(search) > -1) + this.dbmasters.filter(master => master.master_name.toLowerCase().indexOf(search) > -1) ); + }); + + //this.filteredMasters.next(this.dbmasters.slice()); } } diff --git a/ng6-seed/src/app/settings/masters/model/Dbmaster.ts b/ng6-seed/src/app/settings/masters/model/Dbmaster.ts new file mode 100644 index 000000000..ca8195cc2 --- /dev/null +++ b/ng6-seed/src/app/settings/masters/model/Dbmaster.ts @@ -0,0 +1,7 @@ +export class Dbmaster { + + master_id: any; + master_name: any; + constant_name: any; + +} diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html index 67e0462a9..4392ea103 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html @@ -12,22 +12,23 @@
-
+
- -
-<<<<<<< HEAD - -======= + +
+ + +
-
+ +
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html index 6a07b4430..e31ad0925 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html @@ -3,22 +3,23 @@
Manage PD Team
-
+
-
+ + +
-
+
- {{pdteamdetails.team_name | titlecase}} info - -
+ {{pdteamdetails.team_name | titlecase}} info + {{pdteamdetails.short_name}}
@@ -49,5 +50,7 @@
{{pdTeamManageData}}
+ + \ No newline at end of file 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 5065050f5..c48574908 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.html +++ b/ng6-seed/src/app/settings/users/register/register.component.html @@ -1,79 +1,121 @@ - - - USER REGISTRATION - - - +
- Personal
+
+
+
User Registration
+
+
+ + + +
+
+
+
+ + Personal
+ +
+ + +
+ User Profile + +
+
+ +
+ + {{img}} + +
+ + + First Name Required. + Atleast 5 Characters. + Not More Than 10 Characters. + -
- - - First Name Required. - Atleast 5 Characters. - Not More Than 10 Characters. - +
+ + + Last Name Required. + + + + + +
+ + + Isactive + + +
+ + - - - - Last Name Required. - - - - - - - -
+
+
+ + Contact
+ +
+ + + email Address Required. + Invalid Email Address. + +
+ + + + Phone Number Required. + Invalid Phone Number. + + +
+ + + -- + + {{s.name}} + + + State Required. +
+ + + + -- + + {{c.name}} + + + city Required. + +
+ + + +
+ + - Account Details

-
- - - email Address Required. - Invalid Email Address. - - - - - - Phone Number Required. - Invalid Phone Number. - - - - - -- - - {{s.name}} - - - State Required. - - - - - -- - - {{c.name}} - - - city Required. - -
- + + @@ -134,7 +176,8 @@ city Required.
--> - Role Information

+ Role
+
Enitity Type Required +
@@ -157,7 +201,9 @@ Lender Name Required. + +
-- @@ -165,7 +211,10 @@ {{ent.full_name}} Vendor Name Required. - + + +
+ @@ -180,9 +229,12 @@
+ + + +
-
-
- User Profile - -
-
- -
- - {{img}} - -
-
- - Isactive - -
-
+
diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.html b/ng6-seed/src/app/settings/users/user-list/user-list.component.html index b5a3a6fed..1d9c308f8 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.html +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.html @@ -1,88 +1,90 @@ - - - -
-
- -
-
-
Users
-
- - - - -
+
+ +
+
+ Users +
- - - - Sl - {{us.SerialNo}} - - - - Full Name - {{us.user_first_name}} {{us.user_last_name}} - - - - Email Id - {{us.email}} - - - Mobile No - {{us.mobile_no}} - - - Roles - {{us.role_name}} - - - Entities - {{us.entitytypename}} - - - Is Active - - - - - - - - - - - - Actions - - edit - - - - - - - - - - - - - -
- + +
+
+
+ + + + +
+
+ + + + Sl + {{us.SerialNo}} + + + + Name + {{us.user_first_name}} {{us.user_last_name}} + + + + Email + {{us.email}} + + + Mobile + {{us.mobile_no}} + + + Role + {{us.role_name}} + + + Entity + {{us.entitytypename}} + + + Active + + + + + + + + + + + + Action + + edit + + + + + + + + + + + +
+ + +
+ \ No newline at end of file diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts index 29f23fae9..5d9842295 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts @@ -5,7 +5,8 @@ import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material'; import { UserService } from '../../service/user.service'; import { DataSource } from '@angular/cdk/table'; import { CognitoService } from '../../../AwsService/cognito.service'; - + /**sweet alert */ +import Swal from 'sweetalert2' @Component({ selector: 'app-user-list', @@ -146,5 +147,41 @@ export class UserListComponent implements OnInit { this.getusers(); }) } + //Sweetalert2 for active and deactive +active(){ + Swal({ + title: 'Are you sure?', + type: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes, activate it!' + }).then((result) => { + if (result.value) { + Swal( + 'Activated!', + 'success' + ) + } + }) +} +deactive() +{ + Swal({ + title: 'Are you sure?', + type: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes, deactivate it!' + }).then((result) => { + if (result.value) { + Swal( + 'Deactivated!', + 'success' + ) + } + }) +} } diff --git a/ng6-seed/src/app/template/questions/add/add.component.html b/ng6-seed/src/app/template/questions/add/add.component.html index c088d4150..029b2a39b 100644 --- a/ng6-seed/src/app/template/questions/add/add.component.html +++ b/ng6-seed/src/app/template/questions/add/add.component.html @@ -12,7 +12,7 @@
- {{ ct.categroy_name }} + {{ ct.category_name }} You must Select Category. diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.html b/ng6-seed/src/app/template/questions/edit/edit.component.html index 159e706ca..caa24924f 100644 --- a/ng6-seed/src/app/template/questions/edit/edit.component.html +++ b/ng6-seed/src/app/template/questions/edit/edit.component.html @@ -13,7 +13,7 @@
- {{ ct.categroy_name }} + {{ ct.category_name }} You must Select Category. diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html index d4f6ed730..0a16393fe 100644 --- a/ng6-seed/src/app/template/questions/list/list.component.html +++ b/ng6-seed/src/app/template/questions/list/list.component.html @@ -12,8 +12,8 @@ - - {{cat.categroy_name}} + + {{cat.category_name}}
@@ -33,11 +33,11 @@
- {{ product.categroy_name }} + {{ product.category_name }}
{{ product.question }} @@ -84,9 +84,9 @@
- + Category - {{row.categroy_name}} + {{row.category_name}} diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html index ec6b2a986..de6c3b18d 100644 --- a/ng6-seed/src/index.html +++ b/ng6-seed/src/index.html @@ -124,6 +124,11 @@ .mat-cell{ font-size:1.2em !important; } + .mat-header-cell{ + font-size:1.2em !important; + font-weight:800 !important; + } + .swal2-header { text-align:left !important; }