From 771354f264448acbbee8f5d4a193a0fafd393029 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 3 Jul 2018 11:36:10 +0530 Subject: [PATCH] EXAM ATTENDANCE COMPLETED AND PROMOTE BATCH ISSUES FIXED --- Apollo/api/application/config/routes.php | 4 +- .../controllers/HallTickets_Controller.php | 57 +- .../application/models/Hallticket_model.php | 224 +++- .../application/models/Reregister_model.php | 11 +- .../js/controllers/examAttendanceCtrl.js | 993 ++++-------------- .../js/controllers/generateHallTicketCtrl.js | 15 +- .../views/hallticket/examAttendance.html | 71 +- .../views/hallticket/examAttendancePDF.html | 60 ++ .../views/hallticket/generatehallticket.html | 18 +- .../views/reregistration/promotebatch.html | 4 +- 10 files changed, 566 insertions(+), 891 deletions(-) create mode 100644 Apollo/assets/views/hallticket/examAttendancePDF.html diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 63ead59e..336c025e 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -254,7 +254,7 @@ $route['addSessionScheduleDetails'] = 'SessionSchedule_Controller/addSessionSche $route['getSessionScheduleDetails'] = 'SessionSchedule_Controller/getSessionScheduleDetails'; $route['updateSessionScheduleDetails'] = 'SessionSchedule_Controller/updateSessionScheduleDetails'; -/// halltickets +/// halltickets and Exam Attendance $route['getUniversityCourseDetails'] = 'HallTickets_Controller/getUniversityCourseDetails'; $route['getSemesterSubjectDetails'] = 'HallTickets_Controller/getSemesterSubjectDetails'; $route['saveAllSemSubMapping'] = 'HallTickets_Controller/saveAllSemesterSubjectMapping'; @@ -263,6 +263,8 @@ $route['getIndividualCourseSemMappingDetails'] = 'HallTickets_Controller/getIndi $route['updateAllSemSubMapping'] = 'HallTickets_Controller/updateAllSemesterSubjectMapping'; $route['getStudentListForHallTicket'] = 'HallTickets_Controller/getStudentListForHallTicket'; $route['getHallTicket'] = 'HallTickets_Controller/getHallTicket'; +$route['getBatchAndCenterDetails'] = 'HallTickets_Controller/getBatchAndCenterDetails'; +$route['getStudentDetailsForExamAttendance'] = 'HallTickets_Controller/getStudentDetailsForExamAttendance'; ///////// $route['updateSheduleDetails'] = 'HallTickets_Controller/updateSheduleDetails'; $route['getSheduleDetails'] = 'HallTickets_Controller/getSheduleDetails'; diff --git a/Apollo/api/application/controllers/HallTickets_Controller.php b/Apollo/api/application/controllers/HallTickets_Controller.php index 9732f367..2a10bec0 100755 --- a/Apollo/api/application/controllers/HallTickets_Controller.php +++ b/Apollo/api/application/controllers/HallTickets_Controller.php @@ -168,7 +168,59 @@ class HallTickets_Controller extends REST_Controller { } + public function getBatchAndCenterDetails_post() + { + $requestedBy = $this->post('requestedBy'); + $branchId = $this->post('branchId'); + + $result = $this->Hallticket_model->getBatchAndCenterDetailsModel($branchId); + //print_r($result['batchDetails']);die(); + if(!empty($result['batchDetails']) && !empty($result['centerDetails'])) + { + $data['status'] = REST_Controller::HTTP_OK; + $data['batchDetails'] = $result['batchDetails']; + $data['centerDetails'] = $result['centerDetails']; + $this->response($data, REST_Controller::HTTP_OK); + } + else + { + $this->response([ + 'message' => 'Batch OR Center Details Not Available', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + } + } + + public function getStudentDetailsForExamAttendance_post() + { + $requestedBy = $this->post('requestedBy'); + $branchId = $this->post('branchId'); + $centerName = $this->post('centerName'); + $examDate = $this->post('examDate'); + //$examDate = strtotime($examDate); + $examDate = date_create($examDate); + $examDate = date_format(date_add($examDate,date_interval_create_from_date_string("1 days")),'Y-m-d'); + $batch = $this->post('batch'); + //echo $examDate; + $universityID = $this->post('university'); + //print_r($universityID);die(); + $result = $this->Hallticket_model->getExamAttendance_model($universityID['universityID'],$branchId,$centerName,$examDate,$batch); + if($result) + { + $data['status'] = REST_Controller::HTTP_OK; + $data['studentDetails'] = $result; + $this->response($data, REST_Controller::HTTP_OK); + } + else + { + $this->response([ + 'message' => 'No Data Found', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + } + + } public function saveAllSemesterSubjectMapping_post() { @@ -372,8 +424,9 @@ class HallTickets_Controller extends REST_Controller { $batch = $this->post('batch'); $requestedBy = $this->post('requestedBy'); $branchId = $this->post('branchId'); - - $res = $this->Hallticket_model->getStudentListForHallTicketmodel($UID,$courseID,$batch,$requestedBy,$branchId); + $center = $this->post('center'); + //print_r($center);die(); + $res = $this->Hallticket_model->getStudentListForHallTicketmodel($UID,$courseID,$batch,$requestedBy,$branchId,$center); if(count($res) > 0) { $data['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php index b552e1e3..1e6142b1 100755 --- a/Apollo/api/application/models/Hallticket_model.php +++ b/Apollo/api/application/models/Hallticket_model.php @@ -690,19 +690,23 @@ class Hallticket_model extends CI_Model } - public function getStudentListForHallTicketmodel($UID,$courseID,$batch,$requestedBy,$branchId) + public function getStudentListForHallTicketmodel($UID,$courseID,$batch,$requestedBy,$branchId,$center) { + $this->db->distinct(); - $this->db->select('T_StudentDetails.StudentID,T_StudentDetails.MobileNumber,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails.EmailID,T_StudentDetails.ProfilePicPath,T_Student_CourseDetails.EnrollmentID'); + $this->db->select('T_StudentDetails.StudentID,T_StudentDetails.MobileNumber,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails.EmailID,T_StudentDetails.ProfilePicPath,T_Student_CourseDetails.EnrollmentID,T_Hallticket_Master.HallTicket_ID,T_Hallticket_Student_Details.HallTicket_ID as isFlag'); $this->db->from('T_Students_Fees_Status'); $this->db->join('T_StudentDetails','T_Students_Fees_Status.StudentID=T_StudentDetails.StudentID and T_StudentDetails.IsActive = 1'); $this->db->join('T_Student_CourseDetails','T_StudentDetails.StudentID = T_Student_CourseDetails.StudentID'); + $this->db->join('T_Hallticket_Master','T_Students_Fees_Status.CourseID = T_Hallticket_Master.CourseID and T_Students_Fees_Status.BatchCode = T_Hallticket_Master.BatchCode and T_Students_Fees_Status.BranchCode = T_Hallticket_Master.BranchCode and T_Hallticket_Master.CenterID='.$center['CenterID'],'left'); + $this->db->join('T_Hallticket_Student_Details','T_Hallticket_Master.HallTicket_ID = T_Hallticket_Student_Details.HallTicket_ID and T_Students_Fees_Status.StudentID = T_Hallticket_Student_Details.StudentID','left'); $this->db->where('T_Students_Fees_Status.BatchCode',$batch); $this->db->where('T_Students_Fees_Status.BranchCode',$branchId); $this->db->where('T_Students_Fees_Status.CourseID',$courseID); $res = $this->db->get(); $data = $res->result(); + //print_r($data);die(); $result_array = array(); if(count($data) > 0) { @@ -719,6 +723,8 @@ class Hallticket_model extends CI_Model $studetdetails['EmailID'] = $r->EmailID; $studetdetails['ProfilePicPath'] = $r->ProfilePicPath; $studetdetails['EnrollmentID'] = $r->EnrollmentID; + $studetdetails['HallTicketMasterID'] = $r->HallTicket_ID; + $studetdetails['isFlag'] = $r->isFlag; $studetdetails['FeeDetails'] = $this->getFeeSemesterDetails($r->StudentID,$batch,$branchId,$courseID); $result_array[] = $studetdetails; $prestu = $r->StudentID; @@ -918,7 +924,8 @@ class Hallticket_model extends CI_Model array_splice($studentIDs[$key1]['FeeDetails'],0,10,$id['FeeDetails']) ; } - //print_r($studentIDs);die(); + // echo "COE"; + // print_r($studentIDs);die(); $this->saveHallTicketDataForExamAttendance($UID,$courseID,$branchId,$studentIDs,$centerName,$batch,$requestedBy); return $studentIDs; } @@ -926,6 +933,7 @@ class Hallticket_model extends CI_Model public function saveHallTicketDataForExamAttendance($UID,$courseID,$branchId,$studentIDs,$centerName,$batch,$requestedBy) { + $MASTERID = '00'; $this->db->select('HallTicket_ID'); @@ -981,38 +989,194 @@ class Hallticket_model extends CI_Model } //Save University,Course,Batch,BranchCode, and Center ID - foreach($studentIDs as $student) + if($studentIDs['NUMTYPE'] == 'SEM') { - //print_r($student);echo "
"; - if(!empty($student['FeeDetails'])) - { - foreach($student['FeeDetails'] as $key => $fees) - { - //print_r($fees); - $tempArray = array('Hallticket_ID'=>$MASTERID,'StudentID'=>$student['StudentID'],'EnrollmentID'=>$student['EnrollmentID'],'Sem_Year'=>('SEM'.($key + 1))); - - $this->db->trans_start(); - $this->db->insert('T_Hallticket_Student_Details',$tempArray); - $HallTicketStudentID = $this->db->insert_id(); - $this->db->trans_complete(); - - foreach($fees as $subject) + foreach($studentIDs as $student) { - //echo $subject->SubjectCode;echo "
"; - $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectCode,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime); - - $this->db->trans_start(); - $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); - $this->db->trans_complete(); - + //print_r($student);echo "
"; + if(!empty($student['FeeDetails'])) + { + foreach($student['FeeDetails'] as $key => $fees) + { + //print_r($fees); + $tempArray = array('Hallticket_ID'=>$MASTERID,'StudentID'=>$student['StudentID'],'EnrollmentID'=>$student['EnrollmentID'],'Sem_Year'=>('SEM'.($key + 1))); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Student_Details',$tempArray); + $HallTicketStudentID = $this->db->insert_id(); + $this->db->trans_complete(); + + foreach($fees as $subject) + { + //echo $subject->SubjectCode;echo "
"; + $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); + $this->db->trans_complete(); + + } + + + } + } } - - - } - } - } + } + else if($studentIDs['NUMTYPE'] == 'YEAR') + { + foreach($studentIDs as $student) + { + if(!empty($student['FeeDetails'])) + { + foreach($student['FeeDetails'][0] as $key => $fees) + { + + if(!empty($fees)) + { + $tempArray = array('Hallticket_ID'=>$MASTERID,'StudentID'=>$student['StudentID'],'EnrollmentID'=>$student['EnrollmentID'],'Sem_Year'=>('YEAR'.($key + 1))); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Student_Details',$tempArray); + $HallTicketStudentID = $this->db->insert_id(); + $this->db->trans_complete(); + + foreach($fees as $subject) + { + + $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); + $this->db->trans_complete(); + + } + } + } + } + } + + } + else if($studentIDs['NUMTYPE'] == 'LAT') + { + foreach($studentIDs as $student) + { + if(!empty($student['FeeDetails'])) + { + foreach($student['FeeDetails'][0] as $key => $fees) + { + + if(!empty($fees)) + { + $tempArray = array('Hallticket_ID'=>$MASTERID,'StudentID'=>$student['StudentID'],'EnrollmentID'=>$student['EnrollmentID'],'Sem_Year'=>('SEM'.($key + 2))); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Student_Details',$tempArray); + $HallTicketStudentID = $this->db->insert_id(); + $this->db->trans_complete(); + + foreach($fees as $subject) + { + + $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); + $this->db->trans_complete(); + + } + } + } + } + } + } + else if($studentIDs['NUMTYPE'] == 'REG') + { + foreach($studentIDs as $student) + { + if(!empty($student['FeeDetails'])) + { + foreach($student['FeeDetails'][0] as $key => $fees) + { + + if(!empty($fees)) + { + $tempArray = array('Hallticket_ID'=>$MASTERID,'StudentID'=>$student['StudentID'],'EnrollmentID'=>$student['EnrollmentID'],'Sem_Year'=>('SEM'.($key + 1))); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Student_Details',$tempArray); + $HallTicketStudentID = $this->db->insert_id(); + $this->db->trans_complete(); + + foreach($fees as $subject) + { + + $tempSubjectArray = array('HallTicket_Student_ID'=>$HallTicketStudentID,'SubjectCode'=>$subject->SubjectID,'ExamDate'=>$subject->ScheduleDate,'FromTime'=>$subject->FromTime,'EndTime'=>$subject->ToTime); + + $this->db->trans_start(); + $this->db->insert('T_Hallticket_Subject_Details',$tempSubjectArray); + $this->db->trans_complete(); + + } + } + } + } + } + } + } + + public function getBatchAndCenterDetailsModel($branchID) + { + $this->db->distinct(); + $this->db->select("BatchCode,BatchDate,BatchName,str_to_date(BatchDate,'%d-%m-%Y') as BD"); + $this->db->from('T_BatchMaster'); + $this->db->where('BranchCode',$branchID); + $this->db->where('IsActive',1); + $this->db->order_by('BD','DESC'); + $result = $this->db->get(); + $data['batchDetails'] = $result->result(); + + $this->db->select('CenterID,CenterCode,CenterName,CenterAddress'); + $this->db->from('T_CenterMaster'); + $this->db->where('BranchCode',$branchID); + $this->db->where('IsActive',1); + $result2 = $this->db->get(); + $data['centerDetails'] = $result2->result(); + + return $data; + + } + public function getExamAttendance_model($UID,$branchId,$centerName,$examDate,$batch) + { + + //echo $UID;die(); + $sql = "SELECT DISTINCT T_Hallticket_Master.UniversityID,T_UniversityMaster.UniversityName,T_Hallticket_Master.CourseID,T_CourseMaster.CourseName,T_CourseMaster.CourseCode,T_Hallticket_Master.BatchCode,T_BatchMaster.BatchName,T_Hallticket_Master.BranchCode,T_Hallticket_Master.CenterID,T_CenterMaster.CenterName,T_Hallticket_Student_Details.StudentID,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_Hallticket_Student_Details.EnrollmentID,T_Hallticket_Student_Details.Sem_Year,T_Hallticket_Subject_Details.SubjectCode,T_SubjectMaster.SubjectName,T_SubjectMaster.SubjectCode,T_Hallticket_Subject_Details.ExamDate,T_Hallticket_Subject_Details.FromTime,T_Hallticket_Subject_Details.EndTime FROM T_Hallticket_Master + + JOIN T_Hallticket_Student_Details ON T_Hallticket_Master.HallTicket_ID = T_Hallticket_Student_Details.HallTicket_ID + + JOIN T_Hallticket_Subject_Details ON T_Hallticket_Student_Details.HallTicket_Student_ID = T_Hallticket_Subject_Details.HallTicket_Student_ID + + JOIN T_UniversityMaster ON T_Hallticket_Master.UniversityID = T_UniversityMaster.UniversityID AND T_UniversityMaster.BranchCode = T_Hallticket_Master.BranchCode + + JOIN T_CourseMaster ON T_Hallticket_Master.CourseID = T_CourseMaster.CourseID + + JOIN T_BatchMaster ON T_Hallticket_Master.BatchCode = T_BatchMaster.BatchCode AND T_BatchMaster.BranchCode = T_Hallticket_Master.BranchCode + + JOIN T_CenterMaster ON T_Hallticket_Master.CenterID = T_CenterMaster.CenterID AND T_CenterMaster.BranchCode = T_Hallticket_Master.BranchCode + + JOIN T_SubjectMaster ON T_Hallticket_Subject_Details.SubjectCode = T_SubjectMaster.SubjectID AND T_SubjectMaster.BranchCode = T_Hallticket_Master.BranchCode + + JOIN T_StudentDetails ON T_Hallticket_Student_Details.StudentID = T_StudentDetails.StudentID AND T_StudentDetails.BranchCode = T_Hallticket_Master.BranchCode + + WHERE T_Hallticket_Master.UniversityID = ? AND T_Hallticket_Master.BatchCode = ? AND T_Hallticket_Master.BranchCode = ? AND T_Hallticket_Master.CenterID = ? AND STR_TO_DATE(T_Hallticket_Subject_Details.ExamDate,'%Y-%m-%d') = STR_TO_DATE(?,'%Y-%m-%d')"; + + $res = $this->db->query($sql,array($UID,$batch,$branchId,$centerName['CenterID'],$examDate)); + $result = $res->result(); + //print_r($this->db->last_query()); + //echo "MODEL";print_r($result);die(); + return $result; + } public function AddBatchScheduleMaster($schedulemaster,$detailArray) diff --git a/Apollo/api/application/models/Reregister_model.php b/Apollo/api/application/models/Reregister_model.php index fcff58a4..8ace89ce 100644 --- a/Apollo/api/application/models/Reregister_model.php +++ b/Apollo/api/application/models/Reregister_model.php @@ -89,7 +89,7 @@ class Reregister_model extends CI_Model $this->db->group_by('T_StudentDetails.StudentID'); $res = $this->db->get(); $data['studentListOne'] = $res->result(); - //print_r($data['studentListOne']); + $data['finalStudentList'] = array(); foreach($data['studentListOne'] as $student) { @@ -126,7 +126,7 @@ class Reregister_model extends CI_Model $sql = "SELECT ID,FeesAmount FROM T_Course_Fees_Details where CourseID = ? and ProgramType = 'Y001' and FeesType = 'F002' and Sem_Year like ?"; $res = $this->db->query($sql,array($student->CourseID,$sem)); $res = $res->result_array(); - + if(!empty($res)) { $feesID = $res[0]['ID']; @@ -169,8 +169,15 @@ class Reregister_model extends CI_Model $tempResult = $this->db->query($sqlquery,array($branchId,$tempArray['SessionDate'])); $tempResult = $tempResult->result(); //echo $this->db->last_query(); + if($tempResult){ $tempArray['nextSessionName'] = $tempResult[0]->SessionName; $tempArray['nextSessionID'] = $tempResult[0]->SessionID; + } + else{ + $tempArray['nextSessionName'] = ""; + $tempArray['nextSessionID'] = ""; + } + $data['finalStudentList'][] = $tempArray; } diff --git a/Apollo/assets/js/controllers/examAttendanceCtrl.js b/Apollo/assets/js/controllers/examAttendanceCtrl.js index c3e5a741..36205be9 100644 --- a/Apollo/assets/js/controllers/examAttendanceCtrl.js +++ b/Apollo/assets/js/controllers/examAttendanceCtrl.js @@ -5,9 +5,10 @@ */ app.controller('examAttendanceCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log) { $scope.myModel = { - "universityName":"", - "courseName":"", - "batchName":"" + "batchName":"", + "centerName":"", + "examDate":"", + "universityName":"" }; $scope.pdfModel = { @@ -38,8 +39,7 @@ $scope.isLoaderTxt = "Loading..."; * created by kms * */ $scope.init = function () { - alert('Exam ATTENDANCE') - var getUniv = { + var getUniv = { method: 'POST', url: apiPoint.url + 'getUniversityCourseDetails/', headers: { @@ -51,13 +51,14 @@ $scope.isLoaderTxt = "Loading..."; } }; $http(getUniv).then(function (response) { - if (response.data.status==200 && response.data.universityStatus) { - $scope.university = response.data.univerSityDetails; - $scope.centers = response.data.centerDetails; - //console.log( $scope.university); - - } else { - $scope.university = ""; + if (response.data.status == 200 && response.data.universityStatus) { + + //$scope.batchDetails = response.data.batchDetails; + $scope.university = response.data.univerSityDetails; + $scope.centerDetails = response.data.centerDetails; + } else { + $scope.batchDetails = ""; + $scope.centerDetails = ""; } }); @@ -68,15 +69,16 @@ $scope.isLoaderTxt = "Loading..."; * created by kms * */ $scope.studentInfo=""; - $scope.getStudentDetails = function (form,myModel) { + $scope.getExamAttendanceDetails = function (form,myModel) { - if(myModel.universityName == null || myModel.universityName == '' || myModel.universityName == undefined){ + + + if(myModel.universityName == '' || myModel.universityName == null || myModel.universityName == undefined){ swal('Select University','','warning'); return false; } - - if(myModel.courseName == '' || myModel.courseName == null || myModel.courseName == undefined){ - swal('Select Course','','warning'); + if(myModel.centerName == '' || myModel.centerName == null || myModel.centerName == undefined){ + swal('Select Center','','warning'); return false; } @@ -84,6 +86,10 @@ $scope.isLoaderTxt = "Loading..."; swal('Select Batch','','warning'); return false; } + if(myModel.examDate == null || myModel.examDate == '' || myModel.examDate == undefined){ + swal('Select Date of Examination','','warning'); + return false; + } var firstError = null; @@ -103,46 +109,63 @@ $scope.isLoaderTxt = "Loading..."; 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.selectedStudentsID = []; - $scope.isLoaderShow = true; - $scope.myModel.all = false; - $scope.isTblShow = false; - var university = myModel.universityName; - var course = myModel.courseName; + // $scope.selectedStudentsID = []; + // $scope.isLoaderShow = true; + // $scope.myModel.all = false; + // $scope.isTblShow = false; + var centerName = myModel.centerName; + var examDate = myModel.examDate; var batch = myModel.batchName; - var getStudents = { + var University =myModel.universityName; + //alert(examDate); + var getAttendance = { method: 'POST', - url: apiPoint.url + 'getStudentListForHallTicket/', + url: apiPoint.url + 'getStudentDetailsForExamAttendance/', headers: { 'Content-Type': 'application/json' }, data: { - university: university, - course:course, - batch:batch, + university:University, + centerName: centerName, + batch:batch, + examDate:examDate, requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID, branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, } }; - $http(getStudents).then(function (response) { - if (response.data.status == 200 && response.data.studentStatus) { + $http(getAttendance).then(function (response) { + //console.log(response); + if (response.data.status == 200 && response.data.studentDetails) { $scope.studentInfo = response.data.studentDetails; $scope.isLoaderShow = false; - $scope.isTblShow = true; - + $scope.studentInfoAM = []; + $scope.studentInfoPM = []; + angular.forEach($scope.studentInfo,function(value,key){ + + var dateType = $filter('date')(new Date(value.FromTime),'a'); + if(dateType == "AM") + { + $scope.studentInfoAM.push(value); + }else if(dateType == "PM") + { + $scope.studentInfoPM.push(value); + } + }); + //console.log($scope.studentInfo); + $scope.open($scope.myModel.universityName['universityName'],$scope.studentInfoAM,$scope.studentInfoPM,myModel.centerName,$scope.selectedBatchName, myModel.examDate); } else { $scope.studentInfo=""; $scope.isLoaderShow = true; - $scope.isTblShow = false; + //$scope.isTblShow = false; $scope.isLoaderTxt = "No Records Found"; } },function(error){ $scope.isLoaderShow = true; - $scope.isTblShow = false; + //$scope.isTblShow = false; $scope.isLoaderTxt = "No Records Found"; }); @@ -152,148 +175,38 @@ $scope.isLoaderTxt = "Loading..."; - $scope.selectedStudentsID = []; - $scope.isClick = function(e) - { - - - var ide = e.target; - var val = (ide.checked ? true : false); - var sid = e.target.id; - angular.forEach($scope.studentInfo,function(value,key){ - if(sid == value.StudentID) - { - sid = value; - } - }); - - var pos = $scope.selectedStudentsID.indexOf(sid); - - if(val) - { - if( pos == -1) - { - - $scope.selectedStudentsID.push(sid); - } - - } - else - { - - $scope.selectedStudentsID.splice(pos,1); - } - - - - } - - - $scope.isCheckAll = function(e) - { - var val = (e.target.checked ? true : false); - - if(val) - { - var len = $scope.studentInfo.length; - var i = 0; - for(i=0;i - + - -
- - +
+ + + + + + + + + - - + +
@@ -79,47 +79,46 @@ ng-model="myModel.batchName" ng-change="captureBatchName()" > - +
-
- -
- -
- +
+
+ -
-
- -
+ + +
+
+ +
- -
- -
- - -
-
- - +
+ +
+ +
- + +
diff --git a/Apollo/assets/views/hallticket/examAttendancePDF.html b/Apollo/assets/views/hallticket/examAttendancePDF.html new file mode 100644 index 00000000..53e017d4 --- /dev/null +++ b/Apollo/assets/views/hallticket/examAttendancePDF.html @@ -0,0 +1,60 @@ + + + +
+ + +
+ +
+ + + + + + +
+ + + + + + + +
{{pdfuname}} {{ pdfbatch }}- Examination {{pdfcenter.CenterName}} Center Attendance - {{pdfexamdate | date:"dd-MM-yyyy"}}
+
+ + +
+ + + + + + + + +
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STUDENT SUGNATURE
{{($index+1)}} {{student.Firstname}} {{student.Lastname}} {{student.CourseName}}{{student.Sem_Year}}{{student.EnrollmentID}}{{student.SubjectCode}}{{student.SubjectName}}
+
+ +
+ + + + + + + + +
SNO STUDENT NAME COURSE SEM/YEAR ENROLLMENT NO SUBJECT CODE SUBJECT NAMEBOOKLET NO STUDENT SUGNATURE
{{($index+1)}} {{student.Firstname}} {{student.Lastname}} {{student.CourseName}}{{student.Sem_Year}}{{student.EnrollmentID}}{{student.SubjectCode}}{{student.SubjectName}}
+
+ + + +
+ + diff --git a/Apollo/assets/views/hallticket/generatehallticket.html b/Apollo/assets/views/hallticket/generatehallticket.html index d8917f7f..fd87aad5 100755 --- a/Apollo/assets/views/hallticket/generatehallticket.html +++ b/Apollo/assets/views/hallticket/generatehallticket.html @@ -110,7 +110,7 @@

- +
@@ -137,15 +137,20 @@ Student Name - - - + Enrollment ID + + Mobile No - EmailID + Email ID + + Status + + + @@ -155,9 +160,10 @@ {{p.Firstname}}{{p.Lastname}} - + {{p.EnrollmentID}} {{p.MobileNumber}} {{p.EmailID}} + GENERATED diff --git a/Apollo/assets/views/reregistration/promotebatch.html b/Apollo/assets/views/reregistration/promotebatch.html index ec7a6ab6..d422fb04 100644 --- a/Apollo/assets/views/reregistration/promotebatch.html +++ b/Apollo/assets/views/reregistration/promotebatch.html @@ -106,7 +106,7 @@ - + @@ -136,7 +136,7 @@ - +
Student Name
{{p.Firstname}}{{p.Lastname}} {{p.CourseName}}{{(p.CourseCode)}}