From f940972fbe04f7b5d285032498783283367dd892 Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Mon, 30 Dec 2024 08:59:58 +0530
Subject: [PATCH] master module 1  vadivel J 30-12-2024

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

diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php
index 0eeb1fb2..7e943aa2 100755
--- a/app/Models/Department_model.php
+++ b/app/Models/Department_model.php
@@ -53,8 +53,7 @@ class Department_model extends Model
     {
         $builder = $this->db->table('t_departmentdetails as BaseT')
             ->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')
+             BaseT.HeadDept')
             ->orderBy("BaseT.DEPCode", "desc");
         $query = $builder->get();
         $result = $query->getResult();
diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php
index b49ad7db..78e4bff2 100755
--- a/app/Views/adddepartment.php
+++ b/app/Views/adddepartment.php
@@ -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> Master Department</option>
+                                                             <option value="" 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 b64df496..bd6b4184 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->HeadDepartment ?></td>
+                        <td><?php echo $record->HeadDept ?></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 cf0bef36..781280cb 100755
--- a/app/Views/editdepartment.php
+++ b/app/Views/editdepartment.php
@@ -120,9 +120,9 @@
                                          <div class="col-md-3">
                                              <label class="col-form-label" for="HeadDept">Head Department</label>
                                              <select class="form-control required" id="HeadDept" name="HeadDept">
-                                                 <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>