Questionnaire: option to auto-delete responses after X time (Fixed code review)

Author: tai.letan

lang/en/questionnaire.php

@@ -53,7 +53,7 @@
 $string['attemptsallowed'] = 'Attempts allowed: {$a}';
 $string['attemptstillinprogress'] = 'In progress. Saved on:';
 $string['autodeletereponse'] = 'Auto delete responses after [?]';
-$string['autodeletereponse_desc'] = 'Enable this setting to automatically delete old responses based on the time set in “Manage old responses after.” Disable to retain all responses.';
+$string['autodeletereponse_desc'] = 'Enable this setting to automatically delete old responses based on the time set in “Delete old responses after.” Disable to retain all responses.';
 $string['autonumbering'] = 'Auto numbering';
 $string['autonumbering_help'] = 'Automatic numbering of questions and pages. You might want to disable automatic numbering
  for questionnaires with conditional branching.';
@@ -584,8 +584,8 @@
 $string['resumesurvey'] = 'Resume questionnaire';
 $string['return'] = 'Return';
 $string['removeoldresponsesdefault'] = 'Never remove';
-$string['removeoldresponses'] = 'Manage old responses';
-$string['removeoldresponsesafter'] = 'Manage old responses after';
+$string['removeoldresponses'] = 'Delete old responses';
+$string['removeoldresponsesafter'] = 'Delete old responses after';
 $string['removeoldresponses_help'] = 'The system can automatically remove responses after a certain length of time.';
 $string['rightlabel'] = 'Right label';
 $string['rightpart'] = ' and {$a->max} is {$a->rightlabel}';

mod_form.php

@@ -145,7 +145,7 @@ protected function definition() {
         // Remove old responses.
         $isautodelete = (bool) get_config('questionnaire', 'autodeleteresponse');
         if ($isautodelete) {
-            $options = questionnaire_create_remove_options();
+            $options = $this->create_remove_options();
             $mform->addElement('header', 'responsehdr', get_string('removeoldresponses', 'questionnaire'));
             $mform->addElement('select', 'removeafter',
                     get_string('removeoldresponsesafter', 'questionnaire'), $options);

settings.php

@@ -54,18 +54,18 @@
     $settings->add(new admin_setting_configcheckbox('questionnaire/allowemailreporting',
         get_string('configemailreporting', 'questionnaire'), get_string('configemailreportinglong', 'questionnaire'), 0));
 
-    // Manage old responses after. The default value is 24 months.
-    $options = questionnaire_create_remove_options();
-    $settings->add(new admin_setting_configselect('questionnaire/removeoldresponses',
-            get_string('removeoldresponsesafter', 'questionnaire'),
-            get_string('configremoveoldresponses', 'questionnaire'), 0, $options));
-
+    // Delete old responses after. The default value is 24 months.
     $options = [
-        '0' => new lang_string('disabled', 'questionnaire'),
-        '1' => new lang_string('enabled', 'questionnaire'),
+            '0' => new lang_string('disabled', 'questionnaire'),
+            '1' => new lang_string('enabled', 'questionnaire'),
     ];
     $name = get_string('autodeletereponse', 'questionnaire');
     $desc = get_string('autodeletereponse_desc', 'questionnaire');
     $setting = new admin_setting_configselect('questionnaire/autodeleteresponse', $name, $desc, 0, $options);
     $settings->add($setting);
+
+    $options = questionnaire_create_remove_options();
+    $settings->add(new admin_setting_configselect('questionnaire/removeoldresponses',
+            get_string('removeoldresponsesafter', 'questionnaire'),
+            get_string('configremoveoldresponses', 'questionnaire'), 0, $options));
 }