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

changes in master details-1 vadivel J 22-11-2024

Browse Source
This commit is contained in:
vadivelJ96 2024-11-22 09:41:31 +05:30
parent 599e3efd7b
commit bd0a29ea95
9 changed files with 629 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/Department.php
View File

@ -145,11 +145,21 @@ class Department extends BaseController
function reActivateDepartment(){ function reActivateDepartment(){
$depCode = $this->request->getGet('SID');
$updateInfo = ['IsActive' => 1];
$result = $this->department_model->reActivateDepartment($depCode , $updateInfo);
return redirect()->route('departmentListing');
} }
function deleteDepartment(){ function deleteDepartment(){
$depCode = $this->request->getGet('SID');
$updateInfo = ['IsActive' => 0];
$result = $this->department_model->reActivateDepartment($depCode , $updateInfo);
return redirect()->route('departmentListing');
} }

16
app/Models/Department_model.php
View File

@ -132,13 +132,21 @@ function getdepcode()
} }
function reActivateDepartment(){ function reActivateDepartment($depCode , $updateInfo){
$this->db->table('t_departmentdetails')
->where('DEPCode', $depCode)
->update($updateInfo);
$res = $this->db->affectedRows();
return $res;
} }
function deleteDepartment(){ function deleteDepartment($depCode , $updateInfo){
$this->db->table('t_departmentdetails')
->where('DEPCode', $depCode)
->update($updateInfo);
$res = $this->db->affectedRows();
return $res;
} }

1
app/Views/MaterialIssueList.php
View File

@ -92,6 +92,7 @@
?> ?>
</tbody> </tbody>
</table> </table>
<p>( Note :The entries count includes archived data... )</p>
<br> <br>
</div> </div>
</div> </div>

58
app/Views/assetListing.php
View File

@ -63,22 +63,29 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> <form class="Date-filter-form" id="DateRangeFilter"
style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
<input type="hidden" name="table" value="requisition"> <input type="hidden" name="table" value="requisition">
<label for="fromDate">From:</label> <label for="fromDate">From:</label>
<input class="form-control date_range form-date-search" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required> <input class="form-control date_range form-date-search" id="fromDate" name="fromDate"
placeholder="Select From Date" autocomplete="off" required>
<label for="toDate">To:</label> <label for="toDate">To:</label>
<input class="form-control date_range to-date-search" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required> <input class="form-control date_range to-date-search" id="toDate" name="toDate"
placeholder="Select To Date" autocomplete="off" required>
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button> <button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true"
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i> class="icon-button" title="Search"></i></button>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button"
id="resetButton" title="Reset"></i>
<div style="margin-left:auto"> <div style="margin-left:auto">
<div class="form-check" style="margin-right: 25px;"> <div class="form-check" style="margin-right: 25px;">
<input class="form-check-input" type="checkbox" id="showArchiveId" name="showArchive" <input class="form-check-input" type="checkbox" id="showArchiveId"
value="1" onchange="showArchiveList()" style="width: 18px; height: 18px;"> name="showArchive" value="1" onchange="showArchiveList()"
<label class="form-check-label" for="showArchiveId" style="font-size: 1rem; margin-left: 8px;"> style="width: 18px; height: 18px;">
<label class="form-check-label" for="showArchiveId"
style="font-size: 1rem; margin-left: 8px;">
Show Archive Show Archive
</label> </label>
</div> </div>
@ -114,10 +121,12 @@
if (!empty($userRecords)) { if (!empty($userRecords)) {
foreach ($userRecords as $record) { foreach ($userRecords as $record) {
?> ?>
<tr <tr class="<?php if ($record->IsActive == 0) {
class="<?php if($record->IsActive == 0){echo"deactivatedRow";}?>" echo "deactivatedRow";
style="<?php if($record->IsActive == 0){echo"display:none";}?>" } ?>"
> style="<?php if ($record->IsActive == 0) {
echo "display:none";
} ?>">
<?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") { <?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") {
$cdate = '00-00-0000'; $cdate = '00-00-0000';
@ -141,25 +150,25 @@
<td> <td>
<?php if ($record->IsActive == 0) { ?> <?php if ($record->IsActive == 0) { ?>
<a <a onclick="confirmReActivatingAsset()"
onclick ="confirmReActivatingAsset()"
href="<?php echo base_url() . 'assetdetails/reActivateAsset/?AssetID=' . $record->AssetCode ?>" href="<?php echo base_url() . 'assetdetails/reActivateAsset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to Re-Activate Asset Details"> data-toggle="tooltip"
title="<?php echo $record->AssetCode; ?> - Click here to Re-Activate Asset Details">
<i class="fa fa-key"></i> <i class="fa fa-key"></i>
</a> </a>
<?php } else { ?> <?php } else { ?>
<a <a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>"
href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>" data-toggle="tooltip"
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to View Asset Details"> title="<?php echo $record->AssetCode; ?> - Click here to View Asset Details">
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a <a onclick="confirmDeleteAsset(event)"
onclick ="confirmDeleteAsset(event)"
href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>" href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to Delete Asset Details"> data-toggle="tooltip"
title="<?php echo $record->AssetCode; ?> - Click here to Delete Asset Details">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>
</a> </a>
@ -293,7 +302,14 @@
} }
$(document).ready(function () { $(document).ready(function () {
let table = $('#asset_list_table').DataTable();
showArchiveList(); showArchiveList();
table.on('draw', function () {
showArchiveList();
});
}); });
function confirmReActivatingAsset(event) { function confirmReActivatingAsset(event) {

8
app/Views/costListing.php
View File

@ -146,6 +146,7 @@
?> ?>
</tbody> </tbody>
</table> </table>
<p>( Note :The entries count includes archived data... )</p>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -416,6 +417,13 @@
} }
$(document).ready(function () { $(document).ready(function () {
let table = $('#cost_listing').DataTable();
showArchiveList();
table.on('draw', function () {
showArchiveList(); showArchiveList();
}); });
});
</script> </script>

91
app/Views/departmentListing.php
View File

@ -90,16 +90,35 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> <form class="Date-filter-form" id="DateRangeFilter"
style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
<input type="hidden" name="table" value="requisition"> <input type="hidden" name="table" value="requisition">
<label for="fromDate">From:</label> <label for="fromDate">From:</label>
<input class="form-control date_range form-date-search" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required> <input class="form-control date_range form-date-search" id="fromDate" name="fromDate"
placeholder="Select From Date" autocomplete="off" required>
<label for="toDate">To:</label> <label for="toDate">To:</label>
<input class="form-control date_range to-date-search" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required> <input class="form-control date_range to-date-search" id="toDate" name="toDate"
placeholder="Select To Date" autocomplete="off" required>
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true"
class="icon-button" title="Search"></i></button>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton"
title="Reset"></i>
<div style="margin-left:auto">
<div class="form-check" style="margin-right: 25px;">
<input class="form-check-input" type="checkbox" id="showArchiveId" name="showArchive" value="1"
onchange="showArchiveList()" style="width: 18px; height: 18px;">
<label class="form-check-label" for="showArchiveId" style="font-size: 1rem; margin-left: 8px;">
Show Archive
</label>
</div>
</div>
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
<div class="error" id="error"></div> <div class="error" id="error"></div>
</form> </form>
<div class="card-body" style="overflow-x:scroll;"> <div class="card-body" style="overflow-x:scroll;">
@ -119,7 +138,11 @@
if (!empty($userRecords)) { if (!empty($userRecords)) {
foreach ($userRecords as $record) { foreach ($userRecords as $record) {
?> ?>
<tr> <tr class="<?php if ($record->IsActive == 0) {
echo "deactivatedRow";
} ?>" style="<?php if ($record->IsActive == 0) {
echo "display:none";
} ?>">
<!-- <td title=" - Click here to view department details"> </td> --> <!-- <td title=" - Click here to view department details"> </td> -->
<?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") { <?php if (date('d-m-Y', strtotime($record->CreatedDt)) == "30-11--0001") {
$cdate = '00-00-0000'; $cdate = '00-00-0000';
@ -130,13 +153,30 @@
<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->HeadDept ?></td> <td><?php echo $record->HeadDept ?></td>
<td><?php if ($record->IsActive == 0) { ?> <td>
<a href="<?php echo base_url() . 'reActivateDepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to Re activate Department Details"><i class="fas fa-key"></i></a></u> <?php if ($record->IsActive == 0) { ?>
<a href="<?php echo base_url() . 'reActivateDepartment/?SID=' . $record->DEPCode ?>"
data-toggle="tooltip"
title="<?php echo $record->DEPCode ?> - Click here to Re activate Department Details"><i
class="fas fa-key"></i></a></u>
<?php } else { ?> <?php } else { ?>
<a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to View Department Details"><i class="fas fa-edit"></i></a></u>
<a href="<?php echo base_url() . 'editOlddepartment/?SID=' . $record->DEPCode ?>"
data-toggle="tooltip"
title="<?php echo $record->DEPCode ?> - Click here to View Department Details"><i
class="fas fa-edit"></i></a></u>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="<?php echo base_url() . 'deleteDepartment/?SID=' . $record->DEPCode ?>" data-toggle="tooltip" title="<?php echo $record->DEPCode ?> - Click here to Delete Department Details"><i class="fas fa-trash"></i></a></u>
<a href="<?php echo base_url() . 'deleteDepartment/?SID=' . $record->DEPCode ?>"
data-toggle="tooltip"
title="<?php echo $record->DEPCode ?> - Click here to Delete Department Details"><i
class="fas fa-trash"></i></a></u>
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>
@ -146,6 +186,7 @@
?> ?>
</tbody> </tbody>
</table> </table>
<p>( Note :The entries count includes archived data... )</p>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -248,3 +289,33 @@
}); });
}); });
</script> </script>
<script>
function showArchiveList() {
let isChecked = $("#showArchiveId").prop('checked');
// Show or hide the rows based on checkbox status
$(".deactivatedRow").each(function () {
if (isChecked) {
$(this).show();
} else {
$(this).hide();
}
});
}
$(document).ready(function () {
let table = $('#department_list_table').DataTable();
showArchiveList();
table.on('draw', function () {
showArchiveList();
});
});
</script>

8
app/Views/rawmaterialListing.php
View File

@ -162,6 +162,7 @@
</tbody> </tbody>
</table> </table>
<p>( Note :The entries count includes archived data... )</p>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -278,7 +279,14 @@
} }
$(document).ready(function () { $(document).ready(function () {
let table = $('#raw_material_list_table').DataTable();
showArchiveList(); showArchiveList();
table.on('draw', function () {
showArchiveList();
});
}); });

57
app/Views/supplierListing.php
View File

@ -68,22 +68,29 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;"> <form class="Date-filter-form" id="DateRangeFilter"
style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
<input type="hidden" name="table" value="requisition"> <input type="hidden" name="table" value="requisition">
<label for="fromDate">From:</label> <label for="fromDate">From:</label>
<input class="form-control date_range form-date-search" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required> <input class="form-control date_range form-date-search" id="fromDate" name="fromDate"
placeholder="Select From Date" autocomplete="off" required>
<label for="toDate">To:</label> <label for="toDate">To:</label>
<input class="form-control date_range to-date-search" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required> <input class="form-control date_range to-date-search" id="toDate" name="toDate"
placeholder="Select To Date" autocomplete="off" required>
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button> <button type="submit" class="range_search_button"><i class="fe-search"
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i> aria-hidden="true" class="icon-button" title="Search"></i></button>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button"
id="resetButton" title="Reset"></i>
<div style="margin-left:auto"> <div style="margin-left:auto">
<div class="form-check" style="margin-right: 25px;"> <div class="form-check" style="margin-right: 25px;">
<input class="form-check-input" type="checkbox" id="showArchiveId" name="showArchive" <input class="form-check-input" type="checkbox" id="showArchiveId"
value="1" onchange="showArchiveList()" style="width: 18px; height: 18px;"> name="showArchive" value="1" onchange="showArchiveList()"
<label class="form-check-label" for="showArchiveId" style="font-size: 1rem; margin-left: 8px;"> style="width: 18px; height: 18px;">
<label class="form-check-label" for="showArchiveId"
style="font-size: 1rem; margin-left: 8px;">
Show Archive Show Archive
</label> </label>
</div> </div>
@ -116,10 +123,12 @@
foreach ($userRecords as $record) { foreach ($userRecords as $record) {
?> ?>
<tr <tr class="<?php if ($record->IsActive == 0) {
class="<?php if($record->IsActive == 0){echo"deactivatedRow";}?>" echo "deactivatedRow";
style="<?php if($record->IsActive == 0){echo"display:none";}?>" } ?>"
> style="<?php if ($record->IsActive == 0) {
echo "display:none";
} ?>">
<?php if (date('d-m-Y', strtotime($record->CreatedOn)) == "30-11--0001") { <?php if (date('d-m-Y', strtotime($record->CreatedOn)) == "30-11--0001") {
$cdate = '00-00-0000'; $cdate = '00-00-0000';
@ -138,20 +147,25 @@
<td><?php echo $record->PaymentTerms ?></td> <td><?php echo $record->PaymentTerms ?></td>
<td><?php if ($record->IsActive == 0) { ?> <td><?php if ($record->IsActive == 0) { ?>
<a style="cursor:pointer;" onclick="reActivateSupplier('<?php echo $record->SupplierID; ?>')"><i class="fa fa-key" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;</a> <a style="cursor:pointer;"
onclick="reActivateSupplier('<?php echo $record->SupplierID; ?>')"><i
class="fa fa-key"
style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;</a>
<?php } else { ?> <?php } else { ?>
<a class="a-tag-link" <a class="a-tag-link"
href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>" href="<?= base_url() ?>viewsupplier?SID=<?= $record->SupplierID ?>&Payment=<?= $record->PaymentTerms ?>"
data-toggle="tooltip" data-toggle="tooltip"
title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i class="fa fa-edit" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp; title="<?= $record->SupplierID ?> - Click here to edit Supplier details"><i
class="fa fa-edit" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
</a> </a>
<a style="cursor:pointer;" <a style="cursor:pointer;" data-toggle="tooltip"
data-toggle="tooltip"
title="<?= $record->SupplierID ?> - Click here to delete Supplier details" title="<?= $record->SupplierID ?> - Click here to delete Supplier details"
onclick="deletesupplier('<?php echo $record->SupplierID; ?>')"><i class="fa fa-trash" style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp; onclick="deletesupplier('<?php echo $record->SupplierID; ?>')"><i
class="fa fa-trash"
style="color:#02a8b5;"></i>&nbsp;&nbsp;&nbsp;
</a> </a>
<?php } ?> <?php } ?>
</td> </td>
@ -162,6 +176,7 @@
?> ?>
</tbody> </tbody>
</table> </table>
<p>( Note :The entries count includes archived data... )</p>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -354,8 +369,14 @@
} }
$(document).ready(function () { $(document).ready(function () {
let table = $('#datatable').DataTable();
showArchiveList();
table.on('draw', function () {
showArchiveList(); showArchiveList();
}); });
</script> });
</script>

9
app/Views/transporterListing.php
View File

@ -186,7 +186,7 @@
</tbody> </tbody>
</table> </table>
<p>( Note :The entries count includes archived data... )</p>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -435,7 +435,14 @@
} }
$(document).ready(function () { $(document).ready(function () {
let table = $('#transporter_list').DataTable();
showArchiveList();
table.on('draw', function () {
showArchiveList(); showArchiveList();
}); });
});
</script> </script>