From e401ba39df9f652cf7c28da08c4d8f1499b278c8 Mon Sep 17 00:00:00 2001
From: toanlamt <67050522+toanlamt@users.noreply.github.com>
Date: Sat, 1 Nov 2025 21:08:13 +0700
Subject: [PATCH 01/13] Questionnaire: All branching shown in View your
 response (#616)

* Questionnaire: All branching shown in View your response
---------

Co-authored-by: toanlamt <toanlamt1@nashtechglobal.com>
---
 questionnaire.class.php                 |  4 ++++
 tests/behat/dependency_question.feature | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/questionnaire.class.php b/questionnaire.class.php
index 5fd3bebee..8ce677427 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -423,6 +423,10 @@ public function view_response($rid, $referer= '', $resps = '', $compare = false,
         }
         $pdf = ($outputtarget == 'pdf') ? true : false;
         foreach ($this->questions as $question) {
+            // Only show eligible questions in the response.
+            if (!$question->dependency_fulfilled($rid, $this->questions)) {
+                continue;
+            }
             if ($question->type_id < QUESPAGEBREAK) {
                 $i++;
             }
diff --git a/tests/behat/dependency_question.feature b/tests/behat/dependency_question.feature
index 8a9a8ccb9..a35213892 100644
--- a/tests/behat/dependency_question.feature
+++ b/tests/behat/dependency_question.feature
@@ -106,3 +106,21 @@ Feature: Questions can be defined to be dependent on answers to multiple previou
     And I should see "Do you own a dog?"
     And I should see "Parent Question : position 1 (Q1->Dog) set"
     And I log out
+
+  @javascript
+  Scenario: Students can only view answers to questions asked on the individual responses page.
+    Given I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "Test questionnaire"
+    When I navigate to "Answer the questions..." in current page administration
+    And I should see "Do you own a car?"
+    And I click on "Yes" "radio"
+    And I press "Next Page >>"
+    And I should see "What colour is the car?"
+    And I set the field "What colour is the car?" to "Black"
+    And I press "Next Page >>"
+    And I press "Submit questionnaire"
+    And I navigate to "View your response(s)" in current page administration
+    And I should see "Do you own a car?"
+    And I should see "What colour is the car?"
+    Then I should not see "Will you buy a car this year?"

From c4dc5a95ab86b1ae7dad93fd4bc3154737d26590 Mon Sep 17 00:00:00 2001
From: Jean-Marie DUMONT <151168938+dumontj01@users.noreply.github.com>
Date: Sat, 1 Nov 2025 15:11:47 +0100
Subject: [PATCH 02/13] Fix298 (#445) (#635)

* add idnumber export option

* Fix up lang strings for export fields.

Co-authored-by: root <root@ik1-407-35604.vs.sakura.ne.jp>

cherry-pick form commit 566a116

Co-authored-by: Dan Marsden <dan@danmarsden.com>
---
 classes/responsetype/responsetype.php |  1 +
 lang/en/questionnaire.php             |  3 ++-
 questionnaire.class.php               |  6 +++++-
 settings.php                          |  1 +
 tests/csvexport_test.php              | 22 +++++++++++-----------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/classes/responsetype/responsetype.php b/classes/responsetype/responsetype.php
index aa9c5dd25..841ea11d4 100644
--- a/classes/responsetype/responsetype.php
+++ b/classes/responsetype/responsetype.php
@@ -287,6 +287,7 @@ protected function user_fields_sql() {
             $userfieldsarr = get_all_user_name_fields();
         }
         $userfieldsarr = array_merge($userfieldsarr, ['username', 'department', 'institution']);
+        $userfieldsarr = array_merge($userfieldsarr, ['username', 'department', 'institution', 'idnumber']);
         $userfields = '';
         foreach ($userfieldsarr as $field) {
             $userfields .= $userfields === '' ? '' : ', ';
diff --git a/lang/en/questionnaire.php b/lang/en/questionnaire.php
index e28d93520..f36e5fc13 100644
--- a/lang/en/questionnaire.php
+++ b/lang/en/questionnaire.php
@@ -264,7 +264,8 @@
 $string['gradesdeleted'] = 'Questionnaire grades deleted';
 $string['headingtext'] = 'Heading text';
 $string['horizontal'] = 'Horizontal';
-$string['id'] = 'ID';
+$string['id'] = 'User id';
+$string['useridnumber'] = 'User idnumber';
 $string['includerankaverages'] = 'Include rank question averages';
 $string['includechoicecodes'] = 'Include choice codes';
 $string['includechoicetext'] = 'Include choice text';
diff --git a/questionnaire.class.php b/questionnaire.class.php
index 8ce677427..c2f8a1751 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -3016,6 +3016,7 @@ protected function user_fields() {
             $userfieldsarr = get_all_user_name_fields();
         }
         $userfieldsarr = array_merge($userfieldsarr, ['username', 'department', 'institution']);
+        $userfieldsarr = array_merge($userfieldsarr, ['username', 'department', 'institution', 'idnumber']);
         return $userfieldsarr;
     }
 
@@ -3186,6 +3187,9 @@ protected function process_csv_row(array &$row,
         if (in_array('id', $options)) {
             array_push($positioned, $uid);
         }
+        if (in_array('useridnumber', $options)) {
+            array_push($positioned, $user->idnumber);
+        }
         if (in_array('fullname', $options)) {
             array_push($positioned, $fullname);
         }
@@ -3245,7 +3249,7 @@ public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes=
         $columns = array();
         $types = array();
         foreach ($options as $option) {
-            if (in_array($option, array('response', 'submitted', 'id'))) {
+            if (in_array($option, array('response', 'submitted', 'id', 'useridnumber'))) {
                 $columns[] = get_string($option, 'questionnaire');
                 $types[] = 0;
             } else if ($option == 'useridentityfields') {
diff --git a/settings.php b/settings.php
index 30e640574..a21bd9b0a 100644
--- a/settings.php
+++ b/settings.php
@@ -43,6 +43,7 @@
         'course' => get_string('course'),
         'group' => get_string('group'),
         'id' => get_string('id', 'questionnaire'),
+        'useridnumber' => get_string('useridnumber', 'questionnaire'),
         'fullname' => get_string('fullname'),
         'username' => get_string('username'),
         'useridentityfields' => get_string('showuseridentity', 'admin')
diff --git a/tests/csvexport_test.php b/tests/csvexport_test.php
index bf90dbef6..f594ee7ca 100644
--- a/tests/csvexport_test.php
+++ b/tests/csvexport_test.php
@@ -199,7 +199,7 @@ private function do_test_csvexport_identity_fields($course, $cm, $user, $roleid,
      * @return string[]
      */
     private function expected_complete_output() {
-        return ["Institution	Department	Course	Group	Full name	Username	Q01_Text Box 1000	Q02_Essay Box 1002	" .
+        return ["Institution	Department	Course	Group	User idnumber	Full name	Username	Q01_Text Box 1000	Q02_Essay Box 1002	" .
             "Q03_Numeric 1004	Q04_Date 1006	Q05_Radio Buttons 1008	Q06_Drop Down 1010	Q07_Check Boxes 1012->four	" .
             "Q07_Check Boxes 1012->five	Q07_Check Boxes 1012->six	Q07_Check Boxes 1012->seven	Q07_Check Boxes 1012->eight	" .
             "Q07_Check Boxes 1012->nine	Q07_Check Boxes 1012->ten	Q07_Check Boxes 1012->eleven	" .
@@ -207,13 +207,13 @@ private function expected_complete_output() {
             "Q08_Rate Scale 1014->fifteen	Q08_Rate Scale 1014->sixteen	Q08_Rate Scale 1014->seventeen	" .
             "Q08_Rate Scale 1014->eighteen	Q08_Rate Scale 1014->nineteen	Q08_Rate Scale 1014->twenty	" .
             "Q08_Rate Scale 1014->happy	Q08_Rate Scale 1014->sad	Q08_Rate Scale 1014->jealous	Q09_Slider 1016",
-            "		Test course 1		Testy Lastname1	username1	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname1	username1	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname2	username2	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname2	username2	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname3	username3	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname3	username3	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname4	username4	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname4	username4	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5"];
     }
 
@@ -222,7 +222,7 @@ private function expected_complete_output() {
      * @return string[]
      */
     private function expected_incomplete_output() {
-        return ["Institution	Department	Course	Group	Full name	Username	Complete	Q01_Text Box 1000	" .
+        return ["Institution	Department	Course	Group	User idnumber	Full name	Username	Complete	Q01_Text Box 1000	" .
             "Q02_Essay Box 1002	" .
             "Q03_Numeric 1004	Q04_Date 1006	Q05_Radio Buttons 1008	Q06_Drop Down 1010	Q07_Check Boxes 1012->four	" .
             "Q07_Check Boxes 1012->five	Q07_Check Boxes 1012->six	Q07_Check Boxes 1012->seven	Q07_Check Boxes 1012->eight	" .
@@ -231,15 +231,15 @@ private function expected_incomplete_output() {
             "Q08_Rate Scale 1014->fifteen	Q08_Rate Scale 1014->sixteen	Q08_Rate Scale 1014->seventeen	" .
             "Q08_Rate Scale 1014->eighteen	Q08_Rate Scale 1014->nineteen	Q08_Rate Scale 1014->twenty	" .
             "Q08_Rate Scale 1014->happy	Q08_Rate Scale 1014->sad	Q08_Rate Scale 1014->jealous	Q09_Slider 1016",
-            "		Test course 1		Testy Lastname1	username1	y	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname1	username1	y	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname2	username2	y	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname2	username2	y	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname3	username3	y	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname3	username3	y	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname4	username4	y	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname4	username4	y	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5",
-            "		Test course 1		Testy Lastname5	username5	n	Test answer	Some header textSome paragraph text	83	" .
+            "		Test course 1			Testy Lastname5	username5	n	Test answer	Some header textSome paragraph text	83	" .
             "27/12/2017	wind	three	0	0	0	0	0	0	0	0	0	1	1	2	3	4	5	1	2	3	4		5"];
     }
 }

From e8c57588a62a3c4c4be71e059435600baec204ec Mon Sep 17 00:00:00 2001
From: Ahmed Raza <raza403@gmail.com>
Date: Sat, 1 Nov 2025 19:13:22 +0500
Subject: [PATCH 03/13] Added question name as data attribute for anchoring.
 This PR is made for #253 (#637)

---
 classes/output/renderer.php           | 3 ++-
 templates/question_container.mustache | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/output/renderer.php b/classes/output/renderer.php
index 85497f8a3..a35cdb944 100755
--- a/classes/output/renderer.php
+++ b/classes/output/renderer.php
@@ -244,7 +244,8 @@ public function question_output($question, $response, $qnum, $blankquestionnaire
                 $pagetags->notifications = $this->notification($notification, \core\output\notification::NOTIFY_ERROR);
             }
         }
-
+        $pagetags->questionname = $question->name;
+        
         return $this->render_from_template('mod_questionnaire/question_container', $pagetags);
     }
 
diff --git a/templates/question_container.mustache b/templates/question_container.mustache
index f29c93acf..97ebd1a96 100644
--- a/templates/question_container.mustache
+++ b/templates/question_container.mustache
@@ -58,7 +58,7 @@
             {{{required}}}
         </div>
     {{/qnum}}
-    <div class="qn-content">
+    <div class="qn-content" {{#questionname}}data-question-name="{{questionname}}"{{/questionname}}>
         <div class="qn-question {{skippedclass}}">
             {{#label}}<label for="{{label.for}}">{{/label}}
             {{{qcontent}}}

From 76bddd4e782572fbb8926105656f6f33d0421646 Mon Sep 17 00:00:00 2001
From: Viet Truong Quoc <56838006+vietlx426@users.noreply.github.com>
Date: Sat, 1 Nov 2025 21:18:56 +0700
Subject: [PATCH 04/13] Questionnaire: Make summary page even more intuitive
 (#640)

Co-authored-by: vietlx426 <vt2944@open.ac.uk>
---
 lang/en/questionnaire.php                       |  1 +
 questionnaire.class.php                         | 17 +++++++++++++++++
 tests/behat/check_responses.feature             |  4 ++--
 .../behat/check_responses_capabilities.feature  |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lang/en/questionnaire.php b/lang/en/questionnaire.php
index f36e5fc13..205b646ca 100644
--- a/lang/en/questionnaire.php
+++ b/lang/en/questionnaire.php
@@ -570,6 +570,7 @@
 $string['responseformat'] = 'Response format';
 $string['responseoptions'] = 'Response options';
 $string['responses'] = 'Responses';
+$string['responses_breakdown'] = '(Submissions: {$a->responses} | In progress: {$a->incomplete})';
 $string['responseview'] = 'Students can view ALL responses';
 $string['responseview_help'] = 'You can specify who can see the responses of all respondents to submitted questionnaires (general statistics tables).';
 $string['responseview_link'] = 'mod/questionnaire/mod#Response_viewing';
diff --git a/questionnaire.class.php b/questionnaire.class.php
index c2f8a1751..b284327f8 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -2891,6 +2891,23 @@ public function survey_results($rid = '', $uid=false, $pdf = false, $currentgrou
             if ($userview === 'y') {
                 $respondentstring = get_string('submissions', 'questionnaire');
             }
+            if (!$userview) {
+                $completedcount = 0;
+                $inprogresscount = 0;
+
+                foreach ($rows as $row) {
+                    if ($row->complete === 'y') {
+                        $completedcount++;
+                    } else if ($row->complete === 'n') {
+                        $inprogresscount++;
+                    }
+                }
+                $numresps .= ' ' . get_string('responses_breakdown', 'questionnaire',
+                    [
+                        'responses' => $completedcount,
+                        'incomplete' => $inprogresscount,
+                    ]);
+            }
             $this->page->add_to_page('respondentinfo',
                     ' ' . $respondentstring . ': <strong>' . $numresps . '</strong>');
             if (empty($rows)) {
diff --git a/tests/behat/check_responses.feature b/tests/behat/check_responses.feature
index df296d09d..e45a62390 100644
--- a/tests/behat/check_responses.feature
+++ b/tests/behat/check_responses.feature
@@ -35,7 +35,7 @@ Feature: Review responses
     Then I should see "View all responses"
     And I navigate to "View all responses" in current page administration
     And I should see "View Default order"
-    And I should see "Responses: 7"
+    And I should see "Responses: 7 (Submissions: 6 | In progress: 1)"
     And I set the field "View" to "Full submissions"
     And I should see "Submissions: 6"
     And I set the field "View" to "Responses not submitted"
@@ -70,7 +70,7 @@ Feature: Review responses
     Then I should see "1 / 6"
     And I follow "Summary"
     And I should see "View Default order"
-    And I should see "Responses: 6"
+    And I should see "Responses: 6 (Submissions: 6 | In progress: 0)"
     And I follow "Delete ALL Responses"
     Then I should see "Are you sure you want to delete ALL the responses in this questionnaire?"
     And I press "Delete"
diff --git a/tests/behat/check_responses_capabilities.feature b/tests/behat/check_responses_capabilities.feature
index 1593013a4..348d88708 100644
--- a/tests/behat/check_responses_capabilities.feature
+++ b/tests/behat/check_responses_capabilities.feature
@@ -33,7 +33,7 @@ Feature: Review responses with different capabilities
     And I navigate to "View all responses" in current page administration
     Then I should see "All responses"
     And I should see "View Default order"
-    And I should see "Responses: 7"
+    And I should see "Responses: 7 (Submissions: 6 | In progress: 1)"
     And I log out
 
   @javascript

From 3d277dcf3b710e4ec9e257a614077d9cda0dc89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Sat, 1 Nov 2025 19:57:29 +0100
Subject: [PATCH 05/13] The thank you page header is not filtered, resolves
 #664. (#665)

---
 questionnaire.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/questionnaire.class.php b/questionnaire.class.php
index b284327f8..f8ab9868a 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -2524,7 +2524,7 @@ private function response_goto_thankyou() {
             $this->page->add_to_page('progressbar',
                     $this->renderer->render_progress_bar(count($this->questionsbysec) + 1, $this->questionsbysec));
         }
-        $this->page->add_to_page('title', $thankhead);
+        $this->page->add_to_page('title', format_string($thankhead));
         $this->page->add_to_page('addinfo',
             format_text(file_rewrite_pluginfile_urls($thankbody, 'pluginfile.php',
                 $this->context->id, 'mod_questionnaire', 'thankbody', $this->survey->id), FORMAT_HTML, ['noclean' => true]));

From 13672972ff3da0a7175e8e27cacbf8e81c0ed83f Mon Sep 17 00:00:00 2001
From: Mike Churchward <mike.churchward@poetopensource.org>
Date: Thu, 6 Nov 2025 10:12:19 -0500
Subject: [PATCH 06/13] Checking for SCSS deprecations. (#670)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7fa8c53d8..958429ce6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,4 +112,4 @@ jobs:
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --profile chrome
+        run: moodle-plugin-ci behat --profile chrome --scss-deprecations

From ed39e6a3492d589d33774834e347b4a8d9504727 Mon Sep 17 00:00:00 2001
From: Mike Churchward <mike.churchward@poetopensource.org>
Date: Sun, 9 Nov 2025 12:26:22 -0500
Subject: [PATCH 07/13] Prepping release 4.4.0.

---
 CHANGES.md  | 26 ++++++++++++++++++++++++--
 version.php |  4 ++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 493b4a376..4c026a25b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,26 @@
 Release Notes
 
-Release 4.1.0 (Build - 2023081100)
+Release 4.4.0 (Build - 2025110900)
+New Features:
+* [PR590](https://github.com/PoetOS/moodle-mod_questionnaire/pull/590): Allow responses to be deleted automatically after a specified time. This is disabled by default.
 
-Initial release for Moodle 4.1 forward.
+Improvements:
+* [PR618](https://github.com/PoetOS/moodle-mod_questionnaire/pull/618): Make printable questionnaire more readable.
+* Updated deprecated functions.
+* [PR589](https://github.com/PoetOS/moodle-mod_questionnaire/pull/589): Allow selection of submitted responses or in progress responses on results pages.
+* [PR596](https://github.com/PoetOS/moodle-mod_questionnaire/pull/596): Allow sorting on name and submission date on summary page.
+* [PR588](https://github.com/PoetOS/moodle-mod_questionnaire/pull/588): Add a print button to the My report page.
+* [PR378](https://github.com/PoetOS/moodle-mod_questionnaire/pull/378): Add open and close dates back to view page.
+* [PR604](https://github.com/PoetOS/moodle-mod_questionnaire/pull/604): Show all "other" free choices for rate questions individually on report pages.
+* [PR616](https://github.com/PoetOS/moodle-mod_questionnaire/pull/616): Only show dependent questions answered on response page.
+* [I120](https://github.com/PoetOS/moodle-mod_questionnaire/issues/120): Added idnumber to export.
+
+Bug Fixes:
+* Ensure numbering doesn't appear on results pages when they are turned off.
+* Mobile - ensure pull to refresh doesn't resend question responses.
+* Fixed empty key error.
+* Fixed oversize icon display in 4.5.
+* Thank you page header is now filtered.
 
 Release 4.1.1 (Build - 2024082900)
 
@@ -34,5 +52,9 @@ Bug Fixes:
 * PR514 - Section text qtype should not support feedback.
 * PR516 - Course description displays properly.
 
+Release 4.1.0 (Build - 2023081100)
+
+Initial release for Moodle 4.1 forward.
+
 (see CHANGES.md in release 4.00 for earlier changes.)
 
diff --git a/version.php b/version.php
index 06f46f1de..68c2822ec 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022121601.01;  // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2024080100.01;  // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2024042200.00; // Moodle version (4.4.0).
 
 $plugin->component = 'mod_questionnaire';
 
-$plugin->release = '4.4.0 (Build - 2024082900)';
+$plugin->release = '4.4.0 (Build - 2025110900)';
 $plugin->maturity = MATURITY_STABLE;

From e9f3409ba11469c075a68b2d99aa33176be3e138 Mon Sep 17 00:00:00 2001
From: Mike Churchward <mike.churchward@poetopensource.org>
Date: Sun, 9 Nov 2025 13:38:07 -0500
Subject: [PATCH 08/13] Fixing version.

---
 version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.php b/version.php
index 68c2822ec..44f6f74b6 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024080100.01;  // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2024080100;  // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2024042200.00; // Moodle version (4.4.0).
 
 $plugin->component = 'mod_questionnaire';

From 2e0c5a80871a3c7a87a417c14bfa837aade76878 Mon Sep 17 00:00:00 2001
From: Mike Churchward <mike.churchward@poetopensource.org>
Date: Mon, 10 Nov 2025 13:52:27 -0500
Subject: [PATCH 09/13] Add group selector to individual report (#674)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add group filter dropdown to List of responses

* Ensuring by response page is displayed when no responses.

---------

Co-authored-by: Iñigo Zendegi Urzelai <izendegi@mondragon.edu>
---
 report.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/report.php b/report.php
index 5c81c84a9..a627ec4bb 100755
--- a/report.php
+++ b/report.php
@@ -727,6 +727,13 @@
             }
         }
 
+        // Add group filter dropdown.
+        if ($groupmode > 0) {
+            $groupselect = groups_print_activity_menu($cm, $url->out(), true);
+            $questionnaire->page->add_to_page('respondentinfo', $groupselect);
+            $currentgroupid = groups_get_activity_group($cm);
+        }
+
         if ($byresponse || $rid) {
             // Available group modes (0 = no groups; 1 = separate groups; 2 = visible groups).
             if ($groupmode > 0) {
@@ -765,12 +772,7 @@
             $rid = $rids[0];
         }
 
-        if ($noresponses) {
-            $questionnaire->page->add_to_page('respondentinfo',
-                get_string('group') . ' <strong>' . groups_get_group_name($currentgroupid) . '</strong>: ' .
-                get_string('noresponses', 'questionnaire'));
-
-        } else if ($outputtarget == 'pdf') {
+        if ($outputtarget == 'pdf') {
             $pdf = questionnaire_report_start_pdf();
             if ($currentgroupid > 0) {
                 $groupname = get_string('group') . ': <strong>' . groups_get_group_name($currentgroupid) . '</strong>';
@@ -789,6 +791,12 @@
             error_reporting($errorreporting);
 
         } else { // Default to HTML.
+            if ($noresponses) {
+                $questionnaire->page->add_to_page('respondentinfo',
+                    get_string('group') . ' <strong>' . groups_get_group_name($currentgroupid) . '</strong>: ' .
+                    get_string('noresponses', 'questionnaire'));
+            }
+
             // Print the page header.
             $PAGE->set_title(get_string('questionnairereport', 'questionnaire'));
             $PAGE->set_heading(format_string($course->fullname));

From 61e010f9f6e9d731da88809eb60ca5e742903a9e Mon Sep 17 00:00:00 2001
From: Mike Churchward <mike.churchward@poetopensource.org>
Date: Mon, 10 Nov 2025 16:38:05 -0500
Subject: [PATCH 10/13] Add recycle function for deleted questions

* Questionnaire__deletion_area_(Recycle_bin)_for_deleted_orphaned_questions
---------
Co-authored-by: tai.letan <tlt84@open.ac.uk>
Co-authored-by: vietlx426 <vt2944@open.ac.uk>
---
 .../restore_questionnaire_stepslib.php        |   5 +-
 classes/question/question.php                 |  10 +-
 classes/questions_form.php                    |  84 ++++++++++-
 classes/search/question.php                   |   4 +-
 classes/task/cron_task.php                    |  54 +++++++
 db/install.xml                                |   2 +-
 db/tasks.php                                  |  11 +-
 db/upgrade.php                                |  26 ++++
 lang/en/questionnaire.php                     |  15 +-
 locallib.php                                  | 137 ++++++++++++++++--
 questionnaire.class.php                       |  37 ++++-
 questions.php                                 | 101 ++++++++++---
 settings.php                                  |   4 +
 styles.css                                    |  18 +++
 tests/behat/behat_mod_questionnaire.php       |  48 ++++--
 tests/behat/deletion_questionnaire.feature    |  86 +++++++++++
 tests/deletion_question_test.php              |  92 ++++++++++++
 .../backup-activity-questionnaire.mbz         | Bin 0 -> 3496 bytes
 tests/lib_test.php                            |  43 ++++++
 version.php                                   |   2 +-
 20 files changed, 707 insertions(+), 72 deletions(-)
 create mode 100644 classes/task/cron_task.php
 create mode 100644 tests/behat/deletion_questionnaire.feature
 create mode 100644 tests/deletion_question_test.php
 create mode 100644 tests/fixtures/backup-activity-questionnaire.mbz

diff --git a/backup/moodle2/restore_questionnaire_stepslib.php b/backup/moodle2/restore_questionnaire_stepslib.php
index d52356357..769383eac 100644
--- a/backup/moodle2/restore_questionnaire_stepslib.php
+++ b/backup/moodle2/restore_questionnaire_stepslib.php
@@ -163,7 +163,10 @@ protected function process_questionnaire_question($data) {
         $data = (object)$data;
         $oldid = $data->id;
         $data->surveyid = $this->get_new_parentid('questionnaire_survey');
-
+        // Cover for legacy backup data.
+        if ($data->deleted === 'n') {
+            $data->deleted = null;
+        }
         // Insert the questionnaire_question record.
         $newitemid = $DB->insert_record('questionnaire_question', $data);
         $this->set_mapping('questionnaire_question', $oldid, $newitemid, true);
diff --git a/classes/question/question.php b/classes/question/question.php
index ed191496b..86690220a 100644
--- a/classes/question/question.php
+++ b/classes/question/question.php
@@ -103,8 +103,8 @@ abstract class question {
     /** @var boolean $required The required flag. */
     public $required = 'n';
 
-    /** @var boolean $deleted The deleted flag. */
-    public $deleted = 'n';
+    /** @var int $deleted The deleted flag. */
+    public $deleted = null;
 
     /** @var mixed $extradata Any custom data for the question type. */
     public $extradata = '';
@@ -598,7 +598,7 @@ public function response_complete($responsedata) {
             // If $responsedata is webform data, check that its not empty.
             $answered = isset($responsedata->{'q'.$this->id}) && ($responsedata->{'q'.$this->id} != '');
         }
-        return !($this->required() && ($this->deleted == 'n') && !$answered);
+        return !($this->required() && (empty($this->deleted)) && !$answered);
     }
 
     /**
@@ -663,8 +663,8 @@ public function add($questionrecord, array $choicerecords = null, $calcposition
             // Set the position to the end.
             $sql = 'SELECT MAX(position) as maxpos '.
                    'FROM {questionnaire_question} '.
-                   'WHERE surveyid = ? AND deleted = ?';
-            $params = ['surveyid' => $questionrecord->surveyid, 'deleted' => 'n'];
+                   'WHERE surveyid = ? AND deleted IS NULL';
+            $params = ['surveyid' => $questionrecord->surveyid];
             if ($record = $DB->get_record_sql($sql, $params)) {
                 $questionrecord->position = $record->maxpos + 1;
             } else {
diff --git a/classes/questions_form.php b/classes/questions_form.php
index 0bb2b4697..5b4d8312a 100644
--- a/classes/questions_form.php
+++ b/classes/questions_form.php
@@ -50,6 +50,7 @@ public function definition() {
 
         $sid = $questionnaire->survey->id;
         $mform    =& $this->_form;
+        $qidrestore = optional_param(QUESTIONNAIRE_RESTORE_PARAM, 0, PARAM_INT);
 
         $mform->addElement('header', 'questionhdr', get_string('addquestions', 'questionnaire'));
         $mform->addHelpButton('questionhdr', 'questiontypes', 'questionnaire');
@@ -138,7 +139,7 @@ public function definition() {
 
             // No page break in first position!
             if ($tid == QUESPAGEBREAK && $pos == 1) {
-                $DB->set_field('questionnaire_question', 'deleted', 'y', ['id' => $qid, 'surveyid' => $sid]);
+                $DB->set_field('questionnaire_question', 'deleted', time(), ['id' => $qid, 'surveyid' => $sid]);
                 if ($records = $DB->get_records_select('questionnaire_question', $select, null, 'position ASC')) {
                     foreach ($records as $record) {
                         $DB->set_field('questionnaire_question', 'position', $record->position - 1, array('id' => $record->id));
@@ -172,7 +173,12 @@ public function definition() {
                     // Begin div qn-container with indent if questionnaire has child.
                     $mform->addElement('html', '<div class="qn-container qn-indent">');
                 } else {
-                    $mform->addElement('html', '<div class="qn-container">'); // Begin div qn-container.
+                    $containerclass = "qn-container";
+                    if (isset($qidrestore) && $qidrestore == $question->id) {
+                        $containerclass .= " restored-question";
+                    }
+                    // Begin div qn-container.
+                    $mform->addElement('html', "<div class='$containerclass'>");
                 }
 
                 $mextra = array('value' => $question->id,
@@ -220,14 +226,15 @@ public function definition() {
                     // Do not allow moving or deleting a page break if immediately followed by a child question
                     // or immediately preceded by a question with a dependency and followed by a non-dependent question.
                     if ($tid == QUESPAGEBREAK) {
-                        if ($nextquestion = $DB->get_record('questionnaire_question',
-                            ['surveyid' => $sid, 'position' => $pos + 1, 'deleted' => 'n'], 'id, name, content') ) {
-
+                        $select = 'surveyid = ? AND position = ? AND deleted IS NULL';
+                        $nextquestion = $DB->get_record_select('questionnaire_question', $select,
+                            [$sid, $pos + 1], 'id, name, content');
+                        if ($nextquestion) {
                             $nextquestiondependencies = $DB->get_records('questionnaire_dependency',
                                 ['questionid' => $nextquestion->id , 'surveyid' => $sid], 'id ASC');
 
-                            if ($previousquestion = $DB->get_record('questionnaire_question',
-                                ['surveyid' => $sid, 'position' => $pos - 1, 'deleted' => 'n'], 'id, name, content')) {
+                            if ($previousquestion = $DB->get_record_select('questionnaire_question', $select,
+                                [$sid, $pos - 1], 'id, name, content')) {
 
                                 $previousquestiondependencies = $DB->get_records('questionnaire_dependency',
                                     ['questionid' => $previousquestion->id , 'surveyid' => $sid], 'id ASC');
@@ -359,6 +366,66 @@ public function definition() {
             }
         }
 
+        // Question deletion area.
+        $mform->addElement('header', 'deletionq', get_string('deletionquetions', 'questionnaire'));
+        $mform->addHelpButton('deletionq', 'deletionquetions', 'questionnaire');
+        $mform->addElement('html', '<div class="qcontainer">');
+        if (isset($questionnaire->deletequestions)) {
+            $restoreimg = $questionnaire->renderer->image_url('i/up');
+            $deleteimg = $questionnaire->renderer->image_url('t/delete');
+            $rangetimecrontask = questionnaire_get_range_time_permanently();
+            foreach ($questionnaire->deletequestions as $deletequestion) {
+                $delquestiongroup = [];
+                // Preparing deleted time to display time permanently question.
+                $timedeleted = $deletequestion->deleted ?? "";
+                if ($rangetimecrontask == 0) {
+                    $timedeleted = get_string('recylebindisabled', 'questionnaire');
+                } else {
+                    if (!empty($timedeleted)) {
+                        $timedeleted = get_string('timedeletednext7days', 'questionnaire',
+                            date("D j M, Y", $timedeleted + $rangetimecrontask));
+                    }
+                }
+                $qtypeandname = [];
+                $qtypeandname['name'] = $deletequestion->name;
+                $qtypeandname['type'] = questionnaire_get_type($deletequestion->type_id);
+
+                $content = format_text(
+                    file_rewrite_pluginfile_urls($deletequestion->content, 'pluginfile.php',
+                    $deletequestion->context->id,
+                    'mod_questionnaire', 'question', $deletequestion->id),
+                    FORMAT_HTML, ['noclean' => true]
+                );
+
+                $qnumber = '<div class="qn-info"><h2 class="qn-number">NA</h2></div>';
+                $restorextra = [
+                    'value' => $deletequestion->id,
+                    'alt' => get_string('restorebutton', 'questionnaire'),
+                    'title' => get_string('restorebutton', 'questionnaire'),
+                ];
+                $deleleextra = [
+                    'value' => $deletequestion->id,
+                    'alt' => get_string('deletepermanentlybutton', 'questionnaire'),
+                    'title' => get_string('deletepermanentlybutton', 'questionnaire')
+                ];
+                $mform->addElement('html', '<div class="qn-container">'); // Begin div qn-container.
+                $delquestiongroup[] =& $mform->createElement('static', 'opentag_' . $deletequestion->id, '', '');
+                $delquestiongroup[] =& $mform->createElement('image', 'restorebutton[' . $deletequestion->id . ']',
+                    $restoreimg, $restorextra);
+                $delquestiongroup[] =& $mform->createElement('image', 'deletebutton[' . $deletequestion->id . ']',
+                    $deleteimg, $deleleextra);
+                $delquestiongroup[] =& $mform->createElement('static', 'closetag_' . $deletequestion->id, '', '');
+                $delquestiongroup[] =& $mform->createElement('static', 'qinfo_' . $deletequestion->id, '',
+                    get_string('questiontypeandname', 'questionnaire', $qtypeandname));
+                $delquestiongroup[] =& $mform->createElement('static', 'qinfo_' . $deletequestion->id,
+                        '', $timedeleted);
+                $mform->addGroup($delquestiongroup, 'delquestiongroup', '', '&nbsp;', false);
+                $mform->addElement('static', 'qcontent_'.$deletequestion->id, '',
+                    $qnumber.'<div class="qn-question">'.$content.'</div>');
+                $mform->addElement('html', '</div>'); // End div qn-container.
+            }
+        }
+
         if ($this->moveq) {
             $mform->addElement('hidden', 'moveq', $this->moveq);
         }
@@ -373,6 +440,9 @@ public function definition() {
         $mform->setType('moveq', PARAM_RAW);
 
         $mform->addElement('html', '</div>');
+        $mform->setExpanded('questionhdr');
+        $mform->setExpanded('manageq');
+        $mform->setExpanded('deletionq');
     }
 
     /**
diff --git a/classes/search/question.php b/classes/search/question.php
index 0d5d4b60d..f38700fbc 100644
--- a/classes/search/question.php
+++ b/classes/search/question.php
@@ -74,8 +74,8 @@ public function get_document($record, $options = []) {
 
         // Because there is no database agnostic way to combine all of the possible question content data into one record in
         // get_recordset_by_timestamp, I need to grab it all now and add it to the document.
-        $recordset = $DB->get_recordset('questionnaire_question', ['surveyid' => $record->sid, 'deleted' => 'n'],
-            'id', 'id,content');
+        $recordset = $DB->get_recordset_select('questionnaire_question',
+            'surveyid = ? AND deleted IS NULL', [$record->sid], 'id', 'id,content');
 
         // If no question data, don't index this document.
         if (empty($recordset)) {
diff --git a/classes/task/cron_task.php b/classes/task/cron_task.php
new file mode 100644
index 000000000..d715d53b3
--- /dev/null
+++ b/classes/task/cron_task.php
@@ -0,0 +1,54 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_questionnaire\task;
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
+/**
+ * A schedule task for mod_questionnaire cron.
+ *
+ * @package   mod_questionnaire
+ * @copyright 2022 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class cron_task extends \core\task\scheduled_task {
+    /**
+     * Get a descriptive name for this task (shown to admins).
+     *
+     * @return string
+     */
+    public function get_name() {
+        return get_string('cleanrecylebin', 'mod_questionnaire');
+    }
+
+    /**
+     * Run mod_questionnaire cron.
+     */
+    public function execute() {
+        global $DB;
+        $rangetimecrontask = questionnaire_get_range_time_permanently();
+        $sql = "SELECT *
+                  FROM {questionnaire_question}
+                 WHERE deleted IS NOT NULL
+                   AND deleted < ?";
+        if ($deletequestions = $DB->get_records_sql($sql, [time() - $rangetimecrontask])) {
+            foreach ($deletequestions as $question) {
+                questionnaire_delete_permanently_questions($question->id, $question->surveyid);
+            }
+        }
+    }
+}
diff --git a/db/install.xml b/db/install.xml
index e5892b26b..49f51f097 100644
--- a/db/install.xml
+++ b/db/install.xml
@@ -77,7 +77,7 @@
         <FIELD NAME="position" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="content" TYPE="text" NOTNULL="true" SEQUENCE="false"/>
         <FIELD NAME="required" TYPE="char" LENGTH="1" NOTNULL="true" DEFAULT="n" SEQUENCE="false"/>
-        <FIELD NAME="deleted" TYPE="char" LENGTH="1" NOTNULL="true" DEFAULT="n" SEQUENCE="false"/>
+        <FIELD NAME="deleted" TYPE="int" LENGTH="10" NOTNULL="false" SEQUENCE="false" COMMENT="The timestamp record last deleted."/>
         <FIELD NAME="extradata" TYPE="text" NOTNULL="false" SEQUENCE="false" COMMENT="If a question needs more than the standard fields provided, use this field."/>
       </FIELDS>
       <KEYS>
diff --git a/db/tasks.php b/db/tasks.php
index 40d241abc..8629011cb 100644
--- a/db/tasks.php
+++ b/db/tasks.php
@@ -36,5 +36,14 @@
         'day' => '*',
         'month' => '*',
         'dayofweek' => '*'
-    )
+    ),
+    [
+        'classname' => 'mod_questionnaire\task\cron_task',
+        'blocking' => 0,
+        'minute' => '*',
+        'hour' => '*',
+        'day' => '*/7',
+        'month' => '*',
+        'dayofweek' => '*'
+    ],
 );
diff --git a/db/upgrade.php b/db/upgrade.php
index b07cea8c2..756582807 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -1016,6 +1016,32 @@ function xmldb_questionnaire_upgrade($oldversion=0) {
         upgrade_mod_savepoint(true, 2022121601.01, 'questionnaire');
     }
 
+    if ($oldversion < 2024080100.01) {
+        $table = new xmldb_table('questionnaire_question');
+        $index = new xmldb_index('quest_question_sididx', XMLDB_INDEX_NOTUNIQUE, ['surveyid', 'deleted']);
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+        $field = new xmldb_field('deleted', XMLDB_TYPE_CHAR, '10', XMLDB_UNSIGNED, null, null, null, 'required');
+        if ($dbman->field_exists($table, $field)) {
+            $dbman->change_field_type($table, $field);
+        }
+        unset($field);
+
+        $field = new xmldb_field('deleted', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null, 'required');
+        if ($dbman->field_exists($table, $field)) {
+            // Instead of updating all 'deleted' = 'y' to a timestamp (which could be slow on large tables),
+            // simply delete those records, as they were not restorable before this upgrade.
+            $DB->delete_records('questionnaire_question', ['deleted' => 'y']);
+            // Optionally, clear 'deleted' = 'n' to null if required by new logic.
+            $DB->set_field('questionnaire_question', 'deleted', null, ['deleted' => 'n']);
+            $dbman->change_field_type($table, $field);
+        }
+        unset($field);
+        // Questionnaire savepoint reached.
+        upgrade_mod_savepoint(true, 2024080100.01, 'questionnaire');
+    }
+
     return true;
 }
 
diff --git a/lang/en/questionnaire.php b/lang/en/questionnaire.php
index 205b646ca..2da21d836 100644
--- a/lang/en/questionnaire.php
+++ b/lang/en/questionnaire.php
@@ -99,6 +99,7 @@
 $string['closed'] = 'Closed on {$a}.';
 $string['closedate'] = 'Allow responses until';
 $string['closeson'] = 'Questionnaire closes on {$a}';
+$string['cleanrecylebin'] = "Empty Questionnaire 'Recycle bin'";
 $string['completionsubmit'] = 'Student must submit this questionnaire to complete it';
 $string['condition'] = 'Condition';
 $string['confalts'] = '- OR - <br />Confirmation page';
@@ -110,7 +111,8 @@
 $string['confirmdelallresp'] = 'Are you sure you want to delete ALL the responses in this questionnaire?';
 $string['confirmdelchildren'] = 'If you delete this question, its child(ren) question(s) will also be deleted:';
 $string['confirmdelgroupresp'] = 'Are you sure you want to delete ALL the responses of {$a}?';
-$string['confirmdelquestion'] = 'Are you sure you want to delete the question at position {$a}?';
+$string['confirmdelquestion'] = 'Are you sure you want to move the question at position {$a} to the deletion area?';
+$string['confirmdelpermanentlyq'] = 'Are you sure you want to permanently delete this question?';
 $string['confirmdelquestionresps'] = 'This will also delete the {$a} response(s) already given to that question.';
 $string['confirmdelresp'] = 'Are you sure you want to delete the response by&nbsp;{$a}&nbsp;?';
 $string['confirmdeletesection'] = 'Are you sure you want to delete feedback section "{$a}"?';
@@ -142,7 +144,10 @@
 $string['deletedresp'] = 'Deleted Response';
 $string['deleteresp'] = 'Delete this Response';
 $string['deletesection'] = 'Delete this section';
+$string['deletepermanentlybutton'] = 'Permanently delete question';
 $string['deletingresp'] = 'Deleting Response';
+$string['deletequestionsolderthan'] = 'Delete questions older than';
+$string['deletesettingdescription'] = 'The scheduled task will delete questions in deletion area that are older than this many days';
 $string['dependencies'] = 'Dependencies';
 $string['dependquestion'] = 'Parent Question';
 $string['dependquestion_help'] = 'You can select a parent question and a choice option for this question. A child question will only be displayed
@@ -291,6 +296,8 @@
 $string['leftpart'] = '{$a->min} is {$a->leftlabel}';
 $string['leftpartdefault'] = '{$a->min} is minimum slider range';
 $string['managequestions'] = 'Manage questions';
+$string['deletionquetions'] = 'Question deletion area';
+$string['deletionquetions_help'] = 'Deleted or otherwise orphaned questions will be first moved here rather than be outright deleted. The questions can be permanently deleted either manually through a user pressing the \'X\' icon, or the system will automatically remove any questions after a week. Use the \'up arrow\' button to restore the question.';
 $string['managequestions_help'] = 'In the Manage questions section of the Edit Questions page, you can conduct a number of operations on a Questionnaire\'s questions.';
 $string['managequestions_link'] = 'mod/questionnaire/questions#Manage_questions';
 $string['mandatory'] = 'Mandatory - All these dependencies must be fulfilled.';
@@ -527,6 +534,7 @@
 $string['questiontypes'] = 'Question types';
 $string['questiontypes_help'] = 'See the Moodle Documentation below';
 $string['questiontypes_link'] = 'mod/questionnaire/questions#Question_Types';
+$string['questiontypeandname'] = '[{$a->type}] ({$a->name})';
 $string['radiobuttons'] = 'Radio Buttons';
 $string['radiobuttons_help'] = 'In this question type, the respondent must select one out of the choices offered.';
 $string['radiobuttons_link'] = 'mod/questionnaire/questions#Radio_Buttons';
@@ -534,6 +542,7 @@
 $string['ratescale'] = 'Rate (scale 1..5)';
 $string['ratescale_help'] = 'See the Moodle Documentation below';
 $string['ratescale_link'] = 'mod/questionnaire/questions#Rate_.28scale_1..5.29';
+$string['recylebindisabled'] = '<span class="timedeletednext7days">Automatic deletion is disabled</span>';
 $string['realm'] = 'Questionnaire Type';
 $string['realm_help'] = '* **There are  three types of questionnaires:**
  * Private - belongs to the course it is defined in only.
@@ -541,7 +550,7 @@
  * Public - can be shared among courses.';
 $string['realm_link'] = 'mod/questionnaire/qsettings#Questionnaire_Type';
 $string['redirecturl'] = 'The URL to which a user is redirected after completing this questionnaire.';
-$string['remove'] = 'Delete';
+$string['remove'] = 'Move to deletion area';
 $string['removenotinuse'] = 'This questionnaire used to depend on a Public questionnaire which has been deleted.
 It can no longer be used and should be deleted.';
 $string['responsesnotsubmitted'] = 'Responses not submitted';
@@ -584,6 +593,7 @@
  Users can leave the questionnaire unfinished and resume from the save point at a later date.';
 $string['resume_link'] = 'mod/questionnaire/mod#Save/Resume_answers';
 $string['resumesurvey'] = 'Resume questionnaire';
+$string['restorebutton'] = 'Restore this question';
 $string['return'] = 'Return';
 $string['removeoldresponsesdefault'] = 'Never remove';
 $string['removeoldresponses'] = 'Delete old responses';
@@ -668,6 +678,7 @@
 $string['thousands'] = 'Do not use thousands separators.';
 $string['title'] = 'Title';
 $string['title_help'] = 'Title of this questionnaire, which will appear at the top of every page. By default Title is set to the questionnaire Name, but you can edit it as you like.';
+$string['timedeletednext7days'] = '<span class="timedeletednext7days">Time of permanent deletion: night of {$a}</strong>';
 $string['today'] = 'today';
 $string['total'] = 'Total';
 $string['totalofnumbers'] = 'Total of numbers entered';
diff --git a/locallib.php b/locallib.php
index 4ed962ec8..4685b6fa7 100644
--- a/locallib.php
+++ b/locallib.php
@@ -47,6 +47,9 @@
 
 define('QUESTIONNAIRE_DEFAULT_PAGE_COUNT', 20);
 
+define('QUESTIONNAIRE_CONFIRM_DELETE_PERMANENTLY', 'confirmdelpermanentlyq');
+define('QUESTIONNAIRE_RESTORE_PARAM', 'restoreq');
+
 global $questionnairetypes;
 $questionnairetypes = array (QUESTIONNAIREUNLIMITED => get_string('qtypeunlimited', 'questionnaire'),
                               QUESTIONNAIREONCE => get_string('qtypeonce', 'questionnaire'),
@@ -300,6 +303,78 @@ function questionnaire_delete_survey($sid, $questionnaireid) {
     return $status;
 }
 
+/**
+ * Delete permanently questions and data reference.
+ *
+ * @param int $qid question id.
+ * @param int $sid survey question id.
+ * @return void
+ */
+function questionnaire_delete_permanently_questions($qid, $sid) {
+    global $DB;
+    $select = 'id = :id AND surveyid = :sid AND deleted IS NOT NULL';
+    $DB->delete_records_select('questionnaire_question', $select , ['id' => $qid, 'sid' => $sid]);
+    $DB->delete_records('questionnaire_response', ['questionnaireid' => $qid]);
+    questionnaire_delete_responses($qid);
+    questionnaire_delete_dependencies($qid);
+}
+
+/**
+ * Log question deleted event.
+ *
+ * @param int $cmid of module.
+ * @param string $questiontype of question.
+ * @param int $courseid of question.
+ * @return void.
+ */
+function questionnaire_observe_event_delete($cmid, $questiontype, $courseid) {
+    $context = context_module::instance($cmid);
+    $params = [
+            'context' => $context,
+            'courseid' => $courseid,
+            'other' => ['questiontype' => $questiontype]
+    ];
+    $event = \mod_questionnaire\event\question_deleted::create($params);
+    $event->trigger();
+}
+
+/**
+ * Restore deleted questions.
+ *
+ * @param int $qid question id.
+ * @param int $sid survey id.
+ * @return void
+ */
+function questionnaire_restore_deleted_question($qid, $sid) {
+    global $DB;
+    // Get current deleted question and last position.
+    $sql = "SELECT *, (
+                    SELECT position + 1
+                      FROM {questionnaire_question}
+                     WHERE surveyid = ?
+                       AND deleted IS NULL
+                  ORDER BY position DESC
+                     LIMIT 1 ) as lastposition
+              FROM {questionnaire_question}
+             WHERE id = ?
+               AND surveyid = ?
+               AND deleted IS NOT NULL";
+    $question = $DB->get_record_sql($sql, [$sid, $qid, $sid]);
+    if ($question) {
+        // Update question using Moodle API. Only 'id' is needed for update_record.
+        $question->deleted = null;
+        $question->position = $question->lastposition ?? 1;
+        $DB->update_record('questionnaire_question', $question);
+    }
+}
+
+/**
+ * Get range of time permanently in setup cron task.
+ */
+function questionnaire_get_range_time_permanently() {
+    return get_config('questionnaire_questiondeletion', 'duration');
+}
+
 /**
  * Delete the response.
  * @param stdClass $response
@@ -373,6 +448,21 @@ function questionnaire_delete_dependencies($qid) {
     return true;
 }
 
+/**
+ * Delete all page break deleted.
+ *
+ * @param int $sid question survey id.
+ */
+function questionnaire_delete_pagebreaks($sid) {
+    global $DB;
+    $DB->delete_records_select('questionnaire_question',
+            'surveyid = :sid AND deleted IS NOT NULL AND type_id = :type_id',
+            [
+                    'sid' => $sid,
+                    'type_id' => QUESPAGEBREAK
+            ]);
+}
+
 /**
  * Get a survey selection records.
  * @param int $courseid
@@ -750,7 +840,8 @@ function questionnaire_check_page_breaks($questionnaire) {
     $delpb = 0;
     $sid = $questionnaire->survey->id;
     $positions = array();
-    if ($questions = $DB->get_records('questionnaire_question', ['surveyid' => $sid, 'deleted' => 'n'], 'position')) {
+    if ($questions = $DB->get_records_select('questionnaire_question',
+            'surveyid = :sid AND deleted IS NULL', ['sid' => $sid], 'position')) {
         foreach ($questions as $key => $qu) {
             $newqu = new stdClass();
             $newqu->question_id = $key;
@@ -784,11 +875,15 @@ function questionnaire_check_page_breaks($questionnaire) {
                 $delpb ++;
                 $msg .= get_string("checkbreaksremoved", "questionnaire", $delpb).'<br />';
                 // Need to reload questions.
-                if ($questions = $DB->get_records('questionnaire_question', ['surveyid' => $sid, 'deleted' => 'n'],  'id')) {
-                    $DB->set_field('questionnaire_question', 'deleted', 'y', ['id' => $qid, 'surveyid' => $sid]);
-                    $select = 'surveyid = ' . $sid . ' AND deleted = \'n\' AND position > ' .
-                            $questions[$qid]->position;
-                    if ($records = $DB->get_records_select('questionnaire_question', $select, null, 'position ASC')) {
+                if ($questions = $DB->get_records_select('questionnaire_question',
+                        'surveyid = :sid AND deleted IS NULL', ['sid' => $sid], 'id')) {
+
+
+                    $DB->set_field('questionnaire_question', 'deleted', time(), ['id' => $qid, 'surveyid' => $sid]);
+                    $select = 'surveyid = :sid AND deleted IS NULL AND position > :pos';
+                    $records = $DB->get_records_select('questionnaire_question', $select,
+                            ['sid' => $sid, 'pos' => $questions[$qid]->position], 'position ASC');
+                    if ($records) {
                         foreach ($records as $record) {
                             $DB->set_field('questionnaire_question', 'position', $record->position - 1, ['id' => $record->id]);
                         }
@@ -833,9 +928,11 @@ function questionnaire_check_page_breaks($questionnaire) {
 
                 if (($prevtypeid != QUESPAGEBREAK && $diffdependencies != 0)
                         || (!isset($qu['dependencies']) && isset($prevdependencies))) {
-                    $sql = 'SELECT MAX(position) as maxpos FROM {questionnaire_question} ' .
-                        'WHERE surveyid = ' . $questionnaire->survey->id . ' AND deleted = \'n\'';
-                    if ($record = $DB->get_record_sql($sql)) {
+                    $sql = "SELECT MAX(position) as maxpos
+                              FROM {questionnaire_question}
+                             WHERE surveyid = :sid
+                               AND deleted IS NULL";
+                    if ($record = $DB->get_record_sql($sql, ['sid' => $questionnaire->survey->id])) {
                         $pos = $record->maxpos + 1;
                     } else {
                         $pos = 1;
@@ -951,6 +1048,28 @@ function questionnaire_get_standard_page_items($id = null, $a = null) {
 }
 
 
+/**
+ * Count responses already saved for that question.
+ *
+ * @param int $qid question id.
+ * @param int $qtype question type.
+ * @return int number or 0 if responses were not found.
+ */
+function count_reponses_question(int $qid, int $qtype): int {
+    global $DB;
+
+    $countresps = 0;
+    if ($qtype != QUESSECTIONTEXT) {
+        $responsetable = $DB->get_field('questionnaire_question_type', 'response_table', ['typeid' => $qtype]);
+        if (!empty($responsetable)) {
+            $countresps = $DB->count_records('questionnaire_'.$responsetable, ['question_id' => $qid]);
+        }
+    }
+
+    return $countresps;
+}
+
+
 /**
  * Create options for remove old responses in the questionare.
  *
diff --git a/questionnaire.class.php b/questionnaire.class.php
index f8ab9868a..9e301b5db 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -38,6 +38,11 @@ class questionnaire {
      */
     public $questions = [];
 
+    /**
+     * @var \mod_questionnaire\question\question[] $deletequestions
+     */
+    public $deletequestions = [];
+
     /**
      * The survey record.
      * @var object $survey
@@ -105,6 +110,27 @@ public function __construct(&$course, &$cm, $id = 0, $questionnaire = null, $add
         $this->responses = [];
     }
 
+    /**
+     * Get all delete questions by survey id.
+     *
+     * @return void
+     * @throws dml_exception
+     */
+    public function get_delete_questions() {
+        global $DB;
+        $sql = "SELECT *
+                  FROM {questionnaire_question}
+                 WHERE deleted IS NOT NULL
+                   AND surveyid = ? AND type_id != ?
+              ORDER BY deleted DESC";
+        if ($records = $DB->get_records_sql($sql, [$this->sid, QUESPAGEBREAK])) {
+            foreach ($records as $record) {
+                $this->deletequestions[$record->id] = \mod_questionnaire\question\question::question_builder($record->type_id,
+                $record, $this->context);
+            }
+        }
+    }
+
     /**
      * Adding a survey record to the object.
      * @param int $sid
@@ -136,9 +162,8 @@ public function add_questions($sid = false) {
             $this->questionsbysec = [];
         }
 
-        $select = 'surveyid = ? AND deleted = ?';
-        $params = [$sid, 'n'];
-        if ($records = $DB->get_records_select('questionnaire_question', $select, $params, 'position')) {
+        $select = 'surveyid = ? AND deleted IS NULL';
+        if ($records = $DB->get_records_select('questionnaire_question', $select, [$sid], 'position')) {
             $sec = 1;
             $isbreak = false;
             foreach ($records as $record) {
@@ -2006,8 +2031,8 @@ private function response_select_max_sec($rid) {
         global $DB;
 
         $pos = $this->response_select_max_pos($rid);
-        $select = 'surveyid = ? AND type_id = ? AND position < ? AND deleted = ?';
-        $params = [$this->sid, QUESPAGEBREAK, $pos, 'n'];
+        $select = 'surveyid = ? AND type_id = ? AND position < ? AND deleted IS NULL';
+        $params = [$this->sid, QUESPAGEBREAK, $pos];
         $max = $DB->count_records_select('questionnaire_question', $select, $params) + 1;
 
         return $max;
@@ -2029,7 +2054,7 @@ private function response_select_max_pos($rid) {
                 'WHERE a.response_id = ? AND '.
                 'q.id = a.question_id AND '.
                 'q.surveyid = ? AND '.
-                'q.deleted = \'n\'';
+                'q.deleted IS NULL';
             if ($record = $DB->get_record_sql($sql, array($rid, $this->sid))) {
                 $newmax = (int)$record->num;
                 if ($newmax > $max) {
diff --git a/questions.php b/questions.php
index 6175512c5..1bbe7d559 100644
--- a/questions.php
+++ b/questions.php
@@ -33,6 +33,8 @@
 $delq = optional_param('delq', 0, PARAM_INT);             // Question id to delete.
 $qtype = optional_param('type_id', 0, PARAM_INT);         // Question type.
 $currentgroupid = optional_param('group', 0, PARAM_INT); // Group id.
+$delpermanentlyq = optional_param('delpermanentlyq', 0, PARAM_INT); // Question id to delete.
+$restoreq = optional_param(QUESTIONNAIRE_RESTORE_PARAM, 0, PARAM_INT); // Question id to restore question.
 
 if (! $cm = get_coursemodule_from_id('questionnaire', $id)) {
     throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire');
@@ -59,6 +61,7 @@
 $PAGE->set_context($context);
 
 $questionnaire = new questionnaire($course, $cm, 0, $questionnaire);
+$questionnaire->get_delete_questions();
 
 // Add renderer and page objects to the questionnaire object for display use.
 $questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
@@ -85,15 +88,26 @@
     $questionnaireid = $questionnaire->id;
 
     // Need to reload questions before setting deleted question to 'y'.
-    $questions = $DB->get_records('questionnaire_question', ['surveyid' => $sid, 'deleted' => 'n'], 'id') ?? [];
-    $DB->set_field('questionnaire_question', 'deleted', 'y', ['id' => $qid, 'surveyid' => $sid]);
+    $questions = $DB->get_records_select('questionnaire_question',
+            'surveyid = :sid AND deleted IS NULL', ['sid' => $sid], 'id');
+    if (isset($questions[$qid]) && $questions[$qid]->type_id == QUESPAGEBREAK) {
+        $DB->delete_records('questionnaire_question', ['id' => $qid]);
+    } else {
+        $updatesql = "UPDATE {questionnaire_question}
+                         SET deleted = ?
+                       WHERE id = ?
+                         AND surveyid = ?";
+        $DB->execute($updatesql, [time(), $qid, $sid]);
+    }
 
     // Delete all dependency records for this question.
     questionnaire_delete_dependencies($qid);
+    // Delete all page break that references to question deleted.
+    questionnaire_delete_pagebreaks($sid);
 
     // Just in case the page is refreshed (F5) after a question has been deleted.
     if (isset($questions[$qid])) {
-        $select = 'surveyid = '.$sid.' AND deleted = \'n\' AND position > '.
+        $select = 'surveyid = '.$sid.' AND deleted IS NULL AND position > '.
                         $questions[$qid]->position;
     } else {
         redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id);
@@ -113,21 +127,15 @@
         questionnaire_delete_responses($qid);
 
         // If no questions left in this questionnaire, remove all responses.
-        if ($DB->count_records('questionnaire_question', ['surveyid' => $sid, 'deleted' => 'n']) == 0) {
+        if ($DB->count_records_select('questionnaire_question',
+                        'surveyid = :sid AND deleted IS NULL', ['sid' => $sid]) == 0) {
             $DB->delete_records('questionnaire_response', ['questionnaireid' => $qid]);
         }
     }
 
     // Log question deleted event.
-    $context = context_module::instance($questionnaire->cm->id);
     $questiontype = \mod_questionnaire\question\question::qtypename($questionnaire->questions[$qid]->type_id);
-    $params = array(
-                    'context' => $context,
-                    'courseid' => $questionnaire->course->id,
-                    'other' => array('questiontype' => $questiontype)
-    );
-    $event = \mod_questionnaire\event\question_deleted::create($params);
-    $event->trigger();
+    questionnaire_observe_event_delete($questionnaire->cm->id, $questiontype, $questionnaire->course->id);
 
     if ($questionnairehasdependencies) {
         $SESSION->questionnaire->validateresults = questionnaire_check_page_breaks($questionnaire);
@@ -135,6 +143,33 @@
     $reload = true;
 }
 
+// Delete question permanently.
+if ($delpermanentlyq) {
+    $qid = $delpermanentlyq;
+    $sid = $questionnaire->survey->id;
+    questionnaire_delete_permanently_questions($qid, $sid);
+    $deletedquestion = $questionnaire->deletequestions[$qid] ?? null;
+    if ($deletedquestion !== null) {
+        $questiontype = \mod_questionnaire\question\question::qtypename($deletedquestion->type_id);
+        questionnaire_observe_event_delete($questionnaire->cm->id, $questiontype, $questionnaire->course->id);
+        $url = new moodle_url('/mod/questionnaire/questions.php', ['id' => $questionnaire->cm->id]);
+        $PAGE->set_url($url->out(false));
+        $reload = true;
+    }
+}
+
+// Restore question.
+if ($restoreq) {
+    $qid = $restoreq;
+    $qdeleted = isset($questionnaire->deletequestions[$qid]) ? $questionnaire->deletequestions[$qid] : false;
+    if ($qid && $qdeleted) {
+        questionnaire_restore_deleted_question($qid, $qdeleted->surveyid);
+    }
+    $url = new moodle_url('/mod/questionnaire/questions.php', ['id' => $questionnaire->cm->id]);
+    $PAGE->set_url($url->out(false));
+    $reload = true;
+}
+
 if ($action == 'main') {
     $questionsform = new \mod_questionnaire\questions_form('questions.php', $moveq);
     $sdata = clone($questionnaire->survey);
@@ -169,6 +204,10 @@
             $qformdata->removebutton = $exformdata->removebutton;
         } else if (isset($exformdata->requiredbutton)) {
             $qformdata->requiredbutton = $exformdata->requiredbutton;
+        } else if (isset($exformdata->deletebutton)) {
+            $qformdata->deletebutton = $exformdata->deletebutton;
+        } else if (isset($exformdata->restorebutton)) {
+            $qformdata->restorebutton = $exformdata->restorebutton;
         }
 
         // Insert a section break.
@@ -180,7 +219,8 @@
 
             // Delete section breaks without asking for confirmation.
             if ($qtype == QUESPAGEBREAK) {
-                redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id.'&amp;delq='.$qid);
+                redirect(new \moodle_url('/mod/questionnaire/questions.php',
+                    ['id' => $questionnaire->cm->id, 'delq' => $qid]));
             }
 
             $action = "confirmdelquestion";
@@ -259,6 +299,12 @@
             // Validates page breaks for depend questions.
             $SESSION->questionnaire->validateresults = questionnaire_check_page_breaks($questionnaire);
             $reload = true;
+        } else if (isset($qformdata->deletebutton)) {
+            $action = QUESTIONNAIRE_CONFIRM_DELETE_PERMANENTLY;
+        } else if (isset($qformdata->restorebutton)) {
+            $qid = key($qformdata->restorebutton);
+            redirect(new moodle_url('/mod/questionnaire/questions.php',
+                ['id' => $questionnaire->cm->id, QUESTIONNAIRE_RESTORE_PARAM => $qid]));
         }
     }
 
@@ -313,6 +359,7 @@
 if ($reload) {
     unset($questionsform);
     $questionnaire = new questionnaire($course, $cm, $questionnaire->id, null);
+    $questionnaire->get_delete_questions();
     // Add renderer and page objects to the questionnaire object for display use.
     $questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
     $questionnaire->add_page(new \mod_questionnaire\output\questionspage());
@@ -359,14 +406,7 @@
     $question = $questionnaire->questions[$qid];
     $qtype = $question->type_id;
 
-    // Count responses already saved for that question.
-    $countresps = 0;
-    if ($qtype != QUESSECTIONTEXT) {
-        $responsetable = $DB->get_field('questionnaire_question_type', 'response_table', array('typeid' => $qtype));
-        if (!empty($responsetable)) {
-            $countresps = $DB->count_records('questionnaire_'.$responsetable, array('question_id' => $qid));
-        }
-    }
+    $countresps = count_reponses_question($qid, $qtype);
 
     // Needed to print potential media in question text.
 
@@ -410,6 +450,25 @@
     }
     $questionnaire->page->add_to_page('formarea', $questionnaire->renderer->confirm($msg, $buttonyes, $buttonno));
 
+} else if ($action === QUESTIONNAIRE_CONFIRM_DELETE_PERMANENTLY) {
+    $qid = key($qformdata->deletebutton);
+    $qtype = $questionnaire->deletequestions[$qid]->type_id;
+    $questiondelete = $questionnaire->deletequestions[$qid];
+    $countresps = count_reponses_question($qid, $qtype);
+
+    $urlno = new moodle_url("/mod/questionnaire/questions.php", ['id' => $questionnaire->cm->id]);
+    $urlyes = new moodle_url("/mod/questionnaire/questions.php", ['id' => $questionnaire->cm->id, "delpermanentlyq" => $qid]);
+    $buttonyes = new single_button($urlyes, get_string('yes'));
+    $buttonno = new single_button($urlno, get_string('no'));
+    $msg = '<div class="warning centerpara"><p>'.get_string('confirmdelpermanentlyq', 'questionnaire').'</p>';
+    if ($countresps !== 0) {
+        $msg .= '<p>'.get_string('confirmdelquestionresps', 'questionnaire', $countresps).'</p>';
+    }
+    $msg .= '</div>';
+    $msg .= '<div class = "qn-container">NA ('. $questiondelete->name .')
+                <div class="qn-question">'.$questiondelete->content.'</div></div>';
+
+    $questionnaire->page->add_to_page('formarea', $questionnaire->renderer->confirm($msg, $buttonyes, $buttonno));
 } else {
     $questionnaire->page->add_to_page('formarea', $questionsform->render());
 }
diff --git a/settings.php b/settings.php
index a21bd9b0a..dc94193c5 100644
--- a/settings.php
+++ b/settings.php
@@ -55,6 +55,10 @@
     $settings->add(new admin_setting_configcheckbox('questionnaire/allowemailreporting',
         get_string('configemailreporting', 'questionnaire'), get_string('configemailreportinglong', 'questionnaire'), 0));
 
+    $settings->add(new admin_setting_configduration('questionnaire_questiondeletion/duration',
+        get_string('deletequestionsolderthan', 'questionnaire'),
+        get_string('deletesettingdescription', 'questionnaire'),  7 * 86400));
+
     // Delete old responses after. The default value is 24 months.
     $options = [
             '0' => new lang_string('disabled', 'questionnaire'),
diff --git a/styles.css b/styles.css
index 831b4bd3b..1a0c1b5c9 100644
--- a/styles.css
+++ b/styles.css
@@ -477,6 +477,24 @@ td.selected {
     margin-left: 20px;
 }
 
+#page-mod-questionnaire-questions .qcontainer .restored-question {
+    border: 1px solid #008196;
+    background: #fff2d8;
+    color: #343a40;
+}
+
+#page-mod-questionnaire-questions .qcontainer .timedeletednext7days {
+    color: #f00;
+}
+
+#page-mod-questionnaire-questions .generalbox .modal-content {
+    border: 1px solid #b0dfeb;
+}
+
+#page-mod-questionnaire-questions #id_deletionq .qn-question {
+    margin-left: 50px;
+}
+
 .mod_questionnaire_flex-container {
     display: inline-flex;
 }
diff --git a/tests/behat/behat_mod_questionnaire.php b/tests/behat/behat_mod_questionnaire.php
index 57c97c580..5f779f800 100644
--- a/tests/behat/behat_mod_questionnaire.php
+++ b/tests/behat/behat_mod_questionnaire.php
@@ -203,6 +203,22 @@ public function has_questions_and_responses($questionnairename) {
         $this->add_response_data($questionnaire->id, $questionnaire->sid);
     }
 
+    /**
+     * Custom deleteddate for run cron task.
+     *
+     * @Given /^I custom deleted date in table questionnaire question for cron task$/
+     */
+    public function i_custom_deleted_date_in_table_questionnaire_question_for_cron_task() {
+        global $DB;
+        if (!$questionnaire = $DB->get_records_select("questionnaire_question", 'deleted IS NOT NULL')) {
+            throw new ExpectationException('Invalid questionnaire name specified.', $this->getSession());
+        }
+        foreach ($questionnaire as $question) {
+            $question->deleted = $question->deleted - 8 * 24 * 60 * 60;
+            $DB->set_field('questionnaire_question', 'deleted', $question->deleted, ['id' => $question->id]);
+        }
+    }
+
     /**
      * Adds a question data to the given survey id.
      *
@@ -213,25 +229,25 @@ private function add_question_data($sid) {
         $questiondata = array(
             array("id", "surveyid", "name", "type_id", "result_id", "length", "precise", "position", "content", "required",
                   "deleted", "dependquestion", "dependchoice"),
-            array("1", $sid, "own car", "1", null, "0", "0", "1", "<p>Do you own a car?</p>", "y", "n", "0", "0"),
-            array("2", $sid, "optional", "2", null, "20", "25", "3", "<p>What is the colour of your car?</p>", "y", "n", "121",
+            array("1", $sid, "own car", "1", null, "0", "0", "1", "<p>Do you own a car?</p>", "y", null, "0", "0"),
+            array("2", $sid, "optional", "2", null, "20", "25", "3", "<p>What is the colour of your car?</p>", "y", null, "121",
                   "0"),
-            array("3", $sid, null, "99", null, "0", "0", "2", "break", "n", "n", "0", "0"),
+            array("3", $sid, null, "99", null, "0", "0", "2", "break", "n", null, "0", "0"),
             array("4", $sid, "optional2", "1", null, "0", "0", "5", "<p>Do you sometimes use public transport to go to work?</p>",
-                  "y", "n", "0", "0"),
-            array("5", $sid, null, "99", null, "0", "0", "4", "break", "n", "n", "0", "0"),
-            array("6", $sid, "entertext", "2", null, "20", "10", "6", "<p>Enter no more than 10 characters.<br></p>", "n", "n", "0",
+                  "y", null, "0", "0"),
+            array("5", $sid, null, "99", null, "0", "0", "4", "break", "n", null, "0", "0"),
+            array("6", $sid, "entertext", "2", null, "20", "10", "6", "<p>Enter no more than 10 characters.<br></p>", "n", null, "0",
                   "0"),
-            array("7", $sid, "q7", "5", null, "0", "0", "7", "<p>Check all that apply<br></p>", "n", "n", "0", "0"),
-            array("8", $sid, "q8", "9", null, "0", "0", "8", "<p>Enter today's date<br></p>", "n", "n", "0", "0"),
-            array("9", $sid, "q9", "6", null, "0", "0", "9", "<p>Choose One<br></p>", "n", "n", "0", "0"),
-            array("10", $sid, "q10", "3", null, "5", "0", "10", "<p>Write an essay<br></p>", "n", "n", "0", "0"),
-            array("11", $sid, "q11", "10", null, "10", "0", "11", "<p>Enter a number<br></p>", "n", "n", "0", "0"),
-            array("12", $sid, "q12", "4", null, "1", "0", "13", "<p>Choose a colour<br></p>", "n", "n", "0", "0"),
-            array("13", $sid, "q13", "8", null, "5", "1", "14", "<p>Rate this.<br></p>", "n", "n", "0", "0"),
-            array("14", $sid, null, "99", null, "0", "0", "12", "break", "n", "y", "0", "0"),
-            array("15", $sid, null, "99", null, "0", "0", "12", "break", "n", "n", "0", "0"),
-            array("16", $sid, "Q1", "10", null, "3", "2", "15", "Enter a number<br><p><br></p>", "y", "n", "0", "0")
+            array("7", $sid, "q7", "5", null, "0", "0", "7", "<p>Check all that apply<br></p>", "n", null, "0", "0"),
+            array("8", $sid, "q8", "9", null, "0", "0", "8", "<p>Enter today's date<br></p>", "n", null, "0", "0"),
+            array("9", $sid, "q9", "6", null, "0", "0", "9", "<p>Choose One<br></p>", "n", null, "0", "0"),
+            array("10", $sid, "q10", "3", null, "5", "0", "10", "<p>Write an essay<br></p>", "n", null, "0", "0"),
+            array("11", $sid, "q11", "10", null, "10", "0", "11", "<p>Enter a number<br></p>", "n", null, "0", "0"),
+            array("12", $sid, "q12", "4", null, "1", "0", "13", "<p>Choose a colour<br></p>", "n", null, "0", "0"),
+            array("13", $sid, "q13", "8", null, "5", "1", "14", "<p>Rate this.<br></p>", "n", null, "0", "0"),
+            array("14", $sid, null, "99", null, "0", "0", "12", "break", "n", time(), "0", "0"),
+            array("15", $sid, null, "99", null, "0", "0", "12", "break", "n", null, "0", "0"),
+            array("16", $sid, "Q1", "10", null, "3", "2", "15", "Enter a number<br><p><br></p>", "y", null, "0", "0"),
         );
 
         $choicedata = array(
diff --git a/tests/behat/deletion_questionnaire.feature b/tests/behat/deletion_questionnaire.feature
new file mode 100644
index 000000000..9baca3c8c
--- /dev/null
+++ b/tests/behat/deletion_questionnaire.feature
@@ -0,0 +1,86 @@
+@mod @mod_questionnaire @_file_upload
+Feature: Deletion questions area
+  In order to manage deletion question of questionnaire in a course
+  As a teacher
+  I need to manage the delete questions in questionnaire.
+  And as admin
+  I need to setup time for schedule task to run cron job to deteting questionnaire.
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | student1 | Student   | 1        | student1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    And the following config values are set as admin:
+      | enableasyncbackup | 0 |
+    And I log in as "teacher1"
+    And I am on the "Course 1" "restore" page
+    And I press "Manage course backups"
+    And I upload "mod/questionnaire/tests/fixtures/backup-activity-questionnaire.mbz" file to "Files" filemanager
+    And I press "Save changes"
+    Then I restore "backup-activity-questionnaire.mbz" backup into "Course 1" course using this options:
+
+  @javascript
+  Scenario: Manage deletion questionnaire area
+    Given I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "My Questionnaire 1"
+    And I navigate to "Questions" in current page administration
+    And I should see "Question deletion area"
+    And I should see "[Dropdown Box] (Demo dropdown 1)"
+    And I should see "Demo dropdown 1"
+    And I should see "[Numeric] (Demo numeric 1)"
+    And I should see "Demo numeric 1"
+    And I should see "NA"
+    And I click on "(//input[@type='image' and @title='Move to deletion area'])[1]" "xpath_element"
+    And I should see "Confirm"
+    And I should see "Are you sure you want to move the question at position 1 (Demo checkbox 1) to the deletion area?"
+    And I press "Yes"
+    And "//*[@id='id_manageq']//*[contains(.,'[Check Boxes] (Demo checkbox 1)')]" "xpath_element" should not exist
+    And I wait until the page is ready
+    And I click on "(//input[@type='image' and @title='Restore this question'])[2]" "xpath_element"
+    And I wait until the page is ready
+    And "//*[@class='qn-container restored-question']" "xpath_element" should exist
+    And I click on "(//input[@type='image' and @title='Permanently delete question'])[2]" "xpath_element"
+    And I should see "Are you sure you want to permanently delete this question?"
+    And I should see "Demo dropdown 1"
+    And I should see "NA"
+    And I press "Yes"
+    Then "//*[@id='id_manageq']//*[contains(.,'[Dropdown Box] (Demo dropdown 1)')]" "xpath_element" should not exist
+
+  @javascript
+  Scenario: Cron task for deletion questionnaire
+    And I custom deleted date in table questionnaire question for cron task
+    Given I log in as "admin"
+    And I navigate to "Server > Tasks > Scheduled tasks" in site administration
+    And I click on "Empty Questionnaire 'Recycle bin'" "link"
+    And I set the field "id_minute" to "*/1"
+    And I set the field "id_day" to "*"
+    And I press "Save changes"
+    And I am on "Course 1" course homepage
+    And I follow "My Questionnaire 1"
+    Then I navigate to "Questions" in current page administration
+    Then I click on "(//input[@type='image' and @title='Move to deletion area'])[1]" "xpath_element"
+    Then I press "Yes"
+    And I wait "61" seconds
+    Then I trigger cron
+    And I am on "Course 1" course homepage
+    And I follow "My Questionnaire 1"
+    When I navigate to "Questions" in current page administration
+    Then "//*[@id='id_deletionq']//*[contains(.,'[Dropdown Box] (Demo dropdown 1)')]" "xpath_element" should not exist
+    And "//*[@id='id_deletionq']//*[contains(.,'[Numeric] (Demo numeric 1)')]" "xpath_element" should not exist
+    And "//*[@id='id_deletionq']//*[contains(.,'[Check Boxes] (Demo checkbox 1)')]" "xpath_element" should exist
+    And I navigate to "Plugins > Activity modules > Questionnaire" in site administration
+    And I set the field "Delete questions older than" to "0"
+    And I press "Save changes"
+    And I am on "Course 1" course homepage
+    And I follow "My Questionnaire 1"
+    And I navigate to "Questions" in current page administration
+    And I should see "Automatic deletion is disabled"
diff --git a/tests/deletion_question_test.php b/tests/deletion_question_test.php
new file mode 100644
index 000000000..f610a2b39
--- /dev/null
+++ b/tests/deletion_question_test.php
@@ -0,0 +1,92 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * PHPUnit questionnaire generator tests
+ *
+ * @package    mod_questionnaire
+ * @copyright  2022 Mike Churchward (mike@churchward.ca)
+ * @author     Mike Churchward
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot.'/mod/questionnaire/locallib.php');
+require_once($CFG->dirroot.'/mod/questionnaire/classes/question/question.php');
+require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
+
+/**
+ * Unit tests for {@link questionnaire_deletion_question_testcase}
+ *
+ * @group mod_questionnaire
+ */
+class deletion_question_test extends advanced_testcase {
+    public function setUp(): void {
+        $this->create_question_by_type(QUESDATE,
+            ['name' => 'DEMODATE1', 'content' => 'Demo date question 1', 'deleted' => time()]);
+        $this->create_question_by_type(QUESDATE,
+            ['name' => 'DEMODATE2', 'content' => 'Demo date question 2']);
+        $this->create_question_by_type(QUESDATE,
+            ['name' => 'DEMODATE3', 'content' => 'Demo date question 3', 'deleted' => time()]);
+        $this->create_question_by_type(QUESTEXT,
+            ['name' => 'DEMOTEXT4', 'content' => 'Demo text question 4']);
+    }
+
+    /**
+     * Test restore deleted question function.
+     */
+    public function test_restore_deleted_question() : void {
+        global $DB;
+        $question = $DB->get_record_select('questionnaire_question', 'name = ?', ['DEMODATE1']);
+        questionnaire_restore_deleted_question($question->id, $question->surveyid);
+        $question = $DB->get_record('questionnaire_question', ['id' => $question->id]);
+        $this->assertEquals($question->position, 1);
+    }
+
+    /**
+     * Testing delete permanently question.
+     */
+    public function test_delete_permanently_question() : void {
+        global $DB;
+        $question = $DB->get_record_select('questionnaire_question', 'name = ?', ['DEMODATE1']);
+        questionnaire_delete_permanently_questions($question->id, $question->surveyid);
+        $question = $DB->get_record('questionnaire_question', ['id' => $question->id]);
+        $this->assertEquals($question, false);
+    }
+
+    /**
+     * Create a question by type of question.
+     *
+     * @param int question type.
+     * @param string class name of question.
+     * @param object data of question.
+     * @return void
+     */
+    public function create_question_by_type($qtype, $qdata) :void {
+        $this->resetAfterTest(true);
+        $course = $this->getDataGenerator()->create_course();
+        $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire');
+        $questionnaire = $generator->create_instance(['course' => $course->id]);
+        $qdata['type_id'] = $qtype;
+        $qdata['surveyid'] = $questionnaire->sid;
+        $qdata['name'] = isset($qdata['name']) ? $qdata['name'] : 'Q1';
+        $qdata['content'] = isset($qdata['content']) ? $qdata['content'] : 'Test content';
+        $qdata['position'] = isset($qdata['position']) ? $qdata['position'] : 1;
+        $question = $generator->create_question($questionnaire, $qdata, null);
+    }
+}
\ No newline at end of file
diff --git a/tests/fixtures/backup-activity-questionnaire.mbz b/tests/fixtures/backup-activity-questionnaire.mbz
new file mode 100644
index 0000000000000000000000000000000000000000..8457b57a9562995b83a6e44f9ba62c2354b312c3
GIT binary patch
literal 3496
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
W@M*&T0RRC1{{sN3TUSN^jsO6D(%GQ^

literal 0
HcmV?d00001

diff --git a/tests/lib_test.php b/tests/lib_test.php
index 4f828306e..818e6684f 100644
--- a/tests/lib_test.php
+++ b/tests/lib_test.php
@@ -343,4 +343,47 @@ public function test_questionnaire_grade_item_update() {
         $questionnaire->courseid = $questionnaire->course->id;
         $this->assertEquals(GRADE_UPDATE_OK, questionnaire_grade_item_update($questionnaire));
     }
+
+    /**
+     * Test for questionnaire_restore_deleted_question().
+     *
+     * @return void
+     */
+    public function test_questionnaire_restore_deleted_question() {
+        global $DB;
+        $this->resetAfterTest();
+        $this->setAdminUser();
+        $course = $this->getDataGenerator()->create_course();
+        $generator = $this->getDataGenerator()->get_plugin_generator('mod_questionnaire');
+        $questionnaire = $generator->create_test_questionnaire($course);
+        $sid = $questionnaire->sid;
+
+        // Add three questions.
+        $q1 = $DB->insert_record('questionnaire_question', [
+            'surveyid' => $sid, 'type_id' => 1, 'position' => 1, 'deleted' => null, 'content' => 'Q1']);
+        $q2 = $DB->insert_record('questionnaire_question', [
+            'surveyid' => $sid, 'type_id' => 1, 'position' => 2, 'deleted' => null, 'content' => 'Q2']);
+        $q3 = $DB->insert_record('questionnaire_question', [
+            'surveyid' => $sid, 'type_id' => 1, 'position' => 3, 'deleted' => null, 'content' => 'Q3']);
+
+        // Delete Q2 and Q3.
+        $DB->set_field('questionnaire_question', 'deleted', 1234567890, ['id' => $q2]);
+        $DB->set_field('questionnaire_question', 'deleted', 1234567891, ['id' => $q3]);
+
+        // Restore Q2.
+        questionnaire_restore_deleted_question($q2, $sid);
+        $restoredq2 = $DB->get_record('questionnaire_question', ['id' => $q2]);
+        $this->assertNull($restoredq2->deleted);
+        $this->assertEquals(2, $restoredq2->position); // Should be after Q1.
+
+        // Restore Q3.
+        questionnaire_restore_deleted_question($q3, $sid);
+        $restoredq3 = $DB->get_record('questionnaire_question', ['id' => $q3]);
+        $this->assertNull($restoredq3->deleted);
+        $this->assertEquals(3, $restoredq3->position); // Should be after Q2.
+
+        // Check for no duplicate positions.
+        $positions = $DB->get_fieldset_select('questionnaire_question', 'position', 'surveyid = ?', [$sid]);
+        $this->assertCount(count(array_unique($positions)), $positions);
+    }
 }
diff --git a/version.php b/version.php
index 44f6f74b6..68c2822ec 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024080100;  // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2024080100.01;  // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2024042200.00; // Moodle version (4.4.0).
 
 $plugin->component = 'mod_questionnaire';

From dd95c27a21c9f214a80bb6710c91f83c265d8b08 Mon Sep 17 00:00:00 2001
From: Mike Churchward <mike.churchward@poetopensource.org>
Date: Mon, 10 Nov 2025 22:12:27 -0500
Subject: [PATCH 11/13] Fixing question recycle images size.

---
 classes/questions_form.php | 4 +++-
 styles.css                 | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/classes/questions_form.php b/classes/questions_form.php
index 5b4d8312a..aa7f46719 100644
--- a/classes/questions_form.php
+++ b/classes/questions_form.php
@@ -402,11 +402,13 @@ public function definition() {
                     'value' => $deletequestion->id,
                     'alt' => get_string('restorebutton', 'questionnaire'),
                     'title' => get_string('restorebutton', 'questionnaire'),
+                    'class' => 'mod_questionnaire_recycleq',
                 ];
                 $deleleextra = [
                     'value' => $deletequestion->id,
                     'alt' => get_string('deletepermanentlybutton', 'questionnaire'),
-                    'title' => get_string('deletepermanentlybutton', 'questionnaire')
+                    'title' => get_string('deletepermanentlybutton', 'questionnaire'),
+                    'class' => 'mod_questionnaire_recycleq',
                 ];
                 $mform->addElement('html', '<div class="qn-container">'); // Begin div qn-container.
                 $delquestiongroup[] =& $mform->createElement('static', 'opentag_' . $deletequestion->id, '', '');
diff --git a/styles.css b/styles.css
index 1a0c1b5c9..86164eb54 100644
--- a/styles.css
+++ b/styles.css
@@ -495,6 +495,10 @@ td.selected {
     margin-left: 50px;
 }
 
+input[type=image].mod_questionnaire_recycleq {
+    max-height: 1em;
+}
+
 .mod_questionnaire_flex-container {
     display: inline-flex;
 }

From c7d8281681f5a49246103cfed886f128acaf3c84 Mon Sep 17 00:00:00 2001
From: emanoylov <80328987+emanoylov@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:53:20 +0000
Subject: [PATCH 12/13] Questionnaire: Showing warnings when starting Answer
 the questions OU 900306 (#651)

Co-authored-by: Emanoil Manoylov <em22699@open.ac.uk>
---
 questionnaire.class.php | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/questionnaire.class.php b/questionnaire.class.php
index 9e301b5db..b117e281f 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -914,7 +914,7 @@ private function has_required($section = 0) {
                     return true;
                 }
             }
-        } else {
+        } else if (key_exists($section, $this->questionsbysec)) {
             foreach ($this->questionsbysec[$section] as $questionid) {
                 if ($this->questions[$questionid]->required()) {
                     return true;
@@ -1355,21 +1355,23 @@ private function survey_render(&$formdata, $section = 1, $message = '') {
             $this->page->add_to_page('progressbar',
                     $this->renderer->render_progress_bar($section, $this->questionsbysec));
         }
-        foreach ($this->questionsbysec[$section] as $questionid) {
-            if ($this->questions[$questionid]->is_numbered()) {
-                $i++;
-            }
-            // Need questionnaire id to get the questionnaire object in sectiontext (Label) question class.
-            $formdata->questionnaire_id = $this->id;
-            if (isset($formdata->rid) && !empty($formdata->rid)) {
-                $this->add_response($formdata->rid);
-            } else {
-                $this->add_response_from_formdata($formdata);
+        if (key_exists($section, $this->questionsbysec)) {
+            foreach ($this->questionsbysec[$section] as $questionid) {
+                if ($this->questions[$questionid]->is_numbered()) {
+                    $i++;
+                }
+                // Need questionnaire id to get the questionnaire object in sectiontext (Label) question class.
+                $formdata->questionnaire_id = $this->id;
+                if (isset($formdata->rid) && !empty($formdata->rid)) {
+                    $this->add_response($formdata->rid);
+                } else {
+                    $this->add_response_from_formdata($formdata);
+                }
+                $this->page->add_to_page('questions',
+                    $this->renderer->question_output($this->questions[$questionid],
+                        (isset($this->responses[$formdata->rid]) ? $this->responses[$formdata->rid] : []),
+                        $i, $this->usehtmleditor, []));
             }
-            $this->page->add_to_page('questions',
-                $this->renderer->question_output($this->questions[$questionid],
-                    (isset($this->responses[$formdata->rid]) ? $this->responses[$formdata->rid] : []),
-                    $i, $this->usehtmleditor, []));
         }
 
         $this->print_survey_end($section, $numsections);

From c484ca56c1d8c20c6f218df5e91ce8eab4697043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Wed, 12 Nov 2025 01:40:04 +0100
Subject: [PATCH 13/13] Style the print button, resolves #656. (#657)

---
 templates/reportpage.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/reportpage.mustache b/templates/reportpage.mustache
index d54016fab..01d1e102e 100644
--- a/templates/reportpage.mustache
+++ b/templates/reportpage.mustache
@@ -83,7 +83,7 @@
         {{#responses}}{{{.}}}{{/responses}}
         {{#bottomnavigationbar}}<div class="box respondentsnavbar">{{{.}}}</div>{{/bottomnavigationbar}}
         {{#printparam}}
-            <button id="print-button" title="{{#str}}print, mod_questionnaire{{/str}}">
+            <button id="print-button" class="btn btn-primary" title="{{#str}}print, mod_questionnaire{{/str}}">
                     {{#str}}printbutton, mod_questionnaire{{/str}}
             </button>
         {{/printparam}}