RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock changes 23-04-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-04-23 15:00:50 +05:30
parent c249f9d69d
commit 457585c5ad
9 changed files with 187 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Controllers/Report.php
View File

@ -79,6 +79,11 @@ class Report extends BaseController
$agt = $this->request->getPost('aging_to'); $agt = $this->request->getPost('aging_to');
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['pending_list'] = $this->dahsboard_Model->req_list($fa, $aa, $m, $frm, $t, $agf, $agt); $data['pending_list'] = $this->dahsboard_Model->req_list($fa, $aa, $m, $frm, $t, $agf, $agt);
$data['givenYear'] = $ab ;
$data['givenMonth']= $m ;
$data['givenFrm'] = $frm ;
$data['givenTo'] = $t;
//print_r($data); //print_r($data);
} }
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
@ -105,7 +110,13 @@ class Report extends BaseController
$agt = $this->request->getPost('total_order_value_To'); $agt = $this->request->getPost('total_order_value_To');
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['rel_po'] = $this->dahsboard_Model->report_relpo($fa, $aa, $m, $frm, $t, $agf, $agt); $data['rel_po'] = $this->dahsboard_Model->report_relpo($fa, $aa, $m, $frm, $t, $agf, $agt);
//print_r($data);
$data['givenYear'] = $ab ;
$data['givenMonth']= $m ;
$data['givenFrm'] = $frm ;
$data['givenTo'] = $t;
$data['givenAgf'] = $agf;
$data['givenAgt'] = $agt;
@ -155,6 +166,8 @@ class Report extends BaseController
$aa = substr((string)$ab, 5, 5); $aa = substr((string)$ab, 5, 5);
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['Total'] = $this->dahsboard_Model->report_total($fa, $aa); $data['Total'] = $this->dahsboard_Model->report_total($fa, $aa);
$data['givenYear'] = $ab ;
} }
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
@ -318,6 +331,7 @@ class Report extends BaseController
$b = substr((string)$ab, 5, 5); $b = substr((string)$ab, 5, 5);
$data['year'] = $this->dahsboard_Model->report_year_wise($a, $b); $data['year'] = $this->dahsboard_Model->report_year_wise($a, $b);
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['givenFinancialYear'] = $ab;
//$this->loadviews("Report_year_wise",$this->global,$data, NULL); //$this->loadviews("Report_year_wise",$this->global,$data, NULL);
} }
@ -377,6 +391,13 @@ class Report extends BaseController
$data['cust'] = $this->dahsboard_Model->customer_name(); $data['cust'] = $this->dahsboard_Model->customer_name();
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['spurchse'] = $this->dahsboard_Model->report_supplier($cname, $fa, $aa, $m, $frm, $t); $data['spurchse'] = $this->dahsboard_Model->report_supplier($cname, $fa, $aa, $m, $frm, $t);
$data['cname'] = $cname;
$data['ab'] = $ab;
$data['m'] = $m;
$data['frm'] = $frm;
$data['t'] = $t;
} }
$data['material'] = $this->dahsboard_Model->material_name(); $data['material'] = $this->dahsboard_Model->material_name();
$data['cust'] = $this->dahsboard_Model->customer_name(); $data['cust'] = $this->dahsboard_Model->customer_name();
@ -400,6 +421,10 @@ class Report extends BaseController
$data['cust'] = $this->dahsboard_Model->customer_name(); $data['cust'] = $this->dahsboard_Model->customer_name();
$data['finyear'] = $this->dahsboard_Model->report_finyear(); $data['finyear'] = $this->dahsboard_Model->report_finyear();
$data['spurchse'] = $this->dahsboard_Model->report_consolidate($cname, $fa, $aa); $data['spurchse'] = $this->dahsboard_Model->report_consolidate($cname, $fa, $aa);
$data['cname'] = $cname;
$data['ab'] = $ab;
} }
$data['material'] = $this->dahsboard_Model->material_name(); $data['material'] = $this->dahsboard_Model->material_name();
$data['cust'] = $this->dahsboard_Model->customer_name(); $data['cust'] = $this->dahsboard_Model->customer_name();

49
app/Views/Report_POreleased.php
View File

@ -52,9 +52,9 @@
<div class="page-title-right"> <div class="page-title-right">
<ol class="breadcrumb m-0"> <ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
<li class="breadcrumb-item"><a href="javascript: void(0);"></a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
<li class="breadcrumb-item active"> <li class="breadcrumb-item active">
<h4 class="page-title"><b> </b></h4> <h4 class="page-title"><b> Order Value Released </b></h4>
</li> </li>
</ol> </ol>
</div> </div>
@ -82,12 +82,15 @@
<option value="">Select Year</option> <option value="">Select Year</option>
<?php <?php
foreach($finyear as $item): foreach($finyear as $item):
{?> {?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option> <option
<?php echo isset($givenYear) && $item->financial_year == $givenYear ? "selected" : "" ?>
value="<?php echo $item->financial_year;?>">
<?php echo $item->financial_year ; ?>
</option>
<?php } endforeach; ?> <?php } endforeach; ?>
@ -101,19 +104,17 @@
</label> </label>
<div class="input-group"> <div class="input-group">
<select class="form-control" id="month" name="month"> <select class="form-control" id="month" name="month">
<?php $monthArray=['January',"February","March","April",
"May","June","July","August","September","October",
"November","December"] ?>
<option value="">Select Month</option> <option value="">Select Month</option>
<option value="January">January</option> <?php foreach($monthArray as $month): ?>
<option value="February">February</option> <option value="<?=$month?>" <?php if(isset($givenMonth) && $givenMonth == $month){ echo 'selected'; } ?> >
<option value="March">March</option> <?=$month?>
<option value="April">April</option> </option>
<option value="May">May</option> <?php endforeach ?>
<option value="June">June</option>
<option value="July">July</option>
<option value="August">August</option>
<option value="September">September</option>
<option value="October">October</option>
<option value="November">November</option>
<option value="December">December</option>
</select> </select>
</div> </div>
</div> </div>
@ -122,7 +123,8 @@
<?php echo 'Total Order Value From'; ?> <?php echo 'Total Order Value From'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="total_order_value_From" id="total_order_value_From" style="padding:4px;"> <input class="form-control" name="total_order_value_From" id="total_order_value_From" style="padding:4px;"
value="<?php echo isset($givenAgf) ? $givenAgf : "" ?>">
</span> </span>
</div> </div>
</div> </div>
@ -131,7 +133,8 @@
<?php echo 'Total Order Value To'; ?> <?php echo 'Total Order Value To'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="total_order_value_To" id="total_order_value_To" style="padding:4px;"> <input class="form-control" name="total_order_value_To" id="total_order_value_To" style="padding:4px;"
value="<?php echo isset($givenAgt) ? $givenAgt : "" ?>">
</span> </span>
</div> </div>
@ -143,7 +146,8 @@
<?php echo 'From Date'; ?> <?php echo 'From Date'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker"> <input name="from_date" id="max-date" class="form-control datepicker"
value="<?php echo isset($givenFrm) ? $givenFrm : "" ?>">
</div> </div>
</div> </div>
@ -152,12 +156,13 @@
<?php echo 'To Date'; ?> <?php echo 'To Date'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker"> <input name="to_date" id="min-date" class="form-control datepicker"
value="<?php echo isset($givenTo) ? $givenTo : "" ?>">
</div> </div>
</div> </div>
<div class="col-md-3 col-md-offset-10"><br> <div class="col-md-6 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">
@ -312,6 +317,7 @@ $( function() {
dateFormat: 'dd-mm-yy', dateFormat: 'dd-mm-yy',
defaultDate: "+0d", defaultDate: "+0d",
changeMonth: true, changeMonth: true,
orientation : "botttom"
//numberOfMonths: 1 //numberOfMonths: 1
}) })
.on( "change", function() { .on( "change", function() {
@ -321,6 +327,7 @@ $( function() {
dateFormat: 'dd-mm-yy', dateFormat: 'dd-mm-yy',
defaultDate: "+0d", defaultDate: "+0d",
changeMonth: true, changeMonth: true,
orientation : "bottom"
//numberOfMonths: 1 //numberOfMonths: 1
}) })
.on( "change", function() { .on( "change", function() {

36
app/Views/Report_consolidate.php
View File

@ -71,8 +71,8 @@
<form method="post" action="<?php echo base_url('Report_consolidate'); ?>"> <form method="post" action="<?php echo base_url('Report_consolidate'); ?>">
<div class="form-group has-feedback"> <div class="row has-feedback">
<div class="col-md-4"> <div class="col-3">
<label for="client_name"> <label for="client_name">
<?php echo 'Supplier'; ?> <?php echo 'Supplier'; ?>
</label> </label>
@ -84,7 +84,12 @@
{?> {?>
<option value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ; ?></option> <option
<?php echo isset($cname) && ($cname == $item->SupplierName) ? "selected" : "" ;
?>
value="<?php echo $item->SupplierName;?>"><?php echo $item->SupplierName ; ?></option>
<?php } endforeach; ?> <?php } endforeach; ?>
@ -94,7 +99,7 @@
</div> </div>
<div class="col-md-2"> <div class="col-3">
<label for="to_date"> <label for="to_date">
<?php echo 'year'; ?> <?php echo 'year'; ?>
</label> </label>
@ -104,28 +109,41 @@
<?php <?php
foreach($finyear as $item): foreach($finyear as $item)
{?> {?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option> <option
<?php echo (isset($ab) && $ab == ($item->financial_year) )? "selected" : "" ?>
value="<?php echo $item->financial_year;?>"
>
<?php echo $item->financial_year ; ?>
</option>
<?php } endforeach; ?> <?php } ?>
</select> </select>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-3 ">
<label for="">Select Value/Quantity </label>
<br>
<br> <br>
<label><input type="radio" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label> <label><input type="radio" name="colorRadio" id="value" onclick="toggleTables('2')" value="tab"> Value</label>
&nbsp;
<label><input type="radio" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label> <label><input type="radio" name="colorRadio" id="qty" onclick="toggleTables('1')" value="ta" checked> Quantity</label>
</div> </div>
<div class="col-md-2 "><br> <div class="col-3 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">

10
app/Views/Report_openorder.php
View File

@ -52,9 +52,9 @@
<div class="page-title-right"> <div class="page-title-right">
<ol class="breadcrumb m-0"> <ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
<li class="breadcrumb-item"><a href="javascript: void(0);"></a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
<li class="breadcrumb-item active"> <li class="breadcrumb-item active">
<h4 class="page-title"><b> </b></h4> <h4 class="page-title"><b> Open Orders - Pending </b></h4>
</li> </li>
</ol> </ol>
</div> </div>
@ -123,7 +123,7 @@
<?php echo 'Total Order Value From'; ?> <?php echo 'Total Order Value From'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="total_order_value_From" id="total_order_value_From" style="padding:4px;"> <input class="form-control" name="total_order_value_From" id="total_order_value_From" style="padding:4px;">
</span> </span>
</div> </div>
</div> </div>
@ -132,7 +132,7 @@
<?php echo 'Total Order Value To'; ?> <?php echo 'Total Order Value To'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="total_order_value_To" id="total_order_value_To" style="padding:4px;"> <input class="form-control" name="total_order_value_To" id="total_order_value_To" style="padding:4px;">
</span> </span>
</div> </div>
@ -160,7 +160,7 @@
</div> </div>
</div> </div>
<div class="col-md-3 col-md-offset-10"><br> <div class="col-md-6 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">

17
app/Views/Report_pending_purchase.php
View File

@ -71,7 +71,7 @@
<form method="post" action="<?php echo base_url("Report_pending_purchase"); ?>"> <form method="post" action="<?php echo base_url("Report_pending_purchase"); ?>">
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-4"> <div class="col-3">
<label for="client_name"> <label for="client_name">
<?php echo 'Supplier'; ?> <?php echo 'Supplier'; ?>
</label> </label>
@ -84,7 +84,7 @@
endforeach; ?> endforeach; ?>
</select> </select>
</div> </div>
<div class="col-4"> <div class="col-3">
<label for="client_name"> <label for="client_name">
<?php echo 'Material'; ?> <?php echo 'Material'; ?>
</label> </label>
@ -97,7 +97,7 @@
endforeach; ?> endforeach; ?>
</select> </select>
</div> </div>
<div class="col-2"> <div class="col-3">
<label for="to_date"> <label for="to_date">
<?php echo 'Year'; ?> <?php echo 'Year'; ?>
</label> </label>
@ -110,7 +110,7 @@
endforeach; ?> endforeach; ?>
</select> </select>
</div> </div>
<div class="col-2"> <div class="col-3">
<label for="to_date"> <label for="to_date">
<?php echo 'Month'; ?> <?php echo 'Month'; ?>
</label> </label>
@ -127,7 +127,7 @@
</div> </div>
<br> <br>
<div class="row"> <div class="row">
<div class="col-2"> <div class="col-3">
<label for="from_date"> <label for="from_date">
<?php echo 'From Date'; ?> <?php echo 'From Date'; ?>
</label> </label>
@ -135,7 +135,7 @@
<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($from_date)){ echo $from_date; } ?>"> <input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
</div> </div>
</div> </div>
<div class="col-2"> <div class="col-3">
<label for="to_date"> <label for="to_date">
<?php echo 'To Date'; ?> <?php echo 'To Date'; ?>
</label> </label>
@ -144,7 +144,7 @@
</div> </div>
</div> </div>
<div class="col-4"> <div class="col-3">
<label for="purchaseorder_number"> <label for="purchaseorder_number">
<?php echo 'Purchase order number'; ?> <?php echo 'Purchase order number'; ?>
</label> </label>
@ -157,8 +157,7 @@
endforeach; ?> endforeach; ?>
</select> </select>
</div> </div>
<div class="col-md-2"></div> <div class="col-3 text-right"><br>
<div class="col-md-2 text-right"><br>
<input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_pending_purchase') ?>';"> <input type="button" class="btn btn-danger m-2" value="Reset" onclick="window.location.href='<?= base_url('Report_pending_purchase') ?>';">
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">

34
app/Views/Report_supplier.php
View File

@ -73,7 +73,7 @@
<form method="post" action="<?php echo base_url('Report_supplier'); ?>"> <form method="post" action="<?php echo base_url('Report_supplier'); ?>">
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-4"> <div class="col-3">
<label for="client_name"> <label for="client_name">
<?php echo 'Supplier'; ?> <?php echo 'Supplier'; ?>
</label> </label>
@ -86,20 +86,7 @@
endforeach; ?> endforeach; ?>
</select> </select>
</div> </div>
<div class="col-4"> <div class="col-3">
<label for="client_name">
<?php echo 'Material'; ?>
</label>
<select class="form-control" id="item_name" name="item_name">
<option value="">Select Material</option>
<?php
foreach ($material as $it): { ?>
<option <?php if(isset($prod) && ($prod == $it->MaterialName)){ echo 'selected'; } ?> value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName; ?></option>
<?php }
endforeach; ?>
</select>
</div>
<div class="col-2">
<label for="to_date"> <label for="to_date">
<?php echo 'Year'; ?> <?php echo 'Year'; ?>
</label> </label>
@ -112,7 +99,7 @@
endforeach; ?> endforeach; ?>
</select> </select>
</div> </div>
<div class="col-2"> <div class="col-3">
<label for="to_date"> <label for="to_date">
<?php echo 'Month'; ?> <?php echo 'Month'; ?>
</label> </label>
@ -126,10 +113,7 @@
</select> </select>
</div> </div>
</div> </div>
</div> <div class="col-3">
<br>
<div class="row">
<div class="col-2">
<label for="from_date"> <label for="from_date">
<?php echo 'From Date'; ?> <?php echo 'From Date'; ?>
</label> </label>
@ -137,7 +121,11 @@
<input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($frm)){ echo $frm; } ?>"> <input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($frm)){ echo $frm; } ?>">
</div> </div>
</div> </div>
<div class="col-2"> </div>
<br>
<div class="row">
<div class="col-3">
<label for="to_date"> <label for="to_date">
<?php echo 'To Date'; ?> <?php echo 'To Date'; ?>
</label> </label>
@ -146,8 +134,8 @@
</div> </div>
</div> </div>
<div class="col-md-6"></div> <div class="col-6"></div>
<div class="col-md-2 text-right"><br> <div class="col-3 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">
</div> </div>

28
app/Views/Report_totalorders.php
View File

@ -41,9 +41,9 @@
<div class="page-title-right"> <div class="page-title-right">
<ol class="breadcrumb m-0"> <ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
<li class="breadcrumb-item"><a href="javascript: void(0);"></a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Requisation</a></li>
<li class="breadcrumb-item active"> <li class="breadcrumb-item active">
<h4 class="page-title"><b> </b></h4> <h4 class="page-title"><b> Total Orders </b></h4>
</li> </li>
</ol> </ol>
</div> </div>
@ -59,25 +59,34 @@
<div class="card-body"> <div class="card-body">
<form method="post" action=" "> <form method="post" action=" ">
<div class="col-md-2"> <div class="row">
<div class="col-2">
<label for="">Select Budget Year </label>
<select class="form-control" id="financialyear" name="financialyear"> <select class="form-control" id="financialyear" name="financialyear">
<option value="">Select Budget Year</option> <option value="">Select Year</option>
<?php <?php
foreach($finyear as $item): foreach($finyear as $item):
{?> {?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option> <option
<?php echo isset($givenYear) && $givenYear == $item->financial_year
? "selected" : "" ?>
value="<?php echo $item->financial_year;?>">
<?php echo $item->financial_year ; ?></option>
<?php } endforeach; ?> <?php } endforeach; ?>
</select> </select>
</div> </div>
<div class="col-md-2"> <div class="col-10 mt-2 text-right">
<input type="submit" class="btn btn-success" id="year" name="btn_submit" <input type="submit" class="btn btn-success" id="year" name="btn_submit"
value="View Report"> value="View Report">
</div> </div>
</div>
</form> </form>
<table id="req" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;"> <table id="req" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
@ -179,3 +188,10 @@ $(document).ready(function() {
</script> </script>
<script>
$(document).ready(function(){
$('#financialyear').select2();
})
</script>

16
app/Views/Report_year_wise.php
View File

@ -4,9 +4,8 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$("#client_name").select2();
$("#item_name").select2(); $("#financialyear").select2();
$("#purchaseorder_number").select2();
}); });
@ -56,7 +55,7 @@
<li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Reports</a></li>
<li class="breadcrumb-item"><a href="javascript: void(0);">Purchase</a></li> <li class="breadcrumb-item"><a href="javascript: void(0);">Purchase</a></li>
<li class="breadcrumb-item active"> <li class="breadcrumb-item active">
<h4 class="page-title"><b> Report - Purchase </b></h4> <h4 class="page-title"><b> Report - Year Wise </b></h4>
</li> </li>
</ol> </ol>
</div> </div>
@ -74,18 +73,21 @@
<form method="post" action="<?php echo base_url('Report_year_wise'); ?>"> <form method="post" action="<?php echo base_url('Report_year_wise'); ?>">
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-2">
<label for="financialyear"> Select Year</label>
<select class="form-control" id="financialyear" name="financialyear"> <select class="form-control" id="financialyear" name="financialyear">
<option value="">Select Year</option> <option value="">Select Year</option>
<?php <?php
foreach($finyear as $item): foreach($finyear as $item):
{?> {?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option> <option
<?php echo isset($givenFinancialYear) && $givenFinancialYear == $item->financial_year ? "selected" : "" ?>
value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option>
<?php } endforeach; ?> <?php } endforeach; ?>
</select> </select>
</div> </div>
<div class="col-md-6"></div> <div class="col-md-8"></div>
<div class="col-md-2 text-right"><br> <div class="col-md-2 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">

55
app/Views/report_pendingreqst.php
View File

@ -84,11 +84,20 @@
<?php <?php
foreach($finyear as $item): foreach($finyear as $item):
{?> { ; ?>
<option value="<?php echo $item->financial_year;?>"><?php echo $item->financial_year ; ?></option> <option
<?php echo (isset($givenYear) && $item->financial_year == $givenYear)?"selected":""; ?>
value="<?php echo $item->financial_year;?>"
>
<?php echo $item->financial_year ; ?>
</option>
<?php } endforeach; ?> <?php } endforeach; ?>
@ -103,19 +112,18 @@
</label> </label>
<div class="input-group"> <div class="input-group">
<select class="form-control" id="month" name="month"> <select class="form-control" id="month" name="month">
<?php $monthArray=['January',"February","March","April",
"May","June","July","August","September","October",
"November","December"] ?>
<option value="">Select Month</option> <option value="">Select Month</option>
<option value="January">January</option> <?php foreach($monthArray as $month): ?>
<option value="February">February</option> <option value="<?=$month?>" <?php if(isset($givenMonth) && $givenMonth == $month){ echo 'selected'; } ?> >
<option value="March">March</option> <?=$month?>
<option value="April">April</option> </option>
<option value="May">May</option> <?php endforeach ?>
<option value="June">June</option>
<option value="July">July</option>
<option value="August">August</option>
<option value="September">September</option>
<option value="October">October</option>
<option value="November">November</option>
<option value="December">December</option>
</select> </select>
</div> </div>
</div> </div>
@ -151,8 +159,9 @@
<?php echo 'From Date'; ?> <?php echo 'From Date'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker"> <input name="from_date" id="max-date" class="form-control datepicker"
value="<?php echo isset($givenFrm) ? $givenFrm:"" ?>"
>
</div> </div>
</div> </div>
@ -162,13 +171,14 @@
<?php echo 'To Date'; ?> <?php echo 'To Date'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker"> <input name="to_date" id="min-date" class="form-control datepicker"
value="<?php echo isset($givenTo) ? $givenTo:"" ?>"
>
</div> </div>
</div> </div>
<div class="col-md-3"></div>
<div class="col-md-3 "><br> <div class="col-md-6 text-right"><br>
<input type="submit" class="btn btn-success" name="btn_submit" <input type="submit" class="btn btn-success" name="btn_submit"
value="View Report"> value="View Report">
</div> </div>
@ -260,9 +270,10 @@ $( function() {
//var dateFormat = "mm/dd/yy", //var dateFormat = "mm/dd/yy",
from = $( "#min-date" ) from = $( "#min-date" )
.datepicker({ .datepicker({
dateFormat: "dd-mm-yy", format: "mm/dd/yyyy",
defaultDate: "+0d", defaultDate: "+0d",
changeMonth: true, changeMonth: true,
orientation:"bottom"
//numberOfMonths: 1 //numberOfMonths: 1
}) })
@ -270,9 +281,9 @@ $( function() {
to.datepicker("option", "minDate", getDate( this ) ); to.datepicker("option", "minDate", getDate( this ) );
}), }),
to = $( "#max-date" ).datepicker({ to = $( "#max-date" ).datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d", defaultDate: "+0d",
changeMonth: true, changeMonth: true,
orientation : "bottom"
//numberOfMonths: 1 //numberOfMonths: 1
}) })