From 22de98c308edad3b61c0ec7c9902298bb5bec3e5 Mon Sep 17 00:00:00 2001
From: vadivel J <jvadivel.1996@gmail.com>
Date: Wed, 9 Oct 2024 11:24:31 +0530
Subject: [PATCH] client change req in emp module -vadivelJ

---
 app/Controllers/StockController.php |  2 +-
 app/Views/CoatingMachineDetail.php  | 18 ++++----
 app/Views/attendance.php            | 18 ++++----
 app/Views/includes/new_header.php   | 71 ++++++++++++++++++-----------
 4 files changed, 64 insertions(+), 45 deletions(-)

diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 68602ec4..28bbc206 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -64,7 +64,7 @@ class StockController extends BaseController
         $postData['perHourCoatingSandQTY'] = number_format((float)$postData['totalCoatingSandInKg'] / $machineRunningInHrs, 2, '.', '');
         
         
-        //dd( $postData['perHourCoatingSandQTY']);
+ 
         
         $inserted= $this->coatingMachineDetails_model->insert($postData);
 
diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php
index cdeef485..77447c76 100644
--- a/app/Views/CoatingMachineDetail.php
+++ b/app/Views/CoatingMachineDetail.php
@@ -289,26 +289,26 @@
 
         <div class="form-row">
             <div class="form-group col-md-3">
-                <label for="dateId">Date</label>
+                <label for="editDateId">Date</label>
                 <span class="badge mandatory">*</span>
                 <input type="date" class="form-control" id="editDateId" 
                  name="date" value="">
                  <input type="hidden" name="editCoatingMachineDetailId" id="editCoatingMachineDetailId">
             </div>
             <div class="form-group col-md-3">
-                <label for="shiftId">Shift</label>
+                <label for="editShiftId">Shift</label>
                 <span class="badge mandatory">*</span>
                 <input type="text" class="form-control" id="editShiftId" 
                 name="shift" value="">
             </div>
             <div class="form-group col-md-3">
-                <label for="machineOnTimeId">Machine On Time</label>
+                <label for="editMachineOnTimeId">Machine On Time</label>
                 <span class="badge mandatory">*</span>
                 <input type="time" class="form-control" id="editMachineOnTimeId" 
                 name="machineOnTime" value="">
             </div>
             <div class="form-group col-md-3">
-                <label for="machineOffTimeId">Machine Off Time</label>
+                <label for="editMachineOffTimeId">Machine Off Time</label>
                 <span class="badge mandatory">*</span>
                 <input type="time" class="form-control" id="editMachineOffTimeId" 
                 name="machineOffTime" value="">
@@ -318,25 +318,25 @@
 
         <div class="form-row">
              <div class="form-group col-md-3">
-               <label for="customerNameId">Customer Name</label>
+               <label for="editCustomerNameId">Customer Name</label>
                 <span class="badge mandatory">*</span>
                 <input type="text" class="form-control" id="editCustomerNameId" 
                 name="customerName" value="">         
             </div>
             <div class="form-group col-md-3">
-                <label for="totalCoatingId">Total Coating</label>
+                <label for="editTotalCoatingId">Total Coating</label>
                 <span class="badge mandatory">*</span>
                 <input type="text" class="form-control" id="editTotalCoatingId" 
                 name="totalCoating" value="">
             </div>
             <div class="form-group col-md-3">
-                <label for="totalCoatingSandId">Total Coating Sand (in Kg)</label>
+                <label for="editTotalCoatingSandId">Total Coating Sand (in Kg)</label>
                 <span class="badge mandatory">*</span>
                 <input type="text" class="form-control" id="editTotalCoatingSandId" 
                 name="totalCoatingSandInKg" value="">
             </div>
             <div class="form-group col-md-3">
-              <label for="totalGasConsumptionId">Total Gas Consumption</label>
+              <label for="editTotalGasConsumptionId">Total Gas Consumption</label>
                 <span class="badge mandatory">*</span>
                  <input type="text" class="form-control" id="editTotalGasConsumptionId" 
                  name="totalGasConsumption" value="">
@@ -464,7 +464,7 @@ $(document).ready(function() {
         $('#editTotalCoatingSandId').val(totalCoatingSandInKg);
         $('#editTotalGasConsumptionId').val(totalGasConsumption);
         $('#editCoatingMachineDetailId').val(row.data('id'));
-        
+
 
         // Show the modal
         $('#editCoatingMachineDetailModal').modal('show');
diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index 60aa202e..562a2050 100755
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -286,9 +286,9 @@ $currentday = date('d');
                                                     <th <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
                                                         <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
                                                         class="celda_encabezado_general" <?php if ($flag == 1 or $flag2 == 1) {
-                                                                                                echo "style='background: #f39c12 ;'";
+                                                                                                echo "style='background: #f0898a ;'";
                                                                                             } else if ($todayflag == 1) {
-                                                                                                echo "style='background: #dd99ff ;'";
+                                                                                                echo "style='background: #00a65a ;'";
                                                                                             } ?>>
                                                         <?php if ($flag == 1 or $flag2 == 1) {
                                                             echo "<font style='color:#fff;'>" . $col . "W<font>";
@@ -303,9 +303,9 @@ $currentday = date('d');
                                                         <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
                                                         class="celda_encabezado_general"
                                                         <?php if ($flag == 1 or $flag2 == 1) {
-                                                            echo "style='background: #f39c12 ;'";
+                                                            echo "style='background: #f0898a ;'"; //#f39c12 old color
                                                         } else if ($todayflag == 1) {
-                                                            echo "style='background: #dd99ff ;'";
+                                                            echo "style='background: #00a65a;'";
                                                         } ?>>
                                                         <?php if ($flag == 1 or $flag2 == 1) {
                                                             echo "<font style='color:#fff;'>" . $col . "OT<font>";
@@ -382,9 +382,9 @@ $currentday = date('d');
                                                             onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);"
                                                             id="<?php echo $row . 'row' . $col . 'W'; ?>"
                                                             <?php if ($flag == 1 or $flag2 == 1) {
-                                                                echo "style='background: #f9cd86 ;'";
+                                                                echo "style='background: #f5a6a7 ;'";
                                                             } else if ($todayflag == 1) {
-                                                                echo "style='background: #f7e6ff ;'";
+                                                                echo "style='background: #cef0ad ;'";
                                                             } ?>
                                                             contenteditable="true" tabindex="<?php echo $col; ?>">
                                                             <?php if (!empty($a->$WH)) {
@@ -398,9 +398,9 @@ $currentday = date('d');
                                                             onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);"
                                                             id="<?php echo $row . 'row' . $col . 'OT'; ?>"
                                                             <?php if ($flag == 1 or $flag2 == 1) {
-                                                                echo "style='background: #f9cd86 ;'";
+                                                                echo "style='background: #f5a6a7 ;'";
                                                             } else if ($todayflag == 1) {
-                                                                echo "style='background: #f7e6ff ;'";
+                                                                echo "style='background: #cef0ad ;'";
                                                             } ?>
                                                             contenteditable="true" tabindex="<?php echo $col; ?>">
                                                             <?php if (!empty($a->$OT)) {
@@ -467,7 +467,7 @@ $currentday = date('d');
                                 <div class="row">
                                     <div class="col-md-12 text-right">
                                         <input type="button" class="btn btn-success" id="c" value="save"
-                                            ">
+                                            >
                                     </div>
                                 </div>
                             </div>
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 85e60b79..f5dafc3f 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -587,6 +587,8 @@
 
                     <div class="collapse navbar-collapse" id="topnav-menu-content">
                         <ul class="navbar-nav">
+
+                            <!-- Dashboard module -->
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
                                     aria-expanded="false">
@@ -645,22 +647,38 @@
                                             <a href="<?php echo base_url(); ?>amendmentpurchaseorder" class="dropdown-item">Amendment Purchase Order</a>
                                         </div>
                                     </div>
-                                    <div class="dropdown">
-                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-inward"
-                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <i class="ri-task-line align-middle mr-1"></i> Inward <div class="arrow-down"></div>
-                                        </a>
-                                        <div class="dropdown-menu" aria-labelledby="topnav-inward">
-                                            <a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item">Inward Gate Register Entry</a>
-                                            <a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item">View Inward Gate Register</a>
-                                        </div>
-                                    </div>
-                                    <div class="dropdown">
-                                        <a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i> Non IGR / Expense</a>
-                                    </div>
+
+                                   
                                 </div>
                             </li>
 
+                            <!-- Inward Module -->
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-purchase" role="button"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="ri-ancient-gate-fill mr-1"></i> INWARD<div class="arrow-down"></div>
+                                </a>
+                                <div class="dropdown-menu" aria-labelledby="topnav-purchase">
+
+                                  
+                                    
+                                    <div class="">
+                                        <a href="<?php echo base_url(); ?>AddIGR" class="dropdown-item"><i class="ri-task-line align-middle mr-1"></i> 
+                                         Inward Gate Register Entry</a>
+                                    </div>
+                                    <div class="">
+                                       
+                                        <a href="<?php echo base_url(); ?>ViewIGR" class="dropdown-item"><i class="ri-eye-fill mr-1"></i>
+                                         View Inward Gate Register</a>
+                                      
+                                    </div>
+                                    <div class="">
+                                        <a href="<?php echo base_url(); ?>ListIGR" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>
+                                         Non IGR / Expense</a>
+                                    </div>
+                                </div>
+                            </li>   
+
                             <!-- Stock module  -->
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-stock" role="button"
@@ -669,7 +687,7 @@
                                 </a>
                                 <div class="dropdown-menu" aria-labelledby="topnav-stock">
 
-                                    <div class="dropdown">
+                                    <div class="">
                                         <a href="<?php echo base_url(); ?>coatingMachineDetails" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Coating Machine Details</a>
                                     </div>
                                 </div>
@@ -714,19 +732,14 @@
                                 </div>
                             </li>
 
-                            <!-- Others -->
+                            <!-- master detail module -->
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-others" role="button"
                                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <i class="ri-database-2-line align-middle mr-1"></i> OTHERS <div class="arrow-down"></div>
+                                    <i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
                                 </a>
-                                <div class="dropdown-menu" aria-labelledby="topnav-others">
-                                    <div class="dropdown">
-                                        <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-master"
-                                            role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
-                                        </a>
-                                        <div class="dropdown-menu" aria-labelledby="topnav-master">
+                               
+                                <div class="dropdown-menu" aria-labelledby="topnav-master">
                                             <!-- <a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a> -->
                                             <a href="<?php echo base_url(); ?>transporterListing" class="dropdown-item">Transporter Details</a>
                                             <a href="<?php echo base_url(); ?>costListing" class="dropdown-item">Cost Details</a>
@@ -738,27 +751,33 @@
                                             <a href="<?php echo base_url(); ?>userListing" class="dropdown-item">Users</a>
                                             <a href="<?php echo base_url(); ?>readFactoryMachineMasterDetails" class="dropdown-item">Factory Machines Details</a>
                                         </div>
-                                    </div>
-                                </div>
                             </li>
+
+                           
+                            <!-- supplier module -->
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>supplierlisting" role="button" aria-expanded="false">
                                     <i class="fas fa-truck mr-1" style="color: gray;"></i>Supplier
                                 </a>
                             </li>
+
+                            <!-- material module -->
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>rawmaterialListing" role="button" aria-expanded="false">
                                     <i class="fas fa-cubes mr-1"></i>Material
                                 </a>
                             </li>
 
+                            <!-- report list module -->
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"
                                     aria-expanded="false">
-                                    <i class="ri-keyboard-line mr-1"></i> REPORT LISTS
+                                    <i class="ri-keyboard-line mr-1"></i> Report Lists
                                 </a>
                             </li>
 
+               
+
                         </ul> <!-- end navbar-->
                     </div> <!-- end .collapsed-->
                 </nav>