RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master module 1 vadivel J 30-12-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-12-30 08:59:58 +05:30
parent ff8ef6db72
commit f940972fbe
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Department_model.php
View File

@ -53,8 +53,7 @@ class Department_model extends Model
{ {
$builder = $this->db->table('t_departmentdetails as BaseT') $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') BaseT.HeadDept')
->join('t_departmentdetails as HeadDept', 'HeadDept.DEPCode = BaseT.HeadDept', 'left')
->orderBy("BaseT.DEPCode", "desc"); ->orderBy("BaseT.DEPCode", "desc");
$query = $builder->get(); $query = $builder->get();
$result = $query->getResult(); $result = $query->getResult();

2
app/Views/adddepartment.php
View File

@ -42,7 +42,7 @@
<div class="col-md-4"> <div class="col-md-4">
<label class="col-form-label" for="HeadDepartment">Head Department<span class="badge">*</span></label> <label class="col-form-label" for="HeadDepartment">Head Department<span class="badge">*</span></label>
<select class="form-control required" id="HeadDept" name="HeadDept"> <select class="form-control required" id="HeadDept" name="HeadDept">
<option value="-1" required> Master Department</option> <option value="" required> Master Department</option>
<?php <?php
if (!empty($depcode)) { if (!empty($depcode)) {
foreach ($depcode as $DC) { foreach ($depcode as $DC) {

2
app/Views/departmentListing.php
View File

@ -155,7 +155,7 @@
<td><?php echo $cdate; ?> </td> <td><?php echo $cdate; ?> </td>
<td><?php echo $record->DEPCode; ?></td> <td><?php echo $record->DEPCode; ?></td>
<td><?php echo $record->DepartmentName ?></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 == 1) {echo"Active";}else{echo "InActive";}?></td>
<td> <td>
<?php if ($record->IsActive == 0) { ?> <?php if ($record->IsActive == 0) { ?>

2
app/Views/editdepartment.php
View File

@ -120,9 +120,9 @@
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="HeadDept">Head Department</label> <label class="col-form-label" for="HeadDept">Head Department</label>
<select class="form-control required" id="HeadDept" name="HeadDept"> <select class="form-control required" id="HeadDept" name="HeadDept">
<option value="<?php echo $HeadDept; ?>"><?php echo $HeadDept; ?></option>
<?php if (!empty($depcode)) { <?php if (!empty($depcode)) {
foreach ($depcode as $DC) { ?> foreach ($depcode as $DC) { ?>
<option value="<?php echo $DC->DEPCode; ?>"> <option value="<?php echo $DC->DEPCode; ?>">
<?php echo $DC->DEPCode . " - " . $DC->DepartmentName ?> <?php echo $DC->DEPCode . " - " . $DC->DepartmentName ?>
</option> </option>