Merge branch 'spidev' into 'master'
Zeiterfassung Update See merge request fronk/thetool!352
This commit is contained in:
@@ -165,7 +165,13 @@
|
||||
<table class="table ">
|
||||
<tr id="overtimes">
|
||||
</tr>
|
||||
<tr id="plushours25_div" style="display:none">
|
||||
<tr class="overtime-modal-div" style="display:none">
|
||||
<th class="align-middle">Gutstundenkonto</th>
|
||||
<td><input type="number" step="any" class="form-control change-overtime-value"
|
||||
name="overtimehours"
|
||||
id="overtimehours"></td>
|
||||
</tr>
|
||||
<tr class="overtime-modal-div" style="display:none">
|
||||
<th class="align-middle">Mehrstunden 25</th>
|
||||
<td><input type="number" step="any" class="form-control change-overtime-value"
|
||||
name="plushours25"
|
||||
@@ -246,14 +252,14 @@
|
||||
|
||||
$('#overtimes').html('<th>Mehrstunden:</th> <td id="overtime-hours" data-hours="' + button.data('hours') + '">' + button.data('hours') + '</td>');
|
||||
$('#submit-button').data('type', 'difference');
|
||||
$('#plushours25_div').show();
|
||||
$('.overtime-modal-div').show();
|
||||
}
|
||||
if (button.hasClass('change-overtime')) {
|
||||
$('#overtimeModal-title').text('Überstunden Transfer');
|
||||
$('#overtimes').html('<th>Überstunden:</th> <td id="overtime-hours" data-hours="' + button.data('hours') + '">' + button.data('hours') + '</td>');
|
||||
$('#submit-button').data('type', 'overtime');
|
||||
$('#overtimeModal').data('id', button.data('id'));
|
||||
$('#plushours25_div').hide();
|
||||
$('.overtime-modal-div').hide();
|
||||
}
|
||||
$('.change-overtime-value').val('');
|
||||
});
|
||||
@@ -316,17 +322,19 @@
|
||||
var overtime50 = $('#overtime50').val();
|
||||
var overtime100 = $('#overtime100').val();
|
||||
var overtimebpa = $('#overtimebpa').val();
|
||||
var overtimehours = $('#overtimehours').val();
|
||||
$.post("<?= self::getUrl("TimerecordingBilling", "api", ['do' => 'saveovertime']) ?>", {
|
||||
id: id,
|
||||
type: $(this).data('type'),
|
||||
plushours25: plushours25,
|
||||
overtimehours:overtimehours,
|
||||
overtime50: overtime50,
|
||||
overtime100: overtime100,
|
||||
overtimebpa: overtimebpa,
|
||||
ajax: 1
|
||||
}).done(function (data) {
|
||||
window.location.reload();
|
||||
|
||||
ö
|
||||
});
|
||||
});
|
||||
//$.post(insertUrl, {
|
||||
|
||||
Reference in New Issue
Block a user