Achtung AddressModel Anpassungen
Features: • Termin Typen wurden erweitert o IBN ESTMK (Kundensuche alles außer Xinon) o IBN Snopp (Kundensuche alles außer Xinon) o Störungen (Ticketsuche) Derzeit werden Ticket Informationen wie bei IBN (Betreff und Ort eingesetzt, wenn leer) bzw. die Beschreibung erhält den Ticket Link und das Subjekt des Tickets (Ticket Link derzeit nur im Outlook Anklickbar (offene Punkte Hyperlinks)) • Symbole der Termin Typen angepasst • Für Outlook werden für die verschiedenen Termintypen derzeit die Standard Kategorien in Deutsch hergenommen (Anfrage zwecks zentraler Kategorien läuft) o Gelbe Kategorie … IBN Xinon o Grüne Kategorie … IBN ESTMK o Lila Kategorie … IBN Snopp o Rote Kategorie … Störung • Filter wurden eingebaut o Es kann nun explizit nach Termintypen gefiltert werden o Es können auch Termintypen in Kombination gefiltert werden • Vorlagen können nun selbst erstellt und bearbeitet werden o Dynamische Felder Datum [&&date&&] … Startdatum des Termins Start [&&start&&] … Startuhrzeit des Termins Ende [&&end&&] … Enduhrzeit des Termins dyn. VM/NM [&&vmnm&&] … dynamisch vormittags oder nachmittags je nach Startzeit > 12:00 = nachmittags o Vorlagen sind jeweils für jeden IBN Termin Typ zu erstellen o Es darf nur 1ne Reminder Vorlage per Termintyp geben Bugfix: • Mehrfachanzeigebug vom gleichen Termin, wenn der Termin mehrfach in kurzer Zeit verschoben oder vergrößert/verkleinert wurde. • Tolltipps verschwinden jetzt nicht, wenn man direkt darauf fährt.
This commit is contained in:
Daniel Spitzer
@@ -77,8 +77,27 @@ endforeach;
|
||||
<div class="card-body mb-3 ">
|
||||
<div class="row ">
|
||||
<div class="col-12">
|
||||
<div class="float-left">
|
||||
<h4 class="header-title">Kalender</h4>
|
||||
<div class="float-left mb-2">
|
||||
<h4 class="header-title d-inline-block mr-1">Filter:</h4>
|
||||
<div class="d-inline-block">
|
||||
<button title="Xinon Inbetriebnahmen"
|
||||
class="btn btn-light btn-light-search top-search-filter" data-ctype="2"><img
|
||||
class="logo-top-search" src='/img/xinon-logo.png'></button>
|
||||
<button title="ESTMK Inbetriebnahmen"
|
||||
class="btn btn-light btn-light-search top-search-filter" data-ctype="3"><img
|
||||
class="logo-top-search"
|
||||
src='/img/estmk_logo.png'>
|
||||
</button>
|
||||
<button title="SNOPP Inbetriebnahmen"
|
||||
class="btn btn-light btn-light-search top-search-filter" data-ctype="4"><img
|
||||
class="logo-top-search"
|
||||
src='/img/snop-logo.png'>
|
||||
</button>
|
||||
<button title="Störungen" data-ctype="5"
|
||||
class="btn btn-light btn-light-search top-search-filter"><i
|
||||
class="fa-duotone fa-solid fa-triangle-exclamation fa-calendar-alert fa-calendar-alert-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<?php if (!$rights) : ?>
|
||||
<div class="alert alert-danger" role="alert">
|
||||
@@ -86,7 +105,6 @@ endforeach;
|
||||
</div>
|
||||
<?php die(); endif; ?>
|
||||
|
||||
|
||||
<div class="d-inline-block w-50 search-div" style="margin-top: -7px;">
|
||||
<select id="jumpevent" class="jumpevent"></select>
|
||||
</div>
|
||||
@@ -96,13 +114,13 @@ endforeach;
|
||||
</div>
|
||||
</div>
|
||||
<div clas="row">
|
||||
|
||||
</div>
|
||||
<div class="row ">
|
||||
<div id="calendar-side-div" class="col-12 col-lg-2">
|
||||
<div class="calendar-side-borders-main">
|
||||
|
||||
<h3 class="no-movable" data-calendarid="<?= $Calendar[0]->go_calendar_id ?>" data-id="<?= $Calendar[0]->id ?>" id="calendar-id">Kalender
|
||||
<h3 class="no-movable" data-calendarid="<?= $Calendar[0]->go_calendar_id ?>"
|
||||
data-id="<?= $Calendar[0]->id ?>" id="calendar-id">Kalender
|
||||
<div class="add-cal-group-div"><i title="Kalendergruppe hinzufügen"
|
||||
class="fa-duotone fa-solid fa-rectangle-history-circle-plus"></i>
|
||||
</div>
|
||||
@@ -159,52 +177,11 @@ endforeach;
|
||||
<?= ($CalendarAll[$calendar['calendar_id']]->user->name) ?: $specialCalendars[$calendar['calendar_id']] ?>
|
||||
</label>
|
||||
</div>
|
||||
<?php endforeach;
|
||||
// foreach ($Rights as $key => $calendar):
|
||||
?>
|
||||
<!---->
|
||||
<!-- <div class="form-check text-left ml-2"-->
|
||||
<!-- data-origin="-->
|
||||
<?php //= $calendar['origin']
|
||||
?><!--">-->
|
||||
<!-- <input data-calendar_id="-->
|
||||
<?php //= $calendar['calendar_id']
|
||||
?><!--"-->
|
||||
<!-- class="form-check-input calendar-check"-->
|
||||
<!-- name="form-check-input" type="checkbox"-->
|
||||
<!-- --><?php //= ($calendar['checked']) ? 'checked="checked"' : ''
|
||||
?>
|
||||
<!-- value="2">-->
|
||||
<!-- <input-->
|
||||
<!-- data-calendar_id="-->
|
||||
<?php //= $calendar['calendar_id']
|
||||
?><!--"-->
|
||||
<!-- type="color"-->
|
||||
<!-- class="form-control-color color-input"-->
|
||||
<!-- value="-->
|
||||
<?php //= $Calendar_colors[$key]['bgcolor']
|
||||
?><!--"-->
|
||||
<!-- title="Hintergrundfarbe">-->
|
||||
<!-- <input data-calendar_id="-->
|
||||
<?php //= $calendar['calendar_id']
|
||||
?><!--"-->
|
||||
<!-- type="color"-->
|
||||
<!-- class="form-control-color color-text-input"-->
|
||||
<!-- value="-->
|
||||
<?php //= ($Calendar_colors[$key]['txtcolor']) ? $Calendar_colors[$key]['txtcolor'] : '#000000'
|
||||
?><!--"-->
|
||||
<!-- title="Textfarbe">-->
|
||||
<!-- <label class="calendar-side-label" style="margin-top:2px;">-->
|
||||
<!-- --><?php //= ($CalendarAll[$key]->user->name) ?: $specialCalendars[$calendar['calendar_id']]
|
||||
?>
|
||||
<!-- </label>-->
|
||||
<!-- </div>-->
|
||||
<!-- --><?php //endforeach;
|
||||
?>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach;
|
||||
// var_dump($Rights);
|
||||
// var_dump($Rights);
|
||||
?>
|
||||
</div>
|
||||
<?php else : ?>
|
||||
@@ -393,7 +370,10 @@ endforeach;
|
||||
<span title="Erinnerung" class="input-group-text spanwidht">Typ</span>
|
||||
<select class="form-control form-select" aria-label="Default select" id="type">
|
||||
<option value="1">Termin</option>
|
||||
<option value="2">IBN</option>
|
||||
<option value="2">IBN Xinon</option>
|
||||
<option value="3">IBN ESTMK</option>
|
||||
<option value="4">IBN SNOPP</option>
|
||||
<option value="5">Störung</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -565,7 +545,8 @@ endforeach;
|
||||
</div>
|
||||
<div class="d-inline-block ml-2">
|
||||
<div class="dropdown">
|
||||
<button style="padding: 1px 8px;" id="preview-button" class="btn btn-info dropdown-toggle"
|
||||
<button style="padding: 1px 8px;" id="preview-button"
|
||||
class="btn btn-info dropdown-toggle"
|
||||
type="button" data-toggle="dropdown" aria-expanded="false">
|
||||
Vorlagen
|
||||
</button>
|
||||
@@ -589,6 +570,7 @@ endforeach;
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="customer-div customer-info-div">
|
||||
<div class="row mt-2 justify-content-center">
|
||||
<div class="col-10">
|
||||
@@ -606,6 +588,19 @@ endforeach;
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ticket-div">
|
||||
<div class="row mt-2 justify-content-center">
|
||||
|
||||
<div class="col-2">
|
||||
<label for="location" class="col-form-label fw-medium">Ticket</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<div id="relContainer3" style="position:relative">
|
||||
<select id="ticket" class="jumpevent"></select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="documents" class="row mt-2 mb-2 justify-content-center">
|
||||
<div class="col-10" id="attachments" data-newkey="">
|
||||
<label class="col-form-label fw-medium">Anlagen</label>
|
||||
@@ -660,6 +655,7 @@ endforeach;
|
||||
let requestEventAttachmentTmpDeleteUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'deleteCalendarEventAttachmentTmp']) ?>";
|
||||
let requestEventAttachmentUploadUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'uploadCalendarEventAttachment']) ?>";
|
||||
let requestAddressUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getAddress']) ?>";
|
||||
let requestTicketUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getTicket']) ?>";
|
||||
let requestInsertUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'insertCalendarEvent']) ?>";
|
||||
let requestUpdateUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'updateCalendarEvent']) ?>";
|
||||
let requestUpdateStateUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'updateCalendarEventState']) ?>";
|
||||
|
||||
Reference in New Issue
Block a user