Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1642 coursename added

Browse Source
This commit is contained in:
sriramv 2019-01-31 19:41:37 +05:30
parent c7ea3c3fb9
commit e48e825b40
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apollo/api/application/models/Hallticket_model.php
View File

@ -855,7 +855,7 @@ 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,BalFees.semyr,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,T_CourseMaster.CourseName');
$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 and BalFees.bcode=T_Students_Fees_Status.BatchCode');
@ -863,6 +863,7 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
$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');
$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->join('T_CourseMaster','T_CourseMaster.CourseID = T_Student_CourseDetails.CourseID');
$this->db->where('T_Students_Fees_Status.BatchCode',$batch);
$this->db->where('T_Students_Fees_Status.BranchCode',$branchId);
if(($courseID !='')||($courseID != null))
@ -898,7 +899,7 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
$course = $r->CourseID;
$studetdetails['FeeDetails'] = $this->getFeeSemesterDetails($r->StudentID,$batch,$branchId,$course);
$studetdetails['CourseID'] = $r->CourseID;
$studetdetails['CourseName'] = $r->CourseName;
$studetdetails['balpayable'] =$r->balpayable;
$studetdetails['semyr'] =$r->semyr;
$result_array[] = $studetdetails;

9
Apollo/assets/views/hallticket/generatehallticket.html
View File

@ -146,9 +146,10 @@
<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
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> -->
<th ng-click="sort('course')">Course
<span class="glyphicon sort-icon" ng-show="sortKey=='course'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</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>
@ -187,7 +188,7 @@
{{p.MobileNumber}}
</a>
</td>
<!-- <td>{{p.EmailID}}</td> -->
<td>{{p.CourseName}}</td>
<td><span ng-if="p.balpayable >=0">{{p.balpayable}}</span><span ng-if="p.balpayable <0">{{p.balpayable}}(Excess fee)</span></td>