diff --git a/ng6-seed/SalesPd_PWA_FlyHi(01-07-2022)Testing.zip b/ng6-seed/SalesPd_PWA_FlyHi(01-07-2022)Testing.zip new file mode 100644 index 0000000..f4afd8e Binary files /dev/null and b/ng6-seed/SalesPd_PWA_FlyHi(01-07-2022)Testing.zip differ diff --git a/ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.ts b/ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.ts index 13f08ad..571e6f7 100644 --- a/ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.ts +++ b/ng6-seed/src/app/fly-hi/fly-hi-list/fly-hi-list.component.ts @@ -18,7 +18,7 @@ export class FlyHiListComponent implements OnInit { public dataSourceTab4 = new MatTableDataSource(); is_sales_login:boolean = false common: any; - roleID: string; + roleID: any; errorMessage:any[]=[]; flyHiData: any; recordStatus: boolean; diff --git a/ng6-seed/src/app/fly-hi/fly-hi.module.ts b/ng6-seed/src/app/fly-hi/fly-hi.module.ts index e52c8f7..596878a 100644 --- a/ng6-seed/src/app/fly-hi/fly-hi.module.ts +++ b/ng6-seed/src/app/fly-hi/fly-hi.module.ts @@ -28,6 +28,7 @@ import { MatVideoModule } from 'mat-video'; import { AngularSplitModule } from 'angular-split'; import { FormComponent } from './forms-dynamic/form/form.component'; import { ImageVideoComponent } from './image-video/image-video.component'; +import { AnswerOptionCreateDialogComponent } from './forms-dynamic/answer-option-create-dialog/answer-option-create-dialog.component'; @NgModule({ imports: [ @@ -81,7 +82,7 @@ import { ImageVideoComponent } from './image-video/image-video.component'; MatVideoModule ], - declarations:[StartPd2Component,DynamicFormComponent,DynamicQuestionTemplateComponent,FormComponent], + declarations:[StartPd2Component,DynamicFormComponent,DynamicQuestionTemplateComponent,FormComponent,AnswerOptionCreateDialogComponent], exports:[StartPd2Component], entryComponents:[FlyHiListComponent,DynamicFormComponent,DynamicQuestionTemplateComponent,FormComponent], providers:[ConstantsProvider,{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index c7be579..0fbb06a 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -53,7 +53,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { alertMsgTriggerType : any[]; alertMsgAllocateType : any[]; alertCount: any; - userRoleType: String; + userRoleType: any; userDetails: any; constructor(private router: Router, public menuItems: MenuItems, public horizontalMenuItems : HorizontalMenuItems, public translate: TranslateService,public aws:AwsService,public users:UserService,private _dashboardService: DashboardService) { const browserLang: string = translate.getBrowserLang(); diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts index 6700f60..1d28b89 100755 --- a/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts +++ b/ng6-seed/src/app/sales-pd/components/ques-template/ques-template.ts @@ -80,7 +80,7 @@ export class QuesTemplateComponent { image_question_name:any =[] tmp_control: QuestionServiceService; tmp:any =[]; - roleID: string; + roleID: any; pdstatus: string; local_city1: any; local_pincode1: any; diff --git a/ng6-seed/src/app/sales-pd/home/home.ts b/ng6-seed/src/app/sales-pd/home/home.ts index dac8d93..7b199d7 100755 --- a/ng6-seed/src/app/sales-pd/home/home.ts +++ b/ng6-seed/src/app/sales-pd/home/home.ts @@ -154,8 +154,10 @@ export class Section1 { raw_data:any; section_local:number=1 all_sections:any; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // let product_id; // if(this.route.snapshot.params['product_id']){ let product_id = this.route.snapshot.params['product_id']; @@ -233,8 +235,10 @@ export class Section2 { raw_data:any; section_local:number=2 all_sections:any; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -281,8 +285,10 @@ export class Section3 { raw_data:any; section_local:number=3 all_sections:any; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -343,8 +349,10 @@ export class Section4 { raw_data:any; section_local:number=4 all_sections:any; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -404,8 +412,10 @@ export class Section5 { raw_data:any; section_local:number=5 all_sections:any; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -466,8 +476,10 @@ export class Section6 { raw_data:any; section_local:number=6 all_sections:any; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -528,8 +540,10 @@ export class Section7 { section_local:number=7 all_sections:any; private notifier: NotifierService; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -604,8 +618,10 @@ export class Section8 { section_local:number=8 all_sections:any; private notifier: NotifierService; + role_id: any; constructor(private dialog:MatDialog,notifier: NotifierService,private route: ActivatedRoute, private router: Router,private salesPDService:SalesPdService) { + this.role_id = localStorage.getItem('user_role') // if(this.navParams.get('sec_no')){ // this.section_local=this.navParams.get('sec_no') // } @@ -683,7 +699,7 @@ export class Section9 { all_sections:any; formGroupValue: any=null; sec_id: any; - role_id: string; + role_id: any; //network_status: ConnectionStatus constructor(public dialogRef: MatDialogRef,notifier: NotifierService,private route: ActivatedRoute,private router: Router,private dialog: MatDialog,private MatDialogModule:MatDialogModule,@Inject(MAT_DIALOG_DATA) public data: any) {