From 61cf23e1524d97012fc7700213b5a9ed880bd576 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 29 Dec 2017 18:10:55 +0530 Subject: [PATCH] branch status issue fixed --- .../controllers/Branch_Controller.php | 13 ++++++++----- .../controllers/Certificate_Controller.php | 0 .../controllers/DayBookMaster_Controller.php | 0 .../controllers/DayBook_Controller.php | 0 .../controllers/StatusUpdation_Controller.php | 0 .../controllers/StudentView_Controller.php | 0 .../api/application/models/Certificate_model.php | 0 Apollo/api/application/models/DayBook_model.php | 0 .../application/models/DaybookMaster_model.php | 0 .../application/models/StatusUpdation_model.php | 0 .../js/controllers/answerBookletStatusCtrl.js | 0 .../js/controllers/applicationStatusCtrl.js | 0 Apollo/assets/js/controllers/certificateCtrl.js | 0 .../js/controllers/certificationStatusCtrl.js | 0 .../assets/js/controllers/dayBookMasterCtrl.js | 0 Apollo/assets/js/controllers/daybookCtrl.js | 0 Apollo/assets/js/controllers/daybookadminCtrl.js | 0 .../js/controllers/daybooksuperadminCtrl.js | 0 .../js/controllers/studentStatusUpdateCtrl.js | 0 Apollo/assets/js/controllers/studentViewCtrl.js | 0 Apollo/assets/js/directives/convert-words.js | 0 .../assets/views/callTrackingCloseDetails.html | 0 Apollo/assets/views/callTrackingLeadDetails.html | 0 .../assets/views/callTrackingPendingDetails.html | 0 .../certificate/editCertificationDetails.html | 0 Apollo/assets/views/daybook/dayBookMaster.html | 0 Apollo/assets/views/daybook/daybook.html | 0 Apollo/assets/views/daybook/daybookadmin.html | 0 .../assets/views/daybook/daybooksuperadmin.html | 0 .../assets/views/daybook/editDayBookMaster.html | 0 .../assets/views/editDefaultActivityStatus.html | 0 .../status-update/answer_booklet_status.html | 0 .../views/status-update/application_status.html | 0 .../status-update/certification_status.html | 0 .../views/status-update/updateFeesStatus.html | 15 ++++++--------- Apollo/assets/views/studentStatusUpdate.html | 0 Apollo/images/student/Dri_HtrjvpNQzx0O.jpeg | Bin Apollo/images/student/Dri_VWfLTEUvoAna.jpeg | Bin 38 files changed, 14 insertions(+), 14 deletions(-) mode change 100644 => 100755 Apollo/api/application/controllers/Certificate_Controller.php mode change 100644 => 100755 Apollo/api/application/controllers/DayBookMaster_Controller.php mode change 100644 => 100755 Apollo/api/application/controllers/DayBook_Controller.php mode change 100644 => 100755 Apollo/api/application/controllers/StatusUpdation_Controller.php mode change 100644 => 100755 Apollo/api/application/controllers/StudentView_Controller.php mode change 100644 => 100755 Apollo/api/application/models/Certificate_model.php mode change 100644 => 100755 Apollo/api/application/models/DayBook_model.php mode change 100644 => 100755 Apollo/api/application/models/DaybookMaster_model.php mode change 100644 => 100755 Apollo/api/application/models/StatusUpdation_model.php mode change 100644 => 100755 Apollo/assets/js/controllers/answerBookletStatusCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/applicationStatusCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/certificateCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/certificationStatusCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/dayBookMasterCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/daybookCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/daybookadminCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/daybooksuperadminCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/studentStatusUpdateCtrl.js mode change 100644 => 100755 Apollo/assets/js/controllers/studentViewCtrl.js mode change 100644 => 100755 Apollo/assets/js/directives/convert-words.js mode change 100644 => 100755 Apollo/assets/views/callTrackingCloseDetails.html mode change 100644 => 100755 Apollo/assets/views/callTrackingLeadDetails.html mode change 100644 => 100755 Apollo/assets/views/callTrackingPendingDetails.html mode change 100644 => 100755 Apollo/assets/views/certificate/editCertificationDetails.html mode change 100644 => 100755 Apollo/assets/views/daybook/dayBookMaster.html mode change 100644 => 100755 Apollo/assets/views/daybook/daybook.html mode change 100644 => 100755 Apollo/assets/views/daybook/daybookadmin.html mode change 100644 => 100755 Apollo/assets/views/daybook/daybooksuperadmin.html mode change 100644 => 100755 Apollo/assets/views/daybook/editDayBookMaster.html mode change 100644 => 100755 Apollo/assets/views/editDefaultActivityStatus.html mode change 100644 => 100755 Apollo/assets/views/status-update/answer_booklet_status.html mode change 100644 => 100755 Apollo/assets/views/status-update/application_status.html mode change 100644 => 100755 Apollo/assets/views/status-update/certification_status.html mode change 100644 => 100755 Apollo/assets/views/studentStatusUpdate.html mode change 100644 => 100755 Apollo/images/student/Dri_HtrjvpNQzx0O.jpeg mode change 100644 => 100755 Apollo/images/student/Dri_VWfLTEUvoAna.jpeg diff --git a/Apollo/api/application/controllers/Branch_Controller.php b/Apollo/api/application/controllers/Branch_Controller.php index 7fab735b..e81191ff 100755 --- a/Apollo/api/application/controllers/Branch_Controller.php +++ b/Apollo/api/application/controllers/Branch_Controller.php @@ -49,7 +49,8 @@ class Branch_Controller extends REST_Controller { public function addBranchDetails_post() { - + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); $details['BranchCode'] = $this->post('branchCode'); $details['BranchName'] = $this->post('branchName'); // $details['LogoPath'] = $this->post('logo'); @@ -59,7 +60,8 @@ class Branch_Controller extends REST_Controller { $details['Address'] = $this->post('address'); $details['EmailID'] = $this->post('email'); $details['CreatedBy'] = $this->post('createdBy'); - $details['IsActive'] = $this->post('status'); + $details['IsActive'] = $this->post('status') == "true" ? 1 : 0; + $details['CreatedOn'] = $now->format('Y-m-d H:i:s'); $imageStat = $this->post('imageStatus'); @@ -117,6 +119,8 @@ class Branch_Controller extends REST_Controller { * */ public function updateBranchDetails_post() { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); $branchCode = $this->post('branchCode'); $details['BranchName'] = $this->post('branchName'); $details['LogoPath'] = $this->post('logo'); @@ -125,10 +129,9 @@ class Branch_Controller extends REST_Controller { $details['LandlineNumber'] = $this->post('landLine'); $details['Address'] = $this->post('address'); $details['EmailID'] = $this->post('email'); - $details['IsActive'] = $this->post('status'); + $details['IsActive'] = $this->post('status') == "true" ? 1 : 0; $details['UpdatedBy'] = $this->post('createdBy'); - $date = date('Y-m-d H:i:s'); - $details['UpdatedOn'] = $date; + $details['UpdatedOn'] = $now->format("Y-m-d H:i:s"); $imageStat = $this->post('imageStatus'); diff --git a/Apollo/api/application/controllers/Certificate_Controller.php b/Apollo/api/application/controllers/Certificate_Controller.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/controllers/DayBookMaster_Controller.php b/Apollo/api/application/controllers/DayBookMaster_Controller.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/controllers/DayBook_Controller.php b/Apollo/api/application/controllers/DayBook_Controller.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/controllers/StudentView_Controller.php b/Apollo/api/application/controllers/StudentView_Controller.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/models/Certificate_model.php b/Apollo/api/application/models/Certificate_model.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/models/DaybookMaster_model.php b/Apollo/api/application/models/DaybookMaster_model.php old mode 100644 new mode 100755 diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/certificateCtrl.js b/Apollo/assets/js/controllers/certificateCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/dayBookMasterCtrl.js b/Apollo/assets/js/controllers/dayBookMasterCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js b/Apollo/assets/js/controllers/studentStatusUpdateCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/controllers/studentViewCtrl.js b/Apollo/assets/js/controllers/studentViewCtrl.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/js/directives/convert-words.js b/Apollo/assets/js/directives/convert-words.js old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/callTrackingCloseDetails.html b/Apollo/assets/views/callTrackingCloseDetails.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/callTrackingLeadDetails.html b/Apollo/assets/views/callTrackingLeadDetails.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/callTrackingPendingDetails.html b/Apollo/assets/views/callTrackingPendingDetails.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/certificate/editCertificationDetails.html b/Apollo/assets/views/certificate/editCertificationDetails.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/daybook/dayBookMaster.html b/Apollo/assets/views/daybook/dayBookMaster.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/daybook/editDayBookMaster.html b/Apollo/assets/views/daybook/editDayBookMaster.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/editDefaultActivityStatus.html b/Apollo/assets/views/editDefaultActivityStatus.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/status-update/certification_status.html b/Apollo/assets/views/status-update/certification_status.html old mode 100644 new mode 100755 diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 12c5eccd..b4f1f318 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -358,7 +358,7 @@ ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required --> -
-
- - - - + \ No newline at end of file diff --git a/Apollo/assets/views/studentStatusUpdate.html b/Apollo/assets/views/studentStatusUpdate.html old mode 100644 new mode 100755 diff --git a/Apollo/images/student/Dri_HtrjvpNQzx0O.jpeg b/Apollo/images/student/Dri_HtrjvpNQzx0O.jpeg old mode 100644 new mode 100755 diff --git a/Apollo/images/student/Dri_VWfLTEUvoAna.jpeg b/Apollo/images/student/Dri_VWfLTEUvoAna.jpeg old mode 100644 new mode 100755