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:
dineshkumarkannan 2018-08-16 18:07:02 +05:30
commit 844871878d
4 changed files with 8 additions and 10 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.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.MobileNumber,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization');
$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,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization');
$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');

2
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2367,7 +2367,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
// $scope.items = ['item1', 'item2', 'item3'];
$scope.open = function (studentDetails) {
$scope.openStudentView = function (studentDetails) {
// get student view details

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

@ -127,9 +127,9 @@
</thead>
<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><a tooltip="View Student" class="text-dark" ng-click="openStudentView(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><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.MobileNumber}}</a></td>
<td>{{user.UniversityName}}</td>
<td>{{user.CourseName}}</td>
<!-- <td>{{user.SessionName}}</td>-->

10
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -52,7 +52,7 @@
<select class="form-control" name="feesType" tabindex="7" id="feesType"
ng-model="updateModel.feesType"
ng-options="fees.Sem_Year for fees in studentFeesInfo"
required ng-change="changeTotalFees(updateModel.feesType);">
required ng-change="changeTotalFees(updateModel.feesType,Form);">
<!-- <option value=""> Select Sem/Year</option>-->
</select>
<span class="error text-small block"
@ -225,7 +225,7 @@
<select class="form-control" name="feesTypeBill" tabindex="17" id="feesTypeBill"
ng-model="updateModel.feesType"
ng-options="fees.Sem_Year for fees in studentFeesInfo"
required ng-change="changeTotalFees(updateModel.feesType);">
required ng-change="changeTotalFees(updateModel.feesType,Form);">
<!-- <option value=""> Select Sem/Year</option>-->
</select>
<span class="error text-small block"
@ -283,7 +283,7 @@
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="19" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
ng-model="updateModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
<span style="font-size: 11px;color:red;">Total Payable:</span><span style="font-size: 11px;">Rs.{{updateModel.feesType.BalanceAmount}}</span>
<b><span style="font-size: 11px;color:red;">Total Payable:</span><span style="font-size: 11px;color: black;">Rs.{{payableAmtInfo}}</span></b>
<span class="error text-small block"
ng-if="Form.billAmount.$dirty && Form.billAmount.$invalid"
ng-hide="Form.billAmount.$error.maxlength || Form.billAmount.$error.pattern">Bill amount is required</span>
@ -551,11 +551,9 @@
</div>
</fieldset>
</div>
</fieldset>
</div>
</div>