Merge branch 'master' of https://bitbucket.org/sriramv18/sineedgelenderapp

src/assets/data/sales_pd_templates/22-1.json

@@ -63,13 +63,6 @@
                       "validator":"Validators.required",
                       "message":"Company Name Required",
                       "value":null
-                   },
-                   {  
-                      "name":"pattern",
-                      "isactive":"1",
-                      "validator":"[A-Za-z ]*",
-                      "message":"alphabets only ",
-                      "value":null
                    }
                 ]
              },

src/pages/sales_pd/pages/advance-filter/advance-filter.html

@@ -22,6 +22,12 @@
 <ion-content padding>
   <mat-list class="m-gap p-gap" >
     <div [formGroup]="searchForm" fxLayout="row wrap" fxFlex="100%" fxLayoutGap="35px" fxLayoutAlign="flex-start stretch">
+      <mat-form-field style="width: 100%">
+        <mat-select multiple formControlName="sales_pd_type" placeholder="PD Type">
+          <mat-option *ngFor="let item of salesPdTypeList" [value]="item.id">{{item.pd_type_name}}
+          </mat-option>
+        </mat-select>
+      </mat-form-field> 
       <mat-form-field style="width: 100%">
         <mat-select multiple formControlName="pd_status" placeholder="PD Status">
           <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}
@@ -32,13 +38,13 @@
         <input matInput [matDatepicker]="picker"  [max]="todaydate"
           formControlName="pd_from_date" placeholder="Choose a From date">
         <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-        <mat-datepicker #picker></mat-datepicker>
+        <mat-datepicker touchUi #picker></mat-datepicker>
       </mat-form-field>
       <mat-form-field style="width:100%">
         <input matInput [matDatepicker]="picker1" [min]="searchForm.get('pd_from_date').value" [max]="todaydate"
           formControlName="pd_to_date" placeholder="Choose a To date">
         <mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
-        <mat-datepicker #picker1></mat-datepicker>
+        <mat-datepicker touchUi #picker1></mat-datepicker>
       </mat-form-field>
       <mat-form-field style="width:100%">
         <mat-select multiple formControlName="pd_products" placeholder="Products">

src/pages/sales_pd/pages/advance-filter/advance-filter.ts

@@ -31,6 +31,16 @@ export class AdvanceFilterPage {
   xpandStatus:boolean=false;
   pipe=new DatePipe('en-US');
   is_sales_login: boolean = false;
+  salesPdTypeList = [
+    {
+      id:'1',
+      pd_type_name:"Physical PD"
+    },
+    {
+      id:'2',
+      pd_type_name:"Telephonic PD"
+    }
+  ]
   constructor(private _fb:FormBuilder,public navCtrl: NavController, public navParams: NavParams,public actionSheetCtrl: ActionSheetController,private salesPDService:SalesPdProvider,private toastProvider:ToastProvider,private loaderProvider:LoadingProvider,private viewCtrl:ViewController ) {
     this.todaydate = new Date();
     this.getDropdown();
@@ -54,6 +64,7 @@ export class AdvanceFilterPage {
       pd_lender:[local.fk_entity_id],
       pd_applicant_name:[''],
       pd_officer:[''],
+      sales_pd_type:[''],
       sales_pd_officer_id:[this.is_sales_login ? local.userid : '']
     })
     console.log(this.drop_down_datas)

src/pages/sales_pd/pages/section-list/section-list.ts

@@ -307,7 +307,7 @@ export class SectionListPage {
    
   }
   goto(section_id){
-    alert(section_id);
+    // alert(section_id);
     // this.SalesPDService.insertData_Replace('sales_pd_id_PRIMARYKEY',value_obj.sales_pd_id).then(()=>{
     //   localStorage.setItem('product_id_salesPD',value_obj.product_id)
     if(this.sales_pd_id == null && section_id != '1'){

src/pages/sales_pd/providers/sales-pd/sales-pd.ts

@@ -42,9 +42,17 @@ current_section:any;
     if(this.networkProvider.getCurrentNetworkStatus() == ConnectionStatus.online) {
       console.log(this.platform.is('cordova'))
       let api_properties = {method:'post', api_name:this.apiUrl+'loadSalesPDTemplate',params : params}
+
+      // START OF GETTING LOCAL TEMPLATE ONLY ON BROWSER
       if(!this.platform.is('cordova')) {
-         api_properties = {method:'get', api_name:`assets/data/sales_pd_templates/${product_id}.json`,params : params}
+        let fileName = product_id
+        if(sales_pd_type) {
+          fileName += '-'+sales_pd_type
+        }
+        //  api_properties = {method:'get', api_name:`assets/data/sales_pd_templates/${fileName}.json`,params : params}
       }
+      // END OF GETTIG LOCAL TEMPLATE
+      
     return this.http[api_properties.method](api_properties.api_name,api_properties.params).subscribe(result=>{
       if(!this.platform.is('cordova') && !result.hasOwnProperty('dataStatus')) {
         result =  {dataStatus:true,status:200,records:{template:JSON.stringify(result)}}
@@ -519,7 +527,7 @@ return  this.creditPDService.getStakeholderInfo().map(res=>{
         if(this.networkProvider.getCurrentNetworkStatus() == ConnectionStatus.online) {
           let complete_url = this.apiUrl+'listSalesPD/'+det.fk_entity_id
           if(is_sales_login) {
-            complete_url = complete_url+'/'+det.userid
+            complete_url = complete_url+'/'+det.userid+'/'+det.user_role
           }
         return this.http.get(complete_url).map(res=>{
          this.ionicStorageProvider.checkAndInsertApiDataLocally(res,params,'listSalesPD');

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

@@ -102,7 +102,7 @@ apiurl:any;
   }
   userforgotpass(auth) {
     ////(auth); 
-    alert('test');
+    // alert('test');
     const userData = {
       Username: auth.Username,
       Pool: lenderUserPool