SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu allignment and batchcard controller

Browse Source
This commit is contained in:
gandhimathi 2018-05-09 17:44:00 +05:30
parent bf0eca549a
commit 150844c113
11 changed files with 82 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/controllers/batchcard.php
View File

@ -639,44 +639,44 @@ class batchcard extends BaseController
{
case 1:
$sn = '(ed_receipt - ed_issues) as lastmonthclosinged';
$sn = '(sum(ed_receipt) - sum(ed_issues)) as lastmonthclosinged';
$sd1 = 'ed_receipt';
$sd2 = 'ed_issues';
break;
case 2:
$sn = '(rotary_input - rotary_output) as lastmonthclosingrotary';
$sn = '(sum(rotary_input) - sum(rotary_output)) as lastmonthclosingrotary';
$sd1 = 'rotary_input as ed_receipt';
$sd2 = 'rotary_output as ed_issues';
break;
case 3:
$sn = '(diesel_dryer_receipt - diesel_dryer_consumption) as lastmonthclosingdryerdiesel';
$sn = '(sum(diesel_dryer_receipt) - sum(diesel_dryer_consumption)) as lastmonthclosingdryerdiesel';
$sd1 = 'diesel_dryer_receipt as ed_receipt';
$sd2 = 'diesel_dryer_consumption as ed_issues';
break;
case 4:
$sn = '(diesel_receipt - diesel_consumption) as lastmonthclosingbull';
$sn = '(sum(diesel_receipt) - sum(diesel_consumption)) as lastmonthclosingbull';
$sd1 = 'diesel_receipt as ed_receipt';
$sd2 = 'diesel_consumption as ed_issues';
break;
case 5:
$sn = '(trp_roughsand_receipt - trp_roughsand_issues) as lastmonthclosingrough';
$sn = '(sum(trp_roughsand_receipt) - sum(trp_roughsand_issues)) as lastmonthclosingrough';
$sd1 = 'trp_roughsand_receipt as ed_receipt';
$sd2 = 'trp_roughsand_issues as ed_issues';
break;
case 6:
$sn = '(trp_finesand_receipt - trp_finesand_issues) as lastmonthclosingfine';
$sn = '(sum(trp_finesand_receipt) - sum(trp_finesand_issues)) as lastmonthclosingfine';
$sd1 = 'trp_finesand_receipt as ed_receipt';
$sd2 = 'trp_finesand_issues as ed_issues';
break;
case 7:
$sn = '(gas_for_trip_receipt - gas_for_trip_consumption) as lastmonthclosinggas';
$sn = '(sum(gas_for_trip_receipt) - sum(gas_for_trip_consumption)) as lastmonthclosinggas';
$sd1 = 'gas_for_trip_receipt as ed_receipt';
$sd2 = 'gas_for_trip_consumption as ed_issues';
break;
case 8:
$sn = '(water_receipt - water_consumption) as lastmonthclosingewater';
$sn = '(sum(water_receipt) - sum(water_consumption)) as lastmonthclosingewater';
$sd1 = 'water_receipt as ed_receipt';
$sd2 = 'water_consumption as ed_issues';
break;

9
application/views/bankamountpaid.php
View File

@ -60,8 +60,8 @@ if(!empty($amountpaid))
<div class="content-wrapper">
<div class ="content">
<section class ="content">
<div class="row">
<!-- Left col -->
<div class="col-md-12">
@ -191,9 +191,8 @@ if(!empty($amountpaid))
</table>
</div>
</div>
</div>
</section>
</div>
</div></section></div>

4
application/views/bankdebit.php
View File

@ -263,10 +263,10 @@
</div>
</div>
</section>
<!-- /.box -->
</div>
</section>
</div>
<!-- /.col -->
<div class="row">
<div class="col-md-12" id="date1"></div>

69
application/views/bankinvoicesettlement.php
View File

@ -62,7 +62,7 @@ if(!empty($debitmapping))
<div class="content-wrapper">
<section class="content">
<div class="row">
<!-- Left col -->
<div class="col-md-12" >
<!-- TABLE: LATEST ORDERS -->
@ -115,61 +115,17 @@ if(!empty($debitmapping))
<br>
<br>
<div class="row">
<div class="box-body">
<div class="col-md-3 col-md-offset-9">
<div style=" border: 2px solid black;margin-left:0%;margin-top: -55px;font-size:14px;background-color:#ccc;">
<p style="margin-left:62px;padding-top:30px;">Payment ID:&nbsp;&nbsp;<b><?php echo $ap->bankid?></b></p>
<p style="margin-left:41px;">Payment Mode:&nbsp;&nbsp;<b>Bank</b></p>
<p style="margin-left:41px;">Payment Amount:&nbsp;&nbsp;<b><?php echo $totalamount ?></b></p>
</div>
</div>
</div>
<!--<div class="row">
<div class="col-md-3">
<label for="from_date">
<?php echo 'From Date'; ?>
</label>
<div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker">
<span class="input-group-addon">
<i class="fa fa-calendar fa-fw"></i>
</span>
</div>
</div>
<div class="col-md-3">
<label for="to_date">
<?php echo 'To Date'; ?>
</label>
<div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker">
<span class="input-group-addon">
<i class="fa fa-calendar fa-fw"></i>
</span>
</div>
</div>
<div class="col-md-3" >
<label for="from_date">
<?php echo 'Customer'; ?>
</label>
<select class="form-control" id="SupplierName" name="SupplierName">
<option value="">Select Supplier</option>
<?php
foreach($supplier as $gs):
{?>
<option value="<?php echo $gs->SupplierName;?>"><?php echo $gs->SupplierName ; ?></option>
<?php } endforeach; ?>
</select>
</div>
</div>-->
<div class="box-body">
<div class="col-md-3 col-md-offset-9">
<div style=" border: 2px solid black;margin-left:0%;margin-top: -55px;font-size:14px;background-color:#ccc;">
<p style="margin-left:62px;padding-top:30px;">Payment ID:&nbsp;&nbsp;<b><?php echo $ap->bankid?></b></p>
<p style="margin-left:41px;">Payment Mode:&nbsp;&nbsp;<b>Bank</b></p>
<p style="margin-left:41px;">Payment Amount:&nbsp;&nbsp;<b><?php echo $totalamount ?></b></p>
</div>
</div>
</div>
</div>
</form>
<table class="table table-bordered table-hover" id="req" style="table-layout:auto;">
@ -326,6 +282,7 @@ if(!empty($debitmapping))
</div>
</div>
</div>
<!-- /.box -->
</div>
<!-- /.col -->

55
application/views/bankposettlement.php
View File

@ -59,7 +59,8 @@ if(!empty($debitmapping))
</div>-->
<div class="content-wrapper">
<section class="content">
<!-- Left col -->
@ -76,52 +77,7 @@ if(!empty($debitmapping))
<center><h3 class="box-title"><p style="color:#3c8dbc"><b>Bank PO settlement</b></p></h3></center>
<div class="box-body">
<!--<div class="row">
<div class="col-md-3">
<label for="from_date">
<?php echo 'From Date'; ?>
</label>
<div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker">
<span class="input-group-addon">
<i class="fa fa-calendar fa-fw"></i>
</span>
</div>
</div>
<div class="col-md-3">
<label for="to_date">
<?php echo 'To Date'; ?>
</label>
<div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker">
<span class="input-group-addon">
<i class="fa fa-calendar fa-fw"></i>
</span>
</div>
</div>
<div class="col-md-3" >
<label for="from_date">
<?php echo 'Customer'; ?>
</label>
<select class="form-control" id="SupplierName" name="SupplierName">
<option value="">Select Supplier</option>
<?php
foreach($supplier as $gs):
{?>
<option value="<?php echo $gs->SupplierName;?>"><?php echo $gs->SupplierName ; ?></option>
<?php } endforeach; ?>
</select>
</div>
</div>-->
</form>
<br>
<br>
@ -219,9 +175,10 @@ if(!empty($debitmapping))
<!-- /.box -->
</div>
<!-- /.col -->
</section>
</div>

45
application/views/banksettlement.php
View File

@ -63,6 +63,7 @@ if(!empty($mapping))
<div class="content-wrapper">
<section class="content">
<div class="row">
<!-- Left col -->
<div class="col-md-12">
<!-- TABLE: LATEST ORDERS -->
@ -120,7 +121,7 @@ if(!empty($mapping))
<center><h3 class="box-title"><p style="color:#3c8dbc"><b>Bank Debit Amount Paid Report</b></p></h3></center>
<br>
<br>
<div class="row">
<div class="row">
<div class="col-md-3 col-sm-offset-9">
<div class="box-body">
<div style=" border: 2px solid black;margin-left:0%;margin-top: -55px;font-size:14px;background-color:#ccc;">
@ -130,7 +131,7 @@ if(!empty($mapping))
</div>
</div>
</div>
<!--<div class="row">
</div> <!--<div class="row">
<div class="col-md-3">
<label for="from_date">
<?php echo 'From Date'; ?>
@ -332,51 +333,21 @@ if(!empty($mapping))
}
?>
</tbody>
<!--<tfoot width="100%">
<tr>
<td style="text-align:left;"><strong>Total</strong></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align:right"><strong>
<?php
{
echo number_format($ti,2,'.','');
}
?>
</strong>
</td>
<td style="text-align:right"><strong>
<?php
{
echo number_format($tvt,2,'.','');
}
?>
</strong>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</tfoot>-->
</table>
</div>
</div>
</div>
</section>
<!-- /.box -->
</div>
<!-- /.col -->
</section ></div>

62
application/views/bankstatement.php
View File

@ -55,6 +55,7 @@
</div>-->
<div class="content-wrapper">
<section class="content" style="font-size: 12px;">
<div class="row" >
<div id="content"></div>
@ -219,16 +220,7 @@
<tr>
<td align="left" id="bankid<?php echo $i ?>"><span><?php echo $t->ID?></span></td>
<!--<?php
// if($status=='CLOSE')
// {
// ?>
<td data-name="sell"><input type="hidden" onchange="checkamount(<?php echo $type ?>,<?php echo $i ?>) "id="checkboxcheckbox<?php echo $i ?>" name="checkbox<?php echo $i ?>" readonly;></td>
// <?php
// }
// else
// {
// ?>-->
<td data-name="sell"><input type="checkbox" onchange="checkamount(<?php echo $type ?>,<?php echo $i ?>) "id="checkboxcheckbox<?php echo $i ?>" name="checkbox<?php echo $i ?>";></td>
<!--<?php
@ -291,14 +283,7 @@
<td><?php echo $t->cstatus;?></td>
</tr>
<?php
$i++;
@ -308,46 +293,17 @@
?>
</tbody>
<!--<tfoot width="100%">
<tr>
<td style="text-align:left;"><strong>Total</strong></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align:right"><strong>
<?php
{
echo number_format($ti,2,'.','');
}
?>
</strong>
</td>
<td style="text-align:right"><strong>
<?php
{
echo number_format($tvt,2,'.','');
}
?>
</strong>
</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</tfoot>-->
</table>
</table>
</div>
</div>
</div>
</div>
</section>
</div>
<!-- /.box -->
<!-- </div> -->
<!-- /.col -->

2
application/views/cashbookyearlyexpenses.php
View File

@ -151,7 +151,7 @@ foreach($financialyear as $item)
</strong>
</td>
<td>&nbsp;</td>
<!-- <td>&nbsp;</td> -->

33
application/views/editInprocessReport.php
View File

@ -51,11 +51,7 @@ th{
<script src="<?php echo base_url().'assets/jquery.timeentry.js'?>"></script>
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Edit In Process Inspection Report Screen</center>
</h1>
</section>
<section class="content">
@ -63,6 +59,11 @@ th{
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<section class="content-header">
<h1>
<center>Edit In Process Inspection Report Screen</center>
</h1>
</section>
<!--<center><h3 class="box-title">-->
<div class="box-tools">
<div class="row">
@ -492,13 +493,13 @@ $(document).ready(function(){
show_hide_column(13,false,'testreport');
show_hide_column(16,false,'testreport2');
firstTimeValidateMastertable();
firstTimeValidateMastertable();
firstTimeValidateAFStable();
firstTimeValidateMastertable2();
}); // End of document on ready funciton
function keyValidate(e)
{
@ -1290,16 +1291,20 @@ function readURL(input) {
//Funciton for validate all values while data first time loading
function firstTimeValidateMastertable()
{
alert('MASTER');
// VALIDATE testreport Values
var ROWCOUNT = $('#testreport tr').length;
//alert(ROWCOUNT);
for (x=1;x<14;x++){
alert(ROWCOUNT);
for (x=1;x<ROWCOUNT;x++){
var ROW = document.getElementById("testreport").rows[x].getElementsByTagName("td");
var ROW = document.getElementById("testreport").rows[x].getElementsByTagName("td");
@ -1389,7 +1394,10 @@ function readURL(input) {
var ROWCOUNT = $('#afstable tr').length;
//alert(ROWCOUNT);
for (x=1;x<=11;x++){
for (x=1;x<=11;x++)
{
var ROW = document.getElementById("afstable").rows[x].getElementsByTagName("td");
@ -1551,6 +1559,7 @@ function readURL(input) {
//alert(ROWCOUNT);
for (x=1;x<ROWCOUNT;x++){
var ROW = document.getElementById("testreport2").rows[x].getElementsByTagName("td");

13
application/views/includes/header.php
View File

@ -851,9 +851,14 @@ display: none;
<?php foreach($DepAccesslist as $dep){ $check1=0;
$assd= $dep->AssDep;?>
<?php if($assd == FINANCE || $DEPCode == FINANCE){ $check2=1; ?>
<?php foreach($DepAccesslist as $dep){ $check1=0;
$ch=0;
$assd= $dep->AssDep;
?>
<?php if($assd == FINANCE || $DEPCode == FINANCE){ //$check2=1;
$ch=1; ?>
<li>
<a href="<?php echo base_url(); ?>costListing" >
@ -871,7 +876,7 @@ display: none;
<?php }?>
<?php if($check2 == 1){break;} }?>
<?php if($ch == 1){break;} }?>

2
application/views/newresinbatchcard.php
View File

@ -119,7 +119,7 @@ th{
</div>
<div class="col-md-4">
<label>Grade</label>
<label>Grade&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
<?php echo form_dropdown('product',$products,set_value('product',$products[-1]),'id="product"' ,'class="form-control select2', 'style="text-align:center;"');?>
</div>