Merge pull request #5 from andreasschenkel/develop

v1.0.5
andreasschenkel · Dec 3, 2021 · 9c2482f · 9c2482f
2 parents b4f254d + 12b1eca
commit 9c2482f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/classes/Helper.php b/classes/Helper.php
@@ -99,6 +99,7 @@ static function generatePagebreak($itemnumber)
       */
      static function generateSelectionOverview($level, $itemnumber, $firstchoicereferencenumber, $allOptionsToAdd, $option)
      {
+          $selectlabel = get_string('selectlabel', 'report_feedbackchoicegenerator');
           if ($level === 1) {
                $choicelabel = get_string('firstchoicelabel', 'report_feedbackchoicegenerator');
                $firstchoicereferencenumber = 0;
@@ -109,7 +110,7 @@ static function generateSelectionOverview($level, $itemnumber, $firstchoicerefer
           $output = $output . html_writer::start_tag('ITEM', array('TYPE' => 'multichoice', 'REQUIRED' => '0')) . "\n";
           $output = $output . html_writer::tag('ITEMID', "<![CDATA[$itemnumber]]>") . "\n";
           $output = $output . html_writer::tag('ITEMTEXT', "<![CDATA[$choicelabel]]>") . "\n";
-          $output = $output . html_writer::tag('ITEMLABEL', "<![CDATA[$choicelabel auswählen]]>") . "\n";
+          $output = $output . html_writer::tag('ITEMLABEL', "<![CDATA[$choicelabel $selectlabel]]>") . "\n";
           $output = $output . html_writer::tag('PRESENTATION', "<![CDATA[r>>>>>$allOptionsToAdd]]>") . "\n";
           $output = $output . html_writer::tag('OPTIONS', "<![CDATA[h]]>") . "\n";  
           $output = $output . html_writer::tag('DEPENDITEM', "<![CDATA[$firstchoicereferencenumber]]>") . "\n";

diff --git a/classes/View/FeedbackChoiceGenerator.php b/classes/View/FeedbackChoiceGenerator.php
@@ -126,6 +126,8 @@ public function init()
                 'maxoptionslength' => $maxoptionslength,
                 'textareacontent' => $textareacontent,
                 'buttonlabel' => get_string('buttonlabel', 'report_feedbackchoicegenerator'),
+                'downloadbuttonlabel' => get_string('downloadbuttonlabel', 'report_feedbackchoicegenerator'),
+                'resetbuttonlabel' => get_string('resetbuttonlabel', 'report_feedbackchoicegenerator'),
                 'dataurl' => $dataurl
             ]
         );

diff --git a/db/access.php b/db/access.php
@@ -19,6 +19,7 @@
  *
  * @package     report_feedbackchoicegenerator
  * @category    access
+ * @copyright   Andreas Schenkel
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 

diff --git a/lang/de/report_feedbackchoicegenerator.php b/lang/de/report_feedbackchoicegenerator.php
@@ -19,6 +19,7 @@
  *
  * @package     report_feedbackchoicegenerator
  * @category    string
+ * @copyright   Andreas Schenkel
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -52,3 +53,7 @@
     Alternativ den xml-Code in einer Textdatei kopieren und mit der Endung .xml speichern.';
 
 $string['buttonlabel'] = 'XML erzeugen oder aktualisieren';
+$string['downloadbuttonlabel'] = 'Download (rechte Maustaste speichern und unter)';
+$string['resetbuttonlabel'] = 'Eingaben zurücksetzen';
+
+$string['selectlabel'] = 'auswählen';
diff --git a/lang/en/report_feedbackchoicegenerator.php b/lang/en/report_feedbackchoicegenerator.php
@@ -19,6 +19,7 @@
  *
  * @package     report_feedbackchoicegenerator
  * @category    string
+ * @copyright   Andreas Schenkel
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
@@ -48,6 +49,10 @@
 
 $string['optionsheader'] = 'Enter options';
 
-$string['description'] = 'Put the generated xml-Code in to a textfile with the extension .xml. First line of code musst be: <\?xml version=\"1.0\" encoding=\"UTF-8\" ?>';
+$string['description'] = 'Download the generated code or put the generated xml-Code in to a textfile with the extension .xml.';
 
 $string['buttonlabel'] = 'generate XML or update';
+$string['downloadbuttonlabel'] = 'download with right click and save';
+$string['resetbuttonlabel'] = 'reset';
+
+$string['selectlabel'] = 'select';
diff --git a/settings.php b/settings.php
@@ -16,7 +16,7 @@
 
 /**
  * @package    report_feedbackchoicegenerator
- * @copyright  
+ * @copyright   Andreas Schenkel
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 

diff --git a/templates/reportgenerator.mustache b/templates/reportgenerator.mustache
@@ -27,8 +27,8 @@
     <br>
     <div class="form-row mb-2">
         <button id='input_feedbackchoicegenerator' class='btn btn-primary' type='submit'>{{buttonlabel}}</button>
-        <a class='btn btn-warning' href='{{dataurl}}' type='application/xml'>Download (rechte Maustaste speichern unter)</a>
-        <a class='btn btn-danger' href='index.php?id={{courseid}}'>Session zurücksetzen</a>
+        <a class='btn btn-warning' href='{{dataurl}}' type='application/xml'>{{downloadbuttonlabel}}</a>
+        <a class='btn btn-danger' href='index.php?id={{courseid}}'>{{resetbuttonlabel}}</a>
     </div> 
 
 </form>

diff --git a/version.php b/version.php
@@ -17,13 +17,14 @@
 /**
  * @package     report_feedbackchoicegenerator
  * @author      Andreas Schenkel 
+ * @copyright   Andreas Schenkel
  * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'report_feedbackchoicegenerator';
-$plugin->release = '1.0.4';
-$plugin->version = 2021120302;
+$plugin->release = '1.0.5';
+$plugin->version = 2021120303;
 $plugin->requires = 2020061500;
 $plugin->maturity = MATURITY_RC;