From 2120209d2ee2b53ea4a7f36f48a9f55748abf3cc Mon Sep 17 00:00:00 2001
From: Justus Dieckmann <justusdieckmann@wwu.de>
Date: Fri, 15 Jul 2022 16:02:18 +0200
Subject: [PATCH] Show helptext for date setting; Set initial timelastrun to 0
---
.../specificdate/lang/de/lifecycletrigger_specificdate.php | 3 +--
.../specificdate/lang/en/lifecycletrigger_specificdate.php | 3 +--
trigger/specificdate/lib.php | 6 +++---
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/trigger/specificdate/lang/de/lifecycletrigger_specificdate.php b/trigger/specificdate/lang/de/lifecycletrigger_specificdate.php
index 7fdc5c5..51e4efa 100644
--- a/trigger/specificdate/lang/de/lifecycletrigger_specificdate.php
+++ b/trigger/specificdate/lang/de/lifecycletrigger_specificdate.php
@@ -26,7 +26,6 @@ $string['pluginname'] = 'Bestimmtes Datum - Trigger';
$string['privacy:metadata'] = 'Dieses Subplugin speichert keine persönlichen Daten.';
$string['dates'] = 'Daten, an denen der Workflow ausgeführt werden soll.';
-$string['dates_desc'] = 'Ein Datum pro Zeile in dem Format Tag.Monat';
-$string['dates_desc_help'] = 'Ein Datum pro Zeile z.B.: 04.08 , für den 4. August. Wenn Sie das heutige Datum wählen wird es getriggert';
+$string['dates_help'] = 'Ein Datum pro Zeile in dem Format Tag.Monat<br><br>Zum Beispiel 04.08 für den 4. August. Wenn Sie das heutige Datum wählen, wird es getriggert.';
$string['timelastrun'] = 'Datum, an dem der Trigger zuletzt ausgeführt wurde.';
$string['dates_not_parseable'] = 'Daten müssen in dem Format Tag.Monat sein!';
diff --git a/trigger/specificdate/lang/en/lifecycletrigger_specificdate.php b/trigger/specificdate/lang/en/lifecycletrigger_specificdate.php
index 574ebe8..d0a2dbb 100644
--- a/trigger/specificdate/lang/en/lifecycletrigger_specificdate.php
+++ b/trigger/specificdate/lang/en/lifecycletrigger_specificdate.php
@@ -26,7 +26,6 @@ $string['pluginname'] = 'Specific date trigger';
$string['privacy:metadata'] = 'This subplugin does not store any personal data.';
$string['dates'] = 'Dates at which the workflow should run.';
-$string['dates_desc'] = 'Write one date per line with the format Day.Month';
-$string['dates_desc_help'] = 'One date per line for example: 04.08 , for 4th of august. If you are putting todays date it will be triggered';
+$string['dates_help'] = 'Write one date per line with the format Day.Month<br><br>For example 04.08 for 4th of august. If you put in today\'s date, it will be triggered.';
$string['timelastrun'] = 'Date when the trigger last run.';
$string['dates_not_parseable'] = 'Dates must be of the format Day.Month';
diff --git a/trigger/specificdate/lib.php b/trigger/specificdate/lib.php
index d0e7769..9df0bcb 100644
--- a/trigger/specificdate/lib.php
+++ b/trigger/specificdate/lib.php
@@ -135,11 +135,11 @@ class specificdate extends base_automatic {
* @throws \coding_exception
*/
public function extend_add_instance_form_definition($mform) {
- $mform->addElement('textarea', 'dates', get_string('dates', 'lifecycletrigger_specificdate'),
- get_string('dates_desc', 'lifecycletrigger_specificdate'));
+ $mform->addElement('textarea', 'dates', get_string('dates', 'lifecycletrigger_specificdate'));
$mform->setType('dates', PARAM_TEXT);
+ $mform->addHelpButton('dates', 'dates', 'lifecycletrigger_specificdate');
$mform->addElement('hidden', 'timelastrun');
- $mform->setDefault('timelastrun', time());
+ $mform->setDefault('timelastrun', 0);
$mform->setType('timelastrun', PARAM_INT);
}
--
GitLab