From 84e31dbe1829efa858985e250f61606e696fb48f Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Thu, 1 Aug 2024 11:03:59 +0530
Subject: [PATCH] Security login changes : GWM

---
 app/Controllers/Login.php            |  3 ++-
 app/Views/POlist.php                 |  2 +-
 app/Views/createPOfromRequistion.php | 12 ++++++++++--
 app/Views/includes/header.php        | 10 +++++-----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
index 5795aeb3..410c9767 100644
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -81,6 +81,7 @@ class Login extends BaseController
         $result = $this->login_model->loginMe($email, $password);
 
         if (!empty($result)) {
+   
             foreach ($result as $res) {
                 log_message('error', '#####loggin_name : ' . $res->FirstName);
                 $sessionData = [
@@ -106,7 +107,7 @@ class Login extends BaseController
                 $DEPCode = $res->DEPCode;
 
                 if ($DEPCode == SECURITY) {
-                    return redirect()->to(site_url('/Addigr'));
+                    return redirect()->to(site_url('/dashboard'));
                 } else {
                     return redirect()->to(site_url('/dashboard'));
                 }
diff --git a/app/Views/POlist.php b/app/Views/POlist.php
index 09c84bd4..56a6374f 100644
--- a/app/Views/POlist.php
+++ b/app/Views/POlist.php
@@ -202,7 +202,7 @@
                 "info": true,
                 "scrollX": true,
                 "autoWidth": true,
-				        "pageLength": 25,
+				        "pageLength": 10,
                 "order": [[0, "desc"]], // Assuming the "Created Date" is the first column and you want to order by it in descending order
                 "dom": '<"top"lBf>rt<"bottom"ip><"clear">', // Custom layout
                 "buttons": [
diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php
index c87b9db2..8cbb4192 100644
--- a/app/Views/createPOfromRequistion.php
+++ b/app/Views/createPOfromRequistion.php
@@ -33,6 +33,12 @@
 		flex-basis: 50%;
 		float: inline-end;
 	}
+	#REQLIST_paginate{
+		flex-basis: 50%;
+		float: inline-end;
+	}
+	
+
 </style>
 <div class="content-wrapper">
       <?php
@@ -94,7 +100,7 @@
 	   <div class="col-md-12">	   
 		<div class="col-md-3 col-md-offset-9" >
 		 	  <p>
-			  <div align="right" style="padding-right:10px">
+			  <div align="right" style="padding-right:0px">
   <!--<a href="<?php echo base_url(); ?>purchaseorderform/purchaseorder">
   <button type="button" class="btn btn-success">Create PO</button></a> -->
 <!--<input type="submit" class="btn btn-success" onclick="return Validate();"  value="Create Purchase Order"> -->
@@ -491,7 +497,9 @@ $(function () {
 	  "aaSorting": [[ 2, "desc" ]],
       "ordering": true,
       "info": true,
-      "autoWidth": true
+      "autoWidth": true,
+	  "pageLength": 10,             
+	  "lengthMenu": [10, 25, 50, 100]  
 	   
     }); 
   });
diff --git a/app/Views/includes/header.php b/app/Views/includes/header.php
index e378d958..a56d5c53 100644
--- a/app/Views/includes/header.php
+++ b/app/Views/includes/header.php
@@ -185,7 +185,7 @@
 			height: 5px;
 		}
 		::-webkit-scrollbar-track {
-			background-color: #797a7c;
+			background-color: #f5f5f5;
 		}
 		
     </style>
@@ -340,7 +340,7 @@
 
 
 
-	   <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PURCHASE</p>
+	   <!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PURCHASE</p> -->
 	   <!-- Requisition Starts Ends -->
        <?php if ($DEPCode != HR) { ?>
 			 <?php if ($DEPCode != SECURITY) { ?>
@@ -781,7 +781,7 @@
 
 
 
-		<p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">INVENTORY</p>
+		<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">INVENTORY</p> -->
         <!--STOCK -->
 		<?php if (empty($DepAccesslist)) { ?>
 		<?php if ($DEPCode == PRODUCTION) { ?>
@@ -910,7 +910,7 @@
 
 
 
-		<p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PRODUCTION</p>
+		<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PRODUCTION</p> -->
 		<!-- INPROCESS MODULE-->
 		   <?php if (empty($DepAccesslist)) { ?>
 			<?php if ($DEPCode == QUALITY) { ?>
@@ -1163,7 +1163,7 @@
 
 
 
-		   <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">OTHERS</p>
+		   <!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">OTHERS</p> -->
 			<!-- Master Menus starts -->
 			<?php if (empty($DepAccesslist)) { ?>
 				<?php if ($DEPCode == FINANCE ||