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

GWM : expense

Browse Source
This commit is contained in:
Gowtham M 2025-01-02 10:48:47 +05:30
parent b9ac3c7df8
commit e92e5f4b27
5 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/Expense.php
View File

@ -45,14 +45,15 @@ class Expense extends BaseController
$this->global['pageTitle'] = 'Non IGR / Expense List'; $this->global['pageTitle'] = 'Non IGR / Expense List';
$data['fromDate'] = date('d-m-Y', strtotime($fromDate)); $data['fromDate'] = date('d-m-Y', strtotime($fromDate));
$data['toDate'] = date('d-m-Y', strtotime($toDate)); $data['toDate'] = date('d-m-Y', strtotime($toDate));
$this->loadViews("expense_list", $this->global, $data, NULL); $this->loadViews("expense_list", $this->global, $data, NULL);
} }
private function generateSerialNumber($financialYear, $lastSerial) private function generateSerialNumber($financialYear, $lastSerial)
{ {
// If no last serial number exists, start with 00001 // If no last serial number exists, start with 00001
$lastNumber = $lastSerial ? (int)explode('/', $lastSerial)[1] : 0; $lastNumber = $lastSerial ? (int)explode('/', $lastSerial)[2] : 0;
$newNumber = str_pad($lastNumber + 1, 5, '0', STR_PAD_LEFT); $newNumber = str_pad($lastNumber + 1, 3, '0', STR_PAD_LEFT);
return "NonIGR/$financialYear/$newNumber"; return "NonIGR/$financialYear/$newNumber";
} }

9
app/Models/Expense_model.php
View File

@ -16,8 +16,7 @@ class Expense_model extends Model
{ {
return $this->db->table('t_expense') return $this->db->table('t_expense')
->select('serial_number') ->select('serial_number')
->like('serial_number', "$financialYear/", 'after') ->orderBy('id', 'DESC')
->orderBy('serial_number', 'DESC')
->limit(1) ->limit(1)
->get() ->get()
->getRow('serial_number'); ->getRow('serial_number');
@ -25,12 +24,14 @@ class Expense_model extends Model
// Retrieve all active expenses // Retrieve all active expenses
public function getAllExpense($fromDate,$toDate) { public function getAllExpense($fromDate,$toDate) {
return $this->join('t_supplierdetailsn', 't_expense.supplier_id = t_supplierdetailsn.SupplierID')
return $this->db->table('t_expense')
->join('t_supplierdetailsn', 't_expense.supplier_id = t_supplierdetailsn.SupplierID', 'left')
->where('t_expense.isactive', 1) ->where('t_expense.isactive', 1)
->where('t_expense.created_on >=',"$fromDate") ->where('t_expense.created_on >=',"$fromDate")
->where('t_expense.created_on <=',"$toDate") ->where('t_expense.created_on <=',"$toDate")
->orderBy('t_expense.created_on', 'DESC') ->orderBy('t_expense.created_on', 'DESC')
->findAll(); ->get()->getResult();
} }
// Insert new expense // Insert new expense

11
app/Views/attendance.php
View File

@ -778,14 +778,16 @@ $currentday = date('d');
sundaysArray.forEach(element => { sundaysArray.forEach(element => {
if (+element == dateInt) { if (+element == dateInt) {
sundayValidation = true; sundayValidation = true;
var current = value.textContent == '' ? 0 : parseFloat(value.textContent); var text = value.textContent.trim();
var current = (text === '' || isNaN(parseFloat(text))) ? 0 : parseFloat(value.textContent);
sundayWorkingHr += current; sundayWorkingHr += current;
} }
}); });
if (sundayValidation == false) { if (sundayValidation == false) {
var current = value.textContent == '' ? 0 : parseFloat(value.textContent); var text = value.textContent.trim();
var current = (text === '' || isNaN(parseFloat(text))) ? 0 : parseFloat(value.textContent);
totalworkingHrs += current; totalworkingHrs += current;
} }
@ -794,8 +796,11 @@ $currentday = date('d');
} }
} else { } else {
var current = value.textContent == '' ? 0 : parseFloat(value.textContent);
var text = value.textContent.trim();
var current = (text === '' || isNaN(parseFloat(text))) ? 0 : parseFloat(value.textContent);
totalOTHrs = totalOTHrs + current; totalOTHrs = totalOTHrs + current;
} }

35
app/Views/download_multiple_files.php Normal file
View File

@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Download Files</title>
<script>
window.onload = function () {
const fileUrls = <?= json_encode($fileUrls); ?>;
// Function to trigger file downloads
function downloadFiles(urls) {
urls.forEach((url) => {
const link = document.createElement('a');
link.href = file.url;
link.download = file.name; // Use explicit filename
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
});
document.body.removeChild(link);
}
// Start downloading files
downloadFiles(fileUrls);
};
</script>
</head>
<body>
<h1>Your download is starting...</h1>
</body>
</html>

26
app/Views/viewinwardgateregister.php
View File

@ -1,16 +1,10 @@
<style> <style>
.modal {
/* padding-right: 25% ! important; */
}
.num { .num {
text-align: right; text-align: right;
} }
.modal-content {
/* width: 800px ! important; */
}
th { th {
white-space: nowrap; white-space: nowrap;
} }
@ -68,19 +62,7 @@
float: left; float: left;
} }
/* .dataTables_wrapper .dt-buttons,
.dataTables_wrapper .dataTables_filter {
float: right;
margin-left: 10px;
}
.dataTables_wrapper .dt-buttons {
margin-top: 10px;
margin-bottom: 10px;
} */
/* .dataTables_wrapper .dataTables_filter {
margin-top: 10px;
margin-bottom: 10px;
} */
</style> </style>
<script> <script>
$(function() { $(function() {
@ -209,6 +191,7 @@
<thead> <thead>
<tr> <tr>
<th>Create Date</th> <th>Create Date</th>
<th>Create Time</th>
<th>IGR No</th> <th>IGR No</th>
<th>PO No</th> <th>PO No</th>
<th>Supplier Name</th> <th>Supplier Name</th>
@ -240,7 +223,8 @@
$time = $createddate->format('h:i A'); $time = $createddate->format('h:i A');
?> ?>
<tr id="<?php echo $index ?>" > <tr id="<?php echo $index ?>" >
<td align="right"><?php echo $date; ?></td> <td align="center"><?php echo $date; ?></td>
<td align="center"><?php echo $time; ?></td>
<td style="cursor:pointer; color:#0bb2b5" ><a data-toggle="modal" data-target="#Igrshow" data-id="<?php echo $index;?>" data-inx="<?php echo $index;?>" data-userid="<?php echo $record->IGRNO ?>" data-igrstatus="<?php echo $record->IGRStatus ?>"> <td style="cursor:pointer; color:#0bb2b5" ><a data-toggle="modal" data-target="#Igrshow" data-id="<?php echo $index;?>" data-inx="<?php echo $index;?>" data-userid="<?php echo $record->IGRNO ?>" data-igrstatus="<?php echo $record->IGRStatus ?>">
<?php echo $record->IGRNO ?></a> <?php echo $record->IGRNO ?></a>
</td> </td>