From 258e1132b75d63d36bcd3407892ad2660710d328 Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Thu, 18 May 2017 12:01:35 +0530
Subject: [PATCH] PO

---
 application/views/includes/header.php | 71 ++++++++++++++++-----------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 2140f9a1..8253f438 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -10,7 +10,6 @@
     <link href="<?php echo base_url(); ?>assets/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
     <!-- Ionicons 2.0.0 -->
     <link href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
- 
     <!-- Theme style -->
     <link href="<?php echo base_url(); ?>assets/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
     <!-- AdminLTE Skins. Choose a skin from the css/skins 
@@ -18,36 +17,39 @@
     <link href="<?php echo base_url(); ?>assets/dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />
 	
 	<!-- daterange picker -->
-	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
-	<!-- date-range-picker -->
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
-	<script src="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.js"></script>
+  <link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
+ 
  				
 	<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>
     <script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery.jeditable.js"></script>
-    
-	<!-- DataTables -->
+   
+	<script type="text/javascript" src="<?php echo base_url();?>assets/js/plugins/dataTables/jquery.dataTables.js"></script>
+	
+<!-- 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/datatables/dataTables.bootstrap.min.js"></script>	
 			 
-	<!-- cdn fot data Table plugins-->	
+		 
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery.autocomplete.js"></script> 	 
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/underscore.js"></script> 	 	  
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-ui-1.10.4.min.js"></script>
 	<script src="<?php echo base_url();?>assets/dist/jquery.loader.js"></script>
 	<link href="<?php echo base_url();?>assets/dist/jquery.loader.css" rel="stylesheet" type="text/css" />
-	
 	<!-- For Table Sorting -->	
-	<script type="text/javascript" src="<?php echo base_url();?>assets/js/tsort.min.js"></script>
- 	
-	<!-- For Searchable dropdown -->	
+	<script type="text/javascript" src="<?php echo base_url();?>assets/js/tsort.min.js"></script> 	
+		<!-- For Searchable dropdown -->	
 	<script src="<?php echo base_url();?>assets/plugins/select2/select2.full.min.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/moment.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/moment.min.js"></script>
 	<script src="<?php echo base_url();?>assets/plugins/daterangepicker/daterangepicker.js"></script>
+	
 	 
+  	<script src="<?php echo base_url();?>assets/dist/sweetalert.min.js"></script>
+		
+	<link rel="stylesheet" type="text/css" href="<?php echo base_url();?>dist/sweetalert.css">	   
+
 	<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" />
 	<link href="<?php echo base_url();?>assets/css/animate.css" rel="stylesheet" type="text/css" />
@@ -57,16 +59,26 @@
    
 	<link rel="stylesheet" href="//code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css"  type="text/css"> 
 			 
-	 
-	<!-- Searchable dropdown -->
-	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/select2/select2.min.css">
-	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/daterangepicker/daterangepicker.css">
-	<!-- fullCalendar 2.2.5 -->
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
-	<script src="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.js"></script>
-	<!-- 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">
+	<!-- Bootstrap 3.3.4 -->
+    <link href="<?php echo base_url(); ?>assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />    
+    <!-- FontAwesome 4.3.0 -->
+    <link href="<?php echo base_url(); ?>assets/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
+    <!-- Ionicons 2.0.0 -->
+    <link href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
+    <!-- Theme style -->
+    <link href="<?php echo base_url(); ?>assets/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
+    <!-- AdminLTE Skins. Choose a skin from the css/skins 
+         folder instead of downloading all of them to reduce the load. -->
+    <link href="<?php echo base_url(); ?>assets/dist/css/skins/_all-skins.min.css" rel="stylesheet" type="text/css" />
+	    <!-- Searchable dropdown -->
+	 <link rel="stylesheet" href="<?php echo base_url(); ?>assets/plugins/select2/select2.min.css">
+
+	 <!-- fullCalendar 2.2.5 -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
+<script src="<?php echo base_url(); ?>assets/plugins/fullcalendar/fullcalendar.min.js"></script>
+<!-- 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">
     <style>
     	.error{
     		color:red;
@@ -136,9 +148,10 @@
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
               </a>
             </li>
-				<?php  
-						 if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
-						{ 
+				<?php   if($role == ROLE_ADMIN || $DEPCode == SALES || $DEPCode == FINANCE )
+						{  
+						
+						
 						?>
 				
 			<li class="treeview">		      
@@ -227,6 +240,7 @@
 				</ul>  
 			</li>	
  <?php
+						
 							}
 										
 							?>			
@@ -258,7 +272,6 @@
 									<span>Approve Requisition </span>
 								  </a>
 								</li>
-								
 								<?Php 
 								} ?>
 								<?Php  
@@ -269,7 +282,7 @@
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>CreatePO">
 									<i class="fa fa-users"></i>
-									<span>Purchase Order From Requisition</span>
+									<span>Purchase Order Requisition</span>
 								  </a>
 								</li>
 								<?Php } ?>
@@ -281,7 +294,7 @@
 					?>
 					
 			<?php
-						if($DEPCode == FINANCE || $role == ROLE_MANAGER)
+						if($DEPCode == FINANCE)
 						{
 						?>