master module 5 vadivel J 27-12-2024

This commit is contained in:
vadivelJ96 2024-12-27 17:49:18 +05:30
parent 817d2882ec
commit ce1d6b7308
4 changed files with 9 additions and 5 deletions

View File

@ -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();

View File

@ -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) {

View File

@ -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) { ?>

View File

@ -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>