monthly and yearly cb report textbox issues fixed
This commit is contained in:
parent
6c01ea7ec5
commit
a2a8032058
@ -1059,16 +1059,22 @@ class report extends BaseController
|
|||||||
//This Function used to get and display current monthly data (link = form monthly tile option)//
|
//This Function used to get and display current monthly data (link = form monthly tile option)//
|
||||||
//public function monthexpenses()
|
//public function monthexpenses()
|
||||||
public function load_monthly_incexp()
|
public function load_monthly_incexp()
|
||||||
{
|
{ $data['monthyearvalue'] = '';
|
||||||
$this->global['pageTitle'] = 'Resico : Cashbook Monthly Reports';
|
$this->global['pageTitle'] = 'Resico : Cashbook Monthly Reports';
|
||||||
$this->loadviews("cashbookmthlyreport",$this->global,NULL, NULL);
|
$this->loadviews("cashbookmthlyreport",$this->global,$data, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function monthly_incexp()
|
public function monthly_incexp()
|
||||||
{
|
{
|
||||||
|
$monthyearvalue = $this->input->post('monthyear');
|
||||||
|
$this->global['pageTitle'] = 'Resico : Cashbook Monthly Reports';
|
||||||
|
|
||||||
$this->global['pageTitle'] = 'Resico : Cashbook Monthly Reports';
|
if($monthyearvalue == ''){
|
||||||
$monthyearvalue = $this->input->post('monthyear');
|
|
||||||
|
$data['monthyearvalue'] = '';
|
||||||
|
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
|
||||||
$data['monthyearvalue'] = $monthyearvalue;
|
$data['monthyearvalue'] = $monthyearvalue;
|
||||||
$monthyear = explode("-",$monthyearvalue);
|
$monthyear = explode("-",$monthyearvalue);
|
||||||
@ -1087,54 +1093,48 @@ class report extends BaseController
|
|||||||
|
|
||||||
$data['monthlyreport']=$this->dahsboard_Model->month_incexp_report($month,$year);
|
$data['monthlyreport']=$this->dahsboard_Model->month_incexp_report($month,$year);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->loadviews("cashbookmthlyreport",$this->global,$data, NULL);
|
||||||
$this->loadviews("cashbookmthlyreport",$this->global,$data, NULL);
|
|
||||||
//cashbookmonthlyexpenses=>cashbookmthlyreport
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//This Function used to get and display current fin year data (link = form yearly tile option)//
|
|
||||||
//public function yearexpenses()
|
|
||||||
public function load_yearly_incexp()
|
|
||||||
{
|
|
||||||
$this->global['pageTitle'] = 'Resico : Cashbook Yearly Reports';
|
|
||||||
|
|
||||||
$data['financialyear']=$this->dahsboard_Model->cashbookfinyear();
|
|
||||||
|
|
||||||
$this->loadviews("cashbookyearlyreport",$this->global,$data, NULL);
|
|
||||||
//cashbookyearlyexpenses=>cashbookyearlyreport
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public function yearly_incexp()
|
public function yearly_incexp()
|
||||||
{
|
{
|
||||||
$this->global['pageTitle'] = 'Resico : Cashbook Yearly Reports';
|
$this->global['pageTitle'] = 'Resico : Cashbook Yearly Reports';
|
||||||
|
|
||||||
$fyear = $this->input->post('financialyear');
|
$data['financialyear']=$this->dahsboard_Model->cashbookfinyear();
|
||||||
|
|
||||||
|
$fyear = $this->input->post('financialyear');
|
||||||
|
|
||||||
|
if($fyear ==''){
|
||||||
|
|
||||||
|
$data['fyears'] = '';
|
||||||
|
|
||||||
|
}else{
|
||||||
|
|
||||||
|
$data['fyears'] = $fyear;
|
||||||
|
//echo $data['fyears'];
|
||||||
$fa=substr( $fyear,0,-5);
|
$fa=substr( $fyear,0,-5);
|
||||||
$aa=substr( $fyear,5,5);
|
$aa=substr( $fyear,5,5);
|
||||||
$finyear = explode("-",$fyear);
|
$finyear = explode("-",$fyear);
|
||||||
|
|
||||||
|
$b4oneyear = $finyear[0] -1;
|
||||||
|
$b4twoyear = $finyear[1] -1;
|
||||||
|
|
||||||
|
$data['yearlyreport']=$this->dahsboard_Model->yearexpensereport($fa,$aa);
|
||||||
|
|
||||||
|
$data['b4finyeartotal']=$this->dahsboard_Model->yearbeforetotal($b4oneyear,$b4twoyear);
|
||||||
|
|
||||||
|
|
||||||
$b4oneyear = $finyear[0] -1;
|
//$this->loadviews("cashbookyearlyreport",$this->global,$data, NULL);
|
||||||
$b4twoyear = $finyear[1] -1;
|
|
||||||
|
|
||||||
$data['yearlyreport']=$this->dahsboard_Model->yearexpensereport($fa,$aa);
|
|
||||||
$data['financialyear']=$this->dahsboard_Model->cashbookfinyear();
|
|
||||||
$data['b4finyeartotal']=$this->dahsboard_Model->yearbeforetotal($b4oneyear,$b4twoyear);
|
|
||||||
$date['fyears'] = array('fina' => $fyear);
|
|
||||||
$this->loadviews("cashbookyearlyreport",$this->global,$data, NULL);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
$this->loadviews("cashbookyearlyreport",$this->global,$data, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function cashbookdepartment()
|
public function cashbookdepartment()
|
||||||
|
|||||||
@ -10,6 +10,7 @@ $monthyr = '';
|
|||||||
$mthyr = '' ;
|
$mthyr = '' ;
|
||||||
$monthNum = '' ;
|
$monthNum = '' ;
|
||||||
$yearNum = '';
|
$yearNum = '';
|
||||||
|
|
||||||
if(!empty($prevmonthtotal))
|
if(!empty($prevmonthtotal))
|
||||||
{
|
{
|
||||||
foreach ($prevmonthtotal as $prevttl){
|
foreach ($prevmonthtotal as $prevttl){
|
||||||
@ -109,8 +110,12 @@ $(function() {
|
|||||||
<form role="form" id="monthlycashbook" action="<?php echo base_url() ?>report/monthly_incexp" method="post" enctype="multipart/form-data">
|
<form role="form" id="monthlycashbook" action="<?php echo base_url() ?>report/monthly_incexp" method="post" enctype="multipart/form-data">
|
||||||
<div class="col-md-8">
|
<div class="col-md-8">
|
||||||
<label for="monthyear">Month year :</label>
|
<label for="monthyear">Month year :</label>
|
||||||
<input name="monthyear" id="monthyear" class="date-picker" />
|
<?php if($monthyearvalue !=''){?>
|
||||||
</div>
|
<input name="monthyear" id="monthyear" class="date-picker" value="<?php echo $monthyearvalue; ?>"/>
|
||||||
|
<?php } else{ ?>
|
||||||
|
<input name="monthyear" id="monthyear" class="date-picker"/>
|
||||||
|
<?php } ?>
|
||||||
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
<input type="submit" class="btn btn-success" id="monthly" name="btn_submit" value="View Report">
|
<input type="submit" class="btn btn-success" id="monthly" name="btn_submit" value="View Report">
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -8,6 +8,9 @@ $payamt=0.00;
|
|||||||
$recamt = 0.00;
|
$recamt = 0.00;
|
||||||
$zero=0.00;
|
$zero=0.00;
|
||||||
$curr_balances=0.00;
|
$curr_balances=0.00;
|
||||||
|
//print_r($fyears);
|
||||||
|
|
||||||
|
|
||||||
if(!empty($Indiancurrency))
|
if(!empty($Indiancurrency))
|
||||||
{
|
{
|
||||||
foreach ($Indiancurrency as $inr)
|
foreach ($Indiancurrency as $inr)
|
||||||
@ -25,6 +28,7 @@ if(!empty($Indiancurrency))
|
|||||||
$recamt = $prevttl->receipt_amt;
|
$recamt = $prevttl->receipt_amt;
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
|
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css">
|
||||||
@ -57,13 +61,25 @@ if(!empty($Indiancurrency))
|
|||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="content-wrapper">
|
<div class="content-wrapper">
|
||||||
<section class="content">
|
<section class="content">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="box-header">
|
<div class="box-header">
|
||||||
|
|
||||||
<center><h3 class="box-title"><p style="color:#5d0411"><b>Year Report <?php if(!empty($finyear)){ echo '('.$finyear.')'; } else { echo ''; }//echo $finyear?></b></p></h3></center>
|
<center><h3 class="box-title"><p style="color:#5d0411"><b>Year Report <?php if(!empty ($fyears) ){
|
||||||
|
echo '('.$fyears.')'; }
|
||||||
|
else { echo ''; }//echo $finyear?></b></p></h3></center>
|
||||||
|
|
||||||
<!-- <center><h3 class="box-title"><p style="color:#5d0411"><b>Month Report <?php if($monthyr != ''){ echo '('.$monthName.'-'.$yearNum.')'; } else { echo ''; }//<?php ($month=date('F');echo $month;)?></b></p></h3></center> -->
|
<!-- <center><h3 class="box-title"><p style="color:#5d0411"><b>Month Report <?php if($monthyr != ''){ echo '('.$monthName.'-'.$yearNum.')'; } else { echo ''; }//<?php ($month=date('F');echo $month;)?></b></p></h3></center> -->
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 col-md-6 col-md-offset-6">
|
<div class="col-xs-12 col-md-6 col-md-offset-6">
|
||||||
@ -172,6 +188,9 @@ if(!empty($Indiancurrency))
|
|||||||
// Bootstrap datepicker
|
// Bootstrap datepicker
|
||||||
// Set up your table
|
// Set up your table
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
table = $('#yearlypayment').DataTable( {
|
table = $('#yearlypayment').DataTable( {
|
||||||
"dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
|
"dom": "<'row'<'col-md-3'l><'col-md-9'Bf>>" +
|
||||||
"<'row'<'col-md-6'><'col-md-6'>>" +
|
"<'row'<'col-md-6'><'col-md-6'>>" +
|
||||||
@ -192,6 +211,9 @@ $(document).ready(function() {
|
|||||||
'colvis'
|
'colvis'
|
||||||
]
|
]
|
||||||
} );
|
} );
|
||||||
|
<?php if(!empty ($fyears) ){ ?>
|
||||||
|
$('#financialyear option[value="<?php echo $fyears ?>"]').attr("selected", "selected");
|
||||||
|
<?php } ?>
|
||||||
} );
|
} );
|
||||||
|
|
||||||
$('#yearly').click(function() {
|
$('#yearly').click(function() {
|
||||||
|
|||||||
@ -135,7 +135,7 @@ div.dt-buttons {
|
|||||||
<div class="info-box">
|
<div class="info-box">
|
||||||
<span class="info-box-icon bg-aqua" style="height: 90px;padding:25px;"><i<i class="fa fa-spinner"></span>
|
<span class="info-box-icon bg-aqua" style="height: 90px;padding:25px;"><i<i class="fa fa-spinner"></span>
|
||||||
<div class="info-box-content">
|
<div class="info-box-content">
|
||||||
<span class="info-box-number"><a href="<?php echo base_url().'report/load_monthly_incexp' ?>" data-toggle="tooltip" title="Click here to View Monthly payments"><?php echo "This Month" ?></a></span>
|
<span class="info-box-number"><a href="<?php echo base_url().'report/monthly_incexp' ?>" data-toggle="tooltip" title="Click here to View Monthly payments"><?php echo "This Month" ?></a></span>
|
||||||
<span class="info-box-text text-center"><strong>Receipt :</strong>₹<?php echo number_format($month_in,2,'.',''); ?></span>
|
<span class="info-box-text text-center"><strong>Receipt :</strong>₹<?php echo number_format($month_in,2,'.',''); ?></span>
|
||||||
<span class="info-box-text text-center"><strong>Payment :</strong>₹<?php echo number_format($month_ex,2,'.',''); ?></span>
|
<span class="info-box-text text-center"><strong>Payment :</strong>₹<?php echo number_format($month_ex,2,'.',''); ?></span>
|
||||||
</div>
|
</div>
|
||||||
@ -148,7 +148,7 @@ div.dt-buttons {
|
|||||||
<div class="info-box">
|
<div class="info-box">
|
||||||
<span class="info-box-icon bg-green" style="height: 90px;padding:25;"><i class="fa fa-industry" style="padding: 5px;"></i></span>
|
<span class="info-box-icon bg-green" style="height: 90px;padding:25;"><i class="fa fa-industry" style="padding: 5px;"></i></span>
|
||||||
<div class="info-box-content">
|
<div class="info-box-content">
|
||||||
<span class="info-box-number"><a href="<?php echo base_url().'report/load_yearly_incexp' ?>" data-toggle="tooltip" title="Click here to View Yearly payments"><?php echo "This Year" ?></a></span>
|
<span class="info-box-number"><a href="<?php echo base_url().'report/yearly_incexp' ?>" data-toggle="tooltip" title="Click here to View Yearly payments"><?php echo "This Year" ?></a></span>
|
||||||
<span class="info-box-text text-center"><strong>Receipt :</strong>₹<?php echo number_format($year_in,2,'.',''); ?></span>
|
<span class="info-box-text text-center"><strong>Receipt :</strong>₹<?php echo number_format($year_in,2,'.',''); ?></span>
|
||||||
<span class="info-box-text text-center"><strong>Payment :</strong>₹<?php echo number_format($year_ex,2,'.',''); ?></span>
|
<span class="info-box-text text-center"><strong>Payment :</strong>₹<?php echo number_format($year_ex,2,'.',''); ?></span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user