From 435d9e7205fcf443a39de68f117fe33afadf3ffb Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 17:18:47 +0530 Subject: [PATCH 01/13] course changes --- Apollo/assets/views/editCourseDetails.html | 281 +++++++++++---------- 1 file changed, 141 insertions(+), 140 deletions(-) diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html index 319649e7..675f8cab 100755 --- a/Apollo/assets/views/editCourseDetails.html +++ b/Apollo/assets/views/editCourseDetails.html @@ -203,78 +203,87 @@
- {{myModelSemYear1.FeesName}} +
+
+ -
+ + Enter a valid amount -
-
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
- - - -
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
-
+ + +
+ + + + Enter a valid amount + +
+ + +
+
+ + + + Enter a valid amount + +
+
+ + + + Enter a valid amount + +
+
+ +
+
+ + + + Enter a valid amount + +
+
+ + + +
@@ -283,89 +292,81 @@
-
-
-
- - - Enter a valid amount +
+ {{myModelSemYear1.FeesName}} +
+ + +
+
+ + + + + Invalid Sem/Year name +
+
+ + + + + Enter a valid amount + +
+
+
+ + +
+
-
- +
+
+ + + Enter a valid name +
+
+ + + + Enter a valid amount + +
-
+ - -
-
- - - - Enter a valid amount - -
-
- - - - Enter a valid amount - -
-
- -
-
- - - - Enter a valid amount - -
-
- - - - -
+
+
From c4811f4035446822831a24de33eab3add3cb4e43 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 17:18:57 +0530 Subject: [PATCH 02/13] course changes --- Apollo/assets/views/courseDetails.html | 164 +++++++++++++------------ 1 file changed, 85 insertions(+), 79 deletions(-) diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index 3d135d28..c8f4810a 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -13,9 +13,9 @@

{{ mainTitle }}

- + Add/View Course Details. - +
@@ -340,83 +340,8 @@
+
- {{myModelSemYear.FeesName}} - -
- -
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
- -
-
-
-
- -
-
- - - -
-
- +
+ +
+ + + + +
+ +
+
+ {{myModelSemYear.FeesName}} + +
+ + +
+ + + + + Invalid Sem/Year name +
+
+ + + + + Enter a valid amount + +
+
+
+ + +
+
+
+
+ + + + Enter a valid name +
+
+ + + + Enter a valid amount + +
+ +
+ +
+
+ +
+
From 5cdebb77a6abb074d15ee9bf0e71ee1d472f2854 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 23 Aug 2018 18:44:30 +0530 Subject: [PATCH 03/13] daybook table --- Apollo/assets/views/daybook/daybook.html | 2 +- Apollo/assets/views/daybook/daybookadmin.html | 2 +- Apollo/assets/views/daybook/daybooksuperadmin.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 4d8a0385..f8ce665b 100755 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -123,7 +123,7 @@ -
Date + Date Income/
Expense diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 84d364c5..e20bc2ee 100755 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -123,7 +123,7 @@ -
Date + Date Income/
Expense diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 5dd5d61e..cdf76bc3 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -121,7 +121,7 @@ - - + @@ -177,7 +177,7 @@ - + - + diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index 8f26dba0..851cb631 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -128,7 +128,7 @@ - + From e3df495e833a2c790a43eb3ec0cd1134b6e147b0 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 24 Aug 2018 08:48:11 +0000 Subject: [PATCH 10/13] report_balfeeCtrl.js edited online with Bitbucket --- Apollo/assets/js/controllers/report_balfeeCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 89b31626..03153f14 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -351,7 +351,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", submit: function (form, myModel,loading,selectedStudents) { var comments = []; for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ - comments [stuid] ="Call Tracking For Report Balence Fee"; + comments [stuid] ="Call Tracking For Report Balance Fee"; } //console.log(selectedStudents); if(isNaN(myModel.date)){ From 76fd5cc9f17eecbb2caa8830cbd06cfd803c1bfa Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 24 Aug 2018 09:05:08 +0000 Subject: [PATCH 11/13] en.json edited online with Bitbucket - menu items corrected --- Apollo/assets/i18n/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 3e98a564..281f4e89 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -66,7 +66,7 @@ "COURSE": "Courses ", "ACTIVITY": "Activity", "EMPLOYEE": "Employee", - "ANNOUNCEMENT": "Announcements", + "ANNOUNCEMENT": "ANNOUNCEMENTS", "STATUS": "Status", "STUDENTSTATUS": "Activity-Status", "CERTIFICATETYPE": "Certificate Types", @@ -75,8 +75,8 @@ "SUBJECTMASTER":"Subjects", "SESSIONMASTER":"Sessions", "SESSIONSCHEDULE": "Session Schedule", - "HALLTICKET": "Hall Ticket", - "REREGISTRATION":"Re-Registration", + "HALLTICKET": "HALL TICKET", + "REREGISTRATION":"RE-REGISTRATION", "ACCOUNTTYPE":"Account Types" }, "report": { @@ -140,7 +140,7 @@ "MAIN": "INCOME / EXPENSE", "INCOMELISTING": "Income Listing", "EXPENSELISTING": "Expense Listing", - "DAYBOOK": "Day Book", + "DAYBOOK": "DAY BOOK", "APPROVAL": "Approve Expense", "DAYBOOKDETAILS": "Daybook Details", "DAYBOOKAPPROVAL": "Approve Expenses", From 1134bc5018df17a10067d3608ad23db1aad8da1c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 24 Aug 2018 14:45:29 +0530 Subject: [PATCH 12/13] course master changes for duplication validations --- Apollo/assets/js/controllers/courseCtrl.js | 201 ++++++++++++--------- Apollo/assets/views/courseDetails.html | 4 +- Apollo/assets/views/editCourseDetails.html | 89 ++++++++- 3 files changed, 207 insertions(+), 87 deletions(-) diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js index 7a73d074..5d0612b5 100755 --- a/Apollo/assets/js/controllers/courseCtrl.js +++ b/Apollo/assets/js/controllers/courseCtrl.js @@ -207,49 +207,66 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab } else{ - $scope.ldloading1 = {}; - $scope.ldloading1[loading.replace('-', '_')] = true; + /* check duplication objects values */ + if(semYearModel.program=='Y001'){ + $scope.myModelSemYear.programName=""; + $scope.myModelSemYear.FeesAmount=""; + var valueArr = $scope.addMoreItems.map(function(item){ return item.programName }); + var isDuplicate = valueArr.some(function(item, idx){ + return valueArr.indexOf(item) != idx; + }); + } + if(semYearModel.program=='Y001' && isDuplicate==true){ + + swal("Warning!", 'Sem/Year Duplication ', "warning"); + } + else{ + $scope.ldloading1 = {}; + + $scope.ldloading1[loading.replace('-', '_')] = true; - var addCourse = { - method: 'POST', - url: apiPoint.url + 'addCourseDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - courseCode: myModel.courseCode, - courseName: myModel.courseName, - universityName: myModel.universityName, - feesType:myModel.ListName.ListCode, - status: myModel.switchsetting, - provFess:myModel.provFess, - transferAmount:myModel.transferAmount, - degreeAmount:myModel.degreeAmount, - migrationAmount:myModel.migrationAmount, - otherAmount:myModel.otherAmount, - regularFeesAmounts:regularModel, - lateralFeesAmounts:lateralModel, - semFeesAmounts:$scope.addMoreItems, - createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - specilization1:myModel.specilization1, - specilization2:myModel.specilization2, - // subjects:myModel.subject, - branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID - } - }; - $http(addCourse).then(function (response) { - if (response.data.status==200 && response.data.courseStatus) { - $scope.ldloading1[loading.replace('-', '_')] = false; - swal(" ", "Course added successfully.", "success"); - $state.go($state.current, {}, {reload: true}); - } else { - $scope.addMoreItems.splice($scope.addMoreItems.length-1); - $scope.ldloading1[loading.replace('-', '_')] = false; - swal(" ", response.data.message, "error"); - } - }); + var addCourse = { + method: 'POST', + url: apiPoint.url + 'addCourseDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + courseCode: myModel.courseCode, + courseName: myModel.courseName, + universityName: myModel.universityName, + feesType:myModel.ListName.ListCode, + status: myModel.switchsetting, + provFess:myModel.provFess, + transferAmount:myModel.transferAmount, + degreeAmount:myModel.degreeAmount, + migrationAmount:myModel.migrationAmount, + otherAmount:myModel.otherAmount, + regularFeesAmounts:regularModel, + lateralFeesAmounts:lateralModel, + semFeesAmounts:$scope.addMoreItems, + createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + specilization1:myModel.specilization1, + specilization2:myModel.specilization2, + // subjects:myModel.subject, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + } + }; + $http(addCourse).then(function (response) { + if (response.data.status==200 && response.data.courseStatus) { + $scope.ldloading1[loading.replace('-', '_')] = false; + swal(" ", "Course added successfully.", "success"); + $state.go($state.current, {}, {reload: true}); + } else { + $scope.addMoreItems.splice($scope.addMoreItems.length-1); + $scope.ldloading1[loading.replace('-', '_')] = false; + swal(" ", response.data.message, "error"); + } + }); + } + } @@ -296,57 +313,73 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab FeesAmount: semYear.FeesAmount }); } - $scope.ldloading = {}; + /* check duplication objects values */ + if(semYear.program=='Y001'){ + $scope.myModelSemYear1.programName=""; + $scope.myModelSemYear1.FeesAmount=""; + var valueArr = $rootScope.updateMoreItems.map(function(item){ return item.programName }); + var isDuplicate = valueArr.some(function(item, idx){ + return valueArr.indexOf(item) != idx; + }); + } + if(semYear.program=='Y001' && isDuplicate==true){ - $scope.ldloading[loading.replace('-', '_')] = true; + swal("Warning!", 'Sem/Year Duplication ', "warning"); + } + else{ + $scope.ldloading = {}; + + $scope.ldloading[loading.replace('-', '_')] = true; - var update = { - method: 'POST', - url: apiPoint.url + 'updateCourseDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - courseID: myModel.CourseID, - universityID: myModel.UniversityID, - courseCode: myModel.CourseCode, - courseName: myModel.CourseName, - provFess:myModel.PC, - transferAmount:myModel.TC, - degreeAmount:myModel.DC, - migrationAmount:myModel.MC, - otherAmount:myModel.OtherFees, - feesAmounts:myModel.feesStructures, - regularFeesAmounts:regular, - lateralFeesAmounts:lateral, - semFeesAmounts:$rootScope.updateMoreItems, - status: myModel.IsActive, - updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - specilization1:myModel.Specilization1, - specilization2:myModel.Specilization2, - existCourseID:myModel.CourseID, - // subjects:subjects.list, - branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID + var update = { + method: 'POST', + url: apiPoint.url + 'updateCourseDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + courseID: myModel.CourseID, + universityID: myModel.UniversityID, + courseCode: myModel.CourseCode, + courseName: myModel.CourseName, + provFess:myModel.PC, + transferAmount:myModel.TC, + degreeAmount:myModel.DC, + migrationAmount:myModel.MC, + otherAmount:myModel.OtherFees, + feesAmounts:myModel.feesStructures, + regularFeesAmounts:regular, + lateralFeesAmounts:lateral, + semFeesAmounts:$rootScope.updateMoreItems, + status: myModel.IsActive, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + specilization1:myModel.Specilization1, + specilization2:myModel.Specilization2, + existCourseID:myModel.CourseID, + // subjects:subjects.list, + branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID - } - }; - $http(update).then(function (response) { - if (response.data.status==200 && response.data.courseStatus) { - $scope.ldloading[loading.replace('-', '_')] = false; - $rootScope.updateMoreItems=[]; - $rootScope.init(); - swal(" ", "Updated successfully.", "success"); + } + }; + $http(update).then(function (response) { + if (response.data.status==200 && response.data.courseStatus) { + $scope.ldloading[loading.replace('-', '_')] = false; + $rootScope.updateMoreItems=[]; + $rootScope.init(); + swal(" ", "Updated successfully.", "success"); - $scope.editId = -1; + $scope.editId = -1; - } else { - $scope.ldloading[loading.replace('-', '_')] = false; - // $rootScope.init(); - swal(" ", response.data.message, "error"); - } - }); + } else { + $scope.ldloading[loading.replace('-', '_')] = false; + // $rootScope.init(); + swal(" ", response.data.message, "error"); + } + }); + } + } }; /* diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html index c8f4810a..5c8c38b1 100755 --- a/Apollo/assets/views/courseDetails.html +++ b/Apollo/assets/views/courseDetails.html @@ -309,7 +309,7 @@ + ng-model="myModelRegular.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!='' || addMoreItems.length!=0" ng-pattern="/^[0-9]*$/"/> Enter a valid amount @@ -322,7 +322,7 @@ + ng-model="myModelLateral.FeesAmount" ng-disabled="myModelRegular.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!='' || addMoreItems.length!=0" ng-pattern="/^[0-9]*$/"/> Enter a valid amount diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html index 675f8cab..da1139a2 100755 --- a/Apollo/assets/views/editCourseDetails.html +++ b/Apollo/assets/views/editCourseDetails.html @@ -290,8 +290,95 @@ +
+
+
+
+ -
+ + Enter a valid amount + +
+ + + +
+ + + + Enter a valid amount + +
+
+ + +
+
+ + + + Enter a valid amount + +
+
+ + + + Enter a valid amount + +
+
+ +
+
+ + + + Enter a valid amount + +
+
+ + + + +
+ + +
+ +
{{myModelSemYear1.FeesName}} From 43c225e730ae723a887dc3b5fd8953b36ff6689f Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 24 Aug 2018 14:59:08 +0530 Subject: [PATCH 13/13] edit course master changes for duplication validations --- Apollo/assets/views/editCourseDetails.html | 207 ++++++--------------- 1 file changed, 59 insertions(+), 148 deletions(-) diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html index da1139a2..61ac2103 100755 --- a/Apollo/assets/views/editCourseDetails.html +++ b/Apollo/assets/views/editCourseDetails.html @@ -156,8 +156,8 @@
-
-
+
+
@@ -199,98 +199,86 @@
-
+
+
-
-
-
-
- +
+ {{myModelSemYear1.FeesName}} - - Enter a valid amount +
-
+ +
+
+ + + + Invalid Sem/Year name +
+
+ + + + Enter a valid amount -
- - - - Enter a valid amount +
+
+
+
+
-
-
- - - Enter a valid amount +
+
+
-
- + - - Enter a valid amount - -
+ + Enter a valid name
+
+
+
+
-
+
-
+
-
-
- {{myModelSemYear1.FeesName}} - -
- - -
-
- - - - - Invalid Sem/Year name -
-
- - - - - Enter a valid amount - -
-
-
- - -
-
-
- - - -
-
- - - - Enter a valid name -
-
- - - - Enter a valid amount - -
-
- - -
-
- -
Date + Date Income/
Expense From 44a53ee513df3c13df8c08aa4bb9907940137730 Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Thu, 23 Aug 2018 19:12:26 +0530 Subject: [PATCH 04/13] batchshedule duplicate avoided --- Apollo/api/application/config/routes.php | 1 + .../controllers/HallTickets_Controller.php | 53 ++++++++++++++++++- .../application/models/Hallticket_model.php | 50 +++++++++++++++++ Apollo/assets/js/controllers/schCtrl.js | 6 +-- .../assets/views/hallticket/batchshedule.html | 2 +- 5 files changed, 107 insertions(+), 5 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index d43f6524..0dde390c 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -295,6 +295,7 @@ $route['updateSessionScheduleDetails'] = 'SessionSchedule_Controller/updateSessi /// halltickets and Exam Attendance $route['getUniversityCourseDetails'] = 'HallTickets_Controller/getUniversityCourseDetails'; $route['getSemesterSubjectDetails'] = 'HallTickets_Controller/getSemesterSubjectDetails'; +$route['getExistingMapping'] = 'HallTickets_Controller/getExistingMapping'; $route['saveAllSemSubMapping'] = 'HallTickets_Controller/saveAllSemesterSubjectMapping'; $route['getAllSemSubjects'] = 'HallTickets_Controller/getAllSemesterSubjects'; $route['getIndividualCourseSemMappingDetails'] = 'HallTickets_Controller/getIndividualCourseSemMappingDetails'; diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 099f77ce..ab7de366 100755 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -24,6 +24,7 @@ class HallTickets_Controller extends REST_Controller { $this->methods['getCourseSubjectDetails_post']['limit'] = 500; // 500 requests per hour per user/key $this->methods['getUniversityCourseDetails_post']['limit'] = 500; // 500 requests per hour per user/key $this->methods['updateSheduleDetails_post']['limit'] = 500; // 500 requests per hour per user/key + // load the model $this->load->model('Hallticket_model', 'Hallticket_model'); @@ -133,7 +134,7 @@ class HallTickets_Controller extends REST_Controller { * get semester and subjects list for sem course mapping * created by velz * */ - public function getSemesterSubjectDetails_post() + public function getSemesterSubjectDetails_post() { $universityID = $this->post('universityID'); $courseIDS = $this->post('courseID'); @@ -167,6 +168,56 @@ class HallTickets_Controller extends REST_Controller { } } + + /* + * get semester and subjects list for sem course mapping + * created by Bala + * */ + public function getExistingMapping_post() + { + $universityID = $this->post('universityID'); + $courseIDS = $this->post('courseID'); + $requestedBy = $this->post('requestedBy'); + $branchId = $this->post('branchId'); + $tempCourseArray = array(); + foreach($courseIDS as $val) + { + foreach($val as $v){ + $tempCourseArray[] = $v; + } + //print_r($value); + } + + $data['subjectDetails'] = $this->Hallticket_model->getExistDetails($universityID,$tempCourseArray,$branchId); + // print_r( $data['subjectDetails']); + // die(); + //$data['semesterDetails'] = $this->Hallticket_model->getSemesterDetails($universityID,$tempCourseArray); + //1000 it means already data exist http sents 1000// + + if($data['subjectDetails'] == 1 ) + { + $this->response([ + 'message' => 'Already Exist', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + } + + else if($data['subjectDetails']) + { + $data['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($data, REST_Controller::HTTP_OK); + } + else{ + + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + + } + + } public function getBatchAndCenterDetails_post() { diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 7248a4ea..9d10fa52 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -180,6 +180,56 @@ class Hallticket_model extends CI_Model $courseDetails = $this->db->get('T_CourseMaster'); return $courseDetails->result(); } + + /* + * check existing data,only batchschedule. + * @params university id and CourseID + * created by Bala + * */ + + public function getExistDetails($universityID,$courseIDS,$branchId) + { + // echo $universityID; + // //foreach() + // print_r ($courseIDS); + // die(); + $i=0; + foreach($courseIDS as $c) + { + + // $tempCourseArray= $c['CourseID']; + + $this->db->select ('count(*) as count'); + $this->db->from('T_Batch_Schedule_Master'); + $this->db->where('UniversityID',$universityID); + $this->db->where('CourseID', $c); + $result = $this->db->get(); + $res = $result->result(); + + if($res[0]->count > 0 ) + { + $i++; + } + } + + if( $i > 0 ) + { + return 1; + } + else + { + $this->db->distinct(); + $this->db->select('SubjectID,SubjectCode,SubjectName'); + $this->db->from('T_SubjectMaster'); + //$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID'); + $this->db->where('T_SubjectMaster.IsActive','1'); + // $this->db->where('T_CourseSubject_Details.UniversityID',$universityID); + $this->db->where_in('T_SubjectMaster.BranchCode',$branchId); + $result = $this->db->get(); + //echo $this->db->last_query(); + return $result->result(); + } + } /* * get subject details diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index 555194ad..77ee7714 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -178,7 +178,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP $scope.semDropDownShowLoading = true; var getsubject = { method: 'POST', - url: apiPoint.url + 'getSemesterSubjectDetails/', + url: apiPoint.url + 'getExistingMapping/', headers: { 'Content-Type': 'application/json' }, @@ -190,7 +190,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP } }; $http(getsubject).then(function (response) { - + console.log(response); if(response.data.status == 200) { $scope.semDropDownShowLoading = false; @@ -220,7 +220,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP },function(error){ $scope.semDropDownShowLoading = false; - swal('No Subjetcs Found','','error'); + swal('Already Exist','','error'); } ); diff --git a/Apollo/assets/views/hallticket/batchshedule.html b/Apollo/assets/views/hallticket/batchshedule.html index e616a9ed..ded78335 100755 --- a/Apollo/assets/views/hallticket/batchshedule.html +++ b/Apollo/assets/views/hallticket/batchshedule.html @@ -16,7 +16,7 @@ } a { - color: #007AFF; + color: #007AFF; } From 91cc874c62265e8211d59e961ae196b3ed58a0bb Mon Sep 17 00:00:00 2001 From: gayathri1990 Date: Fri, 24 Aug 2018 10:57:31 +0530 Subject: [PATCH 05/13] batchshedule changes --- Apollo/assets/js/controllers/schCtrl.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index 77ee7714..440c91f9 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -206,6 +206,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP "ScheduleDate":"", "ScheduleStartTime":"", "ScheduleEndTime":"" + });// For Main Dropdown }); @@ -220,7 +221,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP },function(error){ $scope.semDropDownShowLoading = false; - swal('Already Exist','','error'); + swal(error.data.message,'','error'); + $state.go($state.current, {}, {reload: true}); } ); From 68fd0c3ee7e10cfe13e932d26adc685633973771 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 24 Aug 2018 06:39:31 +0000 Subject: [PATCH 06/13] nav.html edited online with Bitbucket - removed upper case for superadmin --- Apollo/assets/views/partials/nav.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 4046ab1a..45153fc1 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -2,7 +2,8 @@ -
{{p.SL_NO}}{{p.regdate}} {{p.Total}} {{p.Paid_fee}}{{p.balance}}{{p.bal}} {{p.billno1}} - diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 69b882f3..1f3c2613 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -158,7 +158,7 @@ td,th {
{{p.SL_NO}} {{p.Student_name}} {{p.Father_name}}{{p.Sem_year}}({{p.Sem}}) {{p.Phone_number}} {{p.University}}{{p.Balance_Fee}}{{p.Balance_Fee}} {{p.appdate}} {{p.ansdate}} {{p.Status}}