Zeiterfassung Update

* Check der vorhandenen Buchungen geändert.
 * Exakte überschneidungen von Start und Endzeit können nun verbucht werden und muss nicht die 1 Minute differenz haben
 * Fix: Berechnung Mehrstunden wenn kein Startdatum festgelegt wurde
This commit is contained in:
Spitzer Daniel
2024-02-29 13:32:24 +01:00
parent cfb0efff62
commit 6e00cc3568
4 changed files with 41 additions and 28 deletions
+32 -21
View File
@@ -125,26 +125,32 @@ table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
width: unset;
display: table-cell;
}
.deny-button
{
.deny-button {
color: #f00;
}
.edit-td {
text-align: left;
letter-spacing: 12px;
font-size: 1.1em;
}
.display-calendar
{
color:#0d6efd;
.display-calendar {
color: #0d6efd;
font-size: 30px;
margin-right:10px;
margin-right: 10px;
cursor: pointer;
}
.active-calendar
{
color:#25b343;
.active-calendar {
color: #25b343;
}
.select2-minw {
min-width: 150px;
}
@media (max-width: 1200px) {
.fa-circle-xmark, .fa-ban, .fa-trash, .fa-edit, .fa-square-check, .fa-arrows-up-down-left-right {
font-size: 25px;
@@ -212,17 +218,21 @@ table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) {
font-size: 14px;
margin: 12px 3px 7px 0px;
}
.display-calendar
{
font-size:35px;
margin-top:5px;
margin-right:10px;
margin-bottom:20px;
.display-calendar {
font-size: 35px;
margin-top: 5px;
margin-right: 10px;
margin-bottom: 20px;
}
.label-calendar
{
margin-top:7px;
.label-calendar {
margin-top: 7px;
}
.select2-minw {
min-width: unset;
}
}
@@ -270,10 +280,11 @@ table.dataTable.dtr-inline.collapsed > tbody > tr.parent > td:first-child:before
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out, -webkit-box-shadow .15s ease-in-out;
}
table.dataTable.table-hover>tbody>tr:hover>* {
table.dataTable.table-hover > tbody > tr:hover > * {
box-shadow: none;
}
table.dataTable.table-striped>tbody>tr:nth-of-type(2n+1)>* {
box-shadow: none;
table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) > * {
box-shadow: none;
}