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

Faserplanung/Zeiterfassung

Browse Source 
* Zeiterfassung
 * Faserplanung Koordinatenanzeige bei Rohrverzeichnis bearbeiten hinzugefügt
 * Migrations
This commit is contained in:
Spitzer Daniel
2024-04-23 20:30:08 +02:00
parent 6310e2446e
commit 1ab898fbce
7 changed files with 109 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Layout/default/TimerecordingEmployee/Form.php
View File

@@ -85,9 +85,15 @@ $daysSelect .= "</select>";
<label class="col-lg-2 col-form-label" for="type">Vertragsart *</label>
<div class="col-lg-3">
<select class="select2 form-control " name="type" id="type">
<option value="1" <?= ($timerecordingemployees->type == '1') ? "selected='selected'" : "" ?>>Angestellter</option>
<option value="2" <?= ($timerecordingemployees->type == '2') ? "selected='selected'" : "" ?>>Arbeiter</option>
<option value="3" <?= ($timerecordingemployees->type == '3') ? "selected='selected'" : "" ?>>Lehrling</option>
<option value="1" <?= ($timerecordingemployees->type == '1') ? "selected='selected'" : "" ?>>
Angestellter
</option>
<option value="2" <?= ($timerecordingemployees->type == '2') ? "selected='selected'" : "" ?>>
Arbeiter
</option>
<option value="3" <?= ($timerecordingemployees->type == '3') ? "selected='selected'" : "" ?>>
Lehrling
</option>
</select>
</div>
</div>
@@ -97,7 +103,7 @@ $daysSelect .= "</select>";
<div class="col-lg-2">
<input required="required" type="date" id="startdate" name="startdate"
class="form-control"
value="<?= ($timerecordingemployees->startdate) ? date('Y-m-d', $timerecordingemployees->startdate): "" ?>"/>
value="<?= ($timerecordingemployees->startdate) ? date('Y-m-d', $timerecordingemployees->startdate) : "" ?>"/>
</div>
</div>
<div class="form-group row">
@@ -106,7 +112,7 @@ $daysSelect .= "</select>";
<div class="col-lg-2">
<input type="date" id="enddate" name="enddate"
class="form-control"
value="<?= ($timerecordingemployees->enddate) ? date('Y-m-d', $timerecordingemployees->enddate): "" ?>"/>
value="<?= ($timerecordingemployees->enddate) ? date('Y-m-d', $timerecordingemployees->enddate) : "" ?>"/>
</div>
</div>
<div class="form-group row">
@@ -114,10 +120,29 @@ $daysSelect .= "</select>";
<div class="col-lg-2">
<input type="date" id="birthday" name="birthday"
class="form-control"
value="<?= ($timerecordingemployees->birthday) ? date('Y-m-d', $timerecordingemployees->birthday): "" ?>"/>
value="<?= ($timerecordingemployees->birthday) ? date('Y-m-d', $timerecordingemployees->birthday) : "" ?>"/>
</div>
</div>
<?php if ($me->superexpertEnabled()): ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="bpahours">Black Pig Stunden</label>
<div class="col-lg-1">
<input required="required" type="text" id="bpahours" name="bpahours"
class="form-control"
value="<?= str_replace(".", ",", $timerecordingemployees->bpahours / 3600) ?>"/>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="bpahours_value">Black Pig
Bewertung</label>
<div class="col-lg-1">
<input required="required" type="text" id="bpahours_value"
name="bpahours_value"
class="form-control"
value="<?= str_replace(".", ",", $timerecordingemployees->bpahours_value) ?>"/>
</div>
</div>
<?php endif; ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="holidays">Initiale Urlaubstage</label>
<div class="col-lg-1">
@@ -135,6 +160,7 @@ $daysSelect .= "</select>";
value="<?= str_replace(".", ",", $timerecordingemployees->plushours / 3600) ?>"/>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="overtime">Initiale Überstunden</label>
<div class="col-lg-1">

2
Layout/default/TimerecordingEmployee/Index.php
View File

@@ -120,7 +120,7 @@ $type[3] = "Lehrling";
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['overtime_now'] ?>"><?= $overTime ?></td>
<?php if ($me->superexpertEnabled()): ?>
<td class="text-center"
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['bpa_hours'] ?>"><?= sprintf('%02dh:%02dm', floor($timerecordingemployees[$timerecordinguser->id]['bpa_hours'] / 3600), floor($timerecordingemployees[$timerecordinguser->id]['bpa_hours'] / 60 % 60)) ?></td>
data-order="<?= $timerecordingemployees[$timerecordinguser->id]['bpahours'] ?>"><?= sprintf('%02dh:%02dm', floor($timerecordingemployees[$timerecordinguser->id]['bpahours'] / 3600), floor($timerecordingemployees[$timerecordinguser->id]['bpahours'] / 60 % 60)) ?></td>
<?php endif; ?>
<td class="text-center"
data-order="<?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] : '' ?>"><?= ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'] . ' Tage' : '' ?> </td>