diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 21ddcce91..ae5969331 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -222,6 +222,7 @@ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 4b24803a8..1a0e2fb39 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -515,6 +515,26 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.router.navigate(['../../../startpd', pdDetails.assigned_pd,this.masterRandomString], { relativeTo: this.route }); } } + getPDStart2(pdDetails: any, status: string) { + this.destroyType = 3; + if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED) { + const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, { + data: { pdid: pdDetails.assigned_pd, pd_status: this.pdStatusCheck.INPROGRESS ,random_string:this.masterRandomString}, + disableClose: true, + minWidth: '30%', + maxWidth: '40%', + }); + dialogRef.afterClosed() + .subscribe(dataresult => { + if (dataresult.update_status == true) { + this.router.navigate(['../../../startpd2',pdDetails.assigned_pd,this.masterRandomString], { relativeTo: this.route }); + } + }); + } + else { + this.router.navigate(['../../../startpd2', pdDetails.assigned_pd,this.masterRandomString], { relativeTo: this.route }); + } + } getPDIDReport(pdID: any) { this.destroyType = 3; diff --git a/ng6-seed/src/app/template2/edit-template/edit-template.component.html b/ng6-seed/src/app/template2/edit-template/edit-template.component.html index 263d48f5f..294da2663 100644 --- a/ng6-seed/src/app/template2/edit-template/edit-template.component.html +++ b/ng6-seed/src/app/template2/edit-template/edit-template.component.html @@ -4,6 +4,10 @@
Deselective Questions will be Disable
+
+ +
@@ -64,4 +68,4 @@ - + diff --git a/ng6-seed/src/app/template2/edit-template/edit-template.component.ts b/ng6-seed/src/app/template2/edit-template/edit-template.component.ts index e94bbc2e2..6fbf35905 100644 --- a/ng6-seed/src/app/template2/edit-template/edit-template.component.ts +++ b/ng6-seed/src/app/template2/edit-template/edit-template.component.ts @@ -699,13 +699,8 @@ getLevel = (node: TodoItemFlatNode) => node.level; console.log(this.dataSource) } loadPdViewCompoent(){ - //this.router.routeReuseStrategy.shouldReuseRoute = () => false; - //this.router.onSameUrlNavigation = 'reload'; - - this.router.navigate(['template2/lenderlist']); - setTimeout(()=>{ //<<<---using ()=> syntax - window.location.reload() - }, 1); + + this.router.navigate(['../', ], {relativeTo: this.route}); //this.router.navigate([ 'template2/lenderlist'], { relativeTo: this.route }); } diff --git a/ng6-seed/src/app/template2/form-group/form-group.component.html b/ng6-seed/src/app/template2/form-group/form-group.component.html index 82232a921..473291386 100644 --- a/ng6-seed/src/app/template2/form-group/form-group.component.html +++ b/ng6-seed/src/app/template2/form-group/form-group.component.html @@ -4,7 +4,8 @@ {{pageTitle}}
- +
diff --git a/ng6-seed/src/app/template2/form-group/form-group.component.ts b/ng6-seed/src/app/template2/form-group/form-group.component.ts index 3fe88216b..61ea3cd22 100644 --- a/ng6-seed/src/app/template2/form-group/form-group.component.ts +++ b/ng6-seed/src/app/template2/form-group/form-group.component.ts @@ -116,6 +116,12 @@ export class FormGroupComponent implements OnInit { +} +loadPdViewCompoent(){ + + this.router.navigate(['../', ], {relativeTo: this.route}); + + //this.router.navigate([ 'template2/lenderlist'], { relativeTo: this.route }); } // direct form based questions OnSelectBusinessGroupForms(details: any, company: any,id:any) { diff --git a/ng6-seed/src/app/template2/lender-list/lender-list.component.html b/ng6-seed/src/app/template2/lender-list/lender-list.component.html index a3f8217d5..4bdba028b 100644 --- a/ng6-seed/src/app/template2/lender-list/lender-list.component.html +++ b/ng6-seed/src/app/template2/lender-list/lender-list.component.html @@ -1,4 +1,5 @@
+
diff --git a/ng6-seed/src/app/template2/lender-list/lender-list.component.ts b/ng6-seed/src/app/template2/lender-list/lender-list.component.ts index af8a183e8..22d2559b5 100644 --- a/ng6-seed/src/app/template2/lender-list/lender-list.component.ts +++ b/ng6-seed/src/app/template2/lender-list/lender-list.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, OnInit } from '@angular/core'; +import { Component, ViewChild, OnInit, ElementRef } from '@angular/core'; import { MatPaginator, MatSort, MatTableDataSource, MatDialog, PageEvent } from '@angular/material'; import { FormGroup, FormControl, FormBuilder } from '@angular/forms'; import { ActivatedRoute, Router, Params } from '@angular/router'; @@ -57,15 +57,14 @@ export class LenderListComponent implements OnInit { private masterService: MasterService, private _formBuilder: FormBuilder, private route: ActivatedRoute, - private router: Router, + private router: Router,private elementRef: ElementRef, private entityService: EntityService) { // this.filterFormGroupCtrl = this._formBuilder.group({ // category: [null, ''] // }); //<<<---using ()=> syntax - - - + + this.listView = 'block'; } @@ -134,6 +133,7 @@ export class LenderListComponent implements OnInit { // add questions popup model call addNewQuestion() { + this.router.navigate(['/setting/entity/add']); // const dialogRef = this.dialog.open(EntityAddComponent, { @@ -151,7 +151,7 @@ export class LenderListComponent implements OnInit { public parentMessage: any = []; editEntity(detail){ // this.parentMessage = detail; - this.router.navigate([ '../lenderlist/lps', detail.entity_id ], { relativeTo: this.route }); + this.router.navigate([ '../lenderlist/lps', detail.entity_id ], { relativeTo: this.route }); this.listView = false; localStorage.setItem('listView', this.listView); localStorage.setItem('entity_id', detail.entity_id); @@ -211,7 +211,9 @@ export class LenderListComponent implements OnInit { // alert(result); }); } - + ngOndestroy() { + this.elementRef.nativeElement.remove(); + } } diff --git a/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html b/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html index f84714dd5..94861a183 100644 --- a/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html +++ b/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.html @@ -4,6 +4,10 @@
Lender product and Customer Segment (Add / Edit)
+
+ +
@@ -62,3 +66,4 @@
+ \ No newline at end of file diff --git a/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.ts b/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.ts index c47218c3a..fa6a2d208 100644 --- a/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.ts +++ b/ng6-seed/src/app/template2/lender-product-seg-mapping/lender-product-seg-mapping.component.ts @@ -5,7 +5,7 @@ import { FormGroup, FormControl, FormBuilder, Validators, FormArray } from '@ang import { ActivatedRoute, Router, Params } from '@angular/router'; import { DataSource } from '@angular/cdk/table'; import { Observable } from 'rxjs/Observable'; - +import { LenderListComponent } from '../lender-list/lender-list.component'; import { NotifierService } from 'angular-notifier'; // import { TemplatesService } from './../../../../service/templates/templates.service'; @@ -47,7 +47,7 @@ export class LenderProductSegMappingComponent implements OnInit { constructor( - notifier: NotifierService, + notifier: NotifierService, private LenderListComponent: LenderListComponent, private masterService: MasterService, private route: ActivatedRoute, private router: Router, @@ -306,7 +306,13 @@ export class LenderProductSegMappingComponent implements OnInit { }); return seenDuplicate; } - + loadPdViewCompoent(){ + this.LenderListComponent.showListView(true); + this.router.navigate(['../../', ], {relativeTo: this.route}); + let d= localStorage.getItem('listView'); + console.log(d) + //this.router.navigate([ 'template2/lenderlist'], { relativeTo: this.route }); + } ngOnDestroy(): void { //Called once, before the instance is destroyed. //Add 'implements OnDestroy' to the class. diff --git a/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.html b/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.html index 2a1e17140..201b5d248 100644 --- a/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.html +++ b/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.html @@ -4,6 +4,10 @@
Section List Edit Items (Enable / Disable)
+
+ +
diff --git a/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.ts b/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.ts index f035d039c..8c652c265 100644 --- a/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.ts +++ b/ng6-seed/src/app/template2/selection-list-view/selection-list-view.component.ts @@ -206,7 +206,7 @@ export class SelectionListViewComponent implements OnInit { if(details.is_group_form == 1){ this.masterService.list_3.next(details); console.log(id) - this.router.navigate(['Group-form'], { relativeTo: this.route }); + this.router.navigate(['group-form'], { relativeTo: this.route }); }else{ @@ -253,7 +253,8 @@ export class SelectionListViewComponent implements OnInit { } // load pd view component loadPdViewCompoent() { - this.router.navigate(['../../../viewpd', this.pdMasterList.parent_pd_id,this.randomString], {relativeTo: this.route}); + + this.router.navigate(['../../../lps', this.entity_id ], {relativeTo: this.route}); } } diff --git a/ng6-seed/src/app/template2/template2.module.ts b/ng6-seed/src/app/template2/template2.module.ts index 534d26cef..b8adb7384 100644 --- a/ng6-seed/src/app/template2/template2.module.ts +++ b/ng6-seed/src/app/template2/template2.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { Template2Routes } from './template2.routing'; +import { Template2Routes, Template2Routing } from './template2.routing'; import { LenderListComponent } from './lender-list/lender-list.component'; import { NotifierModule, NotifierOptions } from 'angular-notifier'; import { FlexLayoutModule } from '@angular/flex-layout'; @@ -109,7 +109,7 @@ const customNotifierOptions: NotifierOptions = { CommonModule, CdkTreeModule, PdfViewerModule,FileUploadModule,TreeModule,NgxDatatableModule,NgxSpinnerModule, - + CKEditorModule, diff --git a/ng6-seed/src/app/template2/template2.routing.ts b/ng6-seed/src/app/template2/template2.routing.ts index 10bcc7323..9e067589f 100644 --- a/ng6-seed/src/app/template2/template2.routing.ts +++ b/ng6-seed/src/app/template2/template2.routing.ts @@ -1,4 +1,6 @@ -import { Routes } from '@angular/router'; + +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; import { EditTemplateComponent } from './edit-template/edit-template.component'; import { FormGroupComponent } from './form-group/form-group.component'; import { LenderListComponent } from './lender-list/lender-list.component'; @@ -31,63 +33,26 @@ export const Template2Routes: Routes = [ component: EditTemplateComponent, }, { - path: 'lps/:question-id/selection-list/Group-form', + path: 'lps/:question-id/selection-list/group-form', component: FormGroupComponent, }, { - path: 'lps/:question-id/selection-list/Group-form/Edit-template', + path: 'lps/:question-id/selection-list/group-form/Edit-template', component: EditTemplateComponent, } ] }, - // { - // path: 'add', - // component: EntityAddComponent, - // }, - // { - // path: 'edit', - // component: EntityEditComponent, - // } + ] } - // { - - - // path: '', - // pathMatch: 'full', - // redirectTo: 'lenderlist' - // }, - - - // { - // path: 'lenderlist', - // component: LenderListComponent, - // children: [ - - // { - // path: 'lps/:question-id', - // component: LenderProductSegMappingComponent, - // }, - // { - // path: 'lps/:question-id/selection-list', - // component: SelectionListViewComponent, - // }, - // { - // path: 'lps/:question-id/selection-list/Edit-template', - // component: EditTemplateComponent, - // }, - // { - // path: 'lps/:question-id/selection-list/Group-form', - // component: FormGroupComponent, - // }, - // { - // path: 'lps/:question-id/selection-list/Group-form/Edit-template', - // component: EditTemplateComponent, - // } - - // ] - // } + - ] + ]; + @NgModule({ + imports: [RouterModule.forChild(Template2Routes)], + exports: [RouterModule] + }) + export class Template2Routing {} + diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json index 1a4be21ea..43dab818e 100644 --- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json +++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/1.json @@ -293,7 +293,7 @@ "question_key":"Type_of_Business_Activity", "question":"Type of Business Activity", "place_holder":"Enter the text", - "type":"2", + "type":"4", "api_properties":{ "api":"getListOfMaster", "api_method":"POST",