[add] Data loaded to be edited
This commit is contained in:
parent
b84b9fa2fb
commit
3ad687f797
@ -10,12 +10,20 @@
|
|||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-md-4 control-label" for="workDaysSearchEmployee">Employee</label>
|
<label class="col-md-4 control-label" for="workDaysSearchEmployee">Search employee</label>
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<input id="workDaysSearchEmployee" name="workDaysSearchEmployee" type="text" class="form-control input-md">
|
<input id="workDaysSearchEmployee" name="workDaysSearchEmployee" type="text" class="form-control input-md">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="col-md-4 control-label" for="workDaysSearchByDate">Search by date</label>
|
||||||
|
<div class="col-md-2">
|
||||||
|
<input id="workDaysSearchByDate" name="workDaysSearchByDate" type="text" class="form-control input-md datepicker">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="registerWorkDaysEmployeeInfo" class="col-md-6">
|
<div id="registerWorkDaysEmployeeInfo" class="col-md-6">
|
||||||
|
@ -7,7 +7,7 @@ $(document).ready(function(){
|
|||||||
loadEmployeeTypesForWorkDays();
|
loadEmployeeTypesForWorkDays();
|
||||||
|
|
||||||
$('.datepicker').datepicker({
|
$('.datepicker').datepicker({
|
||||||
format: "yyyy/mm/dd",
|
format: "yyyy-mm-dd",
|
||||||
autoclose: true
|
autoclose: true
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -253,3 +253,52 @@ function saveNewWorkDay(){
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the search by date field is changed from its default empty status it'll
|
||||||
|
* load the data of the given work day and enable the update mode
|
||||||
|
*/
|
||||||
|
$('#workDaysSearchByDate').on("change", function(data){
|
||||||
|
console.log($(this).val());
|
||||||
|
let baseUrl = getbaseUrl();
|
||||||
|
let date = $(this).val();
|
||||||
|
let code = $('#hidenEmployeeCodeForWorkDaysCode').val();
|
||||||
|
|
||||||
|
// The employee hasn't been picked
|
||||||
|
if (code === ''){
|
||||||
|
$('#modalServerResponseError').modal('show');
|
||||||
|
document.getElementById('modalResponseError').innerHTML = 'Please select an employee in the search form first.';
|
||||||
|
return false; // Exits the function
|
||||||
|
}
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: baseUrl + '/api/employee/salary/date/' + date + '/code/' + code,
|
||||||
|
type: 'GET',
|
||||||
|
dataType: 'json',
|
||||||
|
success:function(data){
|
||||||
|
$('#workDaysEmployeeRol').val(data['idEmployeeType']);
|
||||||
|
$('#workDaysEmployeeContractType').val(data['contractType']);
|
||||||
|
$('#workDaysEmployeeWorkedDay').val(date);
|
||||||
|
$('#workDaysEmployeeDeliveries').val(data['deliveries']);
|
||||||
|
$('#workDaysEmployeePerformedRol').val(data['idEmployeeTypePerformed']);
|
||||||
|
},
|
||||||
|
error:function(x,e) {
|
||||||
|
let responseText = $.parseJSON(x["responseText"]);
|
||||||
|
|
||||||
|
if (x.status==0) {
|
||||||
|
$('#modalErrorInternetConnection').modal('show');
|
||||||
|
} else if(x.status==404) {
|
||||||
|
$('#modalError404').modal('show');
|
||||||
|
} else if(x.status==500) {
|
||||||
|
$('#modalServerResponseError').modal('show');
|
||||||
|
document.getElementById('modalResponseError').innerHTML = responseText['message'];
|
||||||
|
} else if(e=='parsererror') {
|
||||||
|
$('#modalErrorParsererror').modal('show');
|
||||||
|
} else if(e=='timeout'){
|
||||||
|
$('#modalErrorTimeout').modal('show');
|
||||||
|
} else {
|
||||||
|
$('#modalErrorOther').modal('show');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
@ -915,11 +915,25 @@ class EmployeeApplication{
|
|||||||
$results = $stmt->fetchAll();
|
$results = $stmt->fetchAll();
|
||||||
|
|
||||||
if(!$results){
|
if(!$results){
|
||||||
throw new Exception("No data of the work day was found..");
|
throw new Exception("No data of the work day was found.");
|
||||||
}
|
}
|
||||||
$stmt = null;
|
$stmt = null;
|
||||||
|
|
||||||
return $results;
|
foreach($results as $row){
|
||||||
|
$data = array(
|
||||||
|
'idPaymentPerEmployeePerDay' => (int)$row['idPaymentPerEmployeePerDay'],
|
||||||
|
'idEmployeeType' => (int)$row['idEmployeeType'],
|
||||||
|
'idEmployeeTypePerformed' => (int)$row['idEmployeeTypePerformed'],
|
||||||
|
'contractType' => $row['contractType'],
|
||||||
|
'hoursWorked' => (int)$row['hoursWorked'],
|
||||||
|
'paymentPerHour' => (int)$row['paymentPerHour'],
|
||||||
|
'bonusPerHour' => (int)$row['bonusPerHour'],
|
||||||
|
'deliveries' => (int)$row['deliveries'],
|
||||||
|
'paymentPerDelivery' => (int)$row['paymentPerDelivery']
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user