From 60a9826f19e4930a7dbf27488fd3dcbfe00ac8a6 Mon Sep 17 00:00:00 2001 From: resicovenba Date: Thu, 30 Nov 2017 19:52:11 +0530 Subject: [PATCH] annoucement changes --- Apollo/api/application/config/routes.php | 2 +- .../controllers/University_Controller.php | 32 ++-- .../application/models/Announcement_model.php | 19 --- .../application/models/University_model.php | 37 +++-- Apollo/assets/js/config.router.js | 2 +- Apollo/assets/js/controllers/activityCtrl.js | 143 +++++++++++++++--- Apollo/assets/views/activity.html | 48 ++++-- Apollo/assets/views/editActivityDetails.html | 102 +++++++++++++ 8 files changed, 302 insertions(+), 83 deletions(-) create mode 100644 Apollo/assets/views/editActivityDetails.html diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 2677b15b..a70e8479 100644 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -94,7 +94,7 @@ $route['updateCourseDetails'] = 'Course_Controller/updateCourseDetails'; // activity $route['addActivityDetails'] = 'University_Controller/addActivityDetails'; $route['getActivityDetails'] = 'University_Controller/getActivityDetails'; -$route['updateActivityStatus'] = 'University_Controller/updateActivityStatus'; +$route['updateActivityDetails'] = 'University_Controller/updateActivityDetails'; $route['changePassword'] = 'Login_Controller/changePassword'; diff --git a/Apollo/api/application/controllers/University_Controller.php b/Apollo/api/application/controllers/University_Controller.php index 646f4ee8..3910e4bd 100644 --- a/Apollo/api/application/controllers/University_Controller.php +++ b/Apollo/api/application/controllers/University_Controller.php @@ -186,28 +186,38 @@ public function getActivityDetails_post() } } -public function updateActivityStatus_post() { -// {"status":false,"updateFor":"A012","createdBy":"1"} - $ListCode = $this->post('updateFor'); + /* + * update Announcement Details + * created by Surendiran + * */ + public function updateActivityDetails_post() + { + $ListCode = $this->post('ListCode'); + // $details['ID'] = $this->post('ID'); + $details['ListName'] = $this->post('ListName'); + $details['Description'] = $this->post('description'); $details['IsActive'] = $this->post('status'); - $details['UpdatedBy'] = $this->post('createdBy'); - $date = date('Y-m-d H:i:s'); - $details['UpdatedOn'] = $date; - $updateActivity = $this->university_model->updateActivity($ListCode, $details); - if ($updateActivity) + $details['UpdatedBy'] = $this->post('updatedBy'); + $details['UpdatedOn'] = date("Y-m-d", time()); + $activityDetails = $this->university_model->updateActivity($details,$ListCode);// Check if the users data store contains users (in case the database result returns NULL) + + if ($activityDetails) { - $updateActivity['status'] = REST_Controller::HTTP_OK; + $activityDetails['status'] = REST_Controller::HTTP_OK; // Set the response and exit - $this->response($updateActivity, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + $this->response($activityDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } else { // Set the response and exit $this->response([ - 'message' => 'No records found!', + 'message' => 'Something went wrong.please try again!', 'status' => REST_Controller::HTTP_NOT_FOUND ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } + } + + } diff --git a/Apollo/api/application/models/Announcement_model.php b/Apollo/api/application/models/Announcement_model.php index a2e7ce2b..e32c7915 100644 --- a/Apollo/api/application/models/Announcement_model.php +++ b/Apollo/api/application/models/Announcement_model.php @@ -20,19 +20,6 @@ class Announcement_model extends CI_Model { public function addAnnouncement($arrayDetails=null) { - - $this->db->select('Heading'); - $this->db->where('Heading', $arrayDetails['Heading']); - if($this->db->get(ANNOUNCEMENT)->first_row()){ - $result['AnnouncementStatus'] = false; - $result['message'] = "This Announcement is already exist!"; - } else { - $this->db->select('Description'); - $this->db->where('Description', $arrayDetails['Description']); - if($this->db->get(ANNOUNCEMENT)->first_row()){ - $result['AnnouncementStatus'] = false; - $result['message'] = "This Announcement name is already exist!"; - } else{ $this->db->insert(ANNOUNCEMENT, $arrayDetails); if($this->db->affected_rows() == '1'){ @@ -44,12 +31,6 @@ class Announcement_model extends CI_Model { $result['AnnouncementStatus'] = false; $result['message'] = "Something went wrong.please try again"; } - } - - } - - - return $result; } diff --git a/Apollo/api/application/models/University_model.php b/Apollo/api/application/models/University_model.php index a3e34f4a..39b87c68 100644 --- a/Apollo/api/application/models/University_model.php +++ b/Apollo/api/application/models/University_model.php @@ -82,8 +82,8 @@ class University_model extends CI_Model $this->db->select('ListName,ListCode,Description'); $this->db->where('ListGroup', '2'); $this->db->where('ListName', $arrayDetails['ListName']); - $this->db->where('ListCode', $arrayDetails['ListCode']); - $this->db->where('Description', $arrayDetails['Description']); + // $this->db->where('ListCode', $arrayDetails['ListCode']); + // $this->db->where('Description', $arrayDetails['Description']); $checkExistActivity = $this->db->get(PICK_LIST_DETAILS); if($checkExistActivity->result()){ @@ -128,18 +128,23 @@ class University_model extends CI_Model return $result; } - public function updateActivity($updateFor, $arr) { - $this->db->where('ListCode',$updateFor); - $this->db->update( PICK_LIST_DETAILS ,$arr); - if($this->db->affected_rows()== '1'){ - $result['activityUpdateStatus'] = true; - $result['message'] = "Updated successfully!"; - } - else { - $result['activityUpdateStatus'] = false; - $result['message'] = "No records found!"; - } - return $result; - } - + + + /* + * update announcement details + * created by Surendiran + * */ + public function updateActivity($arrayDetails=null,$ListCode=null) { + $this->db->where('ListCode',$ListCode); + $updateStatus=$this->db->update(PICK_LIST_DETAILS, $arrayDetails); + if($updateStatus){ + $result['activityStatus'] = true; + $result['message'] = "Successfully Activity details updated"; + } + else { + $result['activityStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + } + return $result; + } } \ No newline at end of file diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 8d1485c0..e4914760 100644 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -135,7 +135,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com }).state('app.master.activity', { url: '/activity', templateUrl: "assets/views/activity.html", - resolve: loadSequence('activityCtrl','ngTable'), + resolve: loadSequence('activityCtrl','ngTable', 'ladda', 'angular-ladda'), title: 'Activity', ncyBreadcrumb: { label: 'Activity' diff --git a/Apollo/assets/js/controllers/activityCtrl.js b/Apollo/assets/js/controllers/activityCtrl.js index 27dfc9de..49b4acfc 100644 --- a/Apollo/assets/js/controllers/activityCtrl.js +++ b/Apollo/assets/js/controllers/activityCtrl.js @@ -13,8 +13,60 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ "switchsetting": true }; + /* + * edit batch details + * created by subaram + * */ + $scope.editId = -1; + $scope.setEditId = function (pid) { - $scope.addRow = function (myModel) { + $scope.editId = pid; + $scope.viewId = -1; + }; + + /* + * cancel edit div + * created by subaram + * */ + $scope.cancel = function () { + $scope.init(); + $scope.editId = -1; + + }; + + // sorting function for table params + $scope.sort = function(keyname){ + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + + +$scope.activityForm = { + + submit: function (form, myModel,loading) { + + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$name; + } + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + 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.ldloading1 = {}; + + $scope.ldloading1[loading.replace('-', '_')] = true; + + var addactivity = { method: 'POST', url: apiPoint.url + 'addActivityDetails/', @@ -31,38 +83,22 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ }; $http(addactivity).then(function (response) { if (response.data.status == 200 && response.data.activityStatus) { + $scope.ldloading1[loading.replace('-', '_')] = false; $scope.init(); swal("Success!", response.data.message, "success"); $state.go($state.current, {}, { reload: true }); } else { + $scope.ldloading1[loading.replace('-', '_')] = false; swal("Failed!", response.data.message, "error"); } }); - }; + +} + } +}; - $scope.onclick = function (id, status) { - status = status === true ? 1 : 0; - var addactivity = { - method: 'POST', - url: apiPoint.url + 'updateActivityStatus/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - status: status, - updateFor: id, - createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID - } - }; - $http(addactivity).then(function (response) { - if (response.data.status == 200 && response.data.activityUpdateStatus) { - $scope.init(); - } else { - swal("Failed!", response.data.message, "error"); - } - }); - } + /* *get Activity details when page loading called from view file * @@ -93,4 +129,63 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$ } }); }; + + +/* + * update the Activity details + * created by Surendiran + * */ + $scope.updateActivity = function (myModel, form, loading) { + + var firstError = null; + if (form.$invalid) { + var field = null, firstError = null; + for (field in form) { + if (field[0] != '$') { + if (firstError === null && !form[field].$valid) { + firstError = form[field].$stop_name; + } + + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + } else { + $scope.ldloading = {}; + + $scope.ldloading[loading.replace('-', '_')] = true; + + + var update = { + method: 'POST', + url: apiPoint.url + 'updateActivityDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + ListCode: myModel.ListCode, + ListName: myModel.ListName, + description: myModel.Description, + status: myModel.IsActive, + createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + $http(update).then(function (response) { + if (response.data.status==200 && response.data.activityStatus) { + + $scope.ldloading[loading.replace('-', '_')] = false; + swal("Success!", response.data.message, "success"); + $scope.editId = -1; + $scope.init(); + + } else { + $scope.ldloading[loading.replace('-', '_')] = false; + swal("Failed!", response.data.message, "error"); + } + }); + } + }; + }]); \ No newline at end of file diff --git a/Apollo/assets/views/activity.html b/Apollo/assets/views/activity.html index 42dfd4fc..fb075b0a 100644 --- a/Apollo/assets/views/activity.html +++ b/Apollo/assets/views/activity.html @@ -1,3 +1,13 @@ +
@@ -11,7 +21,8 @@
-
+ +
-
+
- + + Activity Name is required + Invalid Activity Name
-
+
- + Activity Name is required + Invalid Activity Name
- +
@@ -53,8 +71,7 @@ Description - Active/De-Active - + @@ -64,15 +81,24 @@ {{p.ListName}} {{p.Description}} - + + + + + + + + + diff --git a/Apollo/assets/views/editActivityDetails.html b/Apollo/assets/views/editActivityDetails.html new file mode 100644 index 00000000..f8c86517 --- /dev/null +++ b/Apollo/assets/views/editActivityDetails.html @@ -0,0 +1,102 @@ + +
+
+
+
+ + Update Activity Details + + +
+
+ + + + Activity ID is required + +
+ + +
+ + + + Activity Name is required + Invalid Activity Name + +
+
+ + + + Description is required + Invalid Description Code + +
+ + + +
+ +
+ + + +
+
+ + +
+ +
+ +
+ +
+
+
+
+ + + + + +
+
+
+ +
+
+
+
+ + + + + + \ No newline at end of file