pd questions and auth images

src/app/app.component.ts

@@ -42,7 +42,7 @@ export class MyApp {
       // Here you can do any higher level native things you might need.
       this.statusBar.styleDefault();
       if (this.platform.is('android')) {
-        this.statusBar.overlaysWebView(true);
+        this.statusBar.overlaysWebView(false);
         this.statusBar.backgroundColorByHexString('#db4437');
     }
       this.splashScreen.hide();

src/app/app.module.ts

@@ -70,6 +70,9 @@ import { IonicImageViewerModule } from 'ionic-img-viewer';
 import { CameraProvider } from '../providers/common-provider/camera';
 import { LoadingProvider } from '../providers/common-provider/loading';
 import { Camera } from '@ionic-native/camera';
+
+import { Geolocation } from '@ionic-native/geolocation';
+
 @NgModule({
     declarations: [
         MyApp,
@@ -149,7 +152,7 @@ import { Camera } from '@ionic-native/camera';
     AwsServiceProvider,
     QuestionCategoryProvider,
     CameraProvider,Camera,
-    LoadingProvider
+    LoadingProvider,Geolocation
     ]
 })
 export class AppModule {}

src/pages/auth/auth.html

@@ -9,7 +9,7 @@
       </mat-card-header>
       <ion-row>
           <ion-col text-center>
-             <img src="../assets/img/misc/avatar.jpg" alt="Circle Image" class="rounded-circle img-fluid">
+             <img [src]="commonImage || '../../assets/img/misc/avatar.jpg'" alt="Circle Image" class="rounded-circle img-fluid">
           </ion-col>
       </ion-row>
       <mat-card-content>
@@ -47,7 +47,7 @@
       </mat-card-header>
       <ion-row>
           <ion-col text-center>
-             <img src="../assets/img/misc/avatar.jpg" alt="Circle Image" class="rounded-circle img-fluid">
+             <img [src]="commonImage || '../../assets/img/misc/avatar.jpg'" alt="Circle Image" class="rounded-circle img-fluid">
           </ion-col>
       </ion-row>
       <mat-card-content>

src/pages/auth/auth.scss

@@ -23,6 +23,7 @@ page-auth {
   }
  .rounded-circle {
      border-radius: 50%!important;
+     
   }
    .img-fluid{
      max-width: 40%;

src/pages/auth/auth.ts

@@ -9,6 +9,7 @@ import { FingerprintAIO } from '@ionic-native/fingerprint-aio';
 import { AwsServiceProvider } from '../../providers/aws-service/aws-service';
 
 import { LoadingProvider } from '../../providers/common-provider/loading';
+import { ConstantsProvider } from '../../providers/constants/constants';
 /**
  * Generated class for the AuthPage page.
  *
@@ -29,9 +30,9 @@ pin:any;
   mpinaccess:boolean =false;
   newpassword:any;
   ConfirmPassword:any;
-  
+  commonImage:any;
-  constructor(public navCtrl: NavController, public navParams: NavParams,public Menu:MenuController,public fb:FormBuilder,public shared:CognitoServiceProvider,public toast:ToastProvider,public faio:FingerprintAIO,public aws:AwsServiceProvider,public loadingCtrl:LoadingProvider) {
+  constructor(public navCtrl: NavController, public navParams: NavParams,public Menu:MenuController,public fb:FormBuilder,public shared:CognitoServiceProvider,public toast:ToastProvider,public faio:FingerprintAIO,public aws:AwsServiceProvider,public loadingCtrl:LoadingProvider,public commonconstant:ConstantsProvider) {
-    
+    this.commonImage = this.commonconstant.commonimage;
     this.shared.refresh();
     this.getuserDetails();
     

src/pages/input/input.html

@@ -15,10 +15,14 @@
         </ion-fab>
      <mat-card style=" border-radius: 10px;">
        <ion-row>
-         <ion-col col-1><ion-icon name="contact"></ion-icon></ion-col>
+         <ion-col class="cardinfo"><ion-icon name="contact"></ion-icon>&nbsp; {{applicatentDetails.applicat_details[0].applicant_name | titlecase}}</ion-col>
-         <ion-col class="cardinfo">{{applicatentDetails.applicat_details[0].applicant_name | titlecase}}</ion-col>
        </ion-row>
        <hr/>
+       <ion-row>
+        <ion-col col-1><ion-icon name="md-people"></ion-icon></ion-col>
+        <ion-col class="cardinfo">{{applicatentDetails.customer_segment_name}}</ion-col>
+     </ion-row>
+     <hr/>
        <a (click)="locationnavicate(applicatentDetails.addressline1)" style="text-decoration: none;"><ion-row>
        
       <ion-col col-1 class="cusicon"><ion-icon name="pin"></ion-icon></ion-col>
@@ -38,10 +42,7 @@
           <ion-col class="cardinfo">{{applicatentDetails.product_name}} / {{applicatentDetails.subproduct_name}}</ion-col>
        </ion-row>
      <hr>
-     <ion-row>
+     
-        <ion-col col-1><ion-icon name="md-people"></ion-icon></ion-col>
-        <ion-col class="cardinfo">{{applicatentDetails.customer_segment_name}}</ion-col>
-     </ion-row>
        <ion-row *ngIf="scheduleAccess">
          <ion-col col-1 class="cusicon"></ion-col>
          <ion-item>

src/pages/input/input.scss

@@ -58,15 +58,14 @@ page-input{
     margin-bottom: 0px !important;
     height: 50px;
    }
+   
    .mat-raised-button{
       border-radius: 30px;
       padding: 19px 45px;
       line-height: 0px;
       box-shadow: 0 16px 38px -12px rgba(0,0,0,.56), 0 4px 25px 0 rgba(0,0,0,.12), 0 8px 10px -5px rgba(0,0,0,.2) !important;
    }
-   ion-fab[middle]{
+   
-     top:17% !important;
-   }
    .fab-md-optblue{
      box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
    }
@@ -75,7 +74,7 @@ page-input{
    }
    .cardinfo
    {
-    font-size: 18px!important;
+    font-size: 19px!important;
-    padding-bottom: 20px!important;
+    padding-bottom: 30px!important;
    }
   }

src/pages/input/input.ts

@@ -13,6 +13,8 @@ import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger';
 import { AwsServiceProvider } from '../../providers/aws-service/aws-service';
 import { PdListPage } from '../pd-list/pd-list';
 import { OtpPage } from '../otp/otp';
+
+import { Geolocation, PositionError, Geoposition } from '@ionic-native/geolocation';
 /**
  * Generated class for the InputPage page.
  *
@@ -41,7 +43,11 @@ scheduleDate:any;
 updateSchedule:any;
 acceptedAccess:boolean = false;
 startedAccess:boolean = false;
-  constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public statusBar:StatusBar,public platform: Platform,public launchNavigator:LaunchNavigator,public aws:AwsServiceProvider,public pdDetails:PdtriggerProvider) {
+
+currentPosPDofficer:any;
+  constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public statusBar:StatusBar,public platform: Platform,public launchNavigator:LaunchNavigator,public aws:AwsServiceProvider,public pdDetails:PdtriggerProvider,public geolocation:Geolocation) {
+
+   
       /***Header value pass */
       this.statusBar.styleDefault();
      
@@ -62,7 +68,7 @@ startedAccess:boolean = false;
      {
        this.initiatedAccess = true;
      }
-
+     //console.log(this.initiatedAccess);
      if(this.applicatentDetails.pd_status == 'INITIATED')
      {
        this.startedAccess = true;
@@ -141,7 +147,16 @@ startedAccess:boolean = false;
   }
   pdinitiated(appdetails)
   { let data:any;
-    data = {'pd_id':appdetails.pd_id,'pd_status':'INITIATED','mobile_no':appdetails.applicat_details[0].mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':appdetails.applicat_details[0].applicant_name,'fk_updatedby':this.users,'updatedon':currentdate};
+
+
+    this.geolocation.getCurrentPosition().then((resp) => {
+      // resp.coords.latitude
+      // resp.coords.longitude
+     
+        this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude;
+    data = {'pd_id':appdetails.pd_id,'pd_status':'INITIATED','mobile_no':appdetails.applicat_details[0].mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':appdetails.applicat_details[0].applicant_name,'fk_updatedby':this.users,'updatedon':currentdate,'link':this.currentPosPDofficer};
+
+
     this.pdDetails.updatepdStatus(data).subscribe(res=>
       {
           this.updateinitiated = res;
@@ -154,6 +169,9 @@ startedAccess:boolean = false;
             this.startedAccess = false;
           }
       })
+    }).catch((error) => {
+      console.log('Error getting location', error);
+    });
   }
 
   startPdDiscussion(appdetails)

src/pages/otp/otp.html

@@ -22,7 +22,7 @@
         </mat-card-header>
         <ion-row>
             <ion-col text-center>
-               <img src="../assets/img/misc/avatar.jpg" alt="Circle Image" class="rounded-circle img-fluid">
+               <img [src]="commonImage || '../../assets/img/misc/avatar.jpg'" alt="Circle Image" class="rounded-circle img-fluid">
             </ion-col>
         </ion-row>
         <mat-card-content>

src/pages/otp/otp.scss

@@ -23,6 +23,8 @@ page-otp {
    }
   .rounded-circle {
       border-radius: 50%!important;
+      background-image: url('../assets/img/misc/avatar.jpg');      
+      
    }
     .img-fluid{
       max-width: 40%;

src/pages/otp/otp.ts

@@ -3,6 +3,7 @@ import { IonicPage, NavController, NavParams, MenuController } from 'ionic-angul
 import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger';
 import { PdQuestionCategoryPage } from '../pd-question-category/pd-question-category';
 import { ToastProvider } from '../../providers/common-provider/toast';
+import { ConstantsProvider } from '../../providers/constants/constants';
 /**
  * Generated class for the OtpPage page.
  *
@@ -19,7 +20,9 @@ export class OtpPage {
 
   otpStatus: any;
   applicatentDetails: any;
-  constructor(public navCtrl: NavController, public navParams: NavParams,public pddetails:PdtriggerProvider,public toast:ToastProvider,public Menu:MenuController) {
+  commonImage:any;
+  constructor(public navCtrl: NavController, public navParams: NavParams,public pddetails:PdtriggerProvider,public toast:ToastProvider,public Menu:MenuController,public commonconstant:ConstantsProvider) {
+    this.commonImage = this.commonconstant.commonimage;
     this.applicatentDetails =  this.navParams.get('pdDetails');
   }
 

src/pages/password/password.html

@@ -19,7 +19,7 @@
     </mat-card-header>
     <ion-row>
         <ion-col text-center>
-           <img src="../assets/img/misc/avatar.jpg" alt="Circle Image" class="rounded-circle img-fluid">
+           <img [src]="commonImage || '../../assets/img/misc/avatar.jpg'" alt="Circle Image" class="rounded-circle img-fluid">
         </ion-col>
     </ion-row>
     <mat-card-content>

src/pages/password/password.scss

@@ -23,6 +23,7 @@ page-password {
    }
   .rounded-circle {
       border-radius: 50%!important;
+     background-image: url('../assets/img/misc/avatar.jpg');      
    }
     .img-fluid{
       max-width: 40%;

src/pages/password/password.ts

@@ -3,6 +3,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { AwsServiceProvider } from '../../providers/aws-service/aws-service';
 import { PdListPage } from '../pd-list/pd-list';
 import { ToastProvider } from '../../providers/common-provider/toast';
+import { ConstantsProvider } from '../../providers/constants/constants';
 /**
  * Generated class for the PasswordPage page.
  *
@@ -16,12 +17,15 @@ import { ToastProvider } from '../../providers/common-provider/toast';
   templateUrl: 'password.html',
 })
 export class PasswordPage {
+  commonImage: string;
   newpassword: any;
   confirmPassword: any;
   pin:any;
   Username:any;
   Password:any;
-  constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider) {
+  
+  constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider,public commonconstant:ConstantsProvider) {
+    this.commonImage = this.commonconstant.commonimage;
     this.Username = this.navParams.get('Username');
     this.Password = this.navParams.get('Password');
   }

src/pages/pd-list/pd-list.html

@@ -3,7 +3,7 @@
     <button ion-button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
-    <ion-title *ngIf="!viewchange">PD Listing</ion-title>
+    <ion-title *ngIf="!viewchange">PD Cases</ion-title>
     
        <ion-title *ngIf="viewchange"> <ion-searchbar
         [animated]="true"

src/pages/pd-list/pd-list.scss

@@ -67,6 +67,11 @@ page-pd-list{
       line-height: 0px;
       box-shadow: 0 16px 38px -12px rgba(0,0,0,.56), 0 4px 25px 0 rgba(0,0,0,.12), 0 8px 10px -5px rgba(0,0,0,.2) !important;
    }
+
+  .button-md-primary {
+    margin-bottom: 0px !important;
+    height: 50px;
+   }
    ion-fab[middle]{
      top:17% !important;
    }

src/pages/pd-question-category/pd-question-category.html

@@ -3,7 +3,7 @@
     <button ion-button menuToggle>
       <ion-icon name="menu"></ion-icon>
     </button>
-    <ion-title *ngIf="!viewchange">PD Listing</ion-title>
+    <ion-title *ngIf="!viewchange">PD Questions Category</ion-title>
     
        <ion-title *ngIf="viewchange"> <ion-searchbar
         [animated]="true"

src/pages/pd-question-category/pd-question-category.scss

@@ -51,7 +51,7 @@ h1{
       box-shadow: 0 5px 20px 0 rgba(0,0,0,.2), 0 13px 24px -11px rgba(0, 0, 0, 0.2);
 }
 *{
-   font-size: 10px;
+   font-size: 16px;
 }
 .mat-card-title{
   margin-bottom: 0px;
@@ -74,5 +74,10 @@ h1{
 .item-md ion-icon[item-start] + .item-inner{
   margin-left: 0px;
 }
+
+.button-md-primary {
+  margin-bottom: 0px !important;
+  height: 50px;
+ }
 }
 

src/pages/pd-question-category/pd-question-category.ts

@@ -92,6 +92,8 @@ completedAccess:any;
           //console.log(this.questionCate.counts);
           if(this.questionCate.question_answers !='')
           {
+            this.questionCateAccess = true;
+            this.questionCate = this.questionCate;
           if(this.questionCate.counts.overall_answered_count !=0 && this.questionCate.counts.overall_question_count !=0 && this.questionCate.counts.overall_answered_count == this.questionCate.counts.overall_question_count)
           {
             this.overallqustioncountAccess = false;
@@ -101,8 +103,7 @@ completedAccess:any;
           }
           
             //console.log(this.questionCate);
-            this.questionCateAccess = true;
+            
-            this.questionCate = this.questionCate;
             
             
             // console.log(this.questionfinishedList);
@@ -121,13 +122,13 @@ completedAccess:any;
     // console.log(this.pdinfo);
       this.questionCate = this.questionCate.question_answers.filter(cate=>cate.fk_question_category_id == categroyId)[0];
       console.log(this.questionCate);
-     if(this.questionCate.questions.length !="0"){
+    //  if(this.questionCate.questions.length !="0"){
     this.navCtrl.push(PdQuestionPage,{'questionDetails':this.questionCate,'pdDetails':this.pdinfo});
-    }else
+    // }else
-    {
+    // {
-      this.getcategoryList();
+    //   this.getcategoryList();
-      this.toast.pdTriggerappmessage('No Question Available');
+    //   this.toast.pdTriggerappmessage('No Question Available');
-    }
+    // }
   }
 
   completed()

src/pages/pd-question/pd-question.html

@@ -10,7 +10,7 @@
   <button ion-button menuToggle>
     <ion-icon name="menu"></ion-icon>
   </button>
-  <ion-title *ngIf="!viewchange">PD Question</ion-title>
+  <ion-title *ngIf="!viewchange">{{questionDetails.category_name}} Category</ion-title>
   
      <ion-title *ngIf="viewchange"> <ion-searchbar
       [animated]="true"
@@ -176,7 +176,7 @@
       <ion-col col-6 style="padding: 0px !important;">
         <!--<button color="accent" mat-raised-button full>Reject</button>-->
             <button ion-button full color="danger" (click)="prev(questionAnswer.value,questionanotherData.value,questionDetails)">
-              <ion-icon name="md-arrow-back"> SAVE & PREVIOUS</ion-icon>
+              <ion-icon name="md-arrow-back"></ion-icon> SAVE & PREVIOUS
             </button>
 
       </ion-col>

src/pages/pd-question/pd-question.ts

@@ -73,7 +73,7 @@ export class PdQuestionPage {
   }
 
   ionViewWillLeave() {
-  this.navCtrl.setRoot(PdQuestionCategoryPage);
+  this.navCtrl.setRoot(PdQuestionCategoryPage,{'pdDetails':this.pdinfo});
   }
 
   scrollIndicatiorTab()
@@ -173,17 +173,19 @@ export class PdQuestionPage {
   getpdQuestionDetails()
   {
     this.questionDetails = this.navParams.get('questionDetails');
-    //console.log('157',this.questionDetails);
+    console.log('157',this.questionDetails);
     this.pdinfo = this.navParams.get('pdDetails');
     // console.log(this.pdinfo);
     for(let qustimage of this.questionDetails.questions)
     { 
+      if(qustimage.images !==undefined){
       for(let image of qustimage.images)
       {
           image.questionId = qustimage.fk_question_id; 
          this.docArray.push(image);
       }
     }
+    }
     console.log(this.docArray);
       for(let i=1;i<=this.questionDetails.questions_count;i++){
         let j = i.toString();

src/providers/aws-service/aws-service.ts

@@ -96,7 +96,7 @@ apiurl:any;
     ////(auth);
     const userData = {
       Username: auth.Username,
-      Pool: lenderUserPool
+      Pool: sineedgedevUserpool
     };
     let cognitoUser = new CognitoUser(userData);
     return Observable.create(observe => {