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

batch add in set fee screen issue no : 1653

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-02-04 16:18:41 +05:30
parent a1717e71b4
commit d2208aead1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/models/Fees_status_model.php
View File

@ -796,15 +796,18 @@ class Fees_status_model extends CI_Model
$result_array['feesStatus']=true;
foreach ($feesDetails->result() as $row){
$SNoValue=$SNoValue+1;
$this->db->select('SFS.FeesID,SFS.CourseFees,SFS.Comments,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.SessionName,SFS.ToSessionName,SFS.RollNo,SFS.BatchCode,SM.SessionName as MasterSessionName,SM1.SessionName as MasterToSessionName');
$this->db->select('SFS.FeesID,SFS.CourseFees,SFS.Comments,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.SessionName,SFS.ToSessionName,SFS.RollNo,SFS.BatchCode,SM.SessionName as MasterSessionName,SM1.SessionName as MasterToSessionName,bm.BatchName');
$this->db->from(STUDENTS_FEES_STATUS.' as SFS');
$this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
$this->db->join(SESSIONMASTER.' as SM1', 'SM1.SessionID = SFS.ToSessionName','left');
$this->db->join(BATCH.' as bm','bm.BatchCode = SFS.BatchCode','left');
// $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = SFS.FeesID','left');
$this->db->where('SFS.StudentID',$student['StudentID']);
$this->db->where('SFS.CourseID',$student['CourseID']);
$this->db->where('SFS.FeesType',$row->ID);
$existFeesDetails = $this->db->get();
// print_r($this->db->last_query());die();
if($existData=$existFeesDetails->result()){
// count the total paid fees details
$this->db->select('FeesId');
@ -834,6 +837,7 @@ class Fees_status_model extends CI_Model
$fetchData['SessionName']=$existData[0]->SessionName;
$fetchData['ToSessionName']=$existData[0]->ToSessionName;
$fetchData['MasterSessionName']=$existData[0]->MasterSessionName;
$fetchData['BatchName']=$existData[0]->BatchName;
if($existData[0]->MasterToSessionName=='' OR $existData[0]->MasterToSessionName==null){
$fetchData['MasterToSessionName']="Not Applicable";
}

2
Apollo/assets/views/status-update/setFeesForStudent.html
View File

@ -391,6 +391,7 @@
<thead>
<tr>
<th>Sem/Year</th>
<th>Batch</th>
<th ng-if="feesStructureInfo[0].ProgramType=='P001' || feesStructureInfo[0].ProgramType=='P002'">Session From/Session To</th>
<th ng-if="feesStructureInfo[0].ProgramType=='Y001'">Session</th>
<th>Roll Number</th>
@ -407,6 +408,7 @@
<tbody ng-repeat="p in feesStructureInfo|orderBy:sortKey:reverse|filter:search:strict">
<tr ng-if="p.ExistValue=='1'">
<td>{{p.Sem_Year}}</td>
<td>{{p.BatchName}}</td>
<td ng-if="feesStructureInfo[0].ProgramType=='P001' || feesStructureInfo[0].ProgramType=='P002'">{{p.MasterSessionName}}/{{p.MasterToSessionName}}</td>
<td ng-if="feesStructureInfo[0].ProgramType=='Y001'">{{p.MasterSessionName}}</td>
<td>{{p.RollNo}}</td>