Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
dineshkumarkannan
commit
d5ddadff3e
@ -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');
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -43,28 +43,28 @@
|
||||
<form name="Form" id="form" novalidate method="post">
|
||||
<fieldset>
|
||||
<legend>Search</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-12 ">
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
University
|
||||
</label>
|
||||
<select class="form-control" name="university" tabindex="1" id="university"
|
||||
<select class="form-control" name="university" tabindex="1" id="university"
|
||||
ng-model="myModel.universityName"
|
||||
ng-options="i.universityName for i in university" ng-change="">
|
||||
<option value=""> Select University</option>
|
||||
</select>
|
||||
<!-- <pre>{{myModel.universityName | json}}</pre> -->
|
||||
<!-- <pre>{{myModel.universityName | json}}</pre>-->
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 form-group">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Course
|
||||
</label>
|
||||
<select class="form-control" name="course" tabindex="4" id="course"
|
||||
ng-model="myModel.courseName"
|
||||
ng-options="courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="">
|
||||
<select ui-select2 class="form-control" name="course" tabindex="4" id="course"
|
||||
ng-model="myModel.courseName">
|
||||
<option value=""> Select Course</option>
|
||||
<option ng-repeat="courseDetails in myModel.universityName.courseDetails" value="{{courseDetails.CourseID}}"><span ng-show="courseDetails.CourseCode != ''"><strong>{{courseDetails.CourseName}}</strong></span></option>
|
||||
</select>
|
||||
|
||||
<!-- <pre>{{myModel.courseName|json}}</pre> -->
|
||||
@ -75,15 +75,16 @@
|
||||
<label>
|
||||
Batch Name
|
||||
</label>
|
||||
<select class="form-control" name="batch" tabindex="4" id="batch"
|
||||
<select ui-select2 class="form-control" name="batch" tabindex="4" id="batch"
|
||||
ng-model="myModel.batchName"
|
||||
ng-options="batchDetails.BatchName for batchDetails in myModel.universityName.batchDetails" ng-change="">
|
||||
>
|
||||
<option value=""> Select Batch</option>
|
||||
<option ng-repeat="batchDetails in myModel.universityName.batchDetails" value="{{batchDetails.BatchCode}}"><span ng-show="batchDetails.BatchCode != ''"><strong>{{batchDetails.BatchName}}</strong></span></option>
|
||||
</select>
|
||||
<!-- <pre>{{myModel.batchName | json}}</pre> -->
|
||||
</div>
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<div class="col-md-2 form-group">
|
||||
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-wide btn-info" data-style="zoom-in" ng-click="getStudentDetails(Form,myModel);">GET STUDENTS</button>
|
||||
|
||||
@ -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 -->
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user