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

student view alignment issue and branch code check in call tracking

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-17 11:33:31 +05:30
parent bf55e17681
commit d8541a9149
2 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/models/Calltracking_model.php
View File

@ -1681,8 +1681,9 @@ public function GetStaffCountDetails($branchID,$myDate)
$this->db->from('T_Lead_Tracking_Followup LTF');
$this->db->join('T_Login L','L.ID=LTF.AssignedStaff');
$this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID');
$this->db->join('T_Staff_BranchAccess SBA','SBA.StaffID = SD.StaffID');
$this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
$this->db->where('SD.BranchCode',$branchID);
$this->db->where('SBA.BranchCode',$branchID);
$this->db->group_by('AssignedStaff');
$Details = $this->db->get()->result();

82
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -242,59 +242,55 @@
</center>-->
</div>
<!--previous table class ="table no-margin height-200 ng-scope" -->
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.feesDetails!=false" fixed-header>
<thead>
<tr>
<th style="text-align:center;">Sem/Year</th>
<th style="text-align:center;">Batch</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
<th style="text-align:center;">Roll Number</th>
<th style="text-align:center;">Total Payable Fees</th>
<th style="text-align:center;">Referral/Waiver</th>
<th style="text-align:center;">Paid Fees</th>
<th style="text-align:center;">Balance Fees</th>
<th></th>
<th></th>
<table class="table table-striped table-bordered table-hover table-condensed" ng-if="course.feesDetails!=false" fixed-header>
<thead>
<tr>
<th style="text-align:center;">Sem/Year</th>
<th style="text-align:center;">Batch</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th style="text-align:center;" ng-if="course.feesDetails[0].ProgramType=='Y001'">Session</th>
<th style="text-align:center;">Roll Number</th>
<th style="text-align:center;">Total Payable Fees</th>
<th style="text-align:center;">Referral/Waiver</th>
<th style="text-align:center;">Paid Fees</th>
<th style="text-align:center;">Balance Fees</th>
<th></th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="fees in course.feesDetails">
<td>
<span>{{fees.FeesName}}</span>
</td>
<td>
<span>{{fees.BatchName}}
</td>
<td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>
<td> <span>{{fees.RollNo}}</span></td>
<td style="text-align:right;">
<span>{{fees.PayableAmount}}</span></td>
<td style="text-align:right;">
<span>{{fees.StudentWaiverRefAmount}}</span>
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat="fees in course.feesDetails">
<td><span>{{fees.FeesName}}</span></td>
<td><span>{{fees.BatchName}}</span></td>
<td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>
<td> <span>{{fees.RollNo}}</span></td>
<td style="text-align:right;">
<span>{{fees.PayableAmount}}</span></td>
<td style="text-align:right;">
<span>{{fees.StudentWaiverRefAmount}}</span>
</td>
<td style="text-align:right;">
<span>{{fees.StudentPaidAmount}}</span></td>
<td style="text-align:right;">
<span>{{fees.BalanceAmount}}</span></td>
<td style="text-align:right;"><span>
<td style="text-align:right;">
<span>{{fees.StudentPaidAmount}}</span></td>
<td style="text-align:right;">
<span>{{fees.BalanceAmount}}</span></td>
<td style="text-align:right;"><span>
<a tooltip="Installment Details" ng-click="open1(fees,'1')">
<i class="fa fa-eye text-blue text-large"></i>
</a> </span>
</td>
<td style="text-align:right;"><span>
</td>
<td style="text-align:right;"><span>
<a tooltip="Bill Details" ng-click="open1(fees,'2')">
<i class="fa fa-eye text-green text-large"></i>
</a> </span>
</td>
</tr>
</td>
</tr>
</tbody>
</table>
</tbody>
</table>
<!--
view tab end