diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index d5923c2f..58145766 100644 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -80,6 +80,7 @@ $route['updateFollowupDetails'] = 'Call_Tracking_Controller/updateFollowupDetail $route['loadFollowupDetails'] = 'Call_Tracking_Controller/loadFollowupDetails'; $route['getUniversity'] = 'University_Controller/getUniversity'; $route['getCourseDetails'] = 'Course_Controller/getCourseDetails'; +$route['updateUniversityDetail'] = 'University_Controller/updateUniversityDetail'; diff --git a/Apollo/api/application/controllers/University_Controller.php b/Apollo/api/application/controllers/University_Controller.php index 852dd715..2d35e64c 100644 --- a/Apollo/api/application/controllers/University_Controller.php +++ b/Apollo/api/application/controllers/University_Controller.php @@ -60,15 +60,24 @@ class University_Controller extends REST_Controller { public function updateUniversityDetail_post() { $reqData = $this->post('data'); - $loginUserId = $reqData['localUserID']; - $loginUserBranchId = $reqData['localBranchID']; - $loginUserType = $reqData['localType']; - $getUniversityListDetails = $this->university_model->get_university_list();// Check if the employee exist - if ($getUniversityListDetails) + $req['UpdatedBy'] = $this->post('updatedBy'); + $date = date('Y-m-d H:i:s'); + $req['UpdatedOn'] = $date; + $req['UniversityName']= $reqData['UniversityName']; + $req['UniversityShortName']= $reqData['UniversityShortName']; + $req['MobileNumber']= $reqData['MobileNumber']; + $req['EmailID']= $reqData['EmailID']; + $req['Address']= $reqData['Address']; + $req['IsActive']= $reqData['IsActive']; + + $updateFor = $reqData['UniversityID']; + + $updateUniversityDetail = $this->university_model->update_university_details($updateFor, $req);// Check if the employee exist + if ($updateUniversityDetail) { - $getUniversityListDetails['status'] = REST_Controller::HTTP_OK; + $updateUniversityDetail['status'] = REST_Controller::HTTP_OK; // Set the response and exit - $this->response($getUniversityListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + $this->response($updateUniversityDetail, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } else { diff --git a/Apollo/api/application/models/University_model.php b/Apollo/api/application/models/University_model.php index a06aa5ac..7b80f5d7 100644 --- a/Apollo/api/application/models/University_model.php +++ b/Apollo/api/application/models/University_model.php @@ -35,5 +35,18 @@ class University_model extends CI_Model } return $results; } + + public function update_university_details($updateFor, $Arr) { + $this->db->where('UniversityID', $updateFor); + $this->db->update(UNIVERSITY, $Arr); + if ($this->db->affected_rows() == '1') { + $result['updateUniversityStatus'] = true; + $result['message'] = "Successfully University details Updated"; + } else { + $result['updateUniversityStatus'] = false; + $result['message'] = "Successfully University details Updated"; + } + return $result; + } } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/universityCtrl.js b/Apollo/assets/js/controllers/universityCtrl.js index c9b6fc40..2928919e 100644 --- a/Apollo/assets/js/controllers/universityCtrl.js +++ b/Apollo/assets/js/controllers/universityCtrl.js @@ -14,6 +14,16 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); + $scope.myModel = { + 'UniversityID': '', + 'UniversityName': '', + 'UniversityShortName': '', + 'MobileNumber': '', + 'EmailID': '', + 'Address': '', + 'switchsetting': true, + }; + $scope.init = function() { $scope.getUniversityList(); @@ -50,6 +60,28 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams } + // check employee Id existing + $scope.checkUnivIdExist = function () { + var checkReq = { + method: 'POST', + url: apiPoint.url + 'chkUnivIdExistDetail/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + data: $scope.myModel.UniversityID, + check: 'univId' + } + }; + $http(checkReq).then(function (response) { + if (response.data.existEmpId == true) { + swal("Warning!", response.data.message, "warning"); + $scope.myModel.UniversityID = ''; + } else { + } + }); + } + $scope.setEditId = function (id) { // alert(id); $scope.editId = id; @@ -77,6 +109,7 @@ app.controller('universityCtrl', ["$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 { + p.IsActive = p.IsActive === true ? 1 : 0; var req = { method: 'POST', url: apiPoint.url + 'updateUniversityDetail/', @@ -89,14 +122,14 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams } }; $http(req).then(function (response) { - // if (response.data.updateEmpStatus = true) { - // swal("Success!", response.data.message, "success"); - // $scope.getEmployeeList(); - // $scope.editId = -1; - // } else { - // // $scope.ldloading1[loading.replace('-', '_')] = false; - // swal("Failed!", response.data.message, "error"); - // } + if (response.data.updateUniversityStatus = true) { + swal("Success!", response.data.message, "success"); + $scope.getUniversityList(); + $scope.editId = -1; + } else { + // $scope.ldloading1[loading.replace('-', '_')] = false; + swal("Failed!", response.data.message, "error"); + } }); } } diff --git a/Apollo/assets/views/editUniversityDetails.html b/Apollo/assets/views/editUniversityDetails.html index f5b2bf2e..69bf04c4 100644 --- a/Apollo/assets/views/editUniversityDetails.html +++ b/Apollo/assets/views/editUniversityDetails.html @@ -26,18 +26,18 @@ + required/> University Short Name required - Invalid University Short Name + -
+
- - Invalid University Name + + University Name required
@@ -50,7 +50,7 @@ Mobile Number - Mobile Number is required. Enter a Valid Phone Number @@ -59,16 +59,16 @@ - Email is required. Please, enter a valid email address.
-
+
- + Address is required
@@ -92,10 +92,10 @@
- -
diff --git a/Apollo/assets/views/university.html b/Apollo/assets/views/university.html index f336c19c..146c4ade 100644 --- a/Apollo/assets/views/university.html +++ b/Apollo/assets/views/university.html @@ -103,247 +103,80 @@ -
- -
+
- - - Invalid Father Name -
- -
- - - - Invalid Last Name + + Mobile Number is required. + Enter a Valid Phone Number
- + Email is required. Please, enter a valid email address.
-
-
- -
+
- - Mobile Number is required. - Enter a Valid Phone Number -
-
- - - Enter a Valid Phone Number -
- -
- -
- - - - Date of Birth is required. - Enter a Valid Date of Birth -
-
- -
-
-
- -
- - - - - Gender is required. - -
-
-
- - - - Enter a Valid Qualification -
- -
- - - - Aadhar Number is required. - Enter a Valid Aadhar Number -
-
- -
-
-
-
- - - Aadhar Number is required. - Enter a Valid Details -
-
- - - Aadhar Number is required. - Enter a Valid Details -
-
-
-
- - - Permenent Address is required -
-
- - - Current Address is required + + Address is required
- -
- - Branch Details - -
-
- - - - Home Branch is Required -
- -
-
- - - - - Date of Joining required -
-
- -
- - - Role is required -
-
-
+
-
- --> +