From 754d05d19fc3fdc6a38e5ba9fe232c0abfc88d0c Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Thu, 7 Oct 2021 09:06:16 +0000
Subject: [PATCH] =?UTF-8?q?TIC=209216=20G=C3=BCltigkeitsdauer=20von=20Anme?=
=?UTF-8?q?lderegeln?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../assets/javascripts/bootstrap/admission.js | 7 ++-
.../assets/stylesheets/scss/admission.scss | 8 +++
templates/admission/rules/configure.php | 56 ++++++++++---------
3 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/resources/assets/javascripts/bootstrap/admission.js b/resources/assets/javascripts/bootstrap/admission.js
index 0734d39af55..4b13af13965 100644
--- a/resources/assets/javascripts/bootstrap/admission.js
+++ b/resources/assets/javascripts/bootstrap/admission.js
@@ -14,6 +14,11 @@ STUDIP.domReady(function () {
$('#courseset-form .autosave').on('click', (event) => {
STUDIP.Admission.autosaveCourseset();
- })
+ });
+ STUDIP.ready(() => {
+ $('#toggle-date-link').on('click', (event) => {
+ $('#admissionrule-valid-date').toggleClass('hidden-js');
+ });
+ });
});
diff --git a/resources/assets/stylesheets/scss/admission.scss b/resources/assets/stylesheets/scss/admission.scss
index 3a3ed05b29f..02badc55983 100644
--- a/resources/assets/stylesheets/scss/admission.scss
+++ b/resources/assets/stylesheets/scss/admission.scss
@@ -4,6 +4,14 @@
margin-left: 25px;
}
+#toggle-date-container {
+ margin-top: 10px;
+
+ img, svg {
+ vertical-align: text-bottom;
+ }
+}
+
.hover_box {
div {
display: inline;
diff --git a/templates/admission/rules/configure.php b/templates/admission/rules/configure.php
index 669b497f467..4a74c1d9ab3 100644
--- a/templates/admission/rules/configure.php
+++ b/templates/admission/rules/configure.php
@@ -4,28 +4,34 @@
</label>
<textarea name="message" rows="4" cols="50"><?= htmlReady($rule->getMessage()) ?></textarea>
<br/>
-<label for="start_date" class="caption">
- <?= _('GĂĽltigkeitszeitraum der Regel') ?>:
-</label>
-<section class="form_group hgroup">
- <label>
- <?= _('von') ?>
- <input type="text" maxlength="16" name="start_date" class="size-s no-hint"
- id="start_date" value="<?= $rule->getStartTime() ?
- date('d.m.Y H:i', $rule->getStartTime()) : '' ?>" data-max-date=""
- placeholder="tt.mm.jjjj --:--"/>
- </label>
-
- <label>
- <?= _('bis') ?>
- <input type="text" maxlength="16" name="end_date" class="size-s no-hint"
- id="end_date" value="<?= $rule->getEndTime() ?
- date('d.m.Y H:i', $rule->getEndTime()) : '' ?>" data-min-date=""
- placeholder="tt.mm.jjjj --:--"/>
- </label>
-
- <script>
- $('#start_date').datetimepicker();
- $('#end_date').datetimepicker();
- </script>
-</section>
+<div id="toggle-date-container">
+ <a href="#" id="toggle-date-link">
+ <?= Icon::create('date') ?>
+ <?= _('GĂĽltigkeitszeitraum dieser Regel festlegen') ?>
+ </a>
+</div>
+<div id="admissionrule-valid-date"<?= $rule->getStartTime() || $rule->getEndTime() ?
+ '' : ' class="hidden-js"' ?>>
+ <b><?= _('Hiermit verändern Sie nur, wann die in dieser Regel getroffenen ' .
+ 'Einstellungen gelten sollen, und nicht den generellen Anmeldezeitraum!') ?></b>
+ <section class="form_group hgroup">
+ <label>
+ <?= _('von') ?>
+ <input type="text" maxlength="16" name="start_date" class="size-s no-hint"
+ id="start_date" value="<?= $rule->getStartTime() ?
+ date('d.m.Y H:i', $rule->getStartTime()) : '' ?>"
+ placeholder="tt.mm.jjjj --:--" data-datetime-picker>
+ </label>
+ <label>
+ <?= _('bis') ?>
+ <input type="text" maxlength="16" name="end_date" class="size-s no-hint"
+ id="end_date" value="<?= $rule->getEndTime() ?
+ date('d.m.Y H:i', $rule->getEndTime()) : '' ?>"
+ placeholder="tt.mm.jjjj --:--" data-datetimepicker='{">":"#start_date"}'>
+ </label>
+ <script>
+ $('#start_date').datetimepicker();
+ $('#end_date').datetimepicker();
+ </script>
+ </section>
+</div>
--
GitLab