diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php index 413842e1..a98cee6c 100755 --- a/Apollo/api/application/controllers/Student_Controller.php +++ b/Apollo/api/application/controllers/Student_Controller.php @@ -268,11 +268,13 @@ class Student_Controller extends REST_Controller { $localdata = $this->post('localData'); $reqData['StudentID'] = $updateDetails['student']; $reqData['Details'] = $updateDetails['doc_Details']; + $reqData['DocumentDate']= $updateDetails['documentdate']; $reqData['Status'] = $updateDetails['checkTracking']; $reqData['CreatedBy'] = $localdata['localUserID']; $date = date('Y-m-d H:i:s'); $reqData['CreatedOn'] = $date; $addStudentPendingDocDetails = $this->student_model->addStu_PendingDoc_Details($reqData, $localdata); + //print_r($reqData); if ($addStudentPendingDocDetails) { $addStudentPendingDocDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index af5af53c..1b1de6a5 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -805,7 +805,8 @@ class Student_model extends CI_Model { } public function getStudent_PendingDoc_Details($stuID, $localData) { - $localBranch = localData['localBranchID']; + $localBranch = $localData['localBranchID']; + $this->db->select('*'); $this->db->order_by('CreatedOn', 'DESC'); $this->db->from(STUDENTDOCUMENTTRACKDETAILS); @@ -1022,7 +1023,7 @@ class Student_model extends CI_Model { $arrayDetails['StatusCode'] = $checkApplicationStatus->ListCode; $arrayDetails['CreatedBranch'] = $localdata['localBranchID']; $arrayDetails['CreatedOn'] = $fromDetails['CreatedOn']; - $arrayDetails['FollowupOn'] = $date = date('d-m-Y'); + $arrayDetails['FollowupOn']=$fromDetails['DocumentDate']; $arrayDetails['FollowupComments'] = $fromDetails['Details']; if ($localdata['localType'] == SUPER_ADMIN) { $this->db->select('LO.ID'); diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index fde7578e..f55a81c7 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -1189,6 +1189,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.myModelAddPendingDocDetails = { "documentDetails": "", + "documentdate":"", "checkTracking": false } $scope.documentTrackAddDetailsLoading = false; @@ -1215,7 +1216,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", var ModelDetails = { "student": stuID, "doc_Details": myModelAddPendingDocDetails.documentDetails, - "checkTracking": myModelAddPendingDocDetails.checkTracking + "checkTracking": myModelAddPendingDocDetails.checkTracking, + "documentdate": myModelAddPendingDocDetails.date }; var updateStudentPendingDocDetails = { method: 'POST', @@ -2749,10 +2751,14 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl angular.element('.ng-invalid[name=' + firstError + ']').focus(); // swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error"); } else { + $scope.docFollowupDate = new Date(myModelAddPendingDocDetails.documentDate).toDateString(); + //alert($filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy')); + // exist(); var ModelDetails = { "student" : stuID, "doc_Details": myModelAddPendingDocDetails.documentDetails, - "checkTracking": myModelAddPendingDocDetails.checkTracking + "checkTracking": myModelAddPendingDocDetails.checkTracking, + "documentdate" :$filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy') }; var updateStudentPendingDocDetails = { method: 'POST', diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html index 491b41e2..6c2efed6 100755 --- a/Apollo/assets/views/student/editStudentDetails.html +++ b/Apollo/assets/views/student/editStudentDetails.html @@ -539,7 +539,7 @@
-
+
+
+
+ + + + Session date is required. + + +
+ -
+
+ +
@@ -570,7 +596,7 @@
-
+
@@ -596,7 +622,8 @@ - + + @@ -604,6 +631,7 @@ +
DetailsDetail Status Delete
{{penddoc.Details}} Open Close