From 72459f1227bbfbce0304b466e85e31544828161a Mon Sep 17 00:00:00 2001 From: Manfred Kindl Date: Fri, 27 Apr 2018 15:37:15 +0200 Subject: [PATCH] Revert "Coodle Farbcodierung" This reverts commit 097218884c82a917ac06e6046bd0f24f7f2b01ea. --- cis/private/coodle/coodle_worker.php | 42 +--------- cis/private/coodle/termin.php | 120 +++++---------------------- 2 files changed, 27 insertions(+), 135 deletions(-) diff --git a/cis/private/coodle/coodle_worker.php b/cis/private/coodle/coodle_worker.php index 87c9ffe9d..a16fe553c 100644 --- a/cis/private/coodle/coodle_worker.php +++ b/cis/private/coodle/coodle_worker.php @@ -68,8 +68,6 @@ switch($work) $email=''; $gruppe_kurzbz=''; $name=''; - $backgroundcolor = ''; - $textcolor = ''; switch($typ) { case 'Ort': $ort = $id; break; @@ -87,7 +85,7 @@ switch($work) $gruppe = new gruppe(); if(!$gruppe->loadUser($gruppe_kurzbz)) die('Fehler: '.$gruppe->errormsg); - + foreach($gruppe->result as $row) { $coodle->coodle_id = $coodle_id; @@ -110,15 +108,7 @@ switch($work) } } } - - $data['result'] = 'true'; - $data['backgroundColor'] = $backgroundcolor; - $data['textColor'] = $textcolor; - - if(isset($_POST['format']) && $_POST['format'] == 'json') - echo json_encode($data); - else - echo 'true'; + echo 'true'; } else { @@ -143,33 +133,9 @@ switch($work) $coodle->insertvon = $user; $coodle->updateamum = date('Y-m-d H:i:s'); $coodle->updatevon = $user; - - if ($uid != '') - { - $backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)'; - $textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)'; - } - elseif ($ort != '') - { - $backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 80%)'; - $textcolor = 'hsl('.abs((crc32($id)) % 360).', 0%, 50%)'; - } - elseif ($email != '') - { - $backgroundcolor = 'hsl('.abs((crc32($id)) % 360).', 80%, 90%)'; - $textcolor = 'hsl('.abs((crc32($id)) % 360).', 60%, 70%)'; - } - $data['result'] = 'true'; - $data['backgroundColor'] = $backgroundcolor; - $data['textColor'] = $textcolor; - + if($coodle->saveRessource(true)) - { - if(isset($_POST['format']) && $_POST['format'] == 'json') - echo json_encode($data); - else - echo 'true'; - } + echo 'true'; else echo 'Fehler beim Speichern:'.$coodle->errormsg; } diff --git a/cis/private/coodle/termin.php b/cis/private/coodle/termin.php index 0454ba660..64619402c 100644 --- a/cis/private/coodle/termin.php +++ b/cis/private/coodle/termin.php @@ -286,22 +286,7 @@ echo ' .ressourceItem { - display: table-cell; font-size: 0.8em; - padding: 3px; - margin-bottom: 3px; - border-radius: 10px 0 0 10px; - -moz-border-radius: 10px 0 0 10px; - } - - .ressourceImage - { - display: table-cell; - vertical-align: top; - padding: 3px; - margin-bottom: 3px; - border-radius: 10px 0 0 10px; - -moz-border-radius: 10px 0 0 10px; } #fertig @@ -330,28 +315,6 @@ echo ' color: #666; } - .fc-event-draggable - { - z-index: 1000 !important; - } - - .ui-state-active - { - border: none !important; - background-color: lightgrey !important; - background-image: none !important; - } - - .ressourceElement - { - background-color: lightblue; - margin: 3px; - padding: 2px 4px; - border-radius: 2px; - margin-bottom: 3px; - } - -