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/package.json b/ng6-seed/package.json index 06740755f..77f4ff8ef 100644 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -88,4 +88,3 @@ "typescript": "^2.7.2" } } - \ No newline at end of file diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index d02b0aefb..3549917f4 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,4 +1,4 @@ -
+
@@ -118,7 +117,6 @@
-
@@ -168,4 +166,4 @@
-
\ No newline at end of file + --> \ 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..17ada9492 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -9,57 +9,57 @@ export class DashboardComponent { 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', - }, ]; + // //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', - }, ]; + // //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', - }, ]; + // //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/company/company.component.html b/ng6-seed/src/app/settings/masters/component/company/company.component.html index aa9475cdb..a2cd3386f 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company.component.html +++ b/ng6-seed/src/app/settings/masters/component/company/company.component.html @@ -78,4 +78,5 @@ - \ 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/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..10732c318 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,9 +35,9 @@ {{row.serialno}} - + Question Category Name - {{row.categroy_name}} + {{row.category_name}} @@ -47,7 +47,7 @@ class="example-margin" matTooltip="Active" matTooltipPosition="above" checked="true" [color]="color" - (change)="isactiveQuestionCategory(row.question_categroy_id,row.isactive)" + (change)="isactiveQuestionCategory(row.question_category_id,row.isactive)" (click)="deactive()"> @@ -55,7 +55,7 @@ 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()"> @@ -76,7 +76,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/masters.component.html b/ng6-seed/src/app/settings/masters/masters.component.html index c1825639c..e258e2f9a 100644 --- a/ng6-seed/src/app/settings/masters/masters.component.html +++ b/ng6-seed/src/app/settings/masters/masters.component.html @@ -11,88 +11,92 @@ [placeholderLabel]="'Find Masters...'" [noEntriesFoundLabel]="'no matching found'"> - + + + {{master.master_name}} You must Pickup Master Name.
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - -
-
- -
-
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
-
-
- -
-
- - -
-
- -
+
+
+ + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
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}}