From 91ea6c7c8c9bbcbb3f1e36454070246bb7baee8c Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Mon, 11 Jun 2018 13:15:12 +0530
Subject: [PATCH] HT Issue Fixed

---
 .../application/models/Hallticket_model.php   | 23 ++++++++++---------
 .../views/hallticket/generatehallticket.html  | 21 +++++++++--------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php
index 197a760e..63235bf0 100755
--- a/Apollo/api/application/models/Hallticket_model.php
+++ b/Apollo/api/application/models/Hallticket_model.php
@@ -670,6 +670,7 @@ class Hallticket_model extends CI_Model
 		$this->db->where('UniversityID',$UniversityID);
 		$this->db->where('IsActive',1);
 		$this->db->where('BranchCode',$branchId);
+		$this->db->order_by('BatchID','DESC');
 		$res = $this->db->get();
 		return $res->result();
 		
@@ -681,9 +682,9 @@ class Hallticket_model extends CI_Model
 		$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->where('T_Students_Fees_Status.BatchCode',$batch['BatchCode']);
+		$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['CourseID']);
+		$this->db->where('T_Students_Fees_Status.CourseID',$courseID);
 		
 		$res = $this->db->get();
 		$data =  $res->result();
@@ -703,7 +704,7 @@ class Hallticket_model extends CI_Model
 					$studetdetails['EmailID'] =  $r->EmailID;
 					$studetdetails['ProfilePicPath'] =  $r->ProfilePicPath;
 					$studetdetails['EnrollmentID'] =  $r->EnrollmentID;
-					$studetdetails['FeeDetails'] =  $this->getFeeSemesterDetails($r->StudentID,$batch['BatchCode'],$branchId,$courseID);
+					$studetdetails['FeeDetails'] =  $this->getFeeSemesterDetails($r->StudentID,$batch,$branchId,$courseID);
 					$result_array[] = $studetdetails;
 					$prestu = $r->StudentID;
 				}
@@ -722,7 +723,7 @@ class Hallticket_model extends CI_Model
 		$this->db->join('T_Course_Fees_Details','T_Students_Fees_Status.FeesType=T_Course_Fees_Details.ID');
 		$this->db->where('T_Students_Fees_Status.BatchCode',$bcode);
 		$this->db->where('T_Students_Fees_Status.BranchCode',$branchId);
-		$this->db->where('T_Students_Fees_Status.CourseID',$courseID['CourseID']);
+		$this->db->where('T_Students_Fees_Status.CourseID',$courseID);
 		$this->db->where('T_Students_Fees_Status.StudentID',$stuid);
 		$res = $this->db->get();
 		return $res->result();
@@ -758,7 +759,7 @@ class Hallticket_model extends CI_Model
 							JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 							JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 							order by T_SemSubMap_Master.SemesterID";
-					$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$ind['SemID'],$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+					$res = $this->db->query($sql,array($UID['universityID'],$courseID,$ind['SemID'],$branchId,$UID['universityID'],$courseID,$branchId)); 
 					//$id['FeeDetails'][$key2] = $res->result();
 					$in =  $res->result();
 					//array_push($id['FeeDetails'][$key2],$ind);
@@ -779,7 +780,7 @@ class Hallticket_model extends CI_Model
 									 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 									 JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 									order by T_SemSubMap_Master.SemesterID";
-							$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$i,$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+							$res = $this->db->query($sql,array($UID['universityID'],$courseID,$i,$branchId,$UID['universityID'],$courseID,$branchId)); 
 							//$id['FeeDetails'][$key2] = $res->result();
 							$in1[] =  $res->result();
 							//array_push($id['FeeDetails'][$key2],$ind);
@@ -800,7 +801,7 @@ class Hallticket_model extends CI_Model
 									 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 									 JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 									order by T_SemSubMap_Master.SemesterID";
-							$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$j,$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+							$res = $this->db->query($sql,array($UID['universityID'],$courseID,$j,$branchId,$UID['universityID'],$courseID,$branchId)); 
 							//$id['FeeDetails'][$key2] = $res->result();
 							$in2[] =  $res->result();
 							//array_push($id['FeeDetails'][$key2],$ind);
@@ -821,7 +822,7 @@ class Hallticket_model extends CI_Model
 									 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 									 JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 									order by T_SemSubMap_Master.SemesterID";
-							$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$k,$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+							$res = $this->db->query($sql,array($UID['universityID'],$courseID,$k,$branchId,$UID['universityID'],$courseID,$branchId)); 
 							//$id['FeeDetails'][$key2] = $res->result();
 							$in3[] =  $res->result();
 							//array_push($id['FeeDetails'][$key2],$ind);
@@ -842,7 +843,7 @@ class Hallticket_model extends CI_Model
 									 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 									 JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 									order by T_SemSubMap_Master.SemesterID";
-							$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$l,$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+							$res = $this->db->query($sql,array($UID['universityID'],$courseID,$l,$branchId,$UID['universityID'],$courseID,$branchId)); 
 							//$id['FeeDetails'][$key2] = $res->result();
 							$in4[] =  $res->result();
 							//array_push($id['FeeDetails'][$key2],$ind);
@@ -865,7 +866,7 @@ class Hallticket_model extends CI_Model
 								 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 								JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 								order by T_SemSubMap_Master.SemesterID";
-						$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$m,$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+						$res = $this->db->query($sql,array($UID['universityID'],$courseID,$m,$branchId,$UID['universityID'],$courseID,$branchId)); 
 						//$id['FeeDetails'][$key2] = $res->result();
 						$in[] =  $res->result();
 						//array_push($id['FeeDetails'][$key2],$ind);
@@ -886,7 +887,7 @@ class Hallticket_model extends CI_Model
 								 JOIN T_Batch_Schedule_Master on T_Batch_Schedule_Master.UniversityID = ? and T_Batch_Schedule_Master.CourseID = ? and T_Batch_Schedule_Master.BranchCode = ?
 								 JOIN T_Batch_Schedule_Child on T_Batch_Schedule_Master.SchId = T_Batch_Schedule_Child.SchId and T_SemSubMap_Child.SubjectID = T_Batch_Schedule_Child.SubjectID and T_Batch_Schedule_Child.IsActive = 1
 								order by T_SemSubMap_Master.SemesterID";
-						$res = $this->db->query($sql,array($UID['universityID'],$courseID['CourseID'],$i,$branchId,$UID['universityID'],$courseID['CourseID'],$branchId)); 
+						$res = $this->db->query($sql,array($UID['universityID'],$courseID,$i,$branchId,$UID['universityID'],$courseID,$branchId)); 
 						//$id['FeeDetails'][$key2] = $res->result();
 						$in[] =  $res->result();
 						//array_push($id['FeeDetails'][$key2],$ind);
diff --git a/Apollo/assets/views/hallticket/generatehallticket.html b/Apollo/assets/views/hallticket/generatehallticket.html
index da452466..df610b73 100755
--- a/Apollo/assets/views/hallticket/generatehallticket.html
+++ b/Apollo/assets/views/hallticket/generatehallticket.html
@@ -43,28 +43,28 @@
 		<form name="Form" id="form" novalidate method="post">
             <fieldset>
                 <legend>Search</legend>
-                <div class="row">
+                <div class="col-md-12 ">
                     
                     <div class="col-md-3 form-group">
                         <label>
                             University
                         </label>
-                        <select class="form-control" name="university" tabindex="1" id="university" 
+                        <select  class="form-control" name="university" tabindex="1" id="university" 
                                 ng-model="myModel.universityName"
                                 ng-options="i.universityName for i in university" ng-change="">
                             <option value=""> Select University</option>
                         </select>
-						 <!-- <pre>{{myModel.universityName | json}}</pre>   -->
+						 <!-- <pre>{{myModel.universityName | json}}</pre>-->
 
                     </div>
-                    <div class="col-md-4 form-group">
+                    <div class="col-md-3 form-group">
                         <label>
                             Course
                         </label>
-                        <select class="form-control" name="course" tabindex="4" id="course"
-                                ng-model="myModel.courseName"
-                                ng-options="courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="">
+                        <select ui-select2 class="form-control" name="course" tabindex="4" id="course"
+                                ng-model="myModel.courseName">
                             <option value=""> Select Course</option>
+							<option ng-repeat="courseDetails in myModel.universityName.courseDetails"  value="{{courseDetails.CourseID}}"><span ng-show="courseDetails.CourseCode != ''"><strong>{{courseDetails.CourseName}}</strong></span></option>
                         </select>
 						
 						<!-- <pre>{{myModel.courseName|json}}</pre> -->
@@ -75,15 +75,16 @@
 							 <label>
                            Batch Name
 								</label>
-								<select class="form-control" name="batch" tabindex="4" id="batch"
+								<select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
 										ng-model="myModel.batchName"
-										ng-options="batchDetails.BatchName for batchDetails in myModel.universityName.batchDetails" ng-change="">
+										>
 									<option value=""> Select Batch</option>
+									<option ng-repeat="batchDetails in myModel.universityName.batchDetails"  value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
 								</select>
 						<!-- <pre>{{myModel.batchName | json}}</pre> -->
 							</div>
 							
-							<div class="col-md-3 form-group">
+							<div class="col-md-2 form-group">
 						
 						<br>                   
                                              <button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-wide btn-info" data-style="zoom-in" ng-click="getStudentDetails(Form,myModel);">GET STUDENTS</button>