Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Zeiterfassung update

Browse Source 
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
* Kalender locales hinzugefügt
* Button für autoausfüllen eingebaut

Config update
define("TT_TIMERECORDING_EMAIL","zeiterfassung@xinon.at");
define("TT_TIMERECORDING_EMAIL_NAME","Xinon Zeiterfassung");
This commit is contained in:
Spitzer Daniel
2024-02-19 14:52:58 +01:00
parent 615fa8d7e6
commit cdbf9de6fe
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/Timerecording/Index.php
View File

@@ -198,11 +198,13 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
</div>
</div>
<div class=" row mt-2">
<div class="col-lg-2 ">
<div class="col-lg-3 ">
<button id="submit-button" type="submit" class="btn btn-primary">Speichern</button>
<button id="cancel-button" type="button" class="btn btn-secondary" style="display:none">
Abbrechen
</button>
<button style="display:none" id="auto-workinghours-button" type="button" class="btn btn-dark">Arbeitswoche verbuchen</button>
</div>
</div>
</div>

4
Layout/default/TimerecordingReport/Index.php
View File

@@ -102,10 +102,10 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
<ol class="breadcrumb m-0">
<li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a>
</li>
<li class="breadcrumb-item active">Buchungen</li>
<li class="breadcrumb-item active">Auswertungen/Korrekturen</li>
</ol>
</div>
<h4 class="page-title">Buchungen</h4>
<h4 class="page-title">Auswertungen/Korrekturen</h4>
</div>
</div>
</div>

2
application/Timerecording/TimerecordingController.php
View File

@@ -265,6 +265,7 @@ class TimerecordingController extends mfBaseController
if ($employee) {
$holiDays = $employee[0]->holidays;
$plusHours = $employee[0]->plushours;
$auto_workinghours = $employee[0]->auto_workinghours;
}
$workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $this->me->id]);
@@ -441,6 +442,7 @@ class TimerecordingController extends mfBaseController
}
endforeach;
$json['success'] = true;
$json['time']['auto_workinghours'] = $auto_workinghours;
$json['time']['is'] = sprintf('%02dh:%02dm', floor($isSeconds / 3600), floor($isSeconds / 60 % 60));
$json['time']['must'] = sprintf('%02dh:%02dm', floor($mustSeconds / 3600), floor($mustSeconds / 60 % 60));
$json['time']['holidays'] = $holiDays;

3
public/js/pages/timerecording/index.js
View File

@@ -86,6 +86,9 @@ table = $('#datatable').DataTable({
$('#must-time').text(json.time.must);
$('#holidays').text(json.time.holidays);
$('#plushours').text(json.time.plushours);
if (json.time.auto_workinghours == "1") {
$('#auto-workinghours-button').show();
}
return json.data;
}