From efe8e0b1f5a36672776541b17d79ccc3292643db Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 31 Jan 2019 14:45:19 +0530
Subject: [PATCH] hall ticket issue no : 1643, 1642

---
 .../application/models/Hallticket_model.php   | 25 +++++++++++++------
 .../js/controllers/generateHallTicketCtrl.js  |  2 +-
 .../views/hallticket/generatehallticket.html  | 19 ++++++++++----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Apollo/api/application/models/Hallticket_model.php b/Apollo/api/application/models/Hallticket_model.php
index 7d836175..366f4b8d 100644
--- a/Apollo/api/application/models/Hallticket_model.php
+++ b/Apollo/api/application/models/Hallticket_model.php
@@ -855,10 +855,10 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
 	{
 		
 		$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,T_Hallticket_Master.HallTicket_ID,T_Hallticket_Student_Details.HallTicket_ID as isFlag,BalFees.balpayable,T_Student_CourseDetails.CourseID as CourseID');
+		$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,BalFees.balpayable,BalFees.semyr,T_Student_CourseDetails.CourseID as CourseID');
 		$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('BalFees','BalFees.student =T_Students_Fees_Status.StudentID and  BalFees.course = T_Students_Fees_Status. CourseID and BalFees.branchCode = T_Students_Fees_Status.BranchCode');
+		$this->db->join('BalFees','BalFees.student =T_Students_Fees_Status.StudentID and  BalFees.course = T_Students_Fees_Status. CourseID and BalFees.branchCode = T_Students_Fees_Status.BranchCode and BalFees.bcode=T_Students_Fees_Status.BatchCode');
 		
 		$this->db->join('T_Student_CourseDetails','T_StudentDetails.StudentID = T_Student_CourseDetails.StudentID and T_Students_Fees_Status.CourseID = T_Student_CourseDetails.CourseID');
 		$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');
@@ -873,6 +873,8 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
 		
 		$res = $this->db->get();
 		$data =  $res->result();
+
+		//print_r($this->db->last_query()); die();
 			
 		$result_array = array();
 		if(count($data) > 0)
@@ -881,8 +883,8 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
 			$prestu = "";
 			foreach($data as $r)
 			{
-				if($prestu !=  $r->StudentID)
-				{
+				// if($prestu !=  $r->StudentID)
+				// {
 					$studetdetails['StudentID'] =  $r->StudentID;
 					$studetdetails['MobileNumber'] =  $r->MobileNumber;
 					$studetdetails['Firstname'] =  $r->Firstname;
@@ -898,14 +900,21 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
 					$studetdetails['CourseID'] =  $r->CourseID;
 
 					$studetdetails['balpayable'] =$r->balpayable;
+					$studetdetails['semyr'] =$r->semyr;
 					$result_array[] = $studetdetails;
 					$prestu = $r->StudentID;
-				}
+
+
+				//}
 			}
-			
+
+
+			//print_r($result_array);die();			
 		}
 		
-		//print_r($this->db->last_query());// die();
+		// print_r($this->db->last_query()); die();
+
+		//print_r($result_array);die();
 		return $result_array;
 		
 	}
@@ -921,6 +930,8 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
 		$this->db->where('T_Students_Fees_Status.CourseID',$courseID);
 		$this->db->where('T_Students_Fees_Status.StudentID',$stuid);
 		$res = $this->db->get();
+
+		//print_r($this->db->last_query());die();
 		return $res->result();
 	}
 
diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
index 7bfd5de9..1ebca409 100755
--- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js
+++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js
@@ -168,7 +168,7 @@ $scope.generateButtonStatus = false;
 
 					angular.forEach(($scope.studentInfo),function(studentInfo,key)
    					{
-          				console.log($scope.studentInfo);
+          				//console.log($scope.studentInfo);
    						 if(studentInfo.balpayable != 0)
     						{
       							var mobileno = studentInfo.MobileNumber;
diff --git a/Apollo/assets/views/hallticket/generatehallticket.html b/Apollo/assets/views/hallticket/generatehallticket.html
index 9c556281..bdcb3f33 100755
--- a/Apollo/assets/views/hallticket/generatehallticket.html
+++ b/Apollo/assets/views/hallticket/generatehallticket.html
@@ -146,13 +146,18 @@
                                             <th ng-click="sort('MobileNumber')">Mobile No
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
-                                            <th ng-click="sort('EmailID')">Email ID
+                                           <!--  <th ng-click="sort('EmailID')">Email ID
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
-                                            </th>
+                                            </th> -->
 											
 											<th ng-click="sort('balpayable')">Balance
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='balpayable'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
                                             </th>
+
+
+                                            <th ng-click="sort('semyr')">Sem/Year
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='semyr'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
 											
 											 <th ng-click="sort('isFlag')">Status
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='isFlag'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
@@ -168,7 +173,7 @@
 										<!-- <td ><span ng-if="p.balpayable !=0" > -->
 										<!-- <input type="checkbox" ng-checked="myModel.all" id="{{p.StudentID}}" name="{{p.StudentID}}" class="form-control" ng-click="isClick($event)"/></span> -->
 										<td>
-										<div ng-if="p.balpayable ==0" >
+										<div ng-if="p.balpayable <=0" >
 										<input type="checkbox" ng-checked="myModel.all" id="{{p.StudentID}}" name="{{p.StudentID}}" class="form-control" ng-click="isClick($event)"/></div>
 </td>
 										 
@@ -182,8 +187,12 @@
                                                     {{p.MobileNumber}}
                                                 </a>
 											</td>
-                                            <td>{{p.EmailID}}</td>
-											<td>{{p.balpayable}}</td>
+                                          <!--   <td>{{p.EmailID}}</td> -->
+
+
+											<td><span ng-if="p.balpayable >=0">{{p.balpayable}}</span><span ng-if="p.balpayable <0">Excess fee</span></td>
+
+                                            <td>{{p.semyr}}</td>
                                             <td> <span ng-if="p.isFlag != null" class="label label-sm label-success">GENERATED</span></td>
 											
 										</tr>