From 06a6a0daa02c359051fa380902b8191104dfc7ca Mon Sep 17 00:00:00 2001
From: saravanakumarkandasami <saravanakumar.k@venbainfotech.com>
Date: Thu, 30 May 2019 19:35:02 +0530
Subject: [PATCH] api changed in schdule : ps

---
 src/pages/input/input.ts                                   | 7 +++++--
 .../pd-question-assessed-business.html                     | 3 +++
 .../pd-question-assessed-business.ts                       | 2 ++
 src/providers/constants/constants.ts                       | 6 +++---
 src/providers/pdtrigger/pdtrigger.ts                       | 6 ++++++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/pages/input/input.ts b/src/pages/input/input.ts
index 0bb2f6cc..28f236b9 100755
--- a/src/pages/input/input.ts
+++ b/src/pages/input/input.ts
@@ -296,13 +296,16 @@ checkOtpAccess:boolean = false;
   pdschedule(scheduledate,appdetails)
   {
     
-    let data :any;
+    let data :any;let param : any;
     console.log(scheduledate);
     if(scheduledate != undefined){
       let schDate = scheduledate.slice(0,19).replace('T',' ');
       console.log(schDate);
       data = {'pd_id':this.address_pd_id,'pd_status':'SCHEDULED','scheduled_on':schDate,'fk_updatedby':this.users,'updatedon':currentdate};
-      this.pdDetails.updatepdStatus(data).subscribe(res=>
+      // this.pdDetails.updatepdStatus(data).subscribe(res=>
+      //sample format : fk_pd_id: "868", schedule_time: "2019-05-30 18:51", fk_scheduled_by: "165";
+      param = {'fk_pd_id': this.address_pd_id, 'schedule_time':schDate, 'fk_scheduled_by': this.users}
+      this.pdDetails.updateSchedule(param).subscribe(res=>
         {
             this.updateSchedule = res;
             if(this.updateSchedule.dataStatus == true)
diff --git a/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.html b/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.html
index 8a7386fa..2d58237e 100755
--- a/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.html
+++ b/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.html
@@ -32,6 +32,9 @@
                         ">{{expense.expense_item}}</mat-option>
                 </mat-select>
           </mat-form-field >
+          <mat-form-field style="width: 100%" *ngIf="item.get('annual_expenses_value').value == 1">
+            <input type="text" matInput placeholder="Specify Business Expense" formControlName="other_expense_item" >
+          </mat-form-field>
           <mat-form-field style="width: 100%">
               <input matInput placeholder="Amount (Rs)" type="number" name="expense_value" formControlName="expense_value" (keyup)="businessCalculation(i,item.value);inWords($event.target.value,i,1)">
               <mat-hint align="end" style="font-size: 11px" *ngIf="item.get('expense_value').value != null">{{"&#8377;"}} {{Value[i]}} Only</mat-hint>
diff --git a/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts b/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts
index e00dce82..cdca1f89 100755
--- a/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts
+++ b/src/pages/pd-question/pd-question-assessed-business/pd-question-assessed-business.ts
@@ -83,6 +83,7 @@ export class PdQuestionAssessedBusinessPage {
         fk_pd_id:[this.pdDetails.pd_id],
         company_id:[this.pdDetails.company_id],
         expense_item_id:[null,Validators.compose([Validators.required])],
+        other_expense_item:[null],
         expense_value:[null,Validators.compose([Validators.required])],
         fk_frequency_id:[null,Validators.compose([Validators.required])],
         annual_expenses_value:[null,Validators.compose([Validators.required])],
@@ -254,6 +255,7 @@ export class PdQuestionAssessedBusinessPage {
         pd_expense_id:[data.pd_expense_id],
         fk_pd_id:[this.pdDetails.pd_id],
         expense_item_id:[data.expense_item_id,Validators.compose([Validators.required])],
+        other_expense_item:[data.other_expense_item || ''],
         expense_value:[data.expense_value,Validators.compose([Validators.required])],
         fk_frequency_id:[data.fk_frequency_id,Validators.compose([Validators.required])],
         annual_expenses_value:[data.annual_expenses_value,Validators.compose([Validators.required])],
diff --git a/src/providers/constants/constants.ts b/src/providers/constants/constants.ts
index 23d5bb61..34e0df53 100755
--- a/src/providers/constants/constants.ts
+++ b/src/providers/constants/constants.ts
@@ -16,12 +16,12 @@ public commonimage = "http://ssa.sineedge.com/sparqapi/logo/avatar.jpg";
 
   apiurl()
   {
-    let testapiurl = 'http://ssa.sineedge.com/sparqtest/api/';
+    let testapiurl = 'https://ssa.sineedge.com/sparqtest/api/';
     let testapiurl_beta='http://ssa.sineedge.com/sparqtest_beta/api/';
     let devapiurl_beta = 'http://ssa.sineedge.com/sparqapi_beta/api/';
-    let devapiurl = 'http://ssa.sineedge.com/sparqapi/api/';
+    let devapiurl = 'https://ssa.sineedge.com/sparqapi/api/';
     let localapiurl = 'http://192.168.0.6:9999/AWSEC2/sparqapi/api/';
-    return testapiurl;
+    return devapiurl;
   }
 
   getcurrentDate()
diff --git a/src/providers/pdtrigger/pdtrigger.ts b/src/providers/pdtrigger/pdtrigger.ts
index 247452cd..65629d19 100755
--- a/src/providers/pdtrigger/pdtrigger.ts
+++ b/src/providers/pdtrigger/pdtrigger.ts
@@ -41,6 +41,12 @@ export class PdtriggerProvider {
     return this.http.post(this.apiurl+'updatePDMaster',records);
   }
 
+  updateSchedule(updateData){
+    return this.http.post(this.apiurl + "schdulePD", { "records": updateData })
+  }
+
+
+
   saveCurrentLocation(data)
   {
     let records = {'records':data};