From ce1d6b7308bb94347bd89beca7b0ae9d8c7e01ea Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Fri, 27 Dec 2024 17:49:18 +0530
Subject: [PATCH] master module 5  vadivel J 27-12-2024

---
 app/Models/Department_model.php | 4 +++-
 app/Views/adddepartment.php     | 4 ++--
 app/Views/departmentListing.php | 2 +-
 app/Views/editdepartment.php    | 4 +++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php
index 50730b21..0eeb1fb2 100755
--- a/app/Models/Department_model.php
+++ b/app/Models/Department_model.php
@@ -52,7 +52,9 @@ class Department_model extends Model
     function departmentListing()
     {
         $builder = $this->db->table('t_departmentdetails as BaseT')
-            ->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept,  BaseT.IsActive')
+            ->select('BaseT.CreatedDt,BaseT.DepartmentName, BaseT.DEPCode, BaseT.HeadDept,  BaseT.IsActive ,
+             HeadDept.DepartmentName as HeadDepartment')
+            ->join('t_departmentdetails as HeadDept', 'HeadDept.DEPCode = BaseT.HeadDept', 'left')
             ->orderBy("BaseT.DEPCode", "desc");
         $query = $builder->get();
         $result = $query->getResult();
diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php
index 2004f0f3..b49ad7db 100755
--- a/app/Views/adddepartment.php
+++ b/app/Views/adddepartment.php
@@ -30,7 +30,7 @@
                              <div class="row">
                                  <div class="col-12">
                                      <form role="form" id="addDepartment" action="<?php echo base_url() ?>savedepartment" method="post">
-                                         <div class="box-body">
+                                         <div class="box-body"> 
                                              <!-- Supplier Information -->
                                              <div class="col-md-12" style="margin-bottom: 27px;">
                                                  <legend style="margin-left:-10px;color: #4f7c97;">Department Information</legend>
@@ -42,7 +42,7 @@
                                                      <div class="col-md-4">
                                                          <label class="col-form-label" for="HeadDepartment">Head Department<span class="badge">*</span></label>
                                                          <select class="form-control required" id="HeadDept" name="HeadDept">
-                                                             <option value="-1" required>Select Department Code</option>
+                                                             <option value="-1" required> Master Department</option>
                                                              <?php
                                                                 if (!empty($depcode)) {
                                                                     foreach ($depcode as $DC) {
diff --git a/app/Views/departmentListing.php b/app/Views/departmentListing.php
index bd6b4184..b64df496 100755
--- a/app/Views/departmentListing.php
+++ b/app/Views/departmentListing.php
@@ -155,7 +155,7 @@
                         <td><?php echo $cdate; ?> </td>
                         <td><?php echo $record->DEPCode; ?></td>
                         <td><?php echo $record->DepartmentName ?></td>
-                        <td><?php echo $record->HeadDept ?></td>
+                        <td><?php echo $record->HeadDepartment ?></td>
                         <td><?php if ($record->IsActive == 1) {echo"Active";}else{echo "InActive";}?></td>
                         <td>
                           <?php if ($record->IsActive == 0) { ?>
diff --git a/app/Views/editdepartment.php b/app/Views/editdepartment.php
index da283800..cf0bef36 100755
--- a/app/Views/editdepartment.php
+++ b/app/Views/editdepartment.php
@@ -123,7 +123,9 @@
                                                  <option value="<?php echo $HeadDept; ?>"><?php echo $HeadDept; ?></option>
                                                  <?php if (!empty($depcode)) {
                                                         foreach ($depcode as $DC) { ?>
-                                                         <option value="<?php echo $DC->DEPCode; ?>"><?php echo $DC->DEPCode . " - " . $DC->DepartmentName; ?></option>
+                                                         <option value="<?php echo $DC->DEPCode; ?>">
+                                                                <?php echo  $DC->DEPCode . " - " . $DC->DepartmentName  ?>                                                           
+                                                        </option>
                                                  <?php }
                                                     } ?>
                                              </select>