diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 79bdc963..550d20cf 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -389,6 +389,8 @@ $route['getStudentListForRegistrer'] = 'Reregister_Controller/getStudentListForR $route['getSubject'] = 'Reregister_Controller/getSubject'; $route['getUniversityCourseDetailsforms'] = 'Reregister_Controller/getUniversityCourseDetailsforms'; +$route['CourseSemDetails'] = 'HallTickets_Controller/CourseSemDetails'; + ///PROMOTE BATCH AND $route['getUniversityBatchDetails'] = 'Reregister_Controller/getUniversityBatchDetails'; $route['getStudentListForPromoteBatch'] = 'Reregister_Controller/getStudentListForPromoteBatch'; diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index dc12fcf1..99bf467f 100644 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -98,6 +98,30 @@ class HallTickets_Controller extends REST_Controller { } + + + + public function CourseSemDetails_post() + { + $CourseID = $this->post('CourseId'); + + $GetCourseDetails = $this->Hallticket_model->Get_Select_CourseDetails($CourseID); + + if ($GetCourseDetails) + { + $GetCourseDetails['status'] = REST_Controller::HTTP_OK; + + $this->response($GetCourseDetails, REST_Controller::HTTP_OK); + } + else + { + + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + } + } /* @@ -184,6 +208,7 @@ class HallTickets_Controller extends REST_Controller { $courseIDS = $this->post('courseID'); $requestedBy = $this->post('requestedBy'); $branchId = $this->post('branchId'); + $Sem_Year = $this->post('Sem_Year'); $tempCourseArray = array(); foreach($courseIDS as $val) { @@ -193,7 +218,7 @@ class HallTickets_Controller extends REST_Controller { //print_r($value); } - $data['subjectDetails'] = $this->Hallticket_model->getExistDetails($universityID,$tempCourseArray,$branchId); + $data['subjectDetails'] = $this->Hallticket_model->getExistDetails($universityID,$tempCourseArray,$branchId,$Sem_Year); // print_r( $data['subjectDetails']); // die(); //$data['semesterDetails'] = $this->Hallticket_model->getSemesterDetails($universityID,$tempCourseArray); @@ -414,14 +439,16 @@ class HallTickets_Controller extends REST_Controller { //$courseid= $this->post('getcourseid'); $requestedBy = $this->post('requestedBy'); $branchId = $this->post('branchId'); + + $Sem_Year = $this->post('Sem_Year'); $Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata')); $CreatedOn = $Cdate->format('Y-m-d H:i:s'); $CourseDatialArray = $this->post('courseDetails'); foreach($CourseDatialArray as $coursedetails) { $course=$coursedetails; - $schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn); - $schedulemasteradd = $this->Hallticket_model->AddBatchScheduleMaster($schedulemaster,$detailArray); + $schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn,'SEM_Year'=>$Sem_Year); + $schedulemasteradd = $this->Hallticket_model->AddBatchScheduleMaster($schedulemaster,$detailArray,$Sem_Year); } //print_r($CourseDatialArray); diff --git a/Apollo/api/application/models/Employee_model.php b/Apollo/api/application/models/Employee_model.php index 24e5efbd..721f92bc 100755 --- a/Apollo/api/application/models/Employee_model.php +++ b/Apollo/api/application/models/Employee_model.php @@ -289,18 +289,29 @@ class Employee_model extends CI_Model } else { // res for Admin $staffId = $this->selfGetEmpId($reqUserID); - $subQuery = "SELECT t1.BranchCode, t1.BranchName - FROM T_BranchMaster as t1 - LEFT JOIN T_Staff_BranchAccess as t2 ON t2.StaffID = '$staffId' - WHERE t1.BranchCode='$branchId' and t2.ListCode='$listcode' + // $subQuery = "SELECT t1.BranchCode, t1.BranchName + // FROM T_BranchMaster as t1 + // LEFT JOIN T_Staff_BranchAccess as t2 ON t2.StaffID = '$staffId' + // WHERE t1.BranchCode='$branchId' and t2.ListCode='$listcode' - AND t1.IsActive = 1 - AND t2.IsActive = 1 - group by t1.BranchCode"; + // AND t1.IsActive = 1 + // AND t2.IsActive = 1 + // group by t1.BranchCode"; + + + $subQuery="SELECT t1.BranchCode, t1.BranchName + FROM T_BranchMaster as t1 + LEFT JOIN T_Staff_BranchAccess as t2 ON t2.BranchCode = t1.BranchCode + WHERE t2.StaffID='$staffId' and t2.ListCode='$listcode' AND t1.IsActive = 1 AND t2.IsActive = 1 group by t1.BranchCode"; + + $mBranchDetails = $this->db->query($subQuery); $results['MeasterBranchDetailStatus'] = true; $results['branch_details'] = $mBranchDetails->result(); } + + + // print_r($this->db->last_query());die(); return $results; } diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index 0baad647..d0a1ec91 100644 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -200,7 +200,7 @@ group by semchild.SubjectID,semchild.MapID"; } public function getExistDetailsfileupload($universityID,$courseIDS,$branchId) { - + $i=0; foreach($courseIDS as $c) @@ -266,22 +266,43 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId) * created by Bala * */ - public function getExistDetails($universityID,$courseIDS,$branchId) + public function getExistDetails($universityID,$courseIDS,$branchId,$Sem_Year) { + // echo $Sem_Year; + // echo substr($Sem_Year, -1); + $sem_yr_no =''; + + if($Sem_Year !='Regular') + { + $sem_yr_no = substr($Sem_Year, -1); + } + + else + { + $sem_yr_no =''; + } + $i=0; foreach($courseIDS as $c) { // $tempCourseArray= $c['CourseID']; - $this->db->select ('count(*) as count'); + $this->db->select ('count(*) as count'); $this->db->from('T_Batch_Schedule_Master'); $this->db->where('UniversityID',$universityID); $this->db->where('CourseID', $c); + + if($Sem_Year !='Regular') + { + $this->db->where('SEM_Year =',$Sem_Year); + } // $this->db->where('BranchCode',$branchId); $result = $this->db->get(); $res = $result->result(); + + //print_r($this->db->last_query());die(); if($res[0]->count > 0 ) { @@ -305,6 +326,10 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId) $this->db->join('T_SemSubMap_Master SMM','SMM.mapID = SC.mapID'); $this->db->where('SMM.UniversityID',$universityID); $this->db->where('SMM.CourseID',$c); + if($sem_yr_no != '') + { + $this->db->where('SMM.SemesterID',$sem_yr_no); + } $result = $this->db->get(); return $result->result(); } @@ -1393,9 +1418,13 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId) } - public function AddBatchScheduleMaster($schedulemaster,$detailArray) + public function AddBatchScheduleMaster($schedulemaster,$detailArray,$Sem_Year) { + $Sem_Year = $Sem_Year; + + //echo $Sem_Year;die(); + $this->db->trans_start(); $this->db->insert('T_Batch_Schedule_Master', $schedulemaster); $insert_id = $this->db->affected_rows(); @@ -1547,4 +1576,30 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId) return $result_array; } + + + public function Get_Select_CourseDetails($CourseID) + { + $this->db->select('CourseID,Sem_Year'); + $this->db->from('T_Course_Fees_Details'); + $this->db->where('CourseID',$CourseID); + + $CourseDetails = $this->db->get()->result(); + + if($CourseDetails) + { + $result_array['searchst'] = true; + $result_array['details'] = $CourseDetails; + } + + else + { + $result_array['searchst'] = false; + $result_array['details'] = "No records found!"; + } + + //print_r($result_array);die(); + return $result_array; + } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index bacbd138..e41b5ebc 100644 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -124,6 +124,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP //Assign Courses to Course array for Multiple select $scope.getuniversity = function(){ + $scope.selectedUniversityCourseName = $scope.myModel.universityName.courseDetails; if($scope.selectedUniversityCourseName.length == 0){ swal('No Courses Available','','info'); } $scope.selectedCourseNameC = { @@ -133,6 +134,55 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP } + $scope.Sem_Year_Details=''; + + $scope.check = function(selectedCourseNameC) + { + var first_CourseId = selectedCourseNameC.first(); + + console.log(first_CourseId) + if((first_CourseId == '')||(first_CourseId == undefined) ||(first_CourseId == null)) + { + $scope.Sem_Year_Details=''; + } + + + var get_CourseSem_details = { + + method: 'POST', + url: apiPoint.url + 'CourseSemDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + CourseId: first_CourseId, + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID + + } + } + + + $http(get_CourseSem_details).then(function (response) { + + // console.log(response.data.status); + if(response.data.status == 200) + { + $scope.Sem_Year_Details = response.data.details + + //console.log($scope.Sem_Year_Details); + } + + }); + + + } + + Array.prototype.first = function () + { + return this[0]; + }; + + /* * get course semester,subjects details * created by TamilBala @@ -141,7 +191,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP var course=''; $scope.getSemSubDetails = function(UID,COURSES){ course=COURSES; - //alert(course) + //console.log($scope.myModel.Sem_Year);return false; var firstError = null; if (form.$invalid) { @@ -162,7 +212,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP else { - + var Sem_Year =$scope.myModel.Sem_Year; + if(UID == undefined || UID == '') { swal("Select University"); @@ -173,7 +224,15 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP swal("Select Course"); return false; } - $scope.editId=1; + + // if(Sem_Year == undefined || Sem_Year =='') + // { + // swal("Select Sem/Year"); + // return false; + + // } + + $scope.editId=1; $scope.semDropDownShowLoading = false; $scope.semDropDownShow = false; $scope.semDropDownShowLoading = true; @@ -186,6 +245,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP data: { universityID : UID, courseID : COURSES, + Sem_Year : Sem_Year, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID } @@ -399,6 +459,8 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { $scope.saveAll= function(myModel,courseDetails,subjectsDetails) { $scope.courseDetailsArray=courseDetails.list; + + //console.log(myModel.Sem_Year);return false; $scope.scheduledDetails=[]; @@ -466,6 +528,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) { //getcourseid :courseDetails.list[0], courseDetails : $scope.courseDetailsArray, scheduleDetails : $scope.scheduledDetails, + Sem_Year : myModel.Sem_Year, requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID diff --git a/Apollo/assets/views/hallticket/batchshedule.html b/Apollo/assets/views/hallticket/batchshedule.html index a3949c8f..80934521 100644 --- a/Apollo/assets/views/hallticket/batchshedule.html +++ b/Apollo/assets/views/hallticket/batchshedule.html @@ -116,7 +116,8 @@
Search -
+
+
+ + + + + + +
+ + + + +
+ -
+
+
+
+

-
+


(OR) -
-
+
+

@@ -174,6 +209,8 @@
+
+
diff --git a/Apollo/assets/views/hallticket/batchshedule1.html b/Apollo/assets/views/hallticket/batchshedule1.html new file mode 100644 index 00000000..8cce75b9 --- /dev/null +++ b/Apollo/assets/views/hallticket/batchshedule1.html @@ -0,0 +1,334 @@ + + +
+
+
+ +

{{ mainTitle }}

+ + Allocate Batch schedule + +
+ +
+
+ + + +
+ + + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

Loading...

+
+ +
+ + + + + +
University NameCourse NameAction
{{c.UniversityName}}{{c.CourseName}} + + + + + + + + + + +
+ + +
+ + + + + + +
+
+ + +
+ + + +
+ Search +
+
+ + + + +
+
+ + + + + + + + + + + {{$item.CourseName}} + + + {{x.CourseName}} + + + + +
+ + + + + + + +
+ + + + +
+ + + + + + +
+
+ + +
+ + + +
+
+
+
+ (OR) +
+
+
+ +
+ + Sample Format + + +
+
+ +
+
+
+

Loading...

+
+ +
+ + +
+
+
+ +
+

Subject

+
+
+

Date

+
+
+

Start Time

+
+
+

End Time

+
+
+ +
+
+ +
+ +
+ + + +
+ + +
+
+ + +
+
+
+ + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+ +
+ + + +
+ + +
+
+
+
+
+
+ + + + +
+
+
+
+ +
+ + + +
+
+ + + + + + + + +