diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index 8c3e6bdb..2c483c1e 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -513,7 +513,7 @@ class Student_model extends CI_Model } }else{ $result['addStuCourseStatus'] = false; - $result['message'] = "Cannot able create a New Cource for a Student, in In-Active Branch"; + $result['message'] = "New Cource Cannot able to create for In-Active Branch"; } @@ -615,7 +615,7 @@ class Student_model extends CI_Model } }else { $result['addStudentStatus'] = false; - $result['message'] = "Please, Cannot able create a new Student for In-Active Branch"; + $result['message'] = "New Student cannot able to create for In-Active Branch"; } return $result; diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index 24345fbc..b54d5573 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -985,14 +985,14 @@ $scope.studentListLength = 0; $http.post(apiPoint.url + 'updateStudentImgDetails/', formData, { transformRequest: angular.identity, headers: { 'Content-Type': undefined, 'Process-Data': false }, - }).success(function (data) { - if (data.updateStuStatus === true) { + }).success(function (response) { + if (response.data.updateStuStatus === true) { swal(" ","Updated successfully." , "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal(" ", data.message, "error"); + swal(" ", response.data.message, "error"); } }); } @@ -1833,7 +1833,7 @@ $scope.myUnivSearch = ""; }; $http(checkReq).then(function (response) { if (response.data.existMobile == true) { - swal("Warning!", response.data.message, "warning"); + // swal("Warning!", response.data.message, "warning"); p.MobileNumber = response.data.resetValue.MobileNumber; } else { } @@ -1940,14 +1940,15 @@ $scope.myUnivSearch = ""; updatedBy: localDetails.localUserID, } }; - $http(req).then(function (data) { - if (data.updateStuStatus === true) { + $http(req).then(function (response) { + if (response.data.updateStuStatus === true) { swal("", "Updated successfully.", "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("", data.message, "error"); + // alert(response.data.message); + swal("", response.data.message, "error"); } }); } else { @@ -1961,14 +1962,15 @@ $scope.myUnivSearch = ""; $http.post(apiPoint.url + 'updateStudentImgDetails/', formData, { transformRequest: angular.identity, headers: { 'Content-Type': undefined, 'Process-Data': false }, - }).success(function (data) { - if (data.updateStuStatus === true) { + }).success(function (response) { + if (response.data.updateStuStatus === true) { swal("", "Updated successfully.", "success"); $scope.getStudentList(); $scope.editId = -1; } else { // $scope.ldloading1[loading.replace('-', '_')] = false; - swal("", data.message, "error"); + // swal("", data.message, "error"); + swal("", response.data.message, "error"); } }); }