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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
velz 2018-06-11 13:16:30 +05:30
commit 93df3c11ec
2 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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');

58
Apollo/assets/views/status-update/fees_status.html
View File

@ -103,10 +103,21 @@
<table class="table table-hover" ng-controller="studentModalDemoCtrl">
<thead>
<tr>
<th>Student Name</th>
<th>Mobile Number</th>
<th>University</th>
<th>Course</th>
<th ng-click="sort('Firstname')">First Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('Lastname')">Last Name
<span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('MobileNumber')">Mobile Number
<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('UniversityName')">University
<span class="glyphicon sort-icon" ng-show="sortKey=='UniversityName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th ng-click="sort('CourseName')">Course
<span class="glyphicon sort-icon" ng-show="sortKey=='CourseName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<!-- <th>Session</th>-->
<th>Action</th>
<th></th>
@ -116,6 +127,7 @@
<tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr>
<td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.Firstname}}</a></td>
<td>{{user.Lastname}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
<td>{{user.UniversityName}}</td>
<td>{{user.CourseName}}</td>
@ -146,44 +158,6 @@
</div>
<!--<div class="row">
<fieldset>
<div class="table-responsive">
<table ng-table="tableParams" class="table table-hover">
<tbody ng-repeat="user in studentInfo">
<tr>
<td data-title="'Student Name'"> {{user.Firstname}} </td>
<td data-title="'Mobile Number'"> {{user.MobileNumber}} </td>
<td data-title="'University'">{{user.UniversityName}}</td>
<td data-title="'Course'">{{user.CourseName}}</td>
<td data-title="'Batch'">{{user.BatchName}}</td>
<td data-title="'Action'">
<input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click Update Fees" id="editRow{{user.ID}}" value="Update Fees" ng-click="updateFees(user)">
</td>
</tr>
<tr ng-show="editId === user.ID" ng-if="editId === user.ID">
<td colspan="12" ng-include
src="'assets/views/status-update/updateFeesStatus.html'"></td>
</tr>
</tbody>
</table>
</div>
</fieldset>
</div>-->
</div>
<!-- end: LIST GROUP -->