From 7584ef0f2f72d703eedb60264d41f5bc01baee15 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 16 Oct 2017 19:18:33 +0530
Subject: [PATCH] header changes for payroll

---
 application/config/constants.php                         | 1 +
 application/logs/log-2017-10-05.php                      | 0
 application/logs/log-2017-10-11.php                      | 0
 application/views/bankreport.php                         | 0
 application/views/bankreportprint.php                    | 0
 application/views/editPayslip.php                        | 0
 application/views/esireportprint.php                     | 0
 application/views/includes/header.php                    | 9 +++++----
 application/views/monthlypayinputs.php                   | 0
 application/views/paysliplist.php                        | 0
 application/views/pfreportprint.php                      | 0
 assets/lightswitch/lightswitch/.gitattributes            | 0
 assets/lightswitch/lightswitch/.gitignore                | 0
 assets/lightswitch/lightswitch/.jshintrc                 | 0
 assets/lightswitch/lightswitch/.travis.yml               | 0
 assets/lightswitch/lightswitch/CHANGELOG.md              | 0
 assets/lightswitch/lightswitch/Gruntfile.js              | 0
 assets/lightswitch/lightswitch/MIT-LICENSE               | 0
 assets/lightswitch/lightswitch/README.md                 | 0
 assets/lightswitch/lightswitch/bower.json                | 0
 assets/lightswitch/lightswitch/lib/jquery.tabletojson.js | 0
 .../lightswitch/lib/jquery.tabletojson.min.js            | 0
 assets/lightswitch/lightswitch/package.json              | 0
 assets/lightswitch/lightswitch/src/jquery.tabletojson.js | 0
 assets/lightswitch/lightswitch/tabletojson.jquery.json   | 0
 assets/lightswitch/lightswitch/test/index.html           | 0
 .../lightswitch/lightswitch/test/specs/content.test.js   | 0
 assets/lightswitch/lightswitch/test/specs/core.test.js   | 0
 28 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 application/logs/log-2017-10-05.php
 mode change 100644 => 100755 application/logs/log-2017-10-11.php
 mode change 100644 => 100755 application/views/bankreport.php
 mode change 100644 => 100755 application/views/bankreportprint.php
 mode change 100644 => 100755 application/views/editPayslip.php
 mode change 100644 => 100755 application/views/esireportprint.php
 mode change 100644 => 100755 application/views/monthlypayinputs.php
 mode change 100644 => 100755 application/views/paysliplist.php
 mode change 100644 => 100755 application/views/pfreportprint.php
 mode change 100644 => 100755 assets/lightswitch/lightswitch/.gitattributes
 mode change 100644 => 100755 assets/lightswitch/lightswitch/.gitignore
 mode change 100644 => 100755 assets/lightswitch/lightswitch/.jshintrc
 mode change 100644 => 100755 assets/lightswitch/lightswitch/.travis.yml
 mode change 100644 => 100755 assets/lightswitch/lightswitch/CHANGELOG.md
 mode change 100644 => 100755 assets/lightswitch/lightswitch/Gruntfile.js
 mode change 100644 => 100755 assets/lightswitch/lightswitch/MIT-LICENSE
 mode change 100644 => 100755 assets/lightswitch/lightswitch/README.md
 mode change 100644 => 100755 assets/lightswitch/lightswitch/bower.json
 mode change 100644 => 100755 assets/lightswitch/lightswitch/lib/jquery.tabletojson.js
 mode change 100644 => 100755 assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js
 mode change 100644 => 100755 assets/lightswitch/lightswitch/package.json
 mode change 100644 => 100755 assets/lightswitch/lightswitch/src/jquery.tabletojson.js
 mode change 100644 => 100755 assets/lightswitch/lightswitch/tabletojson.jquery.json
 mode change 100644 => 100755 assets/lightswitch/lightswitch/test/index.html
 mode change 100644 => 100755 assets/lightswitch/lightswitch/test/specs/content.test.js
 mode change 100644 => 100755 assets/lightswitch/lightswitch/test/specs/core.test.js

diff --git a/application/config/constants.php b/application/config/constants.php
index 614100cc..04f84e4b 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -137,6 +137,7 @@ define('MAINTENANANCE',                            	'DEP09');
 define('FINANCE',                            		'DEP10');
 define('PURCHASE',                            		'DEP11');
 define('MANAGEMENT',                            		'DEP12');
+define('HR',                            		'DEP13');
 /* PO Type  */
 define('REVENUE',                            		'REVENUE');
 define('SERVICE',                            		'SERVICE');
diff --git a/application/logs/log-2017-10-05.php b/application/logs/log-2017-10-05.php
old mode 100644
new mode 100755
diff --git a/application/logs/log-2017-10-11.php b/application/logs/log-2017-10-11.php
old mode 100644
new mode 100755
diff --git a/application/views/bankreport.php b/application/views/bankreport.php
old mode 100644
new mode 100755
diff --git a/application/views/bankreportprint.php b/application/views/bankreportprint.php
old mode 100644
new mode 100755
diff --git a/application/views/editPayslip.php b/application/views/editPayslip.php
old mode 100644
new mode 100755
diff --git a/application/views/esireportprint.php b/application/views/esireportprint.php
old mode 100644
new mode 100755
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index cfb37e5a..b0b760da 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -1,3 +1,4 @@
+
 <html>
   <head>
     <meta charset="UTF-8">
@@ -149,7 +150,7 @@ $(function() {
           <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 ){ ?>
+			  <?php if($Designation != SECURITY  ){ ?>
 			  <li class="treeview">
               <a href="<?php echo base_url(); ?>dashboard">
                 <i class="fa fa-dashboard"></i> <span>Dashboard</span> 
@@ -269,7 +270,7 @@ $(function() {
 										
 							?>			
            <?php
-					if (( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN || $DEPCode == MANAGEMENT) && $Designation != SECURITY )
+					if (( $role == ROLE_MANAGER|| $role == ROLE_EMPLOYEE || $role == ROLE_ADMIN || $DEPCode == MANAGEMENT ) && $Designation != SECURITY && $DEPCode != HR )
 				{
 				?>
 					<li class="treeview">
@@ -398,7 +399,7 @@ $(function() {
             </li>
 						<?php
 						} 
-							if ($Designation != SECURITY )
+							if ($Designation != SECURITY  && $DEPCode != HR )
 				{
 							
 						?>
@@ -438,7 +439,7 @@ $(function() {
 						<?php
 								 
 						}
-			if($DEPCode == FINANCE)
+			if($DEPCode == HR)
 				{
 				?>
 					<li class="treeview">
diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php
old mode 100644
new mode 100755
diff --git a/application/views/paysliplist.php b/application/views/paysliplist.php
old mode 100644
new mode 100755
diff --git a/application/views/pfreportprint.php b/application/views/pfreportprint.php
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/.gitattributes b/assets/lightswitch/lightswitch/.gitattributes
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/.gitignore b/assets/lightswitch/lightswitch/.gitignore
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/.jshintrc b/assets/lightswitch/lightswitch/.jshintrc
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/.travis.yml b/assets/lightswitch/lightswitch/.travis.yml
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/CHANGELOG.md b/assets/lightswitch/lightswitch/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/Gruntfile.js b/assets/lightswitch/lightswitch/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/MIT-LICENSE b/assets/lightswitch/lightswitch/MIT-LICENSE
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/README.md b/assets/lightswitch/lightswitch/README.md
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/bower.json b/assets/lightswitch/lightswitch/bower.json
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js b/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js b/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/package.json b/assets/lightswitch/lightswitch/package.json
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/src/jquery.tabletojson.js b/assets/lightswitch/lightswitch/src/jquery.tabletojson.js
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/tabletojson.jquery.json b/assets/lightswitch/lightswitch/tabletojson.jquery.json
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/test/index.html b/assets/lightswitch/lightswitch/test/index.html
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/test/specs/content.test.js b/assets/lightswitch/lightswitch/test/specs/content.test.js
old mode 100644
new mode 100755
diff --git a/assets/lightswitch/lightswitch/test/specs/core.test.js b/assets/lightswitch/lightswitch/test/specs/core.test.js
old mode 100644
new mode 100755