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-06-01 09:58:59 +05:30
commit c6afe2a083
12 changed files with 149 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,7 @@ class Fees_status_model extends CI_Model
$this->db->where('SFS.CourseID',$student['CourseID']);
$this->db->where('SFS.StudentID',$student['StudentID']);
$this->db->where('BA.BranchCode',$student['BranchCode']);
$this->db->order_by('SFS.FeesID','DESC');
$enrolledFeesDetails = $this->db->get();
if($enrolledFeesDetails->result()){
$result_array['feesStatus']=true;
@ -139,7 +140,7 @@ class Fees_status_model extends CI_Model
$getDefaultCourseFees = $this->getDefaultCourseFees($student);
if($getDefaultCourseFees!=false){
$result_array['feesDetails']=array_merge($CourseFeesArray,$getDefaultCourseFees);
$result_array['feesDetails']=array_merge($getDefaultCourseFees,$CourseFeesArray);
}
else{
$result_array['feesDetails']=$CourseFeesArray;
@ -190,6 +191,7 @@ class Fees_status_model extends CI_Model
$this->db->where('SFS.CourseID', $student['CourseID']);
$this->db->where('SFS.StudentID', $student['StudentID']);
$this->db->where_in('SFS.FeesType', $serachArray);
$this->db->order_by('SFS.FeesID','DESC');
$enrolledFeesDetails = $this->db->get();
if ($enrolledFeesDetails->result()) {
@ -303,7 +305,9 @@ class Fees_status_model extends CI_Model
$storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount;
if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){
$storePaidDetails['BalanceAmount']=0;
//$storePaidDetails['BalanceAmount']=0;
$storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount;
}
else{
@ -329,7 +333,7 @@ class Fees_status_model extends CI_Model
$storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount;
// for get paid bill details
$this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy');
$this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy,SFP.CommentsForStudent,SFP.InternalComments');
$this->db->from(STUDENTS_FEES_PAID.' as SFP');
$this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left');
$this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy');
@ -344,7 +348,7 @@ class Fees_status_model extends CI_Model
}
$existDefaultFees = $this->existStudentCourseDefaultFees($student);
if($existDefaultFees != false){
return array_merge($mergeResult,$existDefaultFees);
return array_merge($existDefaultFees,$mergeResult);
}
else{
return $mergeResult;
@ -410,7 +414,9 @@ class Fees_status_model extends CI_Model
$paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result();
$storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount;
if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){
$storePaidDetails['BalanceAmount']=0;
//$storePaidDetails['BalanceAmount']=0;
$storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount;
}
else{

7
Apollo/api/application/models/Studentview_model.php
View File

@ -184,7 +184,9 @@ class Studentview_model extends CI_Model
$paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result();
$storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount;
if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){
$storePaidDetails['BalanceAmount']=0;
// $storePaidDetails['BalanceAmount']=0;
$storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount;
}
else{
@ -291,7 +293,8 @@ class Studentview_model extends CI_Model
$paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result();
$storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount;
if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){
$storePaidDetails['BalanceAmount']=0;
// $storePaidDetails['BalanceAmount']=0;
$storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount;
}
else{

4
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -1545,7 +1545,9 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
$rootScope.currentDate1=new Date().getFullYear() + '-' + ('0' + (new Date().getMonth() + 1)).slice(-2) + '-' + ('0' + new Date().getDate()).slice(-2);
}
if($rootScope.currentDate1>new Date()){
$rootScope.currentDate1=new Date();
}
$rootScope.myModel1.date=$rootScope.followupDetails.followupDetails[0].FollowupOn;
// get 30 plus date for follwup details
$rootScope.modifyDate1 = moment();

21
Apollo/assets/views/callTrackingCloseDetails.html
View File

@ -15,6 +15,17 @@
}
.listCoutShow {
margin: 12px;
padding: 4px;
padding-left: 10px;
padding-right: 10px;
border: 1px solid #59b176;
border-radius: 7px;
color: #FFF;
background-color: #5fba7d;
text-align: center;
}
</style>
<!-- start: PAGE TITLE -->
@ -61,6 +72,16 @@
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
</div>
</div>
<div class="row">
<div class="pull-right">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
<span style="font-size: 14px;
color: black;">Total Count:</span> <span class="listCoutShow"> {{ data.length }}</span>
</div>
</div>
</div>
</div>
<div class="table-responsive">
<fieldset>

25
Apollo/assets/views/callTrackingDetails.html
View File

@ -15,6 +15,17 @@
}
.listCoutShow {
margin: 12px;
padding: 4px;
padding-left: 10px;
padding-right: 10px;
border: 1px solid #46b8da;
border-radius: 7px;
color: #FFF;
background-color: #46b8da;
text-align: center;
}
</style>
<!-- start: PAGE TITLE -->
@ -103,9 +114,21 @@
<input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Status" />
</div>
<br><br>
</div>
</div>
</div>
<div class="row">
<div class="pull-right">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
<span style="font-size: 14px;
color: black;">Total Count:</span> <span class="listCoutShow"> {{ data.length }}</span>
</div>
</div>
</div>
</div>
<div class="col-md-12" ng-if="loader == true " align="center">

22
Apollo/assets/views/callTrackingLeadDetails.html
View File

@ -15,6 +15,17 @@
}
.listCoutShow {
margin: 12px;
padding: 4px;
padding-left: 10px;
padding-right: 10px;
border: 1px solid #46b8da;
border-radius: 7px;
color: #FFF;
background-color: #46b8da;
text-align: center;
}
</style>
<!-- start: PAGE TITLE -->
@ -62,6 +73,17 @@
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
</div>
</div>
<div class="row">
<div class="pull-right">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
<span style="font-size: 14px;
color: black;">Total Count:</span> <span class="listCoutShow"> {{ data.length }}</span>
</div>
</div>
</div>
</div>
<div class="table-responsive">
<fieldset>

21
Apollo/assets/views/callTrackingPendingDetails.html
View File

@ -15,6 +15,17 @@
}
.listCoutShow {
margin: 12px;
padding: 4px;
padding-left: 10px;
padding-right: 10px;
border: 1px solid #eea236;
border-radius: 7px;
color: #FFF;
background-color: #eea236;
text-align: center;
}
</style>
<!-- start: PAGE TITLE -->
@ -62,6 +73,16 @@
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
</div>
</div>
<div class="row">
<div class="pull-right">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
<span style="font-size: 14px;
color: black;">Total Count:</span> <span class="listCoutShow"> {{ data.length }}</span>
</div>
</div>
</div>
</div>
<div class="table-responsive">
<fieldset>

2
Apollo/assets/views/daybook/dayBookApproval.html
View File

@ -272,7 +272,7 @@
<td>
<div id="containersPara">
<div id="wrapper">
{{p.PaidDescription}} / {{p.Description}}
<span style="white-space:pre-wrap;">{{p.PaidDescription}} / {{p.Description}}</span>
</div>
</div>
</td>

2
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -183,7 +183,7 @@
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara">{{p.ReceiptNoComments}}</div> </td>
<div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}</span></div> </td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>

2
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -251,7 +251,7 @@
<td>
<div class="containersPara">
<div id="wrapper">
{{p.PaidDescription}} / {{p.Description}}
<span style="white-space:pre-wrap;">{{p.PaidDescription}} / {{p.Description}}</span>
</div>
</div>
</td>

2
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -160,7 +160,7 @@
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
<td>{{p.ReceiptNo}}</td>
<td>
<div class="containersPara">{{p.ReceiptNoComments}}</div> </td>
<div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}</span></div> </td>
<td>{{p.ModeOfPayment}}</td>
<td>{{p.Amount}}</td>
<td>{{p.Balance}}</td>

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

@ -180,22 +180,7 @@
ng-if="Form.others.$error.maxlength || Form.others.$error.pattern">Enter a valid amount</span>
</div>
<!--<div class="col-md-3 form-group"
ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
<label>
Waiver</span>
</label>
<input type="text" placeholder="Enter Waiver Amount"
autofocus tabindex="14" class="form-control" name="waiver" id="waiver" ng-maxlength="9"
ng-model="updateModel.feesType.Waiver" ng-pattern="/^[0-9]*$/" readonly/>
<span class="error text-small block"
ng-if="Form.waiver.$dirty && Form.waiver.$invalid"
ng-hide="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Waiver amount is required</span>
<span class="error text-small block"
ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
</div>-->
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
<label>
@ -212,6 +197,14 @@
ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.setFeesComments.$dirty && Form.setFeesComments.$invalid}">
<label>
Comments
</label>
<textarea maxlength="100" placeholder="Enter Comments" tabindex="16" class="form-control" name="setFeesComments" id="setFeesComments" ng-model="updateModel.feesType.Comments" readonly></textarea>
<!--<span class="error text-small block" ng-if="Form.DeactiveComments.$dirty && Form.DeactiveComments.$invalid">De-Active Comments is required</span>-->
</div>
</div>
@ -219,98 +212,25 @@
</div>
<!--<div class="col-md-4">
<fieldset>
<legend>Course End Fees</legend>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
<label>
PC Fees
</label>
<input type="text" placeholder="Enter PC"
autofocus tabindex="8" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
ng-model="updateModel.feesType.PC" ng-pattern="/^[0-9]*$/" readonly>
<span class="error text-small block"
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
<label>
TC Fees
</label>
<input type="text" placeholder="Enter TC"
autofocus tabindex="9" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
ng-model="updateModel.feesType.TC" ng-pattern="/^[0-9]*$/" readonly>
<span class="error text-small block"
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
<label>
DC Fees
</label>
<input type="text" placeholder="Enter DC"
autofocus tabindex="10" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
ng-model="updateModel.feesType.DC" ng-pattern="/^[0-9]*$/" readonly>
<span class="error text-small block"
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
</div>
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
<label>
MC Fees
</label>
<input type="text" placeholder="Enter MC"
autofocus tabindex="11" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
ng-model="updateModel.feesType.MC" ng-pattern="/^[0-9]*$/" readonly>
<span class="error text-small block"
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group"
ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
<label>
Other Fees
</label>
<input type="text" placeholder="Enter Other"
autofocus tabindex="12" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
ng-model="updateModel.feesType.OtherFees" ng-pattern="/^[0-9]*$/" readonly>
<span class="error text-small block"
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
</div>
</div>
</fieldset>
</div>-->
<div class="col-md-12">
<fieldset>
<legend>Bill Details</legend>
<div class="row">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.feesTypeBill.$dirty && Form.feesTypeBill.$invalid, 'has-success':Form.feesTypeBill.$valid}">
<label>
Sem/Year <span class="symbol required"></span>
</label>
<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);">
<!-- <option value=""> Select Sem/Year</option>-->
</select>
<span class="error text-small block"
ng-if="Form.feesTypeBill.$dirty && Form.feesTypeBill.$invalid">Sem/Year is required</span>
</div>
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
@ -346,7 +266,7 @@
</label>
<input type="text" placeholder="Enter Receipt No"
tabindex="16" class="form-control" name="billno"
tabindex="18" class="form-control" name="billno"
ng-model="updateModel.billNo" disallow-spaces capitalize ng-pattern="/^(([a-zA-Z]{3}))(([-]){1})([0-9]{5})$/g" ng-disabled="userType=='R002' && financeType=='0'"/>
<!--<span class="error text-small block"
ng-if="Form.billno.$dirty && Form.billno.$error.required">Bill no is required</span>-->
@ -360,7 +280,7 @@
</label>
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="17" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
autofocus tabindex="19" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
ng-model="updateModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
<span class="error text-small block"
ng-if="Form.billAmount.$dirty && Form.billAmount.$invalid"
@ -370,12 +290,14 @@
</div>
<div class="col-md-3 form-group"
</div>
<div class="row">
<div class="col-md-4 form-group"
ng-class="{'has-error':Form.paymentOn.$dirty && Form.paymentOn.$invalid, 'has-success':Form.paymentOn.$valid}">
<label>
Mode Of Payment <span class="symbol required"></span>
</label>
<select class="form-control" name="paymentOn" tabindex="18" id="paymentOn"
<select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
ng-model="updateModel.paymentOn"
ng-options="payment.paymentOn for payment in paymentOptions"
required>
@ -384,29 +306,13 @@
<span class="error text-small block"
ng-if="Form.paymentOn.$dirty && Form.paymentOn.$invalid">Payment type is required</span>
</div>
<!--<div class="col-md-3 form-group"
ng-class="{'has-error':Form.trackStatus.$dirty && Form.trackStatus.$invalid, 'has-success':Form.trackStatus.$valid}">
<label>
Status For Track <span class="symbol required"></span>
</label>
<select class="form-control" name="trackStatus" tabindex="14" id="trackStatus"
ng-model="updateModel.statusCode"
ng-options="trackS.ListCode as trackS.ListName for trackS in getFeesUpdateStatus"
required>
<option value=""> Select Status</option>
</select>
<span class="error text-small block"
ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required</span>
</div>-->
</div>
<div class="row">
<div class="col-md-6 form-group"
<div class="col-md-4 form-group"
ng-class="{'has-error':Form.studcomments.$dirty && Form.studcomments.$invalid,'has-success':Form.studcomments.$valid}">
<label>
Comments For Student <span class="symbol required"></span>
</label>
<textarea placeholder="Enter Comments" tabindex="19"
<textarea placeholder="Enter Comments" tabindex="21"
class="form-control textdsc" name="studcomments"
ng-model="updateModel.studComments" required></textarea>
<span class="error text-small block"
@ -414,12 +320,12 @@
<!--<span class="success text-small"-->
<!--ng-if="Form.address.$valid">Thank You!</span>-->
</div>
<div class="col-md-6 form-group"
<div class="col-md-4 form-group"
ng-class="{'has-error':Form.internalcomments.$dirty && Form.internalcomments.$invalid,'has-success':Form.internalcomments.$valid}">
<label>
Comments For Internal <span class="symbol required"></span>
</label>
<textarea placeholder="Enter Comments" tabindex="20"
<textarea placeholder="Enter Comments" tabindex="22"
class="form-control textdsc" name="internalcomments"
ng-model="updateModel.internalComments" required></textarea>
<span class="error text-small block"
@ -500,6 +406,8 @@
<th>Bill Amount</th>
<th>Receipt NO</th>
<th>Mode of Payment </th>
<th>Comments For Student </th>
<th>Comments For Internal </th>
<th>Print</th>
</tr>
</thead>
@ -510,6 +418,8 @@
<td>{{v.BillAmount}}</td>
<td>{{v.ReceiptNo}}</td>
<td>{{v.ModeOfPayment}}</td>
<td><span style="white-space: pre-wrap">{{v.CommentsForStudent}}</span></td>
<td>{{v.InternalComments}}</td>
<td>
<a tooltip="Click to print" ng-mouseleave="mouseLeave()" pdf-save-button="{{v.BillNO}}" pdf-name="Billno-{{v.BillNO}}.pdf" class="btn"><i class="fa fa-print" ng-click="ShowHide(v)"></i></a>
@ -614,11 +524,11 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading.zoom_in" tabindex="20" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="saveFees(user,Form,updateModel,'zoom-in')">
<button type="submit" ladda="ldloading.zoom_in" tabindex="23" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="saveFees(user,Form,updateModel,'zoom-in')">
Save
</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="21" value="Cancel"
<input type="button" class="btn btn-warning btn-wide" tabindex="24" value="Cancel"
ng-click="cancel();">
</input>