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

paidleave and stockdetails issues fixed in header

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-04-02 19:55:24 +05:30
parent 6e41bb734d
commit cd8589f992
2 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/views/attendance.php
View File

@ -701,8 +701,10 @@ function myFunction(p,i,v)
} }
else else
{ {
absent = paidleave-2; // absent = paidleave-2;
paidleave = 2; // paidleave = 2;
absent = paidleave-1;
paidleave = 1;
} }
document.getElementById(totalhrsid).textContent = parseFloat(totalworkingHrs).toFixed(2);// == ''?0:parseFloat(totalworkingHrs)); document.getElementById(totalhrsid).textContent = parseFloat(totalworkingHrs).toFixed(2);// == ''?0:parseFloat(totalworkingHrs));
document.getElementById(totalothrsid).textContent = parseFloat(totalOTHrs).toFixed(2);// == ''?0:parseFloat(totalOTHrs)); document.getElementById(totalothrsid).textContent = parseFloat(totalOTHrs).toFixed(2);// == ''?0:parseFloat(totalOTHrs));

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

@ -807,7 +807,7 @@
<?php if($check ==1){break;}}}?> <?php if($check ==1){break;}}}?>
<!-- Billing Menus and Cashbook Menus Ends --> <!-- Billing Menus and Cashbook Menus Ends -->
<!-- Inspection(IGR,MRIR) Menus and Stock Details Menus Starts--> <!-- Inspection(IGR,MRIR) Menus Starts-->
<?php if(empty($DepAccesslist)){ <?php if(empty($DepAccesslist)){
if($DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == SECURITY){ ?> if($DEPCode == STORE || $DEPCode == QUALITY || $DEPCode == SECURITY){ ?>
@ -850,7 +850,7 @@
<?php }?> <?php }?>
<?php if($DEPCode == QUALITY){?> <!-- <?php if($DEPCode == QUALITY){?>
<li><a href="<?php echo base_url(); ?>quality"> <li><a href="<?php echo base_url(); ?>quality">
<i class="fa fa-list-alt"></i> <i class="fa fa-list-alt"></i>
<span>Product Test Specification Master</span> <span>Product Test Specification Master</span>
@ -869,7 +869,7 @@
</a> </a>
</li> </li>
<?php }?> <?php }?>
-->
<?php }?> <?php }?>
<!-- <?php if($DEPCode == SECURITY){?> <!-- <?php if($DEPCode == SECURITY){?>
@ -893,18 +893,6 @@
</ul> </ul>
</li> </li>
<?php if($DEPCode == STORE){?>
<li class="treeview">
<a href="<?php echo base_url(); ?>Stock">
<i class="fa fa-list-alt"></i>
<span>Stock Details</span>
<span class="pull-right-container">
<i class="fa fa-angle-right pull-right"></i>
</span>
</a>
</li>
<?php }?>
<?php }?> <?php }?>
<?php } <?php }
@ -956,21 +944,9 @@
</ul> </ul>
</li> </li>
<?php if($assd == STORE || $DEPCode == STORE){?>
<li class="treeview">
<a href="<?php echo base_url(); ?>Stock">
<i class="fa fa-list-alt"></i>
<span>Stock Details</span>
<span class="pull-right-container">
<i class="fa fa-angle-right pull-right"></i>
</span>
</a>
</li>
<?php }?>
<?php }?> <?php }?>
<?php if($check ==1){break;}}}?> <?php if($check ==1){break;}}}?>
<!-- Inspection(IGR,MRIR) Menus and Stock Details Menus Ends--> <!-- Inspection(IGR,MRIR) Menus Ends-->
<!-- Payslip Menus Starts --> <!-- Payslip Menus Starts -->
@ -1174,6 +1150,42 @@
<?php }?> <?php }?>
<!-- Attendances Menus Ends --> <!-- Attendances Menus Ends -->
<!-- Stock Details Menu Start -->
<?php if(empty($DepAccesslist)){?>
<?php if($DEPCode == STORE){?>
<li class="treeview">
<a href="<?php echo base_url(); ?>Stock">
<i class="fa fa-list-alt"></i>
<span>Stock Details</span>
<span class="pull-right-container">
<i class="fa fa-angle-right pull-right"></i>
</span>
</a>
</li>
<?php }?>
<?php }
else{?>
<?php foreach($DepAccesslist as $dep){
$assd= $dep->AssDep;?>
<?php if($assd == STORE || $DEPCode == STORE){?>
<li class="treeview">
<a href="<?php echo base_url(); ?>Stock">
<i class="fa fa-list-alt"></i>
<span>Stock Details</span>
<span class="pull-right-container">
<i class="fa fa-angle-right pull-right"></i>
</span>
</a>
</li>
<?php }?>
<?php }?>
<?php }?>
<!-- Stock Details Menus Ends -->
<!-- Reports Menu Start --> <!-- Reports Menu Start -->
<?php if(empty($DepAccesslist)){?> <?php if(empty($DepAccesslist)){?>