@@ -290,7 +290,7 @@
person
-->
-
-
- play_circle_filled {{submit_btn ? 'Complete' : 'Save'}}
-
-
- play_circle_filled {{submit_btn ? 'Complete' : 'Save'}}
-
-
-
-
- play_circle_filled {{submit_btn ? 'Complete' : 'Save'}}
-
+
+
+
+
+
+ play_circle_filled {{submit_btn ? 'Complete' : 'Save'}}
+
+
+ play_circle_filled {{submit_btn ? 'Complete' : 'Save'}}
+
+
+
+
+ play_circle_filled {{submit_btn ? 'Complete' : 'Save'}}
\ No newline at end of file
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 e6e67ba..6700f60 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
@@ -82,6 +82,8 @@ export class QuesTemplateComponent {
tmp:any =[];
roleID: string;
pdstatus: string;
+ local_city1: any;
+ local_pincode1: any;
constructor( private cameraService: CameraService,public dialogRef: MatDialogRef,private route: ActivatedRoute,private router: Router,private dialog:MatDialog,private _fb:FormBuilder,private questionService:QuestionServiceService,private SalesPdService:SalesPdService,notifier: NotifierService,private loaderService:LoaderService) {
console.log('Hello QuesTemplateComponent Component');
this.text = 'Hello World';
@@ -89,6 +91,8 @@ export class QuesTemplateComponent {
//this.cameraProvider.checkGPSPermission();
//alert('abi1');
//this.ngOnChanges()
+ this.roleID = localStorage.getItem('user_role')
+ console.log(this.roleID)
}
ngOnChanges(){
@@ -1072,18 +1076,93 @@ this.proceedonChangeProperty(modified)
onChangeProperties_value.forEach(onChangeProperty=>{
console.log("api",onChangeProperty)
+ if(onChangeProperty.purpose == 'api2'){
+ if(onChangeProperty.api == 'getListOfStatesAndCities'){
+ this.SalesPdService.getCityPincode(event.value).subscribe(res=>{
+ console.log('1082')
+ if(res['dataStatus']){
+ console.log('1084')
+ this.local_city1=res['records'].cities
+ this.local_pincode1=res['records'].pincode
+ console.log(this.quesAnsForm.controls.questions['controls'])
+ this.quesAnsForm.controls.questions['controls'].forEach((val,index)=>{
+ console.log(val)
+ // if(val.value.hasOwnProperty('questions_group')){
+ // console.log('1089',val.value.questions_group[0]['questions'])
+ // console.log('1089',val.value.questions_group)
+
+ // val.value.questions_group[0]['questions'].forEach((getCity2,index)=>{
+ // console.log(getCity2)
+ // if(getCity2.api_properties == 'local_city1'){
+ // console.log('1091',getCity2.controls)
+ // this.local_city1=this.questionService.convertArrayNames(['city_id','city_name'],this.local_city1)
+ // console.log('1096',getCity2)
+ // getCity2.answers =(this.local_city1)
+ // console.log(getCity2.answer)
+ // }
+ // else if(getCity2.api_properties == 'local_pincode1'){
+ // this.local_pincode1=this.questionService.convertArrayNames(['pincode_id','pincode'],this.local_pincode1)
+ // getCity2.answers=(this.local_pincode1)
+ // }
+
+ // })
+
+ // // })
+ // }
+
+ // console.log('1089',val.value.hasOwnProperty('questions_group'))
+ if(val.value.api_properties == 'local_city1'){
+ console.log('1091')
+ this.local_city1=this.questionService.convertArrayNames(['city_id','city_name'],this.local_city1)
+ val.controls.answers.setValue(this.local_city1)
+ }
+ else if(val.value.api_properties == 'local_pincode1'){
+ this.local_pincode1=this.questionService.convertArrayNames(['pincode_id','pincode'],this.local_pincode1)
+ val.controls.answers.setValue(this.local_pincode1)
+ }
+
+ })
+
+ }
+ })
+ }
+ else{
+ this.SalesPdService.api_post_method(onChangeProperty.api,onChangeProperty.params,onChangeProperty.api_method).subscribe(result=>{
+ if(result['dataStatus']){
+ if(result.hasOwnProperty('records')){
+ result=result['records']
+ }
+ let ques_control= this.quesAnsForm.controls.questions['controls']
+ if(options == 2){
+ ques_control=group_ques.controls.questions['controls']
+ }
+
+ ques_control.forEach((val,index)=>{
+
+ if(val.value.api_properties == onChangeProperty.local_variable){
+ let values1=this.questionService.convertArrayNames(onChangeProperty.fields,result)
+ val.controls.answers.setValue(values1)
+ }
+
+ })
+ }
+ })
+ }
+ }
if(onChangeProperty.purpose == 'api'){
if(onChangeProperty.api == 'getListOfStatesAndCities'){
this.SalesPdService.getCityPincode(event.value).subscribe(res=>{
if(res['dataStatus']){
this.local_city=res['records'].cities
this.local_pincode=res['records'].pincode
-
+ console.log(this.quesAnsForm.controls.questions['controls'])
this.quesAnsForm.controls.questions['controls'].forEach((val,index)=>{
-
+ console.log(val)
if(val.value.api_properties == 'local_city'){
this.local_city=this.questionService.convertArrayNames(['city_id','city_name'],this.local_city)
+ console.log(this.local_city)
+ console.log(val.controls)
val.controls.answers.setValue(this.local_city)
}
else if(val.value.api_properties == 'local_pincode'){
@@ -1699,7 +1778,7 @@ this.proceedonChangeProperty(modified)
// alert('b');
const dialogRef = this.dialog.open(AlertDialogComponent, {
width: '500px',
- data: {buttons:[{name:"Complete",visible:true,id:'Complete'},{name:'Cancel',visible:'true',id:'cancel'}],title:'Complete sales PD',
+ data: {buttons:[{name:"Complete",visible:true,id:'Complete'},{name:'Cancel',visible:'true',id:'cancel'}],title:'Complete PD',
msg:'You are completing this PD, once completed you will not be able to make changes'}
});
diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html
index 2c203d7..09f13ab 100644
--- a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html
+++ b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.html
@@ -1,4 +1,4 @@
-Capture
+Capture
camera_alt
add_a_photo
diff --git a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts
index 3f30d62..885a043 100644
--- a/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts
+++ b/ng6-seed/src/app/sales-pd/components/ques-template/single-capture-btn/single-capture-btn.component.ts
@@ -14,8 +14,10 @@ export class SingleCaptureBtnComponent implements OnInit {
@Output() singleDataEmitter = new EventEmitter
sales_pd_type: string;
+ role_id: string;
constructor(private ng2ImgMax:Ng2ImgMaxService,private loaderService:LoaderService) {
+ this.role_id = localStorage.getItem('user_role')
this.sales_pd_type = localStorage.getItem('sales_pd_type')
console.log(this.sales_pd_type)
}
diff --git a/ng6-seed/src/app/sales-pd/home/home.html b/ng6-seed/src/app/sales-pd/home/home.html
index 5ec0804..cce38af 100755
--- a/ng6-seed/src/app/sales-pd/home/home.html
+++ b/ng6-seed/src/app/sales-pd/home/home.html
@@ -1,4 +1,4 @@
-
+
{{question_data.section_name}}
diff --git a/ng6-seed/src/app/sales-pd/home/home.ts b/ng6-seed/src/app/sales-pd/home/home.ts
index 39a4956..dac8d93 100755
--- a/ng6-seed/src/app/sales-pd/home/home.ts
+++ b/ng6-seed/src/app/sales-pd/home/home.ts
@@ -683,9 +683,11 @@ export class Section9 {
all_sections:any;
formGroupValue: any=null;
sec_id: any;
+ role_id: string;
//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) {
+ this.role_id = localStorage.getItem('user_role')
// alert('section9')
console.log('data',data)
this.notifier = notifier;
diff --git a/ng6-seed/src/app/sales-pd/providers/sales-pd/sales-pd.ts b/ng6-seed/src/app/sales-pd/providers/sales-pd/sales-pd.ts
index aeee63a..0ef1bf4 100755
--- a/ng6-seed/src/app/sales-pd/providers/sales-pd/sales-pd.ts
+++ b/ng6-seed/src/app/sales-pd/providers/sales-pd/sales-pd.ts
@@ -167,7 +167,14 @@ current_section:any;
}
saveSalesPDSection(params){
let users:any=localStorage.getItem('user_details')
- users=JSON.parse(users)
+ users=JSON.parse(users)
+ let apiName
+ if(users.user_role != '20'){
+ apiName = 'saveSalesPDsection'
+ }else if(users.user_role == '20'){
+ apiName = 'getFlyhiPDSectionData'
+ }
+
params.fk_createdby=users.userid
return Observable.create((observer:Observer)=>{
this.getData_fromLocal('sales_pd_id_PRIMARYKEY').then(key_value=>{
@@ -177,7 +184,7 @@ current_section:any;
let modified_params = params
console.log("###################$%%",(key_value != null ? (typeof(key_value) == 'string' ? !key_value.includes('local') : true ) : true));
if(key_value != null ? (typeof(key_value) == 'string' ? !key_value.includes('local') : true ) : true) {
- return this.http.post(this.apiUrl+'saveSalesPDsection',{records:params}).pipe().subscribe(response=>{
+ return this.http.post(this.apiUrl+apiName,{records:params}).pipe().subscribe(response=>{
// delete modified_params.questions
modified_params.is_synced = true;
modified_params.section_data = section_data
@@ -196,7 +203,7 @@ current_section:any;
else if(modified_params.section_id != '9'){
// console.log("#######params",modified_params)
let offline_params = modified_params
- offline_params.request_items={url:this.apiUrl+'saveSalesPDsection',
+ offline_params.request_items={url:this.apiUrl+apiName,
params:JSON.stringify({records:params}),method:'POST'}
offline_params.is_synced = false
offline_params.section_data = section_data
diff --git a/ng6-seed/src/app/sales-pd/sales-pd-routing.module.ts b/ng6-seed/src/app/sales-pd/sales-pd-routing.module.ts
index 3102398..718e411 100755
--- a/ng6-seed/src/app/sales-pd/sales-pd-routing.module.ts
+++ b/ng6-seed/src/app/sales-pd/sales-pd-routing.module.ts
@@ -4,6 +4,7 @@ import { Routes, RouterModule } from '@angular/router';
import { SectionListComponent } from './section-list/section-list.component';
import { SalesPdComponent } from './sales-pd-list/sales-pd.component';
import { HomePage } from './home/home';
+import { FlyHiListComponent } from 'app/fly-hi/fly-hi-list/fly-hi-list.component';
//import {Section9} from './home/home'
const routes: Routes = [
@@ -28,10 +29,10 @@ const routes: Routes = [
path:'sectionlist/:product_id/:sales_pd_type',
component:SectionListComponent
},
- // {
- // path:'sectionlist/:product_id/:sales_pd_type/:link',
- // component:SectionListComponent
- // },
+ {
+ path:'flyhi-list-pd',
+ component:FlyHiListComponent
+ },
{
path:'',
component:HomePage
diff --git a/ng6-seed/src/app/sales-pd/sales-pd.module.ts b/ng6-seed/src/app/sales-pd/sales-pd.module.ts
index d2db924..449bc29 100755
--- a/ng6-seed/src/app/sales-pd/sales-pd.module.ts
+++ b/ng6-seed/src/app/sales-pd/sales-pd.module.ts
@@ -21,6 +21,8 @@ import { SingleCaptureBtnComponent } from './components/ques-template/single-cap
import { HomePageModule } from './home/home.module';
import { CommonModule } from '@angular/common';
import { ReGenerateReportComponent } from './sales-pd-list/re-generate-report/re-generate-report.component';
+import { FlyHiListComponent } from 'app/fly-hi/fly-hi-list/fly-hi-list.component';
+import { ImageVideoComponent } from 'app/fly-hi/image-video/image-video.component';
@NgModule({
imports: [
SalesPdRoutingModule,
@@ -30,10 +32,11 @@ import { ReGenerateReportComponent } from './sales-pd-list/re-generate-report/re
StartPdModule,
HomePageModule,
CommonModule,
- MatDialogModule
+ MatDialogModule,
+ MatTooltipModule
],
- declarations: [AlertDialogComponent,SalesPdComponent,AdvanceFilterComponent, ReGenerateReportComponent],
- entryComponents:[AlertDialogComponent,SalesPdComponent,ReGenerateReportComponent],
+ declarations: [ImageVideoComponent,AlertDialogComponent,FlyHiListComponent,SalesPdComponent,AdvanceFilterComponent, ReGenerateReportComponent],
+ entryComponents:[ImageVideoComponent,AlertDialogComponent,SalesPdComponent,ReGenerateReportComponent],
providers:[ConstantsProvider,{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},{ provide: MatDialogRef, useValue: {} },{ provide: MAT_DIALOG_DATA, useValue: [] }],
bootstrap: [SalesPdComponent],
diff --git a/ng6-seed/src/app/sales-pd/section-list/section-list.component.html b/ng6-seed/src/app/sales-pd/section-list/section-list.component.html
index 96cca85..478dcc1 100644
--- a/ng6-seed/src/app/sales-pd/section-list/section-list.component.html
+++ b/ng6-seed/src/app/sales-pd/section-list/section-list.component.html
@@ -1,11 +1,19 @@
-
+
-
Section List
+ Section List
-
+
+
+
+
+
+ videocam
+
+
file_copy
@@ -19,7 +27,7 @@
-
close
@@ -27,13 +35,14 @@
+
-
+
@@ -67,6 +76,19 @@ pd_completed.pd_complete_request_items != null">
-->
+
+
+
+
+
+
{{sec.section_name}}
+
+
+ check_circle_outline
+
+
+
+