diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index edf2493a..5fbfe46b 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -17,7 +17,7 @@ class Fees_status_model extends CI_Model public function getStudentList($search=null) { if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!=''){ - $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName'); + $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName'); $this->db->from(STUDENTS.' as ST'); $this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID'); 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 @@
Search -
+
- - +
-
+
- + @@ -75,15 +75,16 @@ -
-
+

diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html index afda8dd2..3a0e3bf9 100755 --- a/Apollo/assets/views/status-update/fees_status.html +++ b/Apollo/assets/views/status-update/fees_status.html @@ -103,10 +103,21 @@ - - - - + + + + + @@ -116,6 +127,7 @@ + @@ -146,44 +158,6 @@ - - - -
Student NameMobile NumberUniversityCourseFirst Name + + Last Name + + Mobile Number + + University + + Course + + Action
{{user.Firstname}}{{user.Lastname}} {{user.MobileNumber}} {{user.UniversityName}} {{user.CourseName}}