Fairoj : Loader added for watermarking and issue fixes

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.sineedge.pdgenie" version="0.0.21" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.sineedge.pdgenie" version="0.0.22" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>PD Genie Officer </name>
     <description>info@pdgenie.com</description>
     <author email="info@pdgenie.com" href="https://pdgenie.com">PD Genie</author>
@@ -96,7 +96,7 @@
     <plugin name="cordova-plugin-request-location-accuracy" spec="2.2.3" />
     <plugin name="cordova-plugin-android-permissions" spec="1.0.0" />
     <plugin name="phonegap-plugin-push" spec="2.2.3">
-        <variable name="SENDER_ID" value="893175418100" />
+        <variable name="SENDER_ID" value="906855209078" />
         <variable name="ANDROID_SUPPORT_V13_VERSION" value="27.+" />
         <variable name="FCM_VERSION" value="11.6.2" />
     </plugin>

src/pages/password/password.ts

@@ -23,6 +23,7 @@ export class PasswordPage {
   pin:any;
   Username:any;
   Password:any;
+  users: any;
   
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider,public commonconstant:ConstantsProvider) {
     this.commonImage = this.commonconstant.commonimage;
@@ -40,7 +41,8 @@ export class PasswordPage {
       console.log(auth);
       this.aws.dologin(auth).subscribe(res => {
         console.log(res);
-        this.navCtrl.setRoot(PdListPage);
+        // this.navCtrl.setRoot(PdListPage);
+        this.getUserDet()
         // this.router.navigate(['/home']);
       }, err => {
         this.toast.pdTriggerappmessage(err.message);
@@ -51,4 +53,24 @@ export class PasswordPage {
       this.toast.pdTriggerappmessage('Enter the new Password');
     }
   }
+  getUserDet(){
+    let userid = this.aws.getlocale();
+      this.aws.getuserprofile(userid).subscribe(usersres=>
+        {
+          this.users = usersres;     
+       
+    if (this.users.dataStatus == true) {
+     
+      if(this.users.records[0].role_name == "PD Officer" || this.users.records[0].role_name == "PD Executive"){
+        localStorage.setItem("pd_user_details",JSON.stringify(this.users.records[0]))
+      this.navCtrl.setRoot(PdListPage);     
+      }else
+      {
+        
+        this.toast.pdTriggerappmessage('This App only for PD Officers');
+         localStorage.clear();
+      }
+    }
+  });
+  }
 }

src/pages/pd-general-images/pd-general-images.ts

@@ -186,7 +186,7 @@ export class PdGeneralImagesPage {
     this.cameraProvider.getpicture().then(res => {
 
       if (res != 'error') {
-        // this.loading.imageWatermarkLoader()
+        this.loading.imageWatermarkLoader()
         // this.constant.getGeoTag().then(geoCoordinates=>{
         //   if(geoCoordinates){
         //   this.geoCoordinates=geoCoordinates
@@ -237,6 +237,7 @@ export class PdGeneralImagesPage {
             bucket_value.Name=value
             this.imageBucket.push(bucket_value)
             this.modalForImageDet(value,bucket_value)
+            this.loading.dismissLoader()
             return
           }
           else{
@@ -245,9 +246,11 @@ export class PdGeneralImagesPage {
          
            bucket_value.Name = value
            this.imageBucket.push(bucket_value)
+           this.loading.dismissLoader()
            this.sendImage(bucket_value)
           // this.imageBucket.push({ 'image': res, 'Name': value, 'link': geoCoordinates });
           // this.cardLast.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
+         
           return
           }
         }
@@ -277,7 +280,9 @@ export class PdGeneralImagesPage {
           // })
           this.modalForImageDet('',bucket_value)
         }
-        // this.loading.dismissLoader()
+        this.loading.dismissLoader()
+      },err=>{
+        this.loading.dismissLoader()
       })
      
       }

src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts

@@ -103,6 +103,7 @@ export class PdQuestionBusinessInfoPage {
         public aws: AwsServiceProvider, public toast: ToastProvider,
         public qustCat: QuestionCategoryProvider, public fb: FormBuilder, public cons: ConstantsProvider,
         private loading: LoadingProvider, private cameraProvider: CameraProvider,private modalCtrl:ModalController) {
+            this.getdropdown();
         this.getStateCityDet();
         // console.log(typeof this.filteredCity)
         this.pdDetails = this.navParams.get('pdDetails');
@@ -172,7 +173,7 @@ export class PdQuestionBusinessInfoPage {
             this.businessForm.removeControl('persons_with_relationships')
         }
         this.loading.dataLoader();
-        this.getdropdown();
+        
 
         // this.initBusinessForm();
 
@@ -208,6 +209,14 @@ export class PdQuestionBusinessInfoPage {
            }
         }
     getdropdown() {
+        this.qustCat.getcommondrop('TYPEOFACTIVITY').subscribe(data => {
+
+            data['records'].forEach(val => {
+                if (val.isactive == 1 && val.type_of_activity_id != 1) {
+                    this.activityData.push(val);
+                }
+            })
+        });
 
         this.qustCat.getcommondrop('RELATIONSHIPS').subscribe(data => {
 
@@ -242,14 +251,7 @@ export class PdQuestionBusinessInfoPage {
             })
         });
 
-        this.qustCat.getcommondrop('TYPEOFACTIVITY').subscribe(data => {
        
-            data['records'].forEach(val => {
-                if (val.isactive == 1 && val.type_of_activity_id != 1) {
-                    this.activityData.push(val);
-                }
-            })
-        });
 
         this.qustCat.getcommondrop('COMPANYRELATIONSHIPS').subscribe(data => {
             this.companyRelationShipList = data['records'].filter(val => val.isactive == 1);
@@ -446,7 +448,7 @@ export class PdQuestionBusinessInfoPage {
                         // this.businessForm.controls['select_business_activity_type'].value[index].exist_status=val.exist_status
 
                     });
-
+                    console.log("check exist acti",check_exist_businees_activity)
                     businessVal.select_business_activity_type = check_exist_businees_activity;
                 }
                 // business_activity.push(this.createBusinessActivity())