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

driver bug fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-03 08:57:39 +00:00
parent 4018698331
commit 01f982f093
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Views/addEmployeenew.php
View File

@ -1092,12 +1092,12 @@
<div class="row"> <div class="row">
<div class="col-md-4"></div> <div class="col-md-4"></div>
<div class="col-md-4"> <div class="col-md-4">
<label>Bank PassBook Name</label> <label>Bank Passbook Name</label>
<input type="text" id="file_name" name="file_name4" maxlength="255" <input type="text" id="file_name" name="file_name4" maxlength="255"
class="form-control" value="Bank Passbook" readonly> class="form-control" value="Bank Passbook" readonly>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Select Bank PassBook File</label><br> <label>Select Bank Passbook File</label><br>
<input type="file" name="emp_file4" class=""> <input type="file" name="emp_file4" class="">
</div> </div>
</div> </div>

30
app/Views/driverAttendance.php
View File

@ -377,7 +377,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
$("#attendanceModal").on("shown.bs.modal", function (e) { $("#attendanceModal").on("shown.bs.modal", function (e) {
var id = $(e.relatedTarget).data('id'); var id = $(e.relatedTarget).data('id');
let fields = ['invoice_number', 'vehicle_number', 'load_type', 'salary_amount', 'food_amount','customer','quantity']; let fields = ['invoice_number', 'vehicle_number', 'load_type', 'salary_amount', 'food_amount','customer','quantity','total_amount'];
fields.forEach(function(field) { fields.forEach(function(field) {
$("#" + field).val(""); $("#" + field).val("");
@ -398,10 +398,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
if(field == 'driver_id'){ if(field == 'driver_id'){
$("#driver_id").val(arr && arr['driver_id']); $("#driver_id").val(arr && arr['driver_id']);
} }
if(field == 'salary_amount' || field == 'food_amount') { var salary = arr['salary_amount'] ? parseFloat(arr['salary_amount']) : 0;
var ttl = parseFloat(arr['salary_amount']) + (parseFloat(arr['food_amount'] || 0)); var food = arr['food_amount'] ? parseFloat(arr['food_amount']) : 0;
if (isNaN(salary)) salary = 0;
if (isNaN(food)) food = 0;
var ttl = salary + food;
$('#total_amount').val(ttl.toFixed(2));
var ttl = parseFloat(salary) + parseFloat(food) ;
$('#total_amount').val(ttl.toFixed(2)); $('#total_amount').val(ttl.toFixed(2));
}
}); });
$('#attendanceTitle').html("Edit Driver Trip"); $('#attendanceTitle').html("Edit Driver Trip");
} }
@ -486,21 +494,9 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
buttons: [ buttons: [
'excel', 'pdf' 'excel', 'pdf'
], ],
pageLength: 10,
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
],
responsive: false, responsive: false,
order: false, order: false,
language: { paging: false,
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
}
},
footerCallback: function (row, data, start, end, display) { footerCallback: function (row, data, start, end, display) {
var api = this.api(); var api = this.api();
var isTableEmpty = api.data().length === 0; var isTableEmpty = api.data().length === 0;

8
app/Views/editEmployeenew.php
View File

@ -1136,7 +1136,7 @@ if (!empty($EmpDetails)) {
<div class="row"> <div class="row">
<div class="col-md-4"></div> <div class="col-md-4"></div>
<div class="col-md-3"> <div class="col-md-3">
<label>Bank PassBook Name</label> <label>Bank Passbook Name</label>
<input type="text" id="file_name" name="file_name4" <input type="text" id="file_name" name="file_name4"
maxlength="255" class="form-control" maxlength="255" class="form-control"
value="Bank Passbook" readonly> value="Bank Passbook" readonly>
@ -1154,7 +1154,7 @@ if (!empty($EmpDetails)) {
<?php } ?> <?php } ?>
<div class="col-md-4"> <div class="col-md-4">
<label>Update Bank PassBook File</label><br> <label>Update Bank Passbook File</label><br>
<input type="file" name="emp_file4" class=""> <input type="file" name="emp_file4" class="">
</div> </div>
@ -1263,13 +1263,13 @@ if (!empty($EmpDetails)) {
<div class="row"> <div class="row">
<div class="col-md-4"></div> <div class="col-md-4"></div>
<div class="col-md-4"> <div class="col-md-4">
<label>Bank PassBok Name</label> <label>Bank Passbook Name</label>
<input type="text" id="file_name" name="file_name4" <input type="text" id="file_name" name="file_name4"
maxlength="255" class="form-control" maxlength="255" class="form-control"
value="Bank Passbook"> value="Bank Passbook">
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Bank PassBok File</label> <label>Bank Passbook File</label>
<input type="file" name="emp_file4" class=""> <input type="file" name="emp_file4" class="">
</div> </div>
</div> </div>