diff --git a/Layout/default/Calendar/View.php b/Layout/default/Calendar/View.php index ea5b508fa..a52f39e77 100644 --- a/Layout/default/Calendar/View.php +++ b/Layout/default/Calendar/View.php @@ -34,25 +34,26 @@ endforeach; type="text/css"/> - + - - - - - + + + + - @@ -247,22 +248,24 @@ endforeach;
-
- - - - -
+ + + + + + + + + + + + + + + + + +
- +
- - - - - - - - - - - -
- - - - - - -
-
- - - - - -
-
-

Verknüpfte Verträge $contract->id])?>">Neuen Contract anlegen

- linkFrom) && count($contract->linkFrom)) || (is_array($contract->linkTo) && count($contract->linkTo))): ?> - - - - - - - - - - - - - - linkFrom, $contract->linkTo] as $links): ?> - - contract_id == $contract->id) { - $direction = "von"; - $linkcontract = $link->origin; - if($link->type == "credit") { - $direction = "zu"; - //continue; - } - } else { - $linkcontract = $link->contract; - if($link->type == "upgrade" || $link->type == "downgrade") { - $direction = "auf"; - } - if($link->type == "relocation") { - $direction = "nach"; - } - if($link->type == "credit") { - $direction = ""; - //continue; - } - - } - - ?> - - - - - - - - - - - - - - - -
TypKundeContract IDProduktPreisPreis SetupBestelldatumFertigstellungKündigung
">type, "contract")?> type != "link") ? $direction : ""?> $linkcontract->owner_id])?>">owner->getCompanyOrName()?> isFinished()) ? "not-finished" : "" ?>"> $linkcontract->id])?>">id?> isFinished()) ? "not-finished" : "" ?>"> $linkcontract->id])?>">product_name?> [matchcode?>] isFinished()) ? "not-finished" : "" ?> price < 0) ? "text-danger" : ""?>">€ price,4,",",".")?> isFinished()) ? "not-finished" : "" ?> price_setup < 0) ? "text-danger" : ""?>">€ price_setup,4,",",".")?> isFinished()) ? "not-finished" : "" ?>">order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?> isFinished()) ? "not-finished" : "" ?>">finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?> isFinished()) ? "not-finished" : "" ?> cancel_date) ? "text-danger font-weight-bold" : ""?>">cancel_date) ? date('d.m.Y', $linkcontract->cancel_date) : ""?> - $link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"> -
- -
-
- - -
-
- $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"> Zurück zur Vertragsübersicht - $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-sm btn-outline-success"> Vertrag bearbeiten -
-
- - - - - - \ No newline at end of file diff --git a/Layout/default/TimerecordingCalendar/Index.php b/Layout/default/TimerecordingCalendar/Index.php index 712aeaed3..ad46c87a5 100644 --- a/Layout/default/TimerecordingCalendar/Index.php +++ b/Layout/default/TimerecordingCalendar/Index.php @@ -186,12 +186,13 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"); color: #fff; } - .fa-window-maximize, .fa-window-restore{ + .fa-window-maximize, .fa-window-restore { font-size: 20px; cursor: pointer; color: #323a36; } + .card-fullscreen { display: block; z-index: 1040; @@ -219,7 +220,7 @@ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");