Fairoj : merge

.sourcemaps/0.js.map

@@ -1 +1,5 @@
-{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}
+<<<<<<< HEAD
+{"version":3,"sources":[],"names":[],"mappings":"","sourcesContent":[]}
+=======
+{"version":3,"sources":["../../@angular/common/http (ignored)"],"names":[],"mappings":";;;;;AAAA,e","file":"0.js","sourcesContent":["/* (ignored) */\n\n\n//////////////////\n// WEBPACK FOOTER\n// @angular/common/http (ignored)\n// module id = 657\n// module chunks = 0"],"sourceRoot":""}
+>>>>>>> 8fde53cce8093e6e59c8fb598743fcc841bbdd25

src/app/app.component.ts

@@ -13,6 +13,8 @@ import {AlertController} from 'ionic-angular'
 import { platformBrowser } from '@angular/platform-browser';
 import {CacheService} from 'ionic-cache'
 // import { AndroidPermissions } from '@ionic-native/android-permissions';
+import { CompleteListPage } from '../pages/complete-list/complete-list';
+
 
 
 @Component({
@@ -37,7 +39,9 @@ export class MyApp {
     this.pages = [          
       // { title: 'Home', component: HomePage, icon: 'home' },
       { title: 'Home', icon: 'home',method:()=>this.menulist(1) },
-      { title: 'Logout', icon: 'md-exit',method:()=>this.menulist(2)}
+      { title: 'Logout', icon: 'md-exit',method:()=>this.menulist(2)},
+      { title: 'Complete List', icon: 'checkmark-circle',method:()=>this.menulist(3)}
+
     ];
 
 
@@ -156,6 +160,7 @@ let alert=this.alertCtrl.create({
   });
   break;
   case 3:
+  this.nav.setRoot(CompleteListPage);
   break;
   case 4:
   break;

src/app/app.module.ts

@@ -123,10 +123,11 @@ import {PdQuestionAssessedDailyPurchasePage} from '../pages/pd-question/pd-quest
 import {RupeeCurrencyFormatPipe} from '../pipes/rupee-currency-format/rupee-currency-format'
 import {PdQuestionAssessedImagesPage} from '../pages/pd-question/pd-question-assessed-images/pd-question-assessed-images'
 // import {PipesModule} from '../pipes/pipes.module'
-import {IonicStorageModule} from '@Ionic/storage'
+import {IonicStorageModule} from '@ionic/storage'
 import { StorageProvider } from '../providers/storage/storage';
 import {PdQuestionRentalDashPage} from '../pages/pd-question/pd-question-rental-info/pd-question-rental-dash/pd-question-rental-dash'
 import {CacheModule} from 'ionic-cache'
+import { CompleteListPage } from '../pages/complete-list/complete-list';
 
 @NgModule({
     declarations: [
@@ -134,6 +135,7 @@ import {CacheModule} from 'ionic-cache'
         AuthPage,
         LoginPage,
         PdListPage,
+        CompleteListPage,
         PdQuestionCategoryPage,
         PdQuestionPage,
         GoogleplaytabPage,
@@ -235,6 +237,7 @@ import {CacheModule} from 'ionic-cache'
         PdQuestionPage,
         GoogleplaytabPage,
         PasswordPage,
+        CompleteListPage,
         PdAllocationPage,
         InputPage,
         OtpPage,

src/pages/complete-list/complete-list.html

@@ -0,0 +1,96 @@
+<ion-header>
+  <ion-navbar color="optblue">
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>Complete List</ion-title>
+  </ion-navbar>
+</ion-header>
+<ion-content>
+  <ion-grid>        
+<!-- <mat-card class="md-box" reorder="true" *ngFor="let progess of pdcomplete;let i = index;">
+  <ion-list>
+         <ion-item (click)="PdAllocation(progess)"> 
+           <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon>
+               <ion-row>
+                 <ion-col col-5 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
+                   <h1>{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
+                 </ion-col>
+                 <ion-col text-right>
+                     <div style="font-size: 13px;">
+                      <h6>{{progess.pd_date_of_initiation}}</h6>
+                      <h6>{{progess.city_name}}</h6>
+                     </div>
+                   </ion-col>                 
+               </ion-row>  
+                <ion-row>
+                  <ion-col col-5>
+                    <h6>{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                  </ion-col>
+                  <ion-col text-right>
+                      <h6>{{progess.pd_status}}</h6>
+                   </ion-col>                                            
+               </ion-row>  
+         </ion-item>  
+   </ion-list>
+   <hr/>
+</mat-card> -->
+
+<mat-card class="md-box" reorder="true" *ngFor="let progess of pdcomplete;let i = index;">
+  <ion-list >
+   <!-- WITH APPLICANT DETAILS -->
+         <ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child != 1"> 
+           <!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColor[i]">{{progess.applicat_details[0].applicant_name | slice : 0 :1 | uppercase}}</ion-icon> -->
+           <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
+               <ion-row>
+                 <ion-col col-5 *ngIf="progess.applicat_details.length !=0 && progess.applicat_details[0].applicant_type == 1">
+                   <h1>{{progess.applicat_details[0].applicant_name | titlecase}}</h1>
+                   <!--<p>28 Sep 2018 10:00 AM</p>-->
+                 </ion-col>
+                 <ion-col text-right>
+                     <div style="font-size: 13px;">
+                        <h6>{{progess.pd_date_of_initiation}}</h6>
+                        <h6>{{progess.city_name}}</h6>
+                     </div>
+                   </ion-col>                 
+               </ion-row>  
+                <ion-row>
+                 <ion-col col-6>
+                   <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                 </ion-col>
+                 <ion-col text-right>
+                     <h6>{{progess.pd_status}}</h6>
+                  </ion-col>                                             
+               </ion-row>  
+         </ion-item>  
+
+         <!-- WITHOUT APPLICAT DETAILS FOR ADD ON PD -->
+         <ion-item (click)="PdAllocation(progess)" *ngIf="progess.is_child == 1"> 
+            <!-- <ion-icon item-start="" class="lettericon" [style.background]="bgColorPast[i]" >{{progess.pd_status | slice : 0 :1 | uppercase}}</ion-icon> -->
+            <p item-start class="lettericon" [style.background]="bgColorPast[i]">{{progess.pd_id}}</p>
+                <ion-row>
+                  <ion-col col-5 >
+                    <h1>Add On for {{progess.parent_pd_id}}</h1>
+                    <!--<p>28 Sep 2018 10:00 AM</p>-->
+                  </ion-col>
+                  <ion-col text-right>
+                      <div style="font-size: 13px;">
+                         <h6>{{progess.pd_date_of_initiation}}</h6>
+                         <h6>{{progess.city_name}}</h6>
+                      </div>
+                    </ion-col>                 
+                </ion-row>  
+                 <ion-row>
+                  <ion-col col-6>
+                    <h6 class="app_id">{{progess.lender_short_name}}, {{progess.lender_applicant_id}}</h6>
+                  </ion-col>
+                  <ion-col text-right>
+                      <h6>{{progess.pd_status}}</h6>
+                   </ion-col>                                             
+                </ion-row>  
+          </ion-item>  
+   </ion-list>
+   <hr/>
+</mat-card>
+  </ion-grid>
+</ion-content>

src/pages/complete-list/complete-list.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { CompleteListPage } from './complete-list';
+
+@NgModule({
+  declarations: [
+    CompleteListPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(CompleteListPage),
+  ],
+})
+export class CompleteListPageModule {}

src/pages/complete-list/complete-list.scss

@@ -0,0 +1,88 @@
+page-complete-list {
+    mat-grid-tile {
+        background: white!important;
+      }
+      .grid{
+        padding:0px;
+      }
+      .scroll-content{
+        padding: 0px !important;
+        // margin-top: 45px !important;
+      }
+      .fadeIn {
+        animation-name: fadeIn;
+        animation-duration: 15s;
+        transition: all 0.5s cubic-bezier(.36,-0.64,.34,1.76);
+      }
+      @font-face{
+        font-family: Roboto;
+        src: url('../../assets/fonts/Roboto-Bold.ttf')!important;
+      }
+      h1{
+          margin: 2px 0;
+          font-size: 2.2rem !important;    
+          // font-weight: bold!important;
+      }
+      // .box{
+      //   box-shadow: 0 5px 20px 0 rgba(0,0,0,.2),0 13px 24px -11px rgba(50, 114, 178, 0.59) !important;
+      // }
+      .scroll-content{
+        //background-color: #eee !important;
+         padding:0px !important;
+      }
+      .mat-card{
+        // border-top: 3px solid rgba(50, 114, 178, 0.78);
+        padding: 0px !important;
+        box-shadow: none !important;
+            // height: 100%;
+      }
+      *{
+         font-size: 10px;
+      }
+      .mat-card-title{
+        margin-bottom: 0px;
+      }
+      .list-md{
+        margin: 0px;
+      }
+      .lettericon{
+        background-color: cadetblue;
+        padding: 10px 8px 10px 8px;
+        border-radius: 20%;
+        color: #fff;
+        font-size: 90%;
+        font-weight: bold
+    }
+    .no_applicant_pd{
+      background-color: cadetblue;
+          padding: 10px 15px 10px 15px;
+          border-radius: 50%;
+          color: #fff;
+                      }
+      .label-md{
+        margin: 0px;
+      }
+      .item-md h4 {
+        font-size: 1.7rem;
+      }
+      .item-md ion-icon[item-start] + .item-inner{
+        margin-left: 0px;
+      }
+      .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;
+     }
+  
+    .button-md-primary {
+      margin-bottom: 0px !important;
+      height: 50px;
+     }
+     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;
+     }
+}

src/pages/complete-list/complete-list.ts

@@ -0,0 +1,133 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { AwsServiceProvider } from '../../providers/aws-service/aws-service';
+import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger';
+import { CognitoServiceProvider } from '../../providers/aws-service/cognito.service';
+import { parseDate } from 'ionic-angular/util/datetime-util';
+import { PdQuestionCategoryPage } from '../pd-question-category/pd-question-category';
+import { DatabaseProvider } from '../../providers/database/database';
+import { AndroidPermissions } from '@ionic-native/android-permissions';
+import { InputPage } from '../input/input';
+
+/**
+ * Generated class for the CompleteListPage page.
+ *
+ * See https://ionicframework.com/docs/components/#navigation for more info on
+ * Ionic pages and navigation.
+ */
+
+@IonicPage()
+@Component({
+  selector: 'page-complete-list',
+  templateUrl: 'complete-list.html',
+})
+export class CompleteListPage {
+  // random_ng_past(): any {
+  //   throw new Error("Method not implemented.");
+  // }
+  // random_bg_color(): any {
+  //   throw new Error("Method not implemented.");
+  // }
+  aws: any;
+  pdlistaccess: boolean;
+  pdofficer: any;
+  pdlistdetails: any = [];
+  pdschduleDetails: any;
+  searchpast: any;
+  pdcomplete: any=[];
+  searchcomplete: any;
+  bgColorPast: any = [];
+  bgColor: any = [];
+  viewchange: boolean;
+  pdlist:any = "0";
+
+  
+  constructor(public navCtrl: NavController, public navParams: NavParams,public awsservice:AwsServiceProvider,public PdtriggerProvider:PdtriggerProvider,public shared:CognitoServiceProvider,public db:DatabaseProvider,public androidPermissions:AndroidPermissions) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad CompleteListPage');
+
+    this.db.getuserDetails();
+   
+  }
+  ionViewCanEnter()
+  {
+    console.log("Pd list ionViewCanEnter")
+    this.getpdTriggerdetails();
+  }
+  
+  doRefresh(refresher) {
+    this.bgColor = [];
+    this.pdschduleDetails = [];
+    this.pdcomplete = [];
+    // this.pdlistaccess = true;
+      this.shared.refresh();
+      this.getpdTriggerdetails();
+    setTimeout(() => {
+     
+      refresher.complete();
+    }, 2000);
+  }
+  getpdTriggerdetails()
+  {
+   
+    let userid = this.awsservice.getlocale();
+    //.log("User",userid)
+    // this.pdlistaccess = true;
+
+    this.PdtriggerProvider.getpddetails(userid).subscribe(res=>
+      {
+        console.log('res',res);
+       this.pdlistdetails = res;
+       if(this.pdlistdetails.dataStatus == true)
+       {
+        this.pdlistaccess = false;
+        
+          
+          // this.searchpast = this.pdschduleDetails;
+          
+          this.pdcomplete =  this.pdlistdetails.records.filter(complete=>complete.pd_status == "COMPLETED");
+          this.searchcomplete = this.pdcomplete;
+         
+          this.random_bg_color();
+          this.random_ng_past();
+       }else
+       {
+         this.pdlistaccess = false;
+          this.pdlistdetails = "No Records Found";
+       }
+      })
+  }
+  random_bg_color() {
+    for(let id of this.pdcomplete){
+    var x = Math.floor(Math.random() * 256);
+    var y = Math.floor(Math.random() * 256);
+    var z = Math.floor(Math.random() * 256);
+    this.bgColor.push("rgb(" + x + "," + y + "," + z + ")");
+    
+  }
+ 
+  return this.bgColor;
+    }
+    random_ng_past()
+    {
+      for(let id of this.pdschduleDetails){
+        var x = Math.floor(Math.random() * 256);
+        var y = Math.floor(Math.random() * 256);
+        var z = Math.floor(Math.random() * 256);
+        this.bgColorPast.push("rgb(" + x + "," + y + "," + z + ")");
+        
+      }
+    }
+ 
+  PdAllocation(pddetails)
+  {
+    
+      if(pddetails.pd_status == 'COMPLETED')
+      {
+      this.navCtrl.push(InputPage,{'pdDetails':pddetails});
+    }
+  }
+
+}

src/pages/input/input.html

@@ -155,6 +155,7 @@
             <a href="tel:?{{other_app.mobile_no}}" style="text-decoration: none;"><ion-icon color="optblue" style="font-size: 24px;" name="call"></ion-icon>
             </a></ion-col>
       </ion-row>
+      <hr>
       </mat-card-content>
     </mat-card><br/>
     <mat-card style="border-radius:10px">

src/pages/input/input.scss

@@ -75,7 +75,7 @@ page-input{
    .cardinfo
    {
     font-size: 19px!important;
-    padding-bottom: 30px!important;
+    // padding-bottom: 30px!important;
     //text-align: center
     // padding-top:15px !important;
    }

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

@@ -160,7 +160,9 @@
             <ion-row>
               <!-- <button ion-button full color="primary" [disabled]="!overallqustioncountAccess"style="background-color: green !important;" (click)="completed()">
                   Completed </button> -->
-                  <button ion-button full color="primary" style="background-color: green !important;" (click)="completePDAlert()">
+                 
+                  <button *ngIf='!complete_status' ion-button full color="primary" style="background-color: green !important;" (click)="completePDAlert()">
                     Completed </button>
+                  
             </ion-row>
             </ion-footer>

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

@@ -67,6 +67,8 @@ completedAccess:any;
 searchitem:any;
   enableAddonPD: boolean=false;
   pageTitle:string;
+  complete_status : boolean = false;
+
   constructor(public navCtrl: NavController, public navParams: NavParams,public templateget:QuestionCategoryProvider,public aws:AwsServiceProvider, public shared:CognitoServiceProvider,public toast:ToastProvider,public pdstatusprovide:PdtriggerProvider) {
     this.pddetails = this.navParams.get('pdDetails');
     this.pageTitle=this.pddetails.is_child != '1' ? this.pddetails.applicat_details[0].applicant_name : 'Add On for'+' '+this.pddetails.parent_pd_id
@@ -79,6 +81,9 @@ searchitem:any;
           console.log("addon",this.enableAddonPD);
         }
     });
+
+    this.complete_status = this.pddetails.pd_status == 'COMPLETED' ? true : false;
+
   }
 
   ionViewCanEnter()

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

@@ -403,8 +403,10 @@
           
      
       <!-- <ion-buttons >
-      <ion-button color="optblue" full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
-      <button ion-button full color="optblue" (click)="savepdQuestion(pdQuestionAddress.value)"> Save</button>
+      <ion-button color="optblue" full [disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
+      <span *ngIf='!complete_status'>
+        <button ion-button full color="optblue" (click)="savepdQuestion(pdQuestionAddress.value)"> Save</button>
+      </span>
        <!-- </ion-buttons> -->
      
  

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

@@ -70,6 +70,8 @@ export class PdQuestionAddressPage {
   addressesList: any;
   pincodeValue:any=[]
   cityDataValue:any=[]
+  complete_status : boolean = false;
+
   // counts:number = 1;
   private search:searchValue[]
   protected _onDestroy = new Subject<void>();
@@ -141,8 +143,9 @@ export class PdQuestionAddressPage {
       //  })
       this.timer = Observable.interval(10000)
       .subscribe((val) => { console.log('test',val); });
-  
-     
+
+      //To checking Completed Status For CompleteList Menu
+      this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {
@@ -273,6 +276,7 @@ countRowsForTextarea(text){
     
    
   }
+
   ionViewCanLeave(){
     this.timer.unsubscribe();
     console.log("dirty",this.pdQuestionAddress.dirty);

src/pages/pd-question/pd-question-assessed-business-income/pd-question-assessed-business-income.html

@@ -86,7 +86,9 @@
         <!-- <ion-buttons >
          <ion-button color="optblue" 
          full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
-        <button ion-button full (click)="saveBusinessData(BuissnessForm.value)"color="optblue"> Save</button>
+         <span *ngIf='!complete_status'>
+        <button ion-button full (click)="saveBusinessData(BuissnessForm.value)" color="optblue"> Save</button>
+         </span>
         <!-- </ion-buttons> -->
       </ion-row>
         </form>

src/pages/pd-question/pd-question-assessed-business-income/pd-question-assessed-business-income.ts

@@ -30,6 +30,7 @@ export class PdQuestionAssessedBusinessIncomePage {
   businessIncome:any;
   Value: any=[];
   AnnualExpenses: any=[];
+  complete_status : boolean = false;
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,public cons:ConstantsProvider) {
     this.pdDetails = this.navParams.get('pdDetails');
     this.expenseDetails = this.navParams.get('income');
@@ -48,6 +49,10 @@ export class PdQuestionAssessedBusinessIncomePage {
         this.addBusinessDetails();
       }
       this.getdropdown();
+
+
+      //To checking Completed Status For CompleteList Menu
+      this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   getdropdown()

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

@@ -84,5 +84,7 @@
         </form>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full (click)="saveBusinessData(BuissnessForm.value)"color="optblue"> Save</button>
+  </span>
 </ion-footer>

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

@@ -22,6 +22,7 @@ export class PdQuestionAssessedBusinessPage {
   expenseDetails: any;
   Value: any=[];
   AnnualExpenses: any=[];
+  complete_status: boolean = false;
   grandpurchaseTotal(arg0: any): any {
     throw new Error("Method not implemented.");
   }
@@ -48,6 +49,9 @@ export class PdQuestionAssessedBusinessPage {
         this.addBusinessDetails();
       }
       this.getdropdown();
+
+      //To checking Completed Status For CompleteList Menu
+      this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   getdropdown()

src/pages/pd-question/pd-question-assessed-daily-purchase/pd-question-assessed-daily-purchase.html

@@ -84,5 +84,7 @@
 </form>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button color="optblue" full (click)="submitDetails(purchaseItemForm.value)">Save</button>
-  </ion-footer>
+    </span>  
+</ion-footer>

src/pages/pd-question/pd-question-assessed-daily-purchase/pd-question-assessed-daily-purchase.ts

@@ -32,6 +32,7 @@ export class PdQuestionAssessedDailyPurchasePage {
   purchaseData:any;
   purchaseAmtInWords: any=[];
   maxDate:any;
+  complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,
     private fb:FormBuilder,private quesCat:QuestionCategoryProvider,private toast:ToastProvider,private cons:ConstantsProvider) {
@@ -56,6 +57,9 @@ export class PdQuestionAssessedDailyPurchasePage {
      // child:this.fb.array([])
     })
     this.getDropDown()
+
+     //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

src/pages/pd-question/pd-question-assessed-daily-sales/pd-question-assessed-daily-sales.html

@@ -135,5 +135,7 @@
     </form>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full color="optblue" (click)="saveData(salesDailyForm.value)"> Save</button>
+</span>
 </ion-footer>

src/pages/pd-question/pd-question-assessed-daily-sales/pd-question-assessed-daily-sales.ts

@@ -37,6 +37,7 @@ export class PdQuestionAssessedDailySalesPage {
   check_type:any=[{'type_id':"1",'type_name':'Date Information'},{'type_id':"2",'type_name':'Frequency Information'}]
   product_and_services: any=[];
   maxDate:any;
+  complete_status: boolean = false;
   constructor(public navCtrl: NavController, public navParams: NavParams, public aws: AwsServiceProvider, public qustCat: QuestionCategoryProvider, public toast: ToastProvider, public fb: FormBuilder,public constant:ConstantsProvider) {
     // this.maxDate=new Date()
     var today=new Date
@@ -64,6 +65,9 @@ export class PdQuestionAssessedDailySalesPage {
 
     }
     this.getDropDown()
+
+    //To checking Completed Status For CompleteList Menu
+    this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -78,5 +78,7 @@
   </form>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full (click)="saveHouseExpenseData(houseHoldForm.value)"color="optblue"> Save</button>
+</span>
 </ion-footer>

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

@@ -30,6 +30,7 @@ export class PdQuestionAssessedHouseholdPage {
   houseHoldForm:FormGroup;
   Value: any=[];
   AnnualExpenses: any=[];
+  complete_status: boolean = false;
   // nn:Object[][]=[]
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public aws:AwsServiceProvider,public toast:ToastProvider,public qustCat:QuestionCategoryProvider,public cons:ConstantsProvider) {
     this.pdDetails = this.navParams.get('pdDetails');
@@ -48,6 +49,9 @@ export class PdQuestionAssessedHouseholdPage {
         this.addHouseExpenses();
       }
       this.getdropdown();
+
+       //To checking Completed Status For CompleteList Menu
+       this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -155,5 +155,7 @@
   </form>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full (click)="savepurchaseData(rawMaterialForm.value)"color="optblue"> Save</button>
+</span>
 </ion-footer>

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

@@ -32,6 +32,7 @@ export class PdQuestionAssessedPurchasePage {
   AnnualPurchase: any=[];
   productListData:any=[]
   check_type:any=[{'type_id':"1",'type_name':'Quantity and Rate Information'},{'type_id':"2",'type_name':'Value Information'}]
+  complete_status: boolean = false;
   constructor(public navCtrl: NavController, public fb:FormBuilder,public navParams: NavParams,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,public aws:AwsServiceProvider,public cons:ConstantsProvider) {
     this.pdDetails = this.navParams.get('pdDetails');
     this.purchaseDetails = this.navParams.get('purchase');
@@ -51,6 +52,9 @@ export class PdQuestionAssessedPurchasePage {
         this.addPurchaseDetails();
       }
       this.getdropList();
+
+      //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -135,5 +135,7 @@
       </form>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full color="optblue" (click)="saveData(assessedForm.value)"> Save</button>
+</span>
 </ion-footer>

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

@@ -37,6 +37,7 @@ export class PdQuestionAssessedSalesPage {
   margin_calculation_status:any=[]
   check_type:any=[{'type_id':"1",'type_name':'Quantity and Rate Information'},{'type_id':"2",'type_name':'Value Information'}]
   product_and_services: any=[];
+  complete_status: boolean = false;
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,public cons:ConstantsProvider) {
     this.pdDetails = this.navParams.get('pdDetails');
     this.FormId = this.navParams.get('FormId');
@@ -58,6 +59,9 @@ export class PdQuestionAssessedSalesPage {
       }
     // this.addSalesCal();
     this.getdropList();
+
+     //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -428,6 +428,7 @@
 </ion-content>
 <ion-footer>
       
-      
+        <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="saveAssetDetails(AssetsDetailsForm.value)"> Save</button>
+</span>
 </ion-footer>

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

@@ -59,6 +59,7 @@ export class PdQuestionAssestsPage {
   imageDisplay: any=[];
   @ViewChild('focusName') inputFocus;
   @ViewChild('picContent') content: Content
+  complete_status: boolean = false;
   // data:Observable <any>;
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,public constprovider:ConstantsProvider,public camera:Camera,public alert: AlertController) {
   
@@ -80,6 +81,9 @@ export class PdQuestionAssestsPage {
           this.getAssetDetails();
           this.getdropList();
           this.loadDetails = true;
+
+           //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
   ionViewDidLoad() {
     console.log('ionViewDidLoad PdQuestionAssestsPage');

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

@@ -200,5 +200,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+<span *ngIf='!complete_status'>
 <button ion-button full color="optblue" (click)="savepdBank(bankDetails.value)"> Save</button>
+</span>
 </ion-footer>

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

@@ -46,6 +46,7 @@ export class PdQuestionBankingPage {
   imageDisplay: any[];
   imageBucket: any=[];
   tab: any='0';
+  complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,
@@ -80,6 +81,9 @@ export class PdQuestionBankingPage {
       // .subscribe(()=>{
       //   this.filterBank();
       // })
+
+       //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
      
   }
 

src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html

@@ -434,5 +434,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full color="optblue" (click)="onSubmit()"> Save</button>
+  </span>
 </ion-footer>

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

@@ -66,6 +66,7 @@ export class PdQuestionBusinessAssetsPage {
   imageDisplay: any[];
   imageBucket: any=[];
   tab: any='0';
+  complete_status: boolean = false;
   
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public fb:FormBuilder,public qustcat:QuestionCategoryProvider,
@@ -91,7 +92,8 @@ export class PdQuestionBusinessAssetsPage {
  
    
     
-    
+     //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
  
   
   }

src/pages/pd-question/pd-question-business-group/pd-question-business-banking/pd-question-business-banking.html

@@ -205,5 +205,7 @@
             <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full color="optblue" (click)="savepdBank(bankingForm.value)"> Save</button>
+</span>
 </ion-footer>

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

@@ -53,6 +53,7 @@ step:number
   imageDisplay: any[];
   imageBucket: any=[];
   tab: string='0';
+  complete_status: boolean = false;
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws: AwsServiceProvider,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,
     public cons:ConstantsProvider,public toast:ToastProvider,private loading:LoadingProvider,
@@ -88,6 +89,9 @@ step:number
      
       this.getdropdown();
       this.retiveBankDetails();
+
+       //To checking Completed Status For CompleteList Menu
+     this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -1654,5 +1654,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="submitDetails()">Save</button>
+    </span>
 </ion-footer>

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

@@ -82,6 +82,7 @@ export class PdQuestionBusinessInfoPage {
     imageDisplay: any[];
     imageBucket: any=[];
     tab: string='0';
+    complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public toast:ToastProvider,
@@ -154,6 +155,9 @@ export class PdQuestionBusinessInfoPage {
  
 // this.initBusinessForm();
 
+//To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
+
   }
 
   ionViewDidLoad() {

src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html

@@ -450,5 +450,7 @@
       <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
         <button ion-button full color="optblue" (click)="saveClientInfo(clientInfoForm.value)"> Save</button>
+        </span>
 </ion-footer>

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

@@ -46,6 +46,7 @@ export class PdQuestionClientInfoPage {
   imageDisplay: any[];
   imageBucket: any=[];
   tab: string='0';
+  complete_status: boolean = false;
 
 
   constructor(public navCtrl: NavController, public navParams: NavParams, 
@@ -100,6 +101,10 @@ export class PdQuestionClientInfoPage {
     });
 
     this.getdropList();
+
+
+    //To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html

@@ -393,5 +393,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="submitDetails()"> Save</button>
+    </span>
 </ion-footer>

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

@@ -58,6 +58,7 @@ export class PdQuestionFinancialInfoPage {
     imageDisplay: any[];
     imageBucket: any=[];
     tab: string='0';
+    complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,
                       public toast:ToastProvider, public qustCat:QuestionCategoryProvider,
@@ -82,6 +83,9 @@ export class PdQuestionFinancialInfoPage {
     //     console.log("changes",res);
     // })
 //}
+
+//To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.html

@@ -447,5 +447,7 @@
       <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
         <button ion-button full color="optblue" (click)="saveStockInfo(stockForm.value)"> Save</button>
+        </span>
 </ion-footer>

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

@@ -57,6 +57,7 @@ export class PdQuestionStockInfoPage {
   imageDisplay: any[];
   imageBucket: any=[];
   tab: string='0';
+  complete_status: boolean = false;
   
   constructor(public navCtrl: NavController, public navParams: NavParams, public qustCat: QuestionCategoryProvider, 
     public aws: AwsServiceProvider, public toast: ToastProvider, public fb: FormBuilder, 
@@ -89,6 +90,9 @@ export class PdQuestionStockInfoPage {
       this.errorMessage = 'No Records Found , Something went Wrong!';
     })
     this.getdropdown();
+
+    //To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -188,5 +188,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
         <button ion-button full color="optblue" (click)="submitCurrentloan(currentLoans.value)" > Save</button>
-</ion-footer>
+</span>
+    </ion-footer>

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

@@ -51,6 +51,7 @@ applicants: any;
   imageBucket: any=[];
   tab: any='0';
   imageDisplay: any=[];
+  complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public qustCat:QuestionCategoryProvider,public toast:ToastProvider, 
@@ -78,7 +79,8 @@ applicants: any;
         loan_details: this.fb.array([])
       });
       
-      
+      //To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
   ionViewDidLoad() {
      console.log('ionViewDidLoad PdQuestionCurrentLoansPage');

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

@@ -329,5 +329,7 @@
             <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="saveEmpInfo()"> Save</button>
+    </span>
 </ion-footer>

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

@@ -56,6 +56,7 @@ export class PdQuestionEmpInfoPage {
   @ViewChild('workExp') expFocus: ElementRef
   @ViewChild('cashPaidFocus') inputCashPaidFocus :ElementRef
   @ViewChild('yearFocus') inputYearFocus :ElementRef
+  complete_status: boolean = false;
   
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
                         public qustCat:QuestionCategoryProvider,public aws: AwsServiceProvider, 
@@ -116,6 +117,9 @@ export class PdQuestionEmpInfoPage {
         // attRegisterSeen:[null],
         // salaryRegisterSeen:[null]
       })
+
+       //To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -474,5 +474,7 @@
         
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
         <button ion-button strong  color="optblue" block  (click)="savepdfamily(familyForm.value)"> Save</button>
+        </span>
 </ion-footer>

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

@@ -69,7 +69,11 @@ data:any;
   imageDisplay: any=[];
   imageBucket: any=[];
   tab: any='0';
+<<<<<<< HEAD
   titleList: any=[];
+=======
+  complete_status: boolean = false;
+>>>>>>> 8fde53cce8093e6e59c8fb598743fcc841bbdd25
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@@ -94,7 +98,8 @@ data:any;
   this.getRelation();
   this.getoccupation();
  
-  
+  //To checking Completed Status For CompleteList Menu
+  this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   
   }
 

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

@@ -204,5 +204,7 @@
     <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" type="submit" (click)="saveFinalRemark()"> Save</button>
+    </span>
 </ion-footer>

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

@@ -37,6 +37,7 @@ export class PdQuestionFinalRemarkPage {
                     {'id':'four_wheeler','name':'Four Wheeler'},
                     {'id':'public_transport','name':'Public Transport'},
                     {'id':'others','name':'Others'}]
+  complete_status: boolean = false;
   constructor(public navCtrl: NavController, public navParams: NavParams, public fb:FormBuilder,
        public qustcat:QuestionCategoryProvider,public aws:AwsServiceProvider,
        public toast:ToastProvider,private cameraProvider:CameraProvider,private loading:LoadingProvider) {
@@ -69,6 +70,9 @@ export class PdQuestionFinalRemarkPage {
       
     })
     this.getDropDown();
+
+    //To checking Completed Status For CompleteList Menu
+  this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
    
   }
   ionViewDidLoad() {

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

@@ -472,5 +472,7 @@
             <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
   <button ion-button full color="optblue" (click)="submitData(generalForm.value)"> Save</button>
+</span>
 </ion-footer>

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

@@ -72,6 +72,9 @@ export class PdQuestionGeneralInfoPage {
    public addComp:boolean
    public addIndi:boolean
   updateIndex_comp: any;
+
+  complete_status : boolean = false;
+
 @ViewChild('remark') nameField: ElementRef;
 @ViewChild('focusBusiness') focus_business_entity : MatSelect
   customer_segment_abbr: any;
@@ -149,6 +152,10 @@ export class PdQuestionGeneralInfoPage {
     this.companyList=control.value.filter(element=>element.company_name )
   })
   this.i=0;
+
+
+   //To checking Completed Status For CompleteList Menu
+   this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   
   }
 

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

@@ -110,6 +110,8 @@
           <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="sumbitData(representativeForm.value)"> Save</button>
+    </span>
 </ion-footer>
 

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

@@ -27,6 +27,7 @@ export class PdQuestionLenderRepresentativePage {
   imageDisplay: any[];
   imageBucket: any=[];
   tab: any='0';
+  complete_status: boolean = false;
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,
     public toast:ToastProvider,public fb:FormBuilder,private cameraProvider:CameraProvider,
@@ -46,6 +47,9 @@ export class PdQuestionLenderRepresentativePage {
       lender_representative_details: this.fb.array([]),
     });
     this.getLenderReDetails();
+
+      //To checking Completed Status For CompleteList Menu
+   this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -263,5 +263,7 @@
             <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
         <button ion-button full color="optblue" (click)="submitLoanDetails()"> Save</button>
+        </span>
 </ion-footer>

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

@@ -78,6 +78,7 @@ export class PdQuestionLoansPage {
   imageDisplay: any=[];
   imageBucket: any=[];
   tab: any='0';
+  complete_status : boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams, public fb: FormBuilder, 
     public qustCat: QuestionCategoryProvider, public aws: AwsServiceProvider, 
@@ -153,7 +154,9 @@ export class PdQuestionLoansPage {
     .subscribe(()=>{
       this.filterBank();
     })
-   
+          //To checking Completed Status For CompleteList Menu
+    this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
+
   }
   ionViewDidLoad() {
     console .log('ionViewDidLoad PdQuestionLoansPage');

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

@@ -263,5 +263,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
   </ion-content>
   <ion-footer>
+      <span *ngIf='!complete_status'>
       <button ion-button full color="optblue" (click)="submitData(neighbourhoodForm.value)"> Save</button>
+      </span>
   </ion-footer>

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

@@ -42,6 +42,7 @@ export class PdQuestionNeighbourHoodPage {
   imageDisplay: any=[];
   imageBucket: any=[];
   tab: any='0';
+  complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,
@@ -68,6 +69,10 @@ export class PdQuestionNeighbourHoodPage {
    
     
     this.getdropdown();
+
+    //To checking Completed Status For CompleteList Menu
+    this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
+
   }
 
   ionViewDidLoad() {

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

@@ -165,5 +165,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+        <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="submitOtherIncome(otherIncomeForm.value)" > Save</button>
+    </span>
 </ion-footer>

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

@@ -44,6 +44,7 @@ export class PdQuestionOtherIncomePage {
   imageDisplay: any=[];
   imageBucket: any=[];
   tab: any='0';
+  complete_status: boolean = false;
 
   constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
     public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@@ -82,6 +83,9 @@ export class PdQuestionOtherIncomePage {
  
   //this.incomeDetails=this.otherIncomeForm.get('income_details')as FormArray
     //this.incomeDetails.push(this.createDetail())
+
+    //To checking Completed Status For CompleteList Menu
+    this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

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

@@ -836,5 +836,7 @@
         <button  mini style="margin-bottom: 10px" ion-fab color="optblue" slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button></ion-fab>
 </ion-content>
 <ion-footer>
+    <span *ngIf='!complete_status'>
     <button ion-button full color="optblue" (click)="saveAlert(rentalForms.value)"> Save</button>
+    </span>
   </ion-footer>

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

@@ -73,6 +73,7 @@ export class PdQuestionRentalInfoPage {
   imageDisplay: any=[];
   pageTitle: string;
   data:any;
+  complete_status: boolean = false;
   
   constructor(public navCtrl: NavController, public navParams: NavParams,
     public aws:AwsServiceProvider,public toast:ToastProvider,
@@ -206,7 +207,8 @@ export class PdQuestionRentalInfoPage {
       control.push(this.createUnitDetails(''));
     }
 
-
+//To checking Completed Status For CompleteList Menu
+this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
   }
 
   ionViewDidLoad() {

src/providers/storage/storage.ts

@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import {Storage} from '@Ionic/storage'
+import {Storage} from '@ionic/storage'
 import {ToastProvider} from '../common-provider/toast'
 
 /*