diff --git a/ng6-seed/src/app/app.routing.ts b/ng6-seed/src/app/app.routing.ts index a72e625..a912f34 100755 --- a/ng6-seed/src/app/app.routing.ts +++ b/ng6-seed/src/app/app.routing.ts @@ -6,8 +6,8 @@ import { CognitoService} from './AwsService/cognito.service'; import { AuthGuard } from './_guard/auth.guard'; // import { SalesPdComponent } from './sales-pd/sales-pd.component'; export const AppRoutes: Routes = [{ - path: '', - redirectTo: 'personal_discussion', + path: 'sales-pd-list', + redirectTo: 'sales-pd-list', pathMatch: 'full', }, { path: '', @@ -22,10 +22,10 @@ export const AppRoutes: Routes = [{ // loadChildren:'./settings/settings.module#SettingsModule' // } // , - { - path:'personal_discussion', - loadChildren:'./personal-discussion/personal-discussion.module#PersonalDiscussionModule' - }, + // { + // path:'personal_discussion', + // loadChildren:'./personal-discussion/personal-discussion.module#PersonalDiscussionModule' + // }, // { // path:'quality_check_discussion', // loadChildren:'./quality-check/quality-check.module#QualityCheckModule' diff --git a/ng6-seed/src/app/lender-credit-pd/lender-credit-pd.module.ts b/ng6-seed/src/app/lender-credit-pd/lender-credit-pd.module.ts index a41cd32..e9e91e2 100644 --- a/ng6-seed/src/app/lender-credit-pd/lender-credit-pd.module.ts +++ b/ng6-seed/src/app/lender-credit-pd/lender-credit-pd.module.ts @@ -14,7 +14,6 @@ import { SharedModule } from 'app/shared/shared.module'; import { FlexLayoutModule } from '@angular/flex-layout'; // import { AdvanceFilterComponent } from 'app/sales-pd/advance-filter/advance-filter.component'; import { CreditAdvanceFilterComponent } from './credit-advance-filter/credit-advance-filter.component'; -import { AlertDialogComponent } from './alert-dialog/alert-dialog.component'; const pdCustomNotifierOptions: NotifierOptions = { position: { @@ -115,8 +114,8 @@ export class MaterialModule { } MatTableModule, MatPaginatorModule ], - entryComponents:[AlertDialogComponent], - declarations: [PdListComponent,PdQuestionsComponent,QuesTemplateComponent,CreditAdvanceFilterComponent,AlertDialogComponent] + entryComponents:[], + declarations: [PdListComponent,PdQuestionsComponent,QuesTemplateComponent,CreditAdvanceFilterComponent] }) export class LenderCreditPdModule { } diff --git a/ng6-seed/src/app/sales-pd/components/components.module.ts b/ng6-seed/src/app/sales-pd/components/components.module.ts index 5b5ca24..962deed 100755 --- a/ng6-seed/src/app/sales-pd/components/components.module.ts +++ b/ng6-seed/src/app/sales-pd/components/components.module.ts @@ -9,9 +9,10 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; //import { IonicModule } from 'ionic-angular'; //import { MyApp } from '../../../app/app.component'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CaptureBtnComponent } from './ques-template/capture-btn/capture-btn.component'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { CaptureBtnComponent } from './ques-template/capture-btn/capture-btn.component'; import { SingleCaptureBtnComponent } from './ques-template/single-capture-btn/single-capture-btn.component'; +import { QuestionServiceService } from '../services/question-service.service'; //import { SharedModule } from '../../../Shared/shared.module'; @@ -57,6 +58,6 @@ import { SingleCaptureBtnComponent } from './ques-template/single-capture-btn/si NgxMatSelectSearchModule, ReactiveFormsModule], exports: [QuesTemplateComponent], - providers:[] + providers:[QuestionServiceService] }) export class ComponentsModule {} diff --git a/ng6-seed/src/app/sales-pd/home/home.module.ts b/ng6-seed/src/app/sales-pd/home/home.module.ts index 0570279..c58cfc3 100755 --- a/ng6-seed/src/app/sales-pd/home/home.module.ts +++ b/ng6-seed/src/app/sales-pd/home/home.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; -import { HomePage, Section9} from '../home/home'; +import { HomePage, Section9, Section1, Section2, Section3, Section4, Section5, Section6, Section7, Section8} from '../home/home'; import { QuesTemplateComponent } from '../components/ques-template/ques-template'; //import { ComponentsModule } from '../../components/components.module'; //import { SalesPdProvider } from '../../providers/sales-pd/sales-pd'; @@ -12,25 +12,26 @@ import { SectionListModule } from '../section-list/section-list.module'; //import {NgxImageCompressService} from 'ngx-image-compress' import { SalesPdService } from '../services/sales-pd.service'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material'; +import { ComponentsModule } from '../components/components.module'; //import {MatDialogModule } from '@angular/material/dialog'; @NgModule({ declarations: [ // SectionListPage, HomePage, - //Section1, - //Section2, - //Section3, - //Section4, - //Section5, - //Section6, - //Section7, - // Section8, + Section1, + Section2, + Section3, + Section4, + Section5, + Section6, + Section7, + Section8, Section9 ], - entryComponents:[HomePage,Section9,MatDialogModule], + entryComponents:[HomePage,Section1,Section2,Section3,Section4,Section5,Section6,Section7,Section8,Section9,MatDialogModule], imports: [ SectionListModule, - + ComponentsModule, // IonicPageModule.forChild(HomePage), MatButtonModule, MatButtonToggleModule, diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts index f92f65e..ea03f41 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts @@ -52,6 +52,7 @@ export class SalesPdComponent implements OnInit { console.log('userdetails'); console.log(userDetails); let role= this.constantProvider.takeDecisionRouting(JSON.parse(userDetails)) + console.log(role) if(role == 'sales'){ this.is_sales_login = true } diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts index a5f21af..7c454f1 100755 --- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -29,16 +29,22 @@ const HORIZONTALMENUITEMS = [ // icon: 'home' // }, { - state:'personal_discussion', - name:'Personal Discussion', + state:'sales-pd-list', + name:'Sales PD', type:'link', - icon:'forum', - - // children:[ - // {state:'pdtriggerlist',name:'Pd Trigger Listing'} - // ] + icon:'work', }, // { + // state:'personal_discussion', + // name:'Personal Discussion', + // type:'link', + // icon:'forum', + + // // children:[ + // // {state:'pdtriggerlist',name:'Pd Trigger Listing'} + // // ] + // }, + // { // state:'quality_check_discussion', // name:'Quality Check', // type:'link', @@ -58,16 +64,16 @@ const salesmenu = [ // type: 'link', // icon: 'home' // }, - { - state:'personal_discussion', - name:'Personal Discussion', - type:'link', - icon:'forum', + // { + // state:'personal_discussion', + // name:'Personal Discussion', + // type:'link', + // icon:'forum', - // children:[ - // {state:'pdtriggerlist',name:'Pd Trigger Listing'} - // ] - }, + // // children:[ + // // {state:'pdtriggerlist',name:'Pd Trigger Listing'} + // // ] + // }, { state:'sales-pd-list', name:'Sales PD', 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 f499551..531a4eb 100755 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -71,15 +71,21 @@ const MENUITEMS : Menu[] = [ // ] // }, { - state:'personal_discussion', - name:'Personal Discussion', + state:'sales-pd-list', + name:'Sales PD', type:'link', - icon:'forum', - // children:[ - // {state:'pdtriggerlist',name:'Pd Trigger Listing'} - // ] + icon:'work', }, // { + // state:'personal_discussion', + // name:'Personal Discussion', + // type:'link', + // icon:'forum', + // // children:[ + // // {state:'pdtriggerlist',name:'Pd Trigger Listing'} + // // ] + // }, + // { // state:'quality_check_discussion', // name:'Quality Check', // type:'link', @@ -140,16 +146,16 @@ const salesMenus: Menu[]= [ // // {state:'pdtriggerlist',name:'Pd Trigger Listing'} // // ] // }, - { - state:'personal_discussion', - name:'Personal Discussion', - type:'link', - icon:'forum', + // { + // state:'personal_discussion', + // name:'Personal Discussion', + // type:'link', + // icon:'forum', - // children:[ - // {state:'pdtriggerlist',name:'Pd Trigger Listing'} - // ] - }, + // // children:[ + // // {state:'pdtriggerlist',name:'Pd Trigger Listing'} + // // ] + // }, { state:'sales-pd-list', name:'Sales PD',