From 68756caaa4bbb30ef9e6617fcbf7e760245e974f Mon Sep 17 00:00:00 2001
From: saravanakumar_kandasami
 <https://saravanakumar_kandasami@bitbucket.org/venbainformationtechnology/unave-marundhu.git>
Date: Fri, 12 May 2017 18:40:43 +0530
Subject: [PATCH] updated code

---
 application/logs/log-2017-05-12.php           | 32 +++++++++++++++
 application/views/costListing.php             |  8 +---
 application/views/dashboard.php               | 39 +++++++++++++++++++
 application/views/includes/header.php         | 34 +++++++++++++---
 application/views/requisitionlist.php         | 32 +++++++--------
 application/views/requisitionlistapproval.php | 11 ++----
 6 files changed, 119 insertions(+), 37 deletions(-)
 create mode 100644 application/logs/log-2017-05-12.php

diff --git a/application/logs/log-2017-05-12.php b/application/logs/log-2017-05-12.php
new file mode 100644
index 00000000..cf6b06e6
--- /dev/null
+++ b/application/logs/log-2017-05-12.php
@@ -0,0 +1,32 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); ?>
+
+ERROR - 2017-05-12 13:11:17 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:17 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:17 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:17 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:17 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:17 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:27 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:28 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:28 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:28 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:28 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:11:28 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:13:19 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:13:19 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:13:19 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:13:19 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:13:19 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:13:19 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:22:46 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:22:46 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:22:46 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:22:46 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:22:46 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:22:46 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:31:34 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:31:34 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:31:34 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:31:34 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:31:34 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
+ERROR - 2017-05-12 13:31:34 --> Severity: Notice  --> Undefined index: RequisitionStatus C:\xampp\htdocs\siddharth_application\application\views\requisitionlistapproval.php 36
diff --git a/application/views/costListing.php b/application/views/costListing.php
index fef656ff..b266e73a 100644
--- a/application/views/costListing.php
+++ b/application/views/costListing.php
@@ -12,8 +12,7 @@ speed:500
     <!-- Content Header (Page header) -->
     <section class="content-header">
       <h1>
-       <center>COST LIST</center>
-        
+       <center>COST LIST</center>       
       </h1>
     </section>
     <section class="content">
@@ -47,10 +46,7 @@ speed:500
                       <th>Cost Name</th>
                       <th>Description</th>
                       <th>Create Date</th>
-                      <th>Action</th>
-                      
-                      
-                      
+                      <th>Action</th>                      
                     </tr>
                     <?php
                     if(!empty($userRecords))
diff --git a/application/views/dashboard.php b/application/views/dashboard.php
index 5b094bea..74d576e9 100644
--- a/application/views/dashboard.php
+++ b/application/views/dashboard.php
@@ -92,5 +92,44 @@ if(!empty($EmpCount))
 		<?php
 		}			
 		?>
+		
+		<!-- Dashboard for Manager department-->
+	<?php
+	if($role == ROLE_MANAGER)
+		{
+	?>          
+  <div class="content-wrapper">
+    <!-- Content Header (Page header) -->
+    <section class="content-header">
+	<center><h1>  Manager Department Dashboard</h1> </center>
+    </section>
+    <!-- Main content -->
+    <section class="content">
+      <!-- Info boxes -->
+	  <center>
+      <div class="row">
+        <!-- fix for small devices only -->
+        <div class="clearfix visible-sm-block"></div>	
+        <div class="col-md-4 col-md-offset-4 col-sm-6 col-xs-12">
+          <div class="info-box">
+            <span class="info-box-icon bg-yellow"><i class="ion ion-ios-people-outline"></i></span>
+            <div class="info-box-content">
+              <span class="info-box-text">Employees</span>
+              <span class="info-box-number"><?php echo $Empcnt ?></span>
+            </div>            
+          </div>          
+        </div>
+      </div>
+	  </center>
+	  <div>
+		  <marquee direction="up" scrollamount="2" height="150px;">Hi This Is Manager Login </marquee>	 
+	  </div>
+	</section>
+  </div>
+   
+	<?php
+		}			
+	?>
+
     </section>
 </div>
\ No newline at end of file
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 398a82e2..d4df5590 100644
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -14,6 +14,12 @@
     <!-- 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" />
+	
+	<!-- 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>
  				
 	<script type="text/javascript" src="<?php echo base_url();?>assets/js/jquery-1.12.4.js"></script>
 	<!-- jquery-1.12.4.min -->
@@ -141,7 +147,10 @@
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
               </a>
             </li>
-			
+				<?php
+						if($role != ROLE_MANAGER )
+						{
+						?>
 				
 			<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> 
@@ -233,7 +242,11 @@
 										
 							?>
 				</ul>  
-			</li>			 
+			</li>	
+ <?php
+							}
+										
+							?>			
            <?php
 					if($role == ROLE_ADMIN || $role == ROLE_MANAGER || $role == ROLE_SALES || $role == ROLE_ACCOUNTS)
 				{
@@ -241,21 +254,30 @@
 					<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_ADMIN ||  $role == ROLE_ACCOUNTS)
+								{									
+								?>
 						<li class="treeview">
 								  <a href="<?php echo base_url(); ?>Requisition">
 									<i class="fa fa-users"></i>
 									<span>Raise Requisition </span>
 								  </a>
 								</li>
-								<?php  if($role == ROLE_MANAGER)
-								{									?>
+								<?Php 
+								} 
+								?>
+								<?php  if($role == ROLE_MANAGER ||  $role == ROLE_ACCOUNTS)
+								{									
+								?>
 								<li class="treeview">
 								  <a href="<?php echo base_url(); ?>ApproveRequisition">
 									<i class="fa fa-users"></i>
 									<span>Approve Requisition </span>
 								  </a>
 								</li>
-								<?Php } 
+								<?Php 
+								} ?>
+								<?Php  
 								 if($role == ROLE_ACCOUNTS)
 								 {
 								?>
@@ -314,7 +336,7 @@
 					}			
 					?>
 			<?php
-						if($role == ROLE_ADMIN)
+						if($role == ROLE_ACCOUNTS)
 						{
 						?>
 						 
diff --git a/application/views/requisitionlist.php b/application/views/requisitionlist.php
index f6b4db50..9c364603 100644
--- a/application/views/requisitionlist.php
+++ b/application/views/requisitionlist.php
@@ -84,23 +84,19 @@
 		</div>
 	 
 		<div class="col-md-3">
-		<label>From Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'FromDate','value' => set_value('FromDate'),'id'=>'FromDate',  'class' => 'form-control' );
-						echo form_input($data);
-						?>   
-					</div>
-		</div>
-		<div class="col-md-3">
-		<label>To Date</label>
-					<div class="form-group">
-								<?php
-						 $data = array('name' => 'ToDate','value' => set_value('ToDate'),'id'=>'ToDate',  'class' => 'form-control' );
-						echo form_input($data);
-						?>   
-					</div>
-		</div>
+		<!-- Date range -->
+              <div class="form-group">
+                <label>Date range:</label>
+
+                <div class="input-group">
+                  <div class="input-group-addon">
+                    <i class="fa fa-calendar"></i>
+                  </div>
+                  <input type="text" class="form-control pull-right" id="reservation">
+                </div>
+                <!-- /.input group -->
+              </div>
+	   </div>
 		 
 	   </div>	 
 	 </div>
@@ -370,5 +366,7 @@ var baseurl = "<?php print base_url(); ?>";
 				
 			
 		 });
+		  //Date range picker
+    $('#reservation').daterangepicker();
 		 </script>
 		  
\ No newline at end of file
diff --git a/application/views/requisitionlistapproval.php b/application/views/requisitionlistapproval.php
index 21908d02..1605d725 100644
--- a/application/views/requisitionlistapproval.php
+++ b/application/views/requisitionlistapproval.php
@@ -4,14 +4,9 @@
 
 <style>
             .table-bordered>thead>tr>th, .table-bordered>tbody>tr>th, .table-bordered>tfoot>tr>th, .table-bordered>thead>tr>td, .table-bordered>tbody>tr>td, .table-bordered>tfoot>tr>td {border: 1px solid #333;}
-			
-            </style>
-<div class="content-wrapper">
-    
- 
-	 <section class="content">
-	 
-	 <div>
+</style>
+<div class="content-wrapper"> 
+	 <section class="content">	 	  
          <center><b><h2>Requisition Approval List </h2></b></center>
 		  <?php
                       $attributes = array('class' => 'form-label-left Approve ','name'  => 'Approve','id'  => 'Approve');