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

Merge branch 'spidev' into 'master'

Browse Source 
Kalender

See merge request fronk/thetool!688
This commit is contained in:
Daniel Spitzer
2024-11-03 20:45:30 +00:00
parent 9a659106a6 44e8be482c
commit 7e1dae3fa4
2 changed files with 63 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Layout/default/Calendar/View.php
View File

@@ -312,7 +312,7 @@ endforeach;
</div>
</div>
<div class="modal fade" id="EventModal" tabindex="-1" aria-labelledby="EventModalLabel" aria-hidden="true">
<div class="modal fade" id="EventModal" aria-labelledby="EventModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
@@ -435,28 +435,25 @@ endforeach;
</div>
</div>
<?php if (count($rights) > 1) : ?>
<div class="row justify-content-center mt-2">
<div class="col-2">
<label for="name" class="col-form-label fw-medium ">Kalender</label>
</div>
<div class="col-8">
<select class="form-control form-select select2-multiple" id="calendar-users"
name="calendar-users"
>
<?php foreach ($CalArray as $key => $value) :
if ($rights[$value] != "all") continue;
if ($value != $Calendar[0]->go_calendar_id) : ?>
<option value="<?= $value ?>"><?= $key ?></option>
<?php else : ?>
<option data-mainuser="1" selected="selected"
value="<?= $value ?>"><?= $key ?></option>
<?php endif;
endforeach; ?>
</select>
</div>
<div class="row justify-content-center mt-2">
<div class="col-2">
<label for="name" class="col-form-label fw-medium ">Kalender</label>
</div>
<?php endif; ?>
<div class="col-8">
<select class="form-control form-select select2-multiple" id="calendar-users"
name="calendar-users">
<?php foreach ($CalArray as $key => $value) :
if ($rights[$value] != "all") continue;
if ($value != $Calendar[0]->go_calendar_id) : ?>
<option value="<?= $value ?>"><?= $key ?></option>
<?php else : ?>
<option data-mainuser="1" selected="selected"
value="<?= $value ?>"><?= $key ?></option>
<?php endif;
endforeach; ?>
</select>
</div>
</div>
<div class="row justify-content-center mt-2">
<div class="col-2">
<label for="name" class="col-form-label fw-medium ">Teilnehmer</label>
@@ -563,6 +560,13 @@ endforeach;
<div class="modal-footer">
<button type="button" class="btn btn-success" id="add-event">Hinzufügen</button>
<button style="display:none" type="button" class="btn btn-success show-attendee" id="add-event">
Zusagen
</button>
<button style="display:none" type="button" class="btn btn-danger show-attendee" id="add-event">
Absagen
</button>
<button style="display:none" type="button" class="btn btn-success show-update" id="update-event">
Speichern
</button>
@@ -575,6 +579,7 @@ endforeach;
</div>
</div>
</div>
<div id="output"></div>
<script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js"></script>
<script>
@@ -590,7 +595,7 @@ endforeach;
let requestUpdateUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'updateCalendarEvent']) ?>";
let requestUpdateColorUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'updateCalendarColor']) ?>";
let requestDeleteUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'deleteCalendarEvent']) ?>";
let requestUpdateEventsUrl = "https://thetool-dev.xinon.at/api/v1/calendar/calendarStream?user=<?= $encryptedUser ?>";
let requestUpdateEventsUrl = "<?= self::getUrl("api/v1/calendar")?>/calendarStream?user=<?= $encryptedUser ?>";
let calendarRights = '<?php echo json_encode($rights); ?>';
var holiDays = [];