diff --git a/application/views/Report_Material_Master_ItemWise.php b/application/views/Report_Material_Master_ItemWise.php
index 694906f7..71e74312 100755
--- a/application/views/Report_Material_Master_ItemWise.php
+++ b/application/views/Report_Material_Master_ItemWise.php
@@ -29,6 +29,10 @@ if(!empty($mmi))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -88,6 +92,8 @@ if(!empty($mmi))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_Material_Master_ReceiptValue.php b/application/views/Report_Material_Master_ReceiptValue.php
index d7be26f1..0473317b 100755
--- a/application/views/Report_Material_Master_ReceiptValue.php
+++ b/application/views/Report_Material_Master_ReceiptValue.php
@@ -44,6 +44,10 @@ if(!empty($mmr))
 <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
 <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.html5.min.js"></script>
 <script src="https://cdn.datatables.net/buttons/1.4.2/js/buttons.colVis.min.js"></script>
+<div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
 
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -257,6 +261,8 @@ if(!empty($mmr))
         </div>
         <!-- /.col -->
       </div>
+  </section>.
+</div>
 
 <script src="https://cdn.datatables.net/buttons/1.3.1/js/dataTables.buttons.min.js"></script>
 <script src="https://cdn.datatables.net/buttons/1.3.1/js/buttons.flash.min.js"></script>
diff --git a/application/views/Report_Material_Master_SupplierWise.php b/application/views/Report_Material_Master_SupplierWise.php
index 936325d8..d58f28ea 100755
--- a/application/views/Report_Material_Master_SupplierWise.php
+++ b/application/views/Report_Material_Master_SupplierWise.php
@@ -29,6 +29,10 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -93,6 +97,10 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 
+  </section>
+
+</div>
+
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/Report_POreleased.php b/application/views/Report_POreleased.php
index 64df53e3..92b45cf5 100755
--- a/application/views/Report_POreleased.php
+++ b/application/views/Report_POreleased.php
@@ -33,6 +33,10 @@ if(!empty($rel_po))
 		 
 			   
 	 </style>
+   <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row"style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -281,11 +285,9 @@ if(!empty($rel_po))
 
 						</div>
 
-						<div class="col-md-2 col-md-offset-11"><br>
+						<div class="col-md-2 col-md-offset-10"><br>
 
-                        <input type="submit" class="btn btn-success" name="btn_submit"
-
-                               value="View Report">
+                        <input type="submit" class="btn btn-success" name="btn_submit" value="View Report">
 
                         
 
@@ -325,7 +327,7 @@ if(!empty($rel_po))
 						<td><span><?php echo $rel->Dept_Name?></span></td>
 					    <!-- <td align="right"><span><?php echo $rel->TotalOrderValue?></span></td> -->
                         <td align="right"><span><?php 
-						$tot= $tot  number_format($rel->TotalOrderValue,2,'.','');
+						$tot= $tot+number_format($rel->TotalOrderValue,2,'.','');
 						echo number_format($rel->TotalOrderValue,2,'.','')?></span></td>
 					   
 					
@@ -364,6 +366,8 @@ if(!empty($rel_po))
         </div>
         <!-- /.col -->
       </div>
+    </section>
+  </div>
       <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
       <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/Report_consolidate.php b/application/views/Report_consolidate.php
index 54e2b207..e4f6fe69 100644
--- a/application/views/Report_consolidate.php
+++ b/application/views/Report_consolidate.php
@@ -26,6 +26,10 @@
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -611,6 +615,13 @@
         </div>
         <!-- /.col -->
       </div>
+  </form>
+</div>
+</div>
+</div>
+</div>
+</section>
+</div>
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/Report_consolidate_inward.php b/application/views/Report_consolidate_inward.php
index 25bcb5d0..00541535 100644
--- a/application/views/Report_consolidate_inward.php
+++ b/application/views/Report_consolidate_inward.php
@@ -36,13 +36,17 @@
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
         <!-- TABLE: LATEST ORDERS -->
           <div class="box box-info">
             <div class="box-header with-border">
-              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Consolidate-Inward</b>br><br>
+              <center><h3 class="box-title"><p style="color:#5d0411"><b>Report - Consolidate-Inward</b><br><br>
 			  <?php
 
 			  if($this->input->post('client_name')){
@@ -629,6 +633,8 @@
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_costcenter.php b/application/views/Report_costcenter.php
index 54789f56..91553e05 100755
--- a/application/views/Report_costcenter.php
+++ b/application/views/Report_costcenter.php
@@ -37,6 +37,10 @@ if(!empty($ccrpt))
                           }
 			   
 	 </style>
+   <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -131,6 +135,8 @@ if(!empty($ccrpt))
               </div>
               <!-- /.col -->
             </div>
+          </section>
+        </div>
          
 <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_cumulative.php b/application/views/Report_cumulative.php
index d8f33a4b..4b31f658 100644
--- a/application/views/Report_cumulative.php
+++ b/application/views/Report_cumulative.php
@@ -33,6 +33,10 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -233,6 +237,9 @@ if(!empty($mms))
         <!-- /.col -->
       </div>
 
+  </section>
+</div>
+
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/Report_cumulative_inward.php b/application/views/Report_cumulative_inward.php
index cb43e097..e16ad932 100644
--- a/application/views/Report_cumulative_inward.php
+++ b/application/views/Report_cumulative_inward.php
@@ -32,6 +32,10 @@ if(!empty($mms))
 						}				 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -229,6 +233,11 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+      <!--content-wrapper-->
+  </section>
+</div>
+
+
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_cumulative_raw.php b/application/views/Report_cumulative_raw.php
index 99a8320a..4f8734eb 100644
--- a/application/views/Report_cumulative_raw.php
+++ b/application/views/Report_cumulative_raw.php
@@ -32,6 +32,10 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -239,6 +243,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_openorder.php b/application/views/Report_openorder.php
index 23e45b42..a9cc50e2 100755
--- a/application/views/Report_openorder.php
+++ b/application/views/Report_openorder.php
@@ -33,6 +33,10 @@ if(!empty($open_po))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -329,6 +333,8 @@ if(!empty($open_po))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
       <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/Report_purchase.php b/application/views/Report_purchase.php
index 7b41b269..567c633c 100755
--- a/application/views/Report_purchase.php
+++ b/application/views/Report_purchase.php
@@ -41,6 +41,10 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -452,6 +456,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_purchase_inward.php b/application/views/Report_purchase_inward.php
index bc4331ba..0d6c7681 100644
--- a/application/views/Report_purchase_inward.php
+++ b/application/views/Report_purchase_inward.php
@@ -39,6 +39,10 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -472,6 +476,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_supplier.php b/application/views/Report_supplier.php
index ae30f081..64eb9b3d 100644
--- a/application/views/Report_supplier.php
+++ b/application/views/Report_supplier.php
@@ -32,6 +32,10 @@ if(!empty($mms))
 		 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -310,6 +314,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_supplier_inward.php b/application/views/Report_supplier_inward.php
index 806a8d8a..c74ceddb 100644
--- a/application/views/Report_supplier_inward.php
+++ b/application/views/Report_supplier_inward.php
@@ -40,6 +40,10 @@ if(!empty($mms))
 						}		
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -310,6 +314,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_totalorders.php b/application/views/Report_totalorders.php
index 8803e922..fd6bad2c 100755
--- a/application/views/Report_totalorders.php
+++ b/application/views/Report_totalorders.php
@@ -25,7 +25,11 @@ if(!empty($Total))
                            }
 		 
 			   
-	 </style> 
+	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>   
 
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
@@ -128,6 +132,8 @@ if(!empty($Total))
 	  </div>
 	  <!-- /.col -->
 	</div>
+</section>
+</div>
 
 	<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	<script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_year_wise.php b/application/views/Report_year_wise.php
index 91024815..b303b1b2 100644
--- a/application/views/Report_year_wise.php
+++ b/application/views/Report_year_wise.php
@@ -32,6 +32,10 @@ if(!empty($mms))
 
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -190,6 +194,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
diff --git a/application/views/Report_year_wise_inward.php b/application/views/Report_year_wise_inward.php
index cf018567..e6147659 100644
--- a/application/views/Report_year_wise_inward.php
+++ b/application/views/Report_year_wise_inward.php
@@ -31,6 +31,10 @@ if(!empty($mms))
 						}		
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row" style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -182,6 +186,8 @@ if(!empty($mms))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
 	  <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/cashbookmonthlyexpenses.php b/application/views/cashbookmonthlyexpenses.php
index 9f1ebff4..32a0d3f1 100644
--- a/application/views/cashbookmonthlyexpenses.php
+++ b/application/views/cashbookmonthlyexpenses.php
@@ -39,11 +39,15 @@ if(!empty($monthlyincreport))
 		 
 			   
 	 </style> 
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
 
  <div class="row" style="min-height: 600px;">
         
       
-	  <div class="content-wrapper">
+	  
        <div class="col-md-10 col-md-offset-1"> 
 	  <div id="panel-quick-actions" class="panel panel-default quick-actions">                
 	  <div class="panel-heading">                    
@@ -93,6 +97,8 @@ if(!empty($monthlyincreport))
 	  </div>
 	  </div>
       </div>
+  </section>
+</div>
 	  
 	  
 	  
diff --git a/application/views/cashbookyearlyexpenses.php b/application/views/cashbookyearlyexpenses.php
index d47907a4..a2040354 100644
--- a/application/views/cashbookyearlyexpenses.php
+++ b/application/views/cashbookyearlyexpenses.php
@@ -29,9 +29,12 @@ if(!empty($Indiancurrency))
 			   
 	 </style> 
 
- 
+ <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
 	  
-       <div class="content-wrapper">
+      
        <div class="col-md-10 col-md-offset-1"> 
 	  <div id="panel-quick-actions" class="panel panel-default quick-actions">                
 	  <div class="panel-heading">                    
@@ -83,6 +86,8 @@ if(!empty($Indiancurrency))
 	  </div>
 	  </div>
 	  </div>
+	</section>
+</div>
 	  
 	  
 	  
diff --git a/application/views/dashboard.php b/application/views/dashboard.php
index 0655387e..d84bfac8 100755
--- a/application/views/dashboard.php
+++ b/application/views/dashboard.php
@@ -16,7 +16,7 @@ if(!empty($EmpCount))
 ?>
 
 
-<div class="content-wrapper">
+<div>
     <section class="content">
 	<!-- Dashboard for Account department-->
 	<?php  
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 4602f64d..c294975c 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -1,4 +1,3 @@
-
 <html>
   <head>
     <meta charset="UTF-8">
@@ -20,11 +19,8 @@
 	<!-- daterange picker -->
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
 	
-	<!-- web favicon -->
-<!-- This is needed for IE -->
-<link rel="icon" href="<?php echo base_url(); ?>assets/dist/img/RI_favicon.png"/>
-
 
+ 				
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.12.4.js"></script>
 	<!-- jquery-1.12.4.min -->
     <script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.12.4.min.js"></script>
@@ -33,6 +29,8 @@
 	<!-- DataTables -->
 	<script src="<?php echo base_url();?>assets/plugins/datatables/jquery.dataTables.min.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/datatables/dataTables.bootstrap.min.js"></script>
+		<script src="<?php echo base_url();?>assets/plugins/slimScroll/jquery.slimscroll.min.js"></script>
+
 			 
 	<!-- cdn fot data Table plugins-->	
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery.autocomplete.js"></script> 	 
@@ -51,8 +49,6 @@
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/daterangepicker.js"></script>
 
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/meter.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
-
 	 
 	<link href="<?php echo base_url();?>assets/css/default.css" rel="stylesheet" type="text/css" />	 	 
 	<link href="<?php echo base_url();?>assets/css/style.css"   rel="stylesheet" type="text/css" />
@@ -86,8 +82,8 @@
 	<!-- fullCalendar 2.2.5-->
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.css">
 	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.print.css" media="print">
-
-	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.js"></script>
 
 <!--	<script type="text/javascript">
 $(function() {
@@ -96,6 +92,26 @@ $(function() {
     });
 }); 
 </script>-->
+	 <?php
+
+
+$pic = $this->profilepic;
+//echo $pic;
+$path = 'uploads/images/';
+$files = glob($path."*.{jpg,jpeg,png,gif}", GLOB_BRACE);
+$full_path = $path .$pic;
+// echo $full_path;
+// print_r($files);
+// if (in_array($full_path,$files))
+// {
+// echo $full_path;
+// echo 'matched., images in this folder';
+// }
+// else
+// {
+// echo 'No images were found in this folder';
+// }
+?>
     <style>
     	.error{
     		color:red;
@@ -147,567 +163,28 @@ $(function() {
    </head>
   
    
-  <body class="skin-blue sidebar-collapse">
-    
-      
-      <header class="main-header">
-        <!-- Logo -->
-        <a class="logo">
-          <!-- mini logo for sidebar mini 50x50 pixels -->
-          <span class="logo-mini"><b>RI</b></span>
-          <!-- logo for regular state and mobile devices -->
-          <span class="logo-lg"><b>Resico Industries</b></span>
-        </a>
-        <!-- Header Navbar: style can be found in header.less -->
-        <nav class="navbar navbar-static-top" role="navigation" >
-          <!-- Sidebar toggle button-->
-          <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
-       <i class="fa fa-bars fa-2x" aria-hidden="true"></i>                      
-      </button>  
-	  
-    </div>
-          <div class="navbar-custom-menu collapse navbar-collapse" id="myNavbar">
+<body class="hold-transition skin-blue fixed sidebar-mini">
+  	<div>
+  <header class="main-header">
+    <!-- Logo -->
+    <a href="<?php echo base_url(); ?>dashboard" class="logo">
+      <!-- mini logo for sidebar mini 50x50 pixels -->
+      <span class="logo-mini"><b>SI</b></span>
+      <!-- logo for regular state and mobile devices -->
+      <span class="logo-lg"><b>RESICO</b></span>
+    </a>
+    <!-- Header Navbar: style can be found in header.less -->
+    <nav class="navbar navbar-static-top">
+      <!-- Sidebar toggle button-->
+      <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+        <span class="sr-only">Toggle navigation</span>
+      </a>
+ 
+<!-- New login-->
+<div class="navbar-custom-menu collapse navbar-collapse" id="myNavbar">
             <ul class="nav navbar-nav">
               <!-- User Account: style can be found in dropdown.less -->
-			  <?php if($Designation != SECURITY  ){ ?>
-			  <li class="treeview">
-              <a href="<?php echo base_url(); ?>dashboard">
-                <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
-              </a>
-            </li>
-				<?php 
-			  }
-			  if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
-						{ 
-						?>
-				
-			<li class="treeview">		      
-				<span id="menu" data-toggle="dropdown"><i class="fa fa-database" aria-hidden="true"></i>  Master Details<span class="caret"></span></span> 
-				<ul class="dropdown-menu" role="menu" aria-labelledby="menu1">
-				  
-						<?php //echo $DEPCode;
-						if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
-						{
-						?>
-						<?php
-						if($DEPCode != FINANCE && $DEPCode != HR)
-						{
-						?>
-						<li class="treeview">
-						  <a href="<?php echo  base_url(); ?>supplierListing" >
-							<i class="fa fa-user-secret"></i>
-							<span class="nav-label">Supplier Details</span>
-						  </a>
-						</li>
-						<?php
-						}
-						?>
-						<?php
-						if($DEPCode == FINANCE )
-						{
-						?>
-						<li class="treeview">
-						 <a href="<?php echo base_url(); ?>costListing" >
-							<i class="fa fa-cart-plus"></i>
-							<span class="nav-label">Cost Details</span>
-						  </a>
-						</li>
-						
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>assetListing" >
-							<i class="fa fa-cogs"></i>
-							<span class="nav-label">Asset Details</span>
-						  </a>
-						</li>
-						<?php
-						}
-						?>
-						<?php
-						if($role == ROLE_ADMIN || $DEPCode == HR)
-						{
-						?>
-						<?php
-						if($DEPCode != HR)
-						{
-						?>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>companyview" >
-							<i class="fa fa-industry"></i>
-							<span class="nav-label">Company Master</span>
-						  </a>
-						</li> 
-						<?php } ?>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>employeeListing" >
-							<i class="fa fa-user-circle"></i>
-							<span class="nav-label">Employee Details</span>
-						  </a>
-						</li>
-						<?php
-						if($DEPCode != HR)
-						{
-						?>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>configlisting" >
-							<i class="fa fa-file-text"></i>
-							<span class="nav-label">Config Master</span>
-						  </a>
-						</li>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>departmentListing" >
-							<i class="fa fa-building"></i>
-							<span class="nav-label">Department Master</span>
-						  </a>
-						</li>
-						<?php } ?>
-						<?php
-						}
-						?>	
-						<?php
-						if($role == ROLE_ADMIN && $DEPCode != HR )
-						{
-						?>
-						<li class="treeview">
-						  <a href="<?php echo base_url();?>rawmaterialListing" >
-							<i class="fa fa-files-o"></i>
-							<span>Material Master</span>
-						  </a>
-						</li>
-						<?php
-						}
-						?>
-						<?php
-						}
-						if($role == ROLE_ADMIN && $DEPCode != HR )
-						{
-						?>
-						
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>userListing">
-							<i class="fa fa-users"></i>
-							<span>Users</span>
-						  </a>
-						</li>
-						 <?php
-							}
-										
-							?>
-				</ul>  
-			</li>	
- <?php
-							}
-										
-							?>			
-           <?php
-					if (( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN || $DEPCode == MANAGEMENT ) && $Designation != SECURITY && $DEPCode != HR )
-				{
-				?>
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Requisition<span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<?php  if (($role == ROLE_MANAGER || $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN  ) && $Designation != SECURITY)
-								{									
-								?>
-							<li class="treeview">
-								  <a href="<?php echo base_url(); ?>Requisition">
-									<i class="fa fa-arrow-circle-up"></i>
-									<span>Raise Requisition </span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>UpdatePOStatus">
-									<i class="fa fa-arrow-circle-up"></i>
-									<span>Update Service PO Status </span>
-								  </a>
-								</li>
-								<?Php 
-								} 
-								?>
-								<?php  if($role == ROLE_MANAGER )
-								{									
-								?>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ApproveRequisition">
-									<i class="fa fa-thumbs-o-up"></i>
-									<span>Approve Requisition </span>
-								  </a>
-								</li>
-								
-								<?Php 
-								} ?>
-								<?Php  
-								 if( $DEPCode == PURCHASE)
-								 {
-								?>
-								
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>CreatePO">
-									<i class="fa fa-empire"></i>
-									<span>Purchase Order From Requisition</span>
-								  </a>
-								</li>
-								<?Php } ?>
-								
-						</ul> 
-					</li>
-				<?php
-					}			
-					?>
-					
-			<?php
-						//if(($DEPCode == FINANCE && $role == ROLE_MANAGER)|| ($(DEPCode == PURCHASE && $role == ROLE_EMPLOYEE)))
-						if($DEPCode == FINANCE || $DEPCode == PURCHASE || $DEPCode == MANAGEMENT)
-						//if($Designation != SECURITY )
-						{
-						?>
-						 
-						<li class="treeview">
-              <span id="menu" data-toggle="dropdown"><i class="fa fa-first-order"></i> Purchase order<span class="caret"></span></span> 
-			  	<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<!-- All User can create Emergency po except Security -->
-						 <?php if($DEPCode == PURCHASE ){ ?>
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>EmergencyPO">
-							<i class="fa fa-ambulance"></i>
-							<span>Emergency Purchase Order  </span>
-						  </a>
-						</li>
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>purchaseorderListing">
-									<i class="fa fa-list"></i>
-									<span>Purchase Order List  </span>
-								  </a>
-								</li>
-								
-						<li class="treeview">
-						  <a href="<?php echo base_url(); ?>amendmentpurchaseorder">
-							<i class="fa fa-ambulance"></i>
-							<span>Amendment Purchase Order  </span>
-						  </a>
-						</li>
-						
-						
-						<?php
-						}
-						?>
-						<!-- For Finance Team for PO approval list-->
-						<?php
-						 
-						if($DEPCode == FINANCE  && $role == ROLE_MANAGER)
-						{
-						?>
-						<li class="treeview">
-								  <a href="<?php echo base_url(); ?>POApproval">
-									<i class="fa fa-users"></i>
-									<span>Approve Purchase Order</span>
-								  </a>
-								</li>
-						<?php
-						}
-						?>
-						<!-- this page is for gate keeper for view the full po list-->
-						
-						
-						<!--FOR Relese PO Management Team -->
-						<?php
-						//if($DEPCode != FINANCE && $DEPCode == PURCHASE)
-							if( $DEPCode == MANAGEMENT)
-						{
-						?>
-                        <li class="treeview">
-                          <a href="<?php echo base_url(); ?>PORelease">
-                            <i class="fa fa-history"></i>
-                            <span>Release Purchase Order</span>
-                          </a>
-                        </li>
-						 <?php
-						}
-						?>
-						<!--END Relese PO Management Team -->
-				</ul> 
-            </li>
-						<?php
-						} 
-							if ($Designation != SECURITY  && $DEPCode != HR )
-				{
-							
-						?>
-						<li class="treeview">
-                      <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Store Requisition<span class="caret"></span></span> 
-                        <ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>storerequisition">
-								<i class="fa fa-upload"></i>
-								<span>Store Requisition</span>
-							  </a>
-							</li>
-								<?php  
-								if($role == ROLE_MANAGER ) {
-									
-								?>
-							<li class="treeview">   
-							  <a href="<?php echo base_url(); ?>approvalstorerequisitionslip">
-								<i class="fa fa-eye"></i>
-								<span>Approve Store Requisition</span>
-							  </a>
-							</li>
-								<?php }
-								if( $DEPCode == STORE)
-								 {							
-							 ?>
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>storerequisitionlisting">
-								<i class="fa fa-eye"></i>
-								<span>Store Requisition Listing</span>
-							  </a>
-							</li>
-								 <?php } ?>
-						</ul>
-                    </li>
-								<?php  }			 
-								
-		           	if($role == ROLE_ADMIN) { ?> 
-									<li class="treeview">
-															<span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Attendance<span class="caret"></span></span> 
-															<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-																	<li class="treeview">
-																			<a href="<?php echo base_url(); ?>attendance">
-																			<i class="fa fa-refresh fa-spin "></i>
-																			<span>Monthly Attendance</span>
-																			</a>
-																		</li>
-																</ul>
-													</li>
-									<?php	}						
-
-			if($DEPCode == HR)
-				{
-				?>
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> PaySlip <span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>monthlypay">
-									<i class="fa fa-keyboard-o"></i>
-									<span>Monthly Pay Information</span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ExcelUpload2">
-									<i class="fa fa-upload"></i>
-									<span>Monthly Pay Upload</span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ViewPay">
-									<i class="fa fa-money"></i>
-									<span>PaySlip Generator</span>
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>PaysilpListing" >
-									<i class="fa fa-credit-card-alt"></i> <span>Edit Payslip</span> 
-								  </a>
-								</li>
-								<li class="treeview">
-                                  <a href="<?php echo base_url(); ?>emppayListings" >
-                                    <i class="fa fa-credit-card"></i> <span>Employee Salary Details</span> 
-                                  </a>
-                                </li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>BankReport" >
-									<i class="fa fa-table"></i> <span>Bank Report</span> 
-								  </a>
-								</li>
-								
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>publicholidays" >
-									<i class="fa fa-calendar"></i> <span>Public Holidays</span> 
-								  </a>
-								</li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>loanreports" >
-									<i class="fa fa-list-alt"></i> <span>Loan Reports</span> 
-								  </a>
-								</li>
-								
-						</ul> 
-					</li>
-				<?php
-					}			
-					?>
-					 <?php if($Designation == SECURITY  || $DEPCode == STORE || $DEPCode == QUALITY){ ?>
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-check-square-o"></i> Inspection<span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu2">
-						<?php if($Designation == SECURITY) {?>
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>Addigr">
-								<i class="fa fa-upload"></i>
-								<span>Inward Gate Register Entry</span>
-							  </a>
-							</li>
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>ViewigrDetails">
-								<i class="fa fa-upload"></i>
-								<span>View Inward Gate Register</span>
-							  </a>
-							</li>
-						<?php } 
-						  if($DEPCode == STORE || $DEPCode == QUALITY)
-						  { 
-						?>	
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>Viewigr">
-								<i class="fa fa-eye"></i>
-								<span>View Inward Gate Register</span>
-							  </a>
-							</li>
-						
-							
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>ViewMRIR">
-								<i class="fa fa-upload"></i>
-								<span>View Material Inspection Report</span>
-							  </a>
-							</li>
-
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>quality">
-								<i class="fa fa-list-alt"></i>
-								<span>Product Test Specification Master</span>
-							  </a>
-							</li>
-							
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>qualityreportlist">
-								<i class="fa fa-table"></i>
-								<span>Product Test Report</span>
-							  </a>
-							</li>
-							
-							<li class="treeview">
-							  <a href="<?php echo base_url(); ?>qualityreportlistinward">
-								<i class="fa fa-hand-o-down"></i>
-								<span>Inward Material Test Report</span>
-							  </a>
-							</li>
-						
-							
-						  <?php 
-							
-						  }
-						  if($DEPCode == STORE)
-						  {?>
-							  <li class="treeview">
-							  <a href="<?php echo base_url(); ?>Distribution">
-								<i class="fa fa-eye"></i>
-								<span>Material Distribution List</span>
-							  </a>
-							</li>
-							  
-						<?php   }
-						  ?>	
-							</ul>
-					</li>
-					 <?php   
-					 if($DEPCode == STORE)
-						  { ?>
-						<li class="treeview">
-							  <a href="<?php echo base_url(); ?>Stock">
-								<i class="fa fa-dashboard"></i> <span>Stock Details</span> 
-							  </a>
-						</li>
-				 <?php } 
-					 }?>
-					<?php   
-                     if($DEPCode == FINANCE)
-                          { ?>
-					  
-					  <li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-thumb-tack"></i> Billing <span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
-						 <li class="treeview">
-                              <a href="<?php echo base_url(); ?>ViewMRIRBilling">
-                                <i class="fa fa-dashboard"></i> <span>MRIR Billing</span> 
-                              </a>
-                        </li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ServicePOBilling">
-									<i class="fa fa-keyboard-o"></i>
-									<span>Service PO Billing</span>
-								  </a>
-								</li>
-								
-								
-						</ul> 
-					</li>
-					<?php } ?> 
-				<?php   
-          if($DEPCode == FINANCE || $DEPCode == HR )
-            { ?>
-          
-					<li class="treeview">
-					  <span id="menu" data-toggle="dropdown" ><i class="fa fa-money"></i> Cash Book <span class="caret"></span></span> 
-						<ul class="dropdown-menu" role="menu" aria-labelledby="menu3">
-						    <li class="treeview">
-                              <a href="<?php echo base_url(); ?>cashbook/CashbookList">
-                                <i class="fa fa-vcard"></i> <span>Account Master</span> 
-                              </a>
-                </li>
-								<li class="treeview">
-								  <a href="<?php echo base_url(); ?>ViewIncomeExpense">
-									<i class="fa fa-credit-card"></i>
-									<span>Income and Expense</span>
-								  </a>
-								</li>
-						</ul>
-					</li>
-				<?php } ?> 
-				
-				 <?php   
-                     if($DEPCode == PURCHASE)
-                          { ?>
-                        <li class="treeview">
-                              <a href="<?php echo base_url(); ?>AdvanceRequest">
-                                <i class="fa fa-dashboard"></i> <span>Advance Request</span> 
-                              </a>
-                        </li>
-								 <?php } 
-								 
-								 if($DEPCode == MANAGEMENT)
-											{ ?>
-				
-				<li class="treeview">
-					<a href="<?php echo base_url(); ?>reports">
-						<i class="fa fa-dashboard"></i> <span>ReportList</span> 
-					</a>
-				</li>
-									 
-						 <?php } ?>
-						 <?php
-$pic = $this->profilepic;
-//echo $pic;
-$path = 'uploads/images/';
-$files = glob($path."*.{jpg,jpeg,png,gif}", GLOB_BRACE);
-$full_path = $path .$pic;
-// echo $full_path;
-// print_r($files);
-// if (in_array($full_path,$files))
-// {
-// echo $full_path;
-// echo 'matched., images in this folder';
-// }
-// else
-// {
-// echo 'No images were found in this folder';
-// }
-?>
- 		  
-						 
-              <li class="dropdown user user-menu">
+			    <li class="dropdown user user-menu">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
 								<?php if(in_array($full_path,$files)) { 
 									      if($this->profilepic != '') {
@@ -738,7 +215,7 @@ $full_path = $path .$pic;
                       <?php echo $name; ?>-<?php echo $role; ?>
                       <small><?php echo $role_text; ?></small>
                     </p>
-                  </li>
+                  </li> 
                   <!-- Menu Footer-->
                   <li class="user-footer">
                     <div class="pull-left">
@@ -749,9 +226,571 @@ $full_path = $path .$pic;
                     </div>
                   </li>
                 </ul>
-              </li>
+              </li>   		  
+               
             </ul>
           </div>
-        </nav>
-      </header>
+<!--End of new  login -->
+      <!--logout-->
+      	
+
+
+     <!--end logout--> 
+    </nav>
+  </header>
+
+
+
+
+          <aside class="main-sidebar ">
+    <!-- sidebar: style can be found in sidebar.less -->
+    <section class="sidebar">
+     
+      <!-- sidebar menu: : style can be found in sidebar.less -->
+      <ul class="sidebar-menu">
+
+
+ <?php if($Designation != SECURITY  ){ ?>
+      	 <li class="active treeview">
+              <a href="<?php echo base_url(); ?>dashboard">
+            <i class="fa fa-dashboard"></i> <span>Dashboard</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          
+        </li>
+<?php 
+			  }
+			  if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
+						{ 
+						?>
+
+
+			<li class="treeview">
+          <a href="#">
+            <i class="fa fa-database"></i>
+            <span>Master Details</span>
+            <span class="pull-right-container">
+              <span class="fa fa-angle-left pull-right"></span>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+          	<?php //echo $DEPCode;
+						if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE || $DEPCode == HR)
+						{
+						?>
+						<?php
+						if($DEPCode != FINANCE && $DEPCode != HR)
+						{
+						?>
+            <li><a href="<?php echo  base_url(); ?>supplierListing" >
+							<i class="fa fa-user-secret"></i>
+							Supplier Details
+						  </a></li>
+						  <?php
+						}
+						?>
+						<?php
+						if($DEPCode == FINANCE )
+						{
+						?>
+            
+            <li><a href="<?php echo base_url(); ?>costListing">
+							<i class="fa fa-cart-plus"></i>
+							Cost Details
+						  </a>
+						</li>
+            <li><a href="<?php echo base_url(); ?>assetListing">
+							<i class="fa fa-cogs"></i>
+							Asset Details
+						  </a>
+						</li>
+						  <?php
+						}
+						?>
+						<?php
+						if($role == ROLE_ADMIN || $DEPCode == HR)
+						{
+						?>
+						<?php
+						if($DEPCode != HR)
+						{
+						?>
+						 <li> <a href="<?php echo base_url(); ?>companyview" >
+							<i class="fa fa-industry"></i>
+							<span class="nav-label">Company Master</span>
+						  </a></li>
+                         <?php } ?>
+                         <li> <a href="<?php echo base_url(); ?>employeeListing" >
+							<i class="fa fa-user-circle"></i>
+							<span class="nav-label">Employee Details</span>
+						  </a></li>
+						  <?php
+						if($DEPCode != HR)
+						{
+						?>
+						 <li> <a href="<?php echo base_url(); ?>configlisting" >
+							<i class="fa fa-file-text"></i>
+							<span class="nav-label">Config Master</span>
+						  </a></li>
+						  <li> <a href="<?php echo base_url(); ?>departmentListing" >
+							<i class="fa fa-building"></i>
+							<span class="nav-label">Department Master</span>
+						  </a></li>
+						  <?php } ?>
+						<?php
+						}
+						?>	
+						<?php
+						if($role == ROLE_ADMIN && $DEPCode != HR )
+						{
+						?>
+						<li>  <a href="<?php echo base_url();?>rawmaterialListing" >
+							<i class="fa fa-files-o"></i>
+							<span>Material Master</span>
+						  </a></li>
+						  <?php
+						}
+						?>
+						<?php
+						}
+						if($role == ROLE_ADMIN && $DEPCode != HR )
+						{
+						?>
+						<li>  <a href="<?php echo base_url(); ?>userListing">
+							<i class="fa fa-users"></i>
+							<span>Users</span>
+						  </a>
+						</li>
+						 <?php
+							}
+										
+							?>
+				  
+			</ul>
+			</li>	
+ <?php
+							}
+										
+							?>			
+           <?php
+					if (( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN || $DEPCode == MANAGEMENT ) && $Designation != SECURITY && $DEPCode != HR )
+				{
+				?>
+
+
+				<li class="treeview">
+          <a href="#">
+            <i class="fa fa-thumb-tack"></i>
+            <span>Requisition</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+          	<?php  if (($role == ROLE_MANAGER || $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN  ) && $Designation != SECURITY)
+								{									
+								?>
+            <li> <a href="<?php echo base_url(); ?>Requisition">
+									<i class="fa fa-arrow-circle-up"></i>
+									Raise Requisition 
+								  </a></li>
+            <li><a href="<?php echo base_url(); ?>UpdatePOStatus">
+									<i class="fa fa-arrow-circle-up"></i>
+									Update Service PO Status 
+								  </a>
+								</li>
+								<?Php 
+								} 
+								?>
+								<?php  if($role == ROLE_MANAGER )
+								{									
+								?>
+            <li><a href="<?php echo base_url(); ?>ApproveRequisition">
+									<i class="fa fa-thumbs-o-up"></i>
+									Approve Requisition 
+								  </a></li>
+								  <?Php 
+								} ?>
+								<?Php  
+								 if( $DEPCode == PURCHASE)
+								 {
+								?>
+								
+            <li><a href="<?php echo base_url(); ?>CreatePO">
+									<i class="fa fa-empire"></i>
+									Purchase Order From Requisition
+								  </a></li>
+								  <?Php } ?>
+          </ul>
+        </li>
+        <?php
+					}			
+					?>
+					
+			<?php
+						//if(($DEPCode == FINANCE && $role == ROLE_MANAGER)|| ($(DEPCode == PURCHASE && $role == ROLE_EMPLOYEE)))
+						if($DEPCode == FINANCE || $DEPCode == PURCHASE || $DEPCode == MANAGEMENT)
+						//if($Designation != SECURITY )
+						{
+						?>
+
+
+						<li class="treeview">
+          <a href="#">
+            <i class="fa fa-first-order"></i>
+            <span>Purchase Order</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+          	 <?php if($DEPCode == PURCHASE ){ ?>
+            <li><a href="<?php echo base_url(); ?>EmergencyPO">
+							<i class="fa fa-ambulance"></i>
+							Emergency Purchase Order  
+						  </a></li>
+            <li><a href="<?php echo base_url(); ?>purchaseorderListing">
+									<i class="fa fa-list"></i>
+									Purchase Order List  
+								  </a></li>
+            <li><a href="<?php echo base_url(); ?>amendmentpurchaseorder">
+							<i class="fa fa-ambulance"></i>
+							Amendment Purchase Order  
+						  </a></li>
+						  <?php
+						}
+						?>
+						<!-- For Finance Team for PO approval list-->
+						<?php
+						 
+						if($DEPCode == FINANCE  && $role == ROLE_MANAGER)
+						{
+						?>
+            <li><a href="<?php echo base_url(); ?>POApproval">
+									<i class="fa fa-users"></i>
+									Approve Purchase Order
+								  </a>
+								</li>
+								<?php
+						}
+						?>
+						
+						<?php
+						//if($DEPCode != FINANCE && $DEPCode == PURCHASE)
+							if( $DEPCode == MANAGEMENT)
+						{
+						?>
+						 <li> <a href="<?php echo base_url(); ?>PORelease">
+                            <i class="fa fa-history"></i>
+                            Release Purchase Order
+                          </a>
+								</li>
+								 <?php
+						}
+						?>
+
+
+          </ul>
+        </li>
+        <?php
+						} 
+							if ($Designation != SECURITY  && $DEPCode != HR )
+				{
+							
+						?>
+						<li class="treeview">
+          <a href="#">
+            <i class="fa fa-check-square-o"></i>
+            	<span>Store Requisition</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+            <li><a href="<?php echo base_url(); ?>storerequisition">
+								<i class="fa fa-upload"></i>
+								Store Requisition
+							  </a></li>
+							  <?php  
+								if($role == ROLE_MANAGER ) {
+									
+								?>
+            <li><a href="<?php echo base_url(); ?>approvalstorerequisitionslip">
+								<i class="fa fa-eye"></i>
+								Approve Store Requisition
+							  </a></li>
+							  <?php }
+								if( $DEPCode == STORE)
+								 {							
+							 ?>
+            <li><a href="<?php echo base_url(); ?>storerequisitionlisting">
+								<i class="fa fa-eye"></i>
+								Store Requisition Listing
+							  </a></li>
+							   <?php } ?>
+
+            
+          </ul>
+        </li>
+
+    <?php  }			 
+								
+		           	if($role == ROLE_ADMIN) { ?> 
+
+		           	<li class="treeview">
+          <a href="#">
+            <i class="fa fa-thumb-tack"></i>
+            <span>Attendance</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+            <li><a href="<?php echo base_url(); ?>attendance">
+				<i class="fa fa-refresh fa-spin "></i>
+			Monthly Attendance
+			</a>
+		</li>
+           
+          </ul>
+        </li>
+        	<?php	}						
+
+			if($DEPCode == HR)
+				{
+				?>
+
+
+				<li class="treeview">
+          <a href="#">
+            <i class="fa fa-thumb-tack"></i>
+            <span>Payslip</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+            <li> <a href="<?php echo base_url(); ?>monthlypay">
+									<i class="fa fa-keyboard-o"></i>
+									Monthly Pay Information
+								  </a></li>
+            <li><a href="<?php echo base_url(); ?>ExcelUpload2">
+									<i class="fa fa-upload"></i>
+									Monthly Pay Upload
+								  </a></li>
+            <li><a href="<?php echo base_url(); ?>ViewPay">
+									<i class="fa fa-money"></i>
+									PaySlip Generator
+								  </a></li>
+            <li> <a href="<?php echo base_url(); ?>PaysilpListing" >
+									<i class="fa fa-credit-card-alt"></i> <span>Edit Payslip</span> 
+								  </a></li>
+            <li> <a href="<?php echo base_url(); ?>emppayListings" >
+                                    <i class="fa fa-credit-card"></i> <span>Employee Salary Details</span> 
+                                  </a></li>
+            <li><a href="<?php echo base_url(); ?>BankReport" >
+									<i class="fa fa-table"></i> <span>Bank Report</span> 
+								  </a></li>
+            <li><a href="<?php echo base_url(); ?>publicholidays" >
+									<i class="fa fa-calendar"></i> <span>Public Holidays</span> 
+								  </a></li>
+            <li> <a href="<?php echo base_url(); ?>loanreports" >
+									<i class="fa fa-list-alt"></i> <span>Loan Reports</span> 
+								  </a></li>
+
+
+          </ul>
+        </li>
+<?php
+					}			
+					?>
+					 <?php if($Designation == SECURITY  || $DEPCode == STORE || $DEPCode == QUALITY){ ?>
+
+
+					 <li class="treeview">
+          <a href="#">
+            <i class="fa fa-check-square-o"></i>
+            <span>Inspection</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+          	<?php if($Designation == SECURITY) {?>
+            <li><a href="<?php echo base_url(); ?>Addigr">
+								<i class="fa fa-upload"></i>
+								Inward Gate Register Entry
+							  </a></li>
+            <li><a href="<?php echo base_url(); ?>ViewigrDetails">
+								<i class="fa fa-upload"></i>
+								<span>View Inward Gate Register</span>
+							  </a>
+							</li>
+							<?php } 
+						  if($DEPCode == STORE || $DEPCode == QUALITY)
+						  { 
+						?>	
+            <li><a href="<?php echo base_url(); ?>Viewigr">
+								<i class="fa fa-eye"></i>
+								<span>View Inward Gate Register</span>
+							  </a></li>
+            <li> <a href="<?php echo base_url(); ?>ViewMRIR">
+								<i class="fa fa-upload"></i>
+								<span>View Material Inspection Report</span>
+							  </a></li>
+             <li> <a href="<?php echo base_url(); ?>quality">
+								<i class="fa fa-list-alt"></i>
+								<span>Product Test Specification Master</span>
+							  </a></li>
+              <li> <a href="<?php echo base_url(); ?>qualityreportlist">
+								<i class="fa fa-table"></i>
+								<span>Product Test Report</span>
+							  </a></li>
+
+				 <li>  <a href="<?php echo base_url(); ?>qualityreportlistinward">
+								<i class="fa fa-hand-o-down"></i>
+								<span>Inward Material Test Report</span>
+							  </a></li>
+
+
+
+
+
+
+							 
+
+						  <?php 
+							
+						  }
+						  if($DEPCode == STORE)
+						  {?>
+               <li><a href="<?php echo base_url(); ?>Distribution">
+								<i class="fa fa-eye"></i>
+								<span>Material Distribution List</span>
+							  </a></li>
+
+						<?php   }
+						  ?>	
+          </ul>
+        </li>
+         <?php   
+					 if($DEPCode == STORE)
+						  { ?>
+						<li class="treeview">
+							  <a href="<?php echo base_url(); ?>Stock">
+								<i class="fa fa-dashboard"></i> Stock Details
+							  </a>
+						</li>
+				 <?php } 
+					 }?>
+					<?php   
+                     if($DEPCode == FINANCE)
+                          { ?>
+
+
+                          	<li class="treeview">
+          <a href="#">
+            <i class="fa fa-thumb-tack"></i>
+            <span>Billing</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+            <li> <a href="<?php echo base_url(); ?>ViewMRIRBilling">
+                                <i class="fa fa-dashboard"></i> MRIR Billing
+                              </a></li>
+            <li><a href="<?php echo base_url(); ?>ServicePOBilling">
+									<i class="fa fa-keyboard-o"></i>
+									<span>Service PO Billing</span>
+								  </a></li>
+            
+          </ul>
+        </li>
+        <?php } ?> 
+				<?php   
+          if($DEPCode == FINANCE || $DEPCode == HR )
+            { ?>
+
+            	<li class="treeview">
+          <a href="#">
+            <i class="fa fa-money"></i>
+            <span>Cash Book</span>
+            <span class="pull-right-container">
+              <i class="fa fa-angle-left pull-right"></i>
+            </span>
+          </a>
+          <ul class="treeview-menu">
+            <li><a href="<?php echo base_url(); ?>cashbook/CashbookList">
+                                <i class="fa fa-vcard"></i> Account Master
+                              </a></li>
+            <li><a href="<?php echo base_url(); ?>ViewIncomeExpense">
+									<i class="fa fa-credit-card"></i>
+									<span>Income and Expense</span>
+								  </a></li>
+								  <?php } ?> 
+				
+				
+           
+          </ul>
+        </li>
+ <?php   
+                     if($DEPCode == PURCHASE)
+                          { ?>
+
+              <li> <a href="<?php echo base_url(); ?>AdvanceRequest">
+                                <i class="fa fa-dashboard"></i> Advance Request 
+                              </a></li>
+                               <?php } 
+								 
+								 if($DEPCode == MANAGEMENT)
+											{ ?>
+				
+            <!-- <li><a href="<?php echo base_url(); ?>reports">
+						<i class="fa fa-book"></i> ReportList 
+					</a></li> -->
+					<li class="treeview">
+					<a href="<?php echo base_url(); ?>reports">
+            <i class="fa fa-book"></i>
+             ReportList 
+            
+          </a>
+      </li>
+
+
+          </ul> <!--imp-->
+        
+
+									 
+						 <?php } ?>
+					
+</section>
+</aside>
+</div>
+
+
+</body>
+</html>
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 		  
+						 
+             
+            
+          
+        
+      
  
\ No newline at end of file
diff --git a/application/views/report_pendingreqst.php b/application/views/report_pendingreqst.php
index 44e8065c..786c62ac 100755
--- a/application/views/report_pendingreqst.php
+++ b/application/views/report_pendingreqst.php
@@ -33,6 +33,10 @@ if(!empty($pending_list))
 		  
 			   
 	 </style>
+	 <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
  <div class="row"style="min-height: 600px;">
         <!-- Left col -->
         <div class="col-md-12">
@@ -335,6 +339,8 @@ if(!empty($pending_list))
         </div>
         <!-- /.col -->
       </div>
+  </section>
+</div>
       <script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 	  <script src="https://cdn.datatables.net/buttons/1.4.2/js/dataTables.buttons.min.js"></script>
 	  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
diff --git a/application/views/reportslink.php b/application/views/reportslink.php
index a43d3b17..5a93eec6 100644
--- a/application/views/reportslink.php
+++ b/application/views/reportslink.php
@@ -37,9 +37,14 @@ h1{
 </style>
 
 	</head>
-        	<section class="dot_background padding-top-10">
+  <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+      
+    <section class="content"><br/>  
+        	<!-- <section class="dot_background padding-top-10"> -->
+          
              
-    <div id="" class="container">
+    <!-- <div id="" class="container"> -->
          <div id="innerwrap" class="">
             
             <div class="col-lg-12 col-md-12" id="seek-trucks-tab">
@@ -425,7 +430,14 @@ h1{
                         </div>
                         </div>
                         </div>
+                      
+                    </div>
                         </section>
+                      </a>
+                    </div>
+                  </div>
+                </div>
+        
 
                         
                 <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>