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-04-17 17:07:38 +05:30
commit 43a31ad069
3 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,10 +78,11 @@ class Fees_status_model extends CI_Model
* created by kms
* */
public function getStudentFeesStructure($student=null){
$this->db->select('CF.ID,CF.Sem_Year,CF.ProgramType,SFS.FeesID,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees,SM.SessionName as SessionName,SM1.SessionName as ToSessionName');
$this->db->select('CF.ID,CF.Sem_Year,CF.ProgramType,SFS.FeesID,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees,SM.SessionName as SessionName,SM1.SessionName as ToSessionName,BA.BatchCode,BA.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 BA', 'BA.BatchCode = SFS.BatchCode');
$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
$this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');
$this->db->where('SFS.CourseID',$student['CourseID']);
@ -100,6 +101,7 @@ class Fees_status_model extends CI_Model
$fetchData['Waiver'] = $row->Waiver;
$fetchData['Others'] = $row->Others;
$fetchData['SessionName'] = $row->SessionName;
$fetchData['BatchName'] = $row->BatchName;
if($row->ToSessionName=='' OR $row->ToSessionName==null){
$fetchData['ToSessionName'] = "Not Applicable";
}
@ -198,6 +200,7 @@ class Fees_status_model extends CI_Model
$fetchData['Others'] = $row->Others;
$fetchData['SessionName'] = "Not Applicable";
$fetchData['ToSessionName'] = "Not Applicable";
$fetchData['BatchName'] = "Not Applicable";
$fetchData['RollNo'] = $row->RollNo;
$fetchData['PayableFees'] = $row->CourseFees + $row->STFOrWR + $row->Others - $row->Waiver;
@ -236,11 +239,12 @@ class Fees_status_model extends CI_Model
$serachArray=[WAIVER,REFERRAL];
$this->db->distinct();
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,ST.Firstname,ST.MobileNumber,ST.Fathername,CU.CourseName,CU.CourseID,CF.Sem_Year,STC.EnrollmentID,US.UniversityName,US.UniversityShortName,SM.SessionName,SM1.SessionName as ToSessionName,CF.ProgramType');
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,ST.Firstname,ST.MobileNumber,ST.Fathername,CU.CourseName,CU.CourseID,CF.Sem_Year,STC.EnrollmentID,US.UniversityName,US.UniversityShortName,SM.SessionName,SM1.SessionName as ToSessionName,CF.ProgramType,BA.BatchCode,BA.BatchName');
$this->db->from(STUDENTS_FEES_PAID.' as SFP');
$this->db->join(STUDENTS_FEES_STATUS.' as SFS','SFP.FeesId = SFS.FeesID');
$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 BA', 'BA.BatchCode = SFS.BatchCode');
$this->db->join(STUDENTS.' as ST', 'ST.StudentID = SFS.StudentID');
$this->db->join(COURSE.' as CU', 'CU.CourseID = SFS.CourseID');
$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
@ -265,6 +269,7 @@ class Fees_status_model extends CI_Model
else{
$storePaidDetails['ToSessionName'] = $feeRow->ToSessionName;
}
$storePaidDetails['BatchName'] = $feeRow->BatchName;
$storePaidDetails['RollNo'] = $feeRow->RollNo;
$storePaidDetails['STFOrWR'] = $feeRow->STFOrWR;
@ -367,6 +372,7 @@ class Fees_status_model extends CI_Model
$storePaidDetails['CourseFees'] = $feeRow->CourseFees;
$storePaidDetails['SessionName'] = "Not Applicable";
$storePaidDetails['ToSessionName'] = "Not Applicable";
$storePaidDetails['BatchName'] = "Not Applicable";
$storePaidDetails['RollNo'] = $feeRow->RollNo;
$storePaidDetails['STFOrWR'] = $feeRow->STFOrWR;
$storePaidDetails['Waiver'] = $feeRow->Waiver;

2
Apollo/assets/js/directives/convert-words.js
View File

@ -78,7 +78,7 @@ app.service('WordsService', function() {
}
words_string = words_string.split(" ").join(" ");
}
return words_string;
return words_string+" Only";
}
});
app.service('installmentService', function() {

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

@ -58,6 +58,25 @@
<span class="error text-small block"
ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Sem/Year is required</span>
</div>
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.batchname.$dirty && Form.batchname.$invalid, 'has-success':Form.batchname.$valid}">
<label ng-if="updateModel.feesType.ProgramType=='Y001' || updateModel.feesType.ProgramType=='P001' || updateModel.feesType.ProgramType=='P002'">
Batch <span class="symbol required"></span>
</label>
<label ng-if="updateModel.feesType.ProgramType!='Y001' && updateModel.feesType.ProgramType!='P001' && updateModel.feesType.ProgramType!='P002'">
Batch <!--<span class="symbol required"></span>-->
</label>
<input type="text" placeholder="Enter Batch Name"
tabindex="8" class="form-control" name="batchname"
ng-model="updateModel.feesType.BatchName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
<span class="error text-small block"
ng-if="Form.batchname.$dirty && Form.batchname.$error.required">Batch name is required</span>
<span class="error text-small block"
ng-if="Form.batchname.$dirty && Form.batchname.$error.pattern">Invalid batch name </span>
<!--<span class="success text-small"-->
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
</div>
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.sessionname.$dirty && Form.sessionname.$invalid, 'has-success':Form.sessionname.$valid}">
<label ng-if="updateModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'">
@ -71,7 +90,7 @@
</label>
<input type="text" placeholder="Enter Session Name"
tabindex="8" class="form-control" name="sessionname"
tabindex="9" class="form-control" name="sessionname"
ng-model="updateModel.feesType.SessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
<span class="error text-small block"
ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span>
@ -87,7 +106,7 @@
</label>
<input type="text" placeholder="Enter Session Name"
tabindex="9" class="form-control" name="sessionname"
tabindex="10" class="form-control" name="sessionname"
ng-model="updateModel.feesType.ToSessionName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required readonly/>
<span class="error text-small block"
ng-if="Form.sessionname.$dirty && Form.sessionname.$error.required">Session name is required</span>
@ -103,7 +122,7 @@
</label>
<input type="text" placeholder="Enter Roll No"
tabindex="10" class="form-control" name="rollNo"
tabindex="11" class="form-control" name="rollNo"
ng-model="updateModel.feesType.RollNo" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/>
<!--<span class="error text-small block"
ng-if="Form.rollNo.$dirty && Form.rollNo.$error.required">Roll No is required</span>-->
@ -120,7 +139,7 @@
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="11" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
autofocus tabindex="12" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="9"
ng-model="updateModel.feesType.ActualFees" ng-pattern="/^[0-9]*$/" required readonly/>
<span class="error text-small block"
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
@ -136,7 +155,7 @@
</label>
<input type="text" placeholder="Enter STF/WR Amount"
autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
autofocus tabindex="13" class="form-control" name="STF" id="STF" ng-maxlength="9"
ng-model="updateModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" readonly/>
<span class="error text-small block"
ng-if="Form.STF.$dirty && Form.STF.$invalid"
@ -152,7 +171,7 @@
</label>
<input type="text" placeholder="Enter Other Amount"
autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9"
autofocus tabindex="14" class="form-control" name="others" id="others" ng-maxlength="9"
ng-model="updateModel.feesType.Others" ng-pattern="/^[0-9]*$/" readonly/>
<span class="error text-small block"
ng-if="Form.others.$dirty && Form.others.$invalid"
@ -421,7 +440,8 @@
<thead>
<tr>
<th>Sem/Year</th>
<th>Course Name</th>
<th>Course</th>
<th>Batch</th>
<th ng-if="existStudentFeesDetails[0].ProgramType=='P001' || existStudentFeesDetails[0].ProgramType=='P002'">Session From/Session To</th>
<th ng-if="existStudentFeesDetails[0].ProgramType=='Y001'">Session</th>
<th>Roll Number</th>
@ -441,6 +461,7 @@
<tr>
<td>{{p.FeesName}}</td>
<td>{{p.CourseName}}</td>
<td>{{p.BatchName}}</td>
<!--<td>{{p.SessionName}}</td>
<td>{{p.ToSessionName}}</td>-->
<td ng-if="existStudentFeesDetails[0].ProgramType=='P001' || existStudentFeesDetails[0].ProgramType=='P002'">{{p.SessionName}}/{{p.ToSessionName}}</td>
@ -544,8 +565,9 @@
<tr style="height: 24px;">
<td style="width: 136px; height: 24px;"><strong>Course:</strong>&nbsp;{{items.CourseName}}</td>
<td style="width: 136px; height: 24px;"><strong>Sem/Year:</strong>&nbsp;{{items.FeesName}}</td>
<td ng-if="items.ToSessionName=='Not Applicale'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}</td>
<td ng-if="items.ToSessionName!='Not Applicale'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}/{{items.ToSessionName}}</td>
<td ng-if="items.SessionName!='Not Applicable' && items.ToSessionName=='Not Applicable'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}</td>
<td ng-if="items.SessionName!='Not Applicable' && items.ToSessionName!='Not Applicable'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;{{items.SessionName}}/{{items.ToSessionName}}</td>
<td ng-if="items.SessionName=='Not Applicable' && items.ToSessionName=='Not Applicable'" style="width: 137px; height: 24px;"><strong>Session:</strong>&nbsp;</td>
<td style="width: 137px; height: 24px;"><strong>Univ:</strong>&nbsp;{{items.UniveShortName}}</td>
</tr>
<tr style="height: 24px;">