diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index 0d21fd16..6a0af7f9 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -898,14 +898,35 @@ class Student_model extends CI_Model public function deleteStu_doc_details($stuId, $docId) { - $sql = "DELETE FROM T_StudentDocumentsDetails WHERE StudentID = '" . $stuId . "' AND ID = '" . $docId . "'"; - if ($this->db->query($sql)) { - $results['deleteStatus'] = true; - } - else { - $results['deleteStatus'] = false; - $results['message'] = 'Something went wrong.please try again'; + $sql1 = "SELECT * FROM T_StudentDocumentsDetails WHERE StudentID = '" . $stuId . "' AND ID = '" . $docId . "'"; + $resultSql1 = $this->db->query($sql1)->result(); + if(count($resultSql1) > 0){ + // print_r($resultSql1); + // echo $resultSql1[0]->DocumentStorePath;exit(); + $sql = "DELETE FROM T_StudentDocumentsDetails WHERE StudentID = '" . $stuId . "' AND ID = '" . $docId . "'"; + if ($this->db->query($sql)) { + try{ + if(!file_exists('../images/' . $resultSql1[0]->DocumentStorePath)) { + throw new Exception("File Not Found."); + }else { + unlink('../images/' . $resultSql1[0]->DocumentStorePath); + } + } catch(Exception $e){ + // echo "Error :"; + } finally { + $results['message'] = 'Deleted Successfully.'; + $results['deleteStatus'] = true; + } + } + else { + $results['deleteStatus'] = false; + $results['message'] = 'Something went wrong.please try again'; + } + }else{ + $results['deleteStatus'] = false; + $results['message'] = 'Something went wrong.please try again'; } + return $results; } // add student entroll doc details diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 0af4ed07..55d2aa92 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -895,7 +895,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.studentDocumentsList = ''; // get Student Document Details $scope.getStuEntrollDocDetails = function (stuId) { - $scope.studentDocumentsList = ''; + // $scope.studentDocumentsList = ''; var getStudentDocDetails = { method: 'POST', url: apiPoint.url + 'getListofStuDocDetails/', @@ -913,6 +913,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.studentDocumentsList = response.data.student_doc_details; } else { $scope.docNotFound = true; + $scope.studentDocumentsList.call(); } }); } @@ -929,6 +930,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", if (res === true) { // alert(id); // alert(stuId); + $scope.documentAddDetailsLoading = true; var deleteDocEntry = { method: 'POST', url: apiPoint.url + 'deleteStuDocDetails/', @@ -942,10 +944,14 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", } }; $http(deleteDocEntry).then(function (response) { - if (response.data.docDeleteStatus == true) { + if (response.data.deleteStatus == true) { + // swal("Success!", response.data.message, "success"); + $scope.documentAddDetailsLoading = false; + $scope.studentDocumentsList = ''; $scope.getStuEntrollDocDetails(stuID); } else { - $scope.docNotFound = true; + swal(" ", res.data.message, "error"); + $scope.documentAddDetailsLoading = false; } }); } @@ -966,9 +972,11 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", $scope.filesDocuments[0] = args.file; }); }); - + + $scope.documentAddDetailsLoading = false; $scope.studentEntrollDocFORM = { submit: function (form, myModelAddDocuments, stuID) { + var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -985,9 +993,11 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", 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 { + if ($scope.filesDocuments[0] == undefined || $scope.filesDocuments[0] == null || $scope.filesDocuments.length === 0) { swal("Warning!", "Choose the File.", "warning"); } else { + $scope.documentAddDetailsLoading = true; var formData = new FormData(); var stuDocProof = $scope.filesDocuments[0]; var stuDocProofStatus = $scope.filesDocuments[0] !== undefined ? true : false; @@ -1004,13 +1014,21 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams", }).success(function (res) { if (res.stuDocUpdateStatus == true) { $scope.getStuEntrollDocDetails(stuID); - swal(" ", "Updated successfully.", "success"); - + // swal(" ", "Updated successfully.", "success"); + $scope.documentAddDetailsLoading = false; + $scope.filesDocuments[0] = undefined; + form.$setPristine(true); + angular.element("input[type='file']").val(null); + $scope.myModelAddDocuments = { + "documentName": "", + "documentComments": "" + } // $scope.getStudentList(); // $scope.editId = -1; // $scope.editSaveButtonDisable = false; } else { swal(" ", res.data.message, "error"); + $scope.documentAddDetailsLoading = false; // $scope.editSaveButtonDisable = false; } }); diff --git a/Apollo/assets/views/student/editStudentDetails.html b/Apollo/assets/views/student/editStudentDetails.html index 510bef5c..28169069 100755 --- a/Apollo/assets/views/student/editStudentDetails.html +++ b/Apollo/assets/views/student/editStudentDetails.html @@ -1,4 +1,4 @@ - +
@@ -399,14 +399,15 @@ -

Document Details

+
Add Document Details
-
+
+
- -
+
-
+
+
+
+
+
Loading...
- - +
@@ -465,10 +470,10 @@ {{doc.DocumentStorePath}} - - - + +