From e15b1127243c31fa1a24d2ef40f962f157d7d269 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 8 Feb 2018 10:49:21 +0530 Subject: [PATCH] subject and center alter --- Apollo/api/application/config/routes.php | 2 - .../controllers/Center_Controller.php | 5 +- .../controllers/Subject_Controller.php | 88 +--- .../api/application/models/Center_model.php | 23 +- .../api/application/models/Subject_model.php | 284 ++++------- Apollo/assets/js/controllers/centerCtrl.js | 15 +- Apollo/assets/js/controllers/subjectCtrl.js | 446 ++---------------- Apollo/assets/views/centerMaster.html | 8 +- Apollo/assets/views/editCenterDetails.html | 2 +- Apollo/assets/views/editSubjectDetails.html | 214 +-------- Apollo/assets/views/subjectMaster.html | 356 ++++---------- 11 files changed, 294 insertions(+), 1149 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 73a68d60..81b07c79 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -227,8 +227,6 @@ $route['getCenterDetails'] = 'Center_Controller/getCenterDetails'; //subject $route['getSubjectDetails'] = 'Subject_Controller/getSubjectDetails'; $route['updateSubjectDetails'] = 'Subject_Controller/updateSubjectDetails'; -$route['getUniversity'] = 'Subject_Controller/getUniversity'; -$route['getCourseBatch'] = 'Subject_Controller/getCorsBatch'; $route['addSubjectDetails'] = 'Subject_Controller/addSubjectDetails'; // session mater diff --git a/Apollo/api/application/controllers/Center_Controller.php b/Apollo/api/application/controllers/Center_Controller.php index b1c30181..8b000cd8 100644 --- a/Apollo/api/application/controllers/Center_Controller.php +++ b/Apollo/api/application/controllers/Center_Controller.php @@ -99,13 +99,14 @@ class Center_Controller extends REST_Controller { $details['CenterCode'] = $this->post('CenterCode'); $details['CenterName'] = $this->post('CenterName'); $details['CenterAddress'] = $this->post('Address'); - $details['Comments'] = $this->post('Comments'); + $details['Comments'] = $this->post('Comments'); + $CenterID=$this->post('CenterID'); $details['IsActive'] = $this->post('status'); $details['UpdateBy'] = $this->post('updateBy'); $details['UpdateOn'] = $now->format("Y-m-d H:i:s"); - $updateDetails = $this->center_model->updateCenter($details);// Check if the users data store contains users (in case the database result returns NULL) + $updateDetails = $this->center_model->updateCenter($details,$CenterID);// Check if the users data store contains users (in case the database result returns NULL) if ($updateDetails) { diff --git a/Apollo/api/application/controllers/Subject_Controller.php b/Apollo/api/application/controllers/Subject_Controller.php index 7c48ea35..0ed22917 100644 --- a/Apollo/api/application/controllers/Subject_Controller.php +++ b/Apollo/api/application/controllers/Subject_Controller.php @@ -32,24 +32,15 @@ class Subject_Controller extends REST_Controller { public function addSubjectDetails_post() { - $now = new DateTime(); - $save['UniversityName'] = $this->post('university'); - $save['Course'] = $this->post('course'); - - $save['Batch'] = $this->post('batch'); - $save['Comments'] = $this->post('Comment'); - $save['IsActive'] = 1; + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $details['SubjectCode'] = $this->post('SubjectCode'); + $details['SubjectName'] = $this->post('SubjectName'); + $details['IsActive'] = $this->post('Status'); + $details['CreatedBy'] = $this->post('createdBy'); + $details['CreatedOn'] = $now->format('Y-m-d H:i:s'); - $now->setTimezone(new DateTimezone('Asia/Kolkata')); - - $save['CreatedBy'] = $this->post('createdBy'); - $save['CreatedOn'] = $now->format('Y-m-d H:i:s'); - //$details['IsActive'] = $this->post('status'); - - - $jsonSemFeesData=$this->post('semFeesAmounts'); - - $subjectDetails = $this->subject_model->addSubject($save,$jsonSemFeesData);// Check if the users data store contains users (in case the database result returns NULL) + $subjectDetails = $this->subject_model->addSubject($details);// Check if the users data store contains users (in case the database result returns NULL) if ($subjectDetails) { @@ -98,24 +89,25 @@ class Subject_Controller extends REST_Controller { } /* - * update the Subject details + * update Subject details * * */ public function updateSubjectDetails_post() { $now = new DateTime(); $now->setTimezone(new DateTimezone('Asia/Kolkata')); - $updateID = $this->post('updateID'); - $save['Comments'] = $this->post('Comments'); - $save['IsActive'] = 1; - $save['UpdatedBy'] = $this->post('updatedBy'); - $save['UpdatedOn'] = $now->format('Y-m-d H:i:s'); - //$details['IsActive'] = $this->post('status'); - $jsonSemFeesData=$this->post('semFeesAmounts'); + $details['SubjectCode'] = $this->post('SubjectCode'); + $details['SubjectName'] = $this->post('SubjectName'); + $SubjectID = $this->post('SubjectID'); + $details['IsActive'] = $this->post('Status'); + $details['UpdatedBy'] = $this->post('updatedBy'); + $details['UpdatedOn'] = $now->format('Y-m-d H:i:s'); + + // print_r($SubjectID);die(); - $updateDetails = $this->subject_model->updateSubject($save,$jsonSemFeesData,$updateID);// Check if the users data store contains users (in case the database result returns NULL) - + $updateDetails = $this->subject_model->updateSubject($details,$SubjectID);// Check if the users data store contains users (in case the database result returns NULL) + // print_r($details,$SubjectID);die(); if ($updateDetails) { @@ -134,48 +126,8 @@ class Subject_Controller extends REST_Controller { } - //get university dropdown - public function getUniversity_post() { - $reqData = $this->post('data'); - $getUniversityListDetails = $this->subject_model->get_university_list(); - if ($getUniversityListDetails) - { - $getUniversityListDetails['status'] = REST_Controller::HTTP_OK; - // Set the response and exit - $this->response($getUniversityListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code - } - else - { - // Set the response and exit - $this->response([ - 'message' => 'No list were found', - 'status' => REST_Controller::HTTP_NOT_FOUND - ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code - } - } - - - //get course & Batch dropdown - public function getCorsBatch_post() { - $data = $this->post('data'); - $getCourseBatchListDetails = $this->subject_model->get_courseBatch_list($data);// Check if the employee exist - if ($getCourseBatchListDetails) - { - $getCourseBatchListDetails['status'] = REST_Controller::HTTP_OK; - // Set the response and exit - $this->response($getCourseBatchListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code - } - else - { - // Set the response and exit - $this->response([ - 'message' => 'No list were found', - '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/Center_model.php b/Apollo/api/application/models/Center_model.php index 884218cf..02d085de 100644 --- a/Apollo/api/application/models/Center_model.php +++ b/Apollo/api/application/models/Center_model.php @@ -11,7 +11,7 @@ class Center_model extends CI_Model { /* - * Add batch details + * Add center details * created by subaramkumar */ @@ -40,7 +40,7 @@ class Center_model extends CI_Model { /* - * Get batch details + * Get center details * created by srk */ @@ -69,13 +69,23 @@ class Center_model extends CI_Model { } /* - * update batch details + * update Center details * created by Srk */ - public function updateCenter($arrayDetails=null) + public function updateCenter($arrayDetails=null,$CenterID=null) { + + $this->db->select('CenterCode'); $this->db->where('CenterCode',$arrayDetails['CenterCode']); - $updateStatus=$this->db->update(CENTER, $arrayDetails); + //$this->db->where('SubjectCode !=', $arrayDetails['SubjectCode']); + $this->db->where('CenterCode !=',$arrayDetails['CenterCode']); + if($this->db->get(CENTER)->first_row()){ + $result['centerStatus']=false; + $result['message']= " This Center code already exist"; + } + else{ + $this->db->where('CenterID',$CenterID); + $updateStatus=$this->db->update(CENTER, $arrayDetails); if($updateStatus){ $result['centerStatus'] = true; @@ -87,11 +97,14 @@ class Center_model extends CI_Model { $result['message'] = "Something went wrong.please try again"; } + } return $result; } + + } \ No newline at end of file diff --git a/Apollo/api/application/models/Subject_model.php b/Apollo/api/application/models/Subject_model.php index 27d73a01..37f3d269 100644 --- a/Apollo/api/application/models/Subject_model.php +++ b/Apollo/api/application/models/Subject_model.php @@ -1,6 +1,6 @@ db->insert('T_SubjectMaster', $save); - $subject_id = $this->db->insert_id(); - if($this->db->affected_rows() == '1'){ - - if($jsonSemFeesData){ - foreach($jsonSemFeesData as $row) - { + + $this->db->select('SubjectCode'); + $this->db->where('SubjectCode',$arrayDetails['SubjectCode']); + if($this->db->get('T_SubjectMaster')->first_row()){ + $result['SubjectStatus']=false; + $result['message']="This subject code already exists"; + }else{ - - $insertFeesArray['Subject_ID'] =$subject_id; - $insertFeesArray['Semester'] =$row['Semester']; - $insertFeesArray['SubjectCode'] =$row['SubjectCode']; - $insertFeesArray['SubjectName'] =$row['SubjectName']; - $insertFeesArray['CreatedOn'] =$save['CreatedOn']; - $insertFeesArray['CreatedBy'] =$save['CreatedBy']; + $this->db->insert('T_SubjectMaster',$arrayDetails); + if ($this->db->affected_rows() == '1') { + $result['SubjectStatus']=true; + $result['message']="Successfully Subject Code is added"; - $this->db->insert('T_SubjectDetails', $insertFeesArray); - - } - - $result['SubjectStatus'] = true; - $result['message'] = "Successfully Subject details added"; - - - - } else { - $result['SubjectStatus'] = false; - $result['message'] = "Something went wrong.please try again"; - } - - return $result; - -} - -} -//update subject - -public function updateSubject($save=null,$jsonSemFeesData=null,$updateID=null) -{ - $this->db->where('ID',$updateID); - $upateStatus=$this->db->update('T_SubjectMaster', $save); - - - if($upateStatus) { - - if ($jsonSemFeesData) { - foreach ($jsonSemFeesData as $row) - { - $subID = $row['ID']; - - $updateFeesArray['Subject_ID'] =$updateID; - $updateFeesArray['Semester'] =$row['Semester']; - $updateFeesArray['SubjectCode'] =$row['SubjectCode']; - $updateFeesArray['SubjectName'] =$row['SubjectName']; - $updateFeesArray['UpdatedOn'] = $save['UpdatedOn']; - $updateFeesArray['UpdatedBy'] = $save['UpdatedBy']; - - if($subID!='' OR $subID!=null){ - $this->db->where('ID', $subID); - $this->db->update('T_SubjectDetails', $updateFeesArray); - } - else{ - $this->db->insert('T_SubjectDetails', $updateFeesArray); - } - - } - $result['SubjectStatus'] = true; - $result['message'] = "Successfully subject details updated"; - } - - } - - else { - $result['SubjectStatus'] = false; - $result['message'] = "Something went wrong.please try again"; - - } - - - return $result; - + }else{ + $result['SubjectStatus'] = false; + $result['message'] = "Something went wrong.please try again"; } + } + return $result; +} + + + /* + * Update Subject details + * created by srk + */ + +public function updateSubject($arrayDetails=null,$SubjectID=null) +{ + $this->db->select('SubjectCode'); + $this->db->where('SubjectCode',$arrayDetails['SubjectCode']); + $this->db->where('SubjectCode !=', $arrayDetails['SubjectCode']); + if($this->db->get('T_SubjectMaster')->first_row()){ + $result['SubjectStatus']=false; + $result['message']="This subject code is already exists"; + }else{ + $this->db->where('SubjectID',$SubjectID); + $upateStatus=$this->db->update('T_SubjectMaster', $arrayDetails); + + + + if($upateStatus){ + + $result['SubjectStatus'] = true; + $result['message'] = "Successfully Subject details updated"; + } + + else { + + $result['SubjectStatus'] = false; + $result['message'] = "Something went wrong.please try again"; + + } + } + + return $result; + + } + /* + * Get subject details + * created by srk + */ + + + + public function getSubject() + { + $this->db->select('*'); + $this->db->order_by('CreatedOn','DESC'); + $subjectDetails = $this->db->get('T_SubjectMaster'); + + + if($subjectDetails->result()){ + + $result['SubjectStatus'] = true; + $result['details'] = $subjectDetails->result(); + } + else { + $result['SubjectStatus'] = false; + $result['message'] = "No records found!"; + } + + return $result; + + } + - //get subject details - public function getSubject() - { - $this->db->select('BS.BatchName,CU.ID,CS.CourseName,CU.Comments ,CU.IsActive,US.UniversityName'); - $this->db->from('T_SubjectMaster'.' as CU'); - $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityName'); - $this->db->join(COURSE.' as CS', 'CS.CourseID = CU.Course'); - $this->db->join(BATCH.' as BS', 'BS.BatchCode = CU.Batch'); - - - $this->db->order_by('CU.CreatedOn','DESC'); - $subjectDetails = $this->db->get(); - - if($subjectDetails->result()){ - - $result['SubjectStatus'] = true; - - foreach ($subjectDetails->result() as $row){ - $fetchData['ID']=$row->ID; - $fetchData['CourseName']=$row->CourseName; - $fetchData['BatchName']=$row->BatchName; - - $fetchData['Comments']=$row->Comments; - - $fetchData['IsActive']=$row->IsActive; - - $fetchData['UniversityName']=$row->UniversityName; - $fetchData['feesStructures'] = $this->getSubjectDetails($row->ID); - - $storeSubjectArray[]=$fetchData; - } - $result['details'] = $storeSubjectArray; - } - else { - $result['SubjectStatus'] = false; - $result['message'] = "No records found!"; - } - - - return $result; - } + - - // public function getUniversityDetails() - // { - // $this->db->select('UniversityID,UniversityName'); - // $this->db->order_by('UniversityID','ASC'); - // $this->db->where('IsActive','1'); - // $universityDetails = $this->db->get(UNIVERSITY); - // return $universityDetails->result(); - // } - - - - public function getSubjectDetails($ID=null) - { - - $this->db->select('ID,Subject_ID,Semester,SubjectCode,SubjectName'); - $this->db->order_by('ID','ASC'); - $this->db->where('Subject_ID',$ID); - $this->db->from('T_SubjectDetails'); - $subjectDetails = $this->db->get(); - return $subjectDetails->result(); - } - + - /*** get university list******/ - public function get_university_list() { - $this->db->select('*'); - $this->db->order_by('CreatedOn', 'DESC'); - $this->db->from(UNIVERSITY); - $this->db->where('IsActive',1); - $univDetails = $this->db->get(); - $universityDetails = $univDetails->result(); - if (count($universityDetails) > 0) { - $results['univList'] = true; - $results['university_details'] = $universityDetails; - } else { - $results['univList'] = false; - $results['message'] = 'No record found'; - } - return $results; - } - - + - /**********get course&Batch for university********/ - - public function get_courseBatch_list($univId) { - $this->db->select('C.CourseID, C.CourseName'); - $this->db->from(COURSE.' as C'); - $this->db->where('UniversityID',$univId); - $this->db->where('IsActive',1); - $courseDetails = $this->db->get(); - if($courseDetails->result()){ - $this->db->select('B.BatchCode, B.BatchName'); - $this->db->from(BATCH.' as B'); - $this->db->where('UniversityID',$univId); - $this->db->where('IsActive',1); - $batchDetails = $this->db->get(); - if( $batchDetails->result()) { - $result['courseStatus'] = true; - $result['course_details'] = $courseDetails->result(); - $result['batch_details'] = $batchDetails->result(); - } else { - $result['courseStatus'] = false; - $result['message'] = "No records found!"; - } - } - else { - $result['courseStatus'] = false; - $result['message'] = "No records found!"; - } - - return $result; - } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/centerCtrl.js b/Apollo/assets/js/controllers/centerCtrl.js index ccafd714..50616c38 100644 --- a/Apollo/assets/js/controllers/centerCtrl.js +++ b/Apollo/assets/js/controllers/centerCtrl.js @@ -16,7 +16,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab /* * edit batch details - * created by subaram + * * */ $scope.editId = -1; $scope.setEditId = function (pid) { @@ -27,7 +27,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab /* * cancel edit div - * created by subaram + * * */ $scope.cancel = function () { $scope.init(); @@ -44,7 +44,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab /* * Submit,update and reset center details * @params myModel - * created by subaram + * * */ $scope.centerForm = { @@ -104,7 +104,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab reset: function (form) { - // $scope.myModel = angular.copy($scope.master); + $scope.myModel = angular.copy($scope.master); form.$setPristine(true); $scope.myModel = { "centerCode": "", @@ -122,7 +122,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab /* * update the center details - * created by subaram + * * */ $scope.updateCenter = function (myModel, form, loading) { @@ -156,9 +156,10 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab data: { CenterCode: myModel.CenterCode, CenterName: myModel.CenterName, - Address: myModel.CenterAddress, - Comments:myModel.Comments, + Address: myModel.CenterAddress, + Comments:myModel.Comments, status: myModel.IsActive, + CenterID:myModel.CenterID, updateBy: JSON.parse(localStorage.getItem('localObj')).localUserID } }; diff --git a/Apollo/assets/js/controllers/subjectCtrl.js b/Apollo/assets/js/controllers/subjectCtrl.js index 0b5b16b3..0b8b93d9 100644 --- a/Apollo/assets/js/controllers/subjectCtrl.js +++ b/Apollo/assets/js/controllers/subjectCtrl.js @@ -7,53 +7,27 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state",'ipCookie', function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,ipCookie) { $scope.myModel = { - "university": "", - "course": "", - "batch": "", - "comments":"", + "SubjectCode": "", + "SubjectNme": "", "switchsetting": true, }; - $rootScope.updateMoreItems = []; + /* + * edit batch details + * created by subaram + * */ $scope.editId = -1; - $rootScope.setEditId = function (pid,p) { - - - $rootScope.updateMoreItems=[]; - // find index for fees type drop down list - - angular.forEach(p.feesStructures, function(value, key){ - $rootScope.updateMoreItems.push({ - "ID":value.ID, - "Semester":value.Semester, - "SubjectCode":value.SubjectCode, - "SubjectName": value. SubjectName, - - - }); - - }); + $scope.setEditId = function (pid) { $scope.editId = pid; + $scope.viewId = -1; }; - - $scope.viewId=-1; - $scope.setEditI = function (pid,p) { - $scope.editId=-1; - $scope.init(); - $scope.viewId=p.ID; - $scope.editId = pid; - } - - - - /* * cancel edit div - * + * created by subaram * */ $scope.cancel = function () { $scope.init(); @@ -67,13 +41,14 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + /* * Submit,update and reset Subject details * @params myModel * * */ $scope.subjectFORM = { - submit: function (form, myModel,semYearModel,loading,addMoreItems) { + submit: function (form, myModel,loading) { var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -91,17 +66,10 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT // 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 = {}; - //$scope.ldloading1[loading.replace('-', '_')] = true; - $rootScope.addMoreItems.push({ - - - Semester: semYearModel. Semester, - SubjectCode:semYearModel.SubjectCode, - SubjectName:semYearModel.SubjectName - }); - + $scope.ldloading1[loading.replace('-', '_')] = true; + var addSubject = { method: 'POST', @@ -110,11 +78,9 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT 'Content-Type': 'application/json' }, data: { - university:myModel.university, - course:myModel.course, - batch:myModel.batch, - semFeesAmounts:$rootScope.addMoreItems, - Comment:myModel.Comment, + SubjectCode:myModel.SubjectCode, + SubjectName:myModel.SubjectName, + Status: myModel.switchsetting, createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID } }; @@ -122,13 +88,12 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT $http(addSubject).then(function (response) { if (response.data.status==200 && response.data.SubjectStatus) { - // $scope.ldloading1[loading.replace('-', '_')] = false; + $scope.ldloading1[loading.replace('-', '_')] = false; swal("Success!", response.data.message, "success"); $state.go($state.current, {}, {reload: true}); } else { - $rootScope.addMoreItems.splice($rootScope.addMoreItems.length-1); - // $scope.ldloading1[loading.replace('-', '_')] = false; + $scope.ldloading1[loading.replace('-', '_')] = false; swal("Failed!", response.data.message, "error"); } }); @@ -136,222 +101,28 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT } }, - reset: function (form) { - $rootScope.addMoreItems = []; - - $scope.myModel = angular.copy($scope.master); - form.$setPristine(true); - $scope.myModel = { - - "university": "", - "course": "", - "batch": "", - "comments":"", - "switchsetting": true, + reset: function (form) { - }; - $scope.myModelSemYear = { - "Semester":"", - "SubjectCode":"", - "SubjectName":"", - }; - - - $rootScope.myModelSemYear1 = { - "Semester":"", - "SubjectCode":"", - "SubjectName":"", - }; - } + $scope.myModel = { + "SubjectCode": "", + "SubjectName": "", + "switchsetting": true + }; + form.$setPristine(true); + } }; - - $rootScope.addMoreItems = []; - - - $scope.myModelSemYear = { - "Semester":"", - "SubjectCode":"", - "SubjectName":"", - }; + + - $rootScope.addMoreFeesItems = function (model,form) { - - 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 { - $rootScope.addMoreItems.push({ - - Semester: model.Semester, - SubjectCode:model.SubjectCode, - SubjectName:model.SubjectName - }); - - - $scope.myModelSemYear.Semester=""; - $scope.myModelSemYear.SubjectCode=""; - $scope.myModelSemYear.SubjectName=""; - - - } - } - - - // //alert('Duplicate Semester: ' + checkDuplicateInObject('Semester', $rootScope.addMoreItems)); - // alert('Duplicate SubjectCode: ' + checkDuplicateInObject('SubjectCode', $rootScope.addMoreItems)); - // //alert('DuplicateSubjectName: ' + checkDuplicateInObject('SubjectName', $rootScope.addMoreItems)); - - - // // - - - // if(checkDuplicateInObject('SubjectCode', $rootScope.addMoreItems) === false) { - // $scope.myModelSemYear.SubjectCode=""; - - // }else{ - // $rootScope.addMoreItems.push({ - - // Semester: model.Semester, - // SubjectCode:model.SubjectCode, - // SubjectName:model.SubjectName - // }); - - // } - - // $scope.myModelSemYear.SubjectCode=""; - // $scope.myModelSemYear.Semester=""; - // $scope.myModelSemYear.SubjectName=""; - - // function checkDuplicateInObject(propertyName, inputArray) { - // var seenDuplicate = true, - // testObject = {}; - - // inputArray.map(function(item) { - // var itemPropertyName = item[propertyName]; - // if (itemPropertyName in testObject) { - // testObject[itemPropertyName].duplicate = true; - // item.duplicate = true; - // seenDuplicate = false; - // } - // else { - // testObject[itemPropertyName] = item; - // delete item.duplicate; - // } - // }); - - // return seenDuplicate; - // } - - - // function checkDuplicateInObject(propertyName, inputArray) { - // // alert(JSON.stringify(inputArray)); - // var seenDuplicate = false; - // $rootScope.testObject = {}; - - // // alert(propertyName); - // // if(inputArray.length === 0) { - // // return $rootScope.seenDuplicate = true; - - // // } else{ - // inputArray.map(function(item) { - // alert(JSON.stringify(item)); - // $rootScope.itemPropertyName = item[propertyName]; - // if ($rootScope.itemPropertyName in $rootScope.testObject) { - // $rootScope.testObject[$rootScope.itemPropertyName].duplicate = true; - // item.duplicate = true; - // seenDuplicate = true; - // alert('kd'); - // } - // else { - // $rootScope.testObject[$rootScope.itemPropertyName] = item; - // delete item.duplicate; - // } - // // alert(JSON.stringify($rootScope.testObject)); - // }); - // // } - - - // return seenDuplicate; - // } - - - - ///***updateupdateMoreItems */ - $rootScope.updateMoreItems = []; - - $rootScope.myModelSemYear1 = { - "Semester":"", - "SubjectCode":"", - "SubjectName":"", - }; - $rootScope.updateMoreFeesItems = function (model,form) { - - - 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; - } + /*update subject details + * * @params myModel*/ - if (form[field].$pristine) { - form[field].$dirty = true; - } - } - } - - angular.element('.ng-invalid[name=' + firstError + ']').focus(); - } - - - - - else { - - $rootScope.updateMoreItems.push({ - - ID:"", - Semester: model.Semester, - SubjectCode:model.SubjectCode, - SubjectName:model.SubjectName - - }); - - - } - $scope.myModelSemYear1.ID=""; - $scope.myModelSemYear1.Semester=""; - $scope.myModelSemYear1.SubjectCode=""; - $scope.myModelSemYear1.SubjectName=""; - } - - ////*****update subject details */ - $scope.updateSubject = function (myModel, form,semYear, loading) { + $scope.updateSubject = function (myModel, form, loading) { var firstError = null; if (form.$invalid) { var field = null, firstError = null; @@ -368,16 +139,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT } angular.element('.ng-invalid[name=' + firstError + ']').focus(); } else { - if(semYear. Semester!="" || semYear.SubjectCode!=""|| semYear. SubjectName!=""){ - $rootScope.updateMoreItems.push({ - ID:"", - Semester:semYear. Semester, - SubjectCode:semYear.SubjectCode, - SubjectName: semYear. SubjectName, - - - }); - } + $scope.ldloading = {}; @@ -393,113 +155,35 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT data: { - semFeesAmounts:$rootScope.updateMoreItems, - Comments:myModel.Comments, - updateID: myModel.ID, + SubjectCode:myModel.SubjectCode, + SubjectName:myModel.SubjectName, + Status:myModel.IsActive, + SubjectID: myModel. SubjectID, //auto id updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID } }; $http(update).then(function (response) { if (response.data.status==200 && response.data.SubjectStatus) { - $scope.ldloading[loading.replace('-', '_')] = false; - $rootScope.updateMoreItems=[]; - $rootScope.myModelSemYear1.ID=""; - $rootScope.myModelSemYear1.Semester=""; - $rootScope.myModelSemYear1.SubjectCode=""; - $rootScope.myModelSemYear1.SubjectName=""; - - - - $scope.init(); - $rootScope.updateMoreItems.splice( $rootScope.updateMoreItems.length-1); + $scope.ldloading[loading.replace('-', '_')] = false; + $scope.init(); swal("Success!", response.data.message, "success"); - $scope.editId = -1; - - } else { $scope.ldloading[loading.replace('-', '_')] = false; $scope.init(); swal("Failed!", response.data.message, "error"); - $rootScope.updateMoreItems.splice( $rootScope.updateMoreItems.length-1); - // $rootScope.addMoreItems.splice($rootScope.addMoreItems.length-1); + } }); } }; - - - - - -/////**********/// */ - var localDetail = JSON.parse(localStorage.getItem('localObj')); - var localDetails = ipCookie('cookiechk'); - - $scope.init = function () { - $scope.getUniversityList(); - } - //GET UNIVERSITY dETAILS - - $scope.universityData = ''; - $scope.getUniversityList = function () { - var empListreq = { - method: 'POST', - url: apiPoint.url + 'getUniversity/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - data: localDetails - } - }; - $http(empListreq).then(function (response) { - if (response.data.univList) { - $scope.universityData = response.data.university_details; - } else { - } - }); - } - - - $scope.getUniversityList(); - - - - -//GET COURSE&BATCH - - $scope.courseLoading = false; - $scope.onSlecetUnivAdd = function () { - $scope.courseDataAdd = ''; - $scope.batchDataAdd = ''; - $scope.myModel.course = ''; - $scope.myModel.batch = ''; - $scope.courseLoading = true; - var univListreq = { - method: 'POST', - url: apiPoint.url + 'getCourseBatch/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - data: $scope.myModel.university - } - }; - $http(univListreq).then(function (response) { - if (response.data.courseStatus) { - $scope.courseLoading = false; - $scope.courseDataAdd = response.data.course_details; - $scope.batchDataAdd = response.data.batch_details; - } else { - $scope.courseLoading = false; - } - }); - } - - + /* + *get Subject details when page loading called from view file + * + * created by Srk + * */ $scope.loader=''; @@ -525,47 +209,9 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT if (response.data.status==200 && response.data.SubjectStatus) { $scope.emptyData=true; - $scope.loader=true; - + $scope.loader=true; $scope.data = response.data.details; -//alert(JSON.stringify( $scope.data )); - /// -// $scope.setModel = { -// "feesType": $scope.data[0], - - -// }; -// //alert(JSON.stringify( $scope.data[0] )); -// // $scope.setTotalAmount=$scope.data[0].PayableFees; - -// $rootScope.updateMoreItems=[]; - -// if($scope.data[0].feesStructures != '') -// // alert(JSON.stringify($scope.data[0].feesStructures)) - -// { -// $scope.myModelSemYear1.ID=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].ID; -// //alert(JSON.stringify( $scope.myModelSemYear1.ID )); -// $rootScope.myModelSemYear1.Semester=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].Semester; -// //alert(JSON.stringify( $scope.myModelSemYear1.Semester )); -// $rootScope.myModelSemYear1.SubjectCode=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].SubjectCode; -// //alert(JSON.stringify( $scope.myModelSemYear1.SubjectCode )); -// $rootScope.myModelSemYear1.SubjectName=$scope.data[0].feesStructures[$scope.data[0].feesStructures.length-1].SubjectName; -// //alert(JSON.stringify( $scope.myModelSemYear1.SubjectName )); - -// for(var i=0; i < $scope.data[0].feesStructures.length-1; i++){ -// $rootScope.updateMoreItems.push($scope.data[0].feesStructures[i]); -// } -// } -// // alert(JSON.stringify( $scope.data[0].feesStructures[i] )); - - //////////// - - - - - } else { $scope.emptyData=false; $scope.loader=true; diff --git a/Apollo/assets/views/centerMaster.html b/Apollo/assets/views/centerMaster.html index 4d657ebf..d3bd11be 100644 --- a/Apollo/assets/views/centerMaster.html +++ b/Apollo/assets/views/centerMaster.html @@ -71,7 +71,7 @@ Center Address - Comments + Status Action @@ -83,18 +83,18 @@ {{p.CenterCode}} {{p.CenterName}} {{p.CenterAddress}} - {{p.Comments}} + Active De-Active - + - + diff --git a/Apollo/assets/views/editCenterDetails.html b/Apollo/assets/views/editCenterDetails.html index 75adc124..24ac7c53 100644 --- a/Apollo/assets/views/editCenterDetails.html +++ b/Apollo/assets/views/editCenterDetails.html @@ -16,7 +16,7 @@ + ng-model="p.CenterCode" ng-pattern="/^[a-zA-Z0-9\s]*$/" required/> Center Code is required - - - - - - +
- - - - University name is required - Invalid University name - - -
- -
- - - - Course name is required - Invalid course name - - -
- -
- - - - Course id is required - Invalid course id - -
- -
- - - Comments is required -
- - - - - - - - -
- - -
-
- Subject Add - -
- - - -
- - -
- - - - Sem/Year is required - Invalid Sem/Year name -
- - - - - - -
-
- - -
-
- - -
-
-
- - - -
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
-
- - - - Enter a subject valid name -
- - -
-
-
-
- -
-
- - - - - -
- diff --git a/Apollo/assets/views/subjectMaster.html b/Apollo/assets/views/subjectMaster.html index 6c51cacd..892bd0f8 100644 --- a/Apollo/assets/views/subjectMaster.html +++ b/Apollo/assets/views/subjectMaster.html @@ -4,8 +4,8 @@ border-radius: 60px; box-shadow: 0px 0px 2px #007AFF; padding: 0.5em 0.6em; - - + + } @@ -33,87 +33,81 @@
Please Wait...
- +

oops! No records found...

-
+
- +


- - + +
- +
- + - - - + + - + - - - - - + + + + - - - - - - + + - + - +
UniversityName - + Subject Code + Course Name + Subject Name Batch - - Status
{{p.UniversityName}}{{p.CourseName}}{{p.BatchName}}{{p.SubjectCode}}{{p.SubjectName}} Active De-Active - + - +
- - + +
- - + + @@ -123,265 +117,101 @@ $('#batch').focus(); }); - + -
+
- Subject + Subject
-
- - - - University is Required -
+
+ + + - - -
- fetching... -
-
- -
- Course is required - -
- -
- - -
- fetching... -
-
- -
- Batch is required - -
-
-
-
- - - Comments is required -
- -
- -
- -
-
- Subject Add + ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.required">Subject Code is required + Enter a valid SubjectCode -
- - - -
- - - - - - -
- - - - Semester is required - Invalid Semester name -
- - - - - - -
+
+
- + SubjectCode is required + ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required"> Subject Name is required Enter a valid SubjectCode - + ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid SubjectName name
-
+
+
+
+ + +
+
+ + +
+ + +
+ + +
+
- - Sem/Year is required - Invalid SubjectName name
- - - - -
-
- - -
-
-
- - - -
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
-
- - - - Enter a subject valid name -
- - -
-
-
-
- -
+ +
-
-
- +
+
+ - - -
-
-
-
+ + +
+
+ + + - -
- - + + + - - - - - - \ No newline at end of file