SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboard and uom issue fixed

Browse Source
This commit is contained in:
gandhimathi 2017-12-06 19:07:17 +05:30
parent 51bfe48a5b
commit 04ecb58368
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/Report_purchase.php
View File

@ -232,7 +232,7 @@ if(!empty($mms))
<td style="text-align:right"><span><?php <td style="text-align:right"><span><?php
$tot_qty= $tot_qty + round($rel->quantity); $tot_qty= $tot_qty + round($rel->quantity);
echo round($rel->quantity);?></span></td> echo round($rel->quantity);?></span></td>
<td style="text-align:right"><span><?php <td style="text-align:left"><span><?php
echo $rel->UOM;?></span></td> echo $rel->UOM;?></span></td>
<td style="text-align:right"><span><?php <td style="text-align:right"><span><?php
$tot_rate= $tot_rate + $rel->rate; $tot_rate= $tot_rate + $rel->rate;

2
application/views/Report_purchase_inward.php
View File

@ -231,7 +231,7 @@ if(!empty($mms))
<td style="text-align:right"><span><?php <td style="text-align:right"><span><?php
$tot_qty= $tot_qty + round($rel->quantity); $tot_qty= $tot_qty + round($rel->quantity);
echo round($rel->quantity);?></span></td> echo round($rel->quantity);?></span></td>
<td style="text-align:right"><span><?php <td style="text-align:left"><span><?php
echo $rel->UOM;?></span></td> echo $rel->UOM;?></span></td>
<td style="text-align:right"><span><?php <td style="text-align:right"><span><?php
$tot_rate= $tot_rate + $rel->rate; $tot_rate= $tot_rate + $rel->rate;

26
application/views/dashboard.php
View File

@ -275,7 +275,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
?> ?>
<span class="info-box-text" style="color:#00a65a;"><strong>TOTAL ORDER VALUE</strong></span> <span class="info-box-text" style="color:#00a65a;"><strong>TOTAL ORDER VALUE</strong></span>
<span class="info-box-number"style="color:black;"><strong> <?php echo $ordervalue->totalordervalue;?></strong></span> <span class="info-box-number"style="color:black;"><strong><i class="fa fa-rupee " ></i> <?php echo $ordervalue->totalordervalue;?></strong></span>
<?php <?php
} }
} }
@ -343,7 +343,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<p class="text-center"> <p class="text-center">
<strong>1 April, 2017 - 31 March, 2017</strong> <strong>1 April, 2017 - 31 March, 2018</strong>
</p> </p>
<div class="chart"> <div class="chart">
@ -462,8 +462,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
?> ?>
<div class="knob-label"><strong style="color:#00c0ef">SERVICE BUDGET</strong></div> <div class="knob-label"><strong style="color:#00c0ef">SERVICE BUDGET</strong></div>
<input type="text" class="knob" data-thickness="0.4" data-readonly="true" value=<?php echo $serviceb->balservicebudget;?> data-min="20" data-max=<?php echo $service->totalservicebudget;?> data-width="" data-height="" data-fgColor="#00c0ef "> <br> <input type="text" class="knob" data-thickness="0.4" data-readonly="true" value=<?php echo $serviceb->balservicebudget;?> data-min="20" data-max=<?php echo $service->totalservicebudget;?> data-width="" data-height="" data-fgColor="#00c0ef "> <br>
<div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : <?php echo $service->totalservicebudget;?></strong></div> <div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $service->totalservicebudget;?></strong></div>
<div class="knob-label"><strong>BALANCE : <?php echo $serviceb->balservicebudget;?></strong></div> <div class="knob-label"><strong>BALANCE :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $serviceb->balservicebudget;?></strong></div>
</div> </div>
<?php <?php
} }
@ -485,8 +485,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
?> ?>
<div class="knob-label"><strong style="color:#dd4b39">REVENUE BUDGET</strong></div> <div class="knob-label"><strong style="color:#dd4b39">REVENUE BUDGET</strong></div>
<input type="text" class="knob" data-thickness="0.4" data-readonly="true" value="<?php echo $revenueb->balrevenuebudget;?> " data-min="0" data-max=<?php echo $revenue->totalrevenuebudget;?> data-width="" data-height="" data-fgColor="#dd4b39 "> <br> <input type="text" class="knob" data-thickness="0.4" data-readonly="true" value="<?php echo $revenueb->balrevenuebudget;?> " data-min="0" data-max=<?php echo $revenue->totalrevenuebudget;?> data-width="" data-height="" data-fgColor="#dd4b39 "> <br>
<div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : <?php echo $revenue->totalrevenuebudget;?> </strong> </div> <div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $revenue->totalrevenuebudget;?> </strong> </div>
<div class="knob-label"><strong>BALANCE : <?php echo $revenueb->balrevenuebudget;?></strong> </div> <div class="knob-label"><strong>BALANCE :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $revenueb->balrevenuebudget;?></strong> </div>
<?php <?php
} }
@ -505,8 +505,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
?> ?>
<div class="knob-label"><strong style="color:#00a65a">IMPORT BUDGET</strong></div> <div class="knob-label"><strong style="color:#00a65a">IMPORT BUDGET</strong></div>
<input type="text" class="knob" data-thickness="0.4" data-readonly="true" value=<?php echo $importb->balimportbudget;?> data-min="0" data-max=<?php echo $import->totalimportbudget;?> data-width="" data-height="" data-fgColor="#00a65a "> <br> <input type="text" class="knob" data-thickness="0.4" data-readonly="true" value=<?php echo $importb->balimportbudget;?> data-min="0" data-max=<?php echo $import->totalimportbudget;?> data-width="" data-height="" data-fgColor="#00a65a "> <br>
<div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : <?php echo $import->totalimportbudget;?> </strong></div> <div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $import->totalimportbudget;?> </strong></div>
<div class="knob-label"><strong>BALANCE : <?php echo $importb->balimportbudget;?> </strong></div> <div class="knob-label"><strong>BALANCE :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $importb->balimportbudget;?> </strong></div>
</div> </div>
<?php <?php
} }
@ -524,8 +524,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
?> ?>
<div class="knob-label"><strong style="color:#f39c12">CAPITAL BUDGET</strong></div> <div class="knob-label"><strong style="color:#f39c12">CAPITAL BUDGET</strong></div>
<input type="text" class="knob" data-thickness="0.4" data-readonly="true" value=<?php echo $capitalb->balcapitalbudget;?> data-min="0" data-max=<?php echo $capital->totalcapitalbudget;?> data-fgColor="#f39c12 "><br> <input type="text" class="knob" data-thickness="0.4" data-readonly="true" value=<?php echo $capitalb->balcapitalbudget;?> data-min="0" data-max=<?php echo $capital->totalcapitalbudget;?> data-fgColor="#f39c12 "><br>
<div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : <?php echo $capital->totalcapitalbudget;?></strong></div> <div class="knob-label"><strong>TOTAL &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $capital->totalcapitalbudget;?></strong></div>
<div class="knob-label"><strong>BALANCE : <?php echo $capitalb->balcapitalbudget;?></strong> </div> <div class="knob-label"><strong>BALANCE :&nbsp;<i class="fa fa-rupee " ></i> <?php echo $capitalb->balcapitalbudget;?></strong> </div>
<?php <?php
} }
} }
@ -537,7 +537,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
</div> </div>
</div> </div>
</div> </div>
<div class="box box-success"> <!--<div class="box box-success">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">Bar Chart</h3> <h3 class="box-title">Bar Chart</h3>
@ -551,7 +551,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
<div class="box-body chart-responsive"> <div class="box-body chart-responsive">
<div class="chart" id="bar-chart" style="height: 300px;"></div> <div class="chart" id="bar-chart" style="height: 300px;"></div>
</div> </div>
<!-- /.box-body -->
</div> </div>
<script> <script>
@ -587,7 +587,7 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
hideHover: 'auto' hideHover: 'auto'
}); });
}); });
</script> </script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
<script src="<?php echo base_url(); ?>assets/plugins/morris/morris.min.js"></script> <script src="<?php echo base_url(); ?>assets/plugins/morris/morris.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">