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

fee report

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-08-23 11:36:15 +05:30
parent e6b5359708
commit 475eaf845b
4 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/config/constants.php
View File

@ -175,9 +175,7 @@ defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f26085367892
//transaxtion methods //transaxtion methods
defined('CASH') OR define('CASH','CASH'); defined('CASH') OR define('CASH','CASH');
defined('CHEQUE') OR define('CHEQUE','CHEQUE'); defined('CHEQUE') OR define('CHEQUE','CHEQUE');
defined('REFERRAL') OR define('REFERRAL','REFERRAL');
defined('ONLINETRANSACTION') OR define('ONLINETRANSACTION','ONLINE TRANSACTION'); defined('ONLINETRANSACTION') OR define('ONLINETRANSACTION','ONLINE TRANSACTION');
defined('WAIVER') OR define('WAIVER','WAIVER');
defined('CreditDebitCard') OR define('CreditDebitCard','Credit/Debit Card'); defined('CreditDebitCard') OR define('CreditDebitCard','Credit/Debit Card');
//end of transaction //end of transaction

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

@ -871,6 +871,10 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
$start_date= $det['from']; $start_date= $det['from'];
$end_date = $det['to']; $end_date = $det['to'];
$fromd= date("Y-m-d",strtotime($start_date));
$tod=date("Y-m-d",strtotime($end_date));
//echo $det['university'];die() ; //echo $det['university'];die() ;
$this->db->select('T_Student_CourseDetails.UniversityID,UniversityName, $this->db->select('T_Student_CourseDetails.UniversityID,UniversityName,
@ -887,9 +891,13 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
// $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"'); // $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"');
$this->db->where('T_Students_Fees_PaidDetails.CreatedOn>=',date('Y-m-d', strtotime($start_date))); $this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
$this->db->where('T_Students_Fees_PaidDetails.CreatedOn<=',date('Y-m-d', strtotime($end_date)));
$this->db->where("date_format(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date)));
// $this->db->where(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)'); // $this->db->where(' BillDate <= str_to_date("'.$end_date.'",%d-%m-%Y)');
@ -905,8 +913,8 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
$feeDetails = $this->db->get()->result(); $feeDetails = $this->db->get()->result();
// print_r( $this->db->last_query()); // print_r( $this->db->last_query());
// die(); // die();
// print_r($feeDetails); // print_r($feeDetails);
if($feeDetails) if($feeDetails)

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

@ -160,8 +160,8 @@ $scope.tod = to_dt;
}, },
data: { data: {
university: $scope.universityId, university: $scope.universityId,
from : $scope.fromd , from : $scope.filters.from_date ,
to : $scope.tod to : $scope.filters.to_date
} }
} }

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

@ -345,6 +345,25 @@
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span> <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
</div> </div>
<div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
<label for="form-field-select-2">
Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<option value="" disabled selected>Select Type</option>
<optgroup ng-repeat="typeName in incomeExpenseName" label="{{typeName.ListName}}">
<option ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
</optgroup>
</select>
<span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}"> <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
@ -365,7 +384,27 @@
required/> required/>
<span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span> <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
</div> </div>
<div class="col-md-4" ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
<div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
<label>
Amount <span class="symbol required"></span>
</label>
<input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
ng-model="myModelAdd.amount" required/>
<span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
</div>
</div>
<div class="row">
<div class="col-md-4" ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
<label> <label>
Description <span class="symbol required"></span> Description <span class="symbol required"></span>
</label> </label>
@ -377,36 +416,15 @@
</div> </div>
</div> <!-- <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
<div class="row">
<div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
<label for="form-field-select-2">
Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
<option value="" disabled selected>Select Type</option>
<optgroup ng-repeat="typeName in incomeExpenseName" label="{{typeName.ListName}}">
<option ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
</optgroup>
<!-- <option value="" disabled selected>Select Type</option>
<option ng-repeat="typeItem in getTypes" value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
</select>
<span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
</div>
<div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
<label> <label>
Amount <span class="symbol required"></span> Amount <span class="symbol required"></span>
</label> </label>
<input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control" <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
ng-model="myModelAdd.amount" required/> ng-model="myModelAdd.amount" required/>
<span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span> <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
<!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
</div> </div> -->
<div class="col-md-4"> <div class="col-md-4">
<label> <label>
Comments Comments