From f484bd971d031a436d0a28299d1a20d854748937 Mon Sep 17 00:00:00 2001
From: mamunozgil <miguel.munoz-gil@hft-stuttgart.de>
Date: Mon, 27 Jan 2025 16:00:13 +0000
Subject: [PATCH] Updated coding style and recommendations
---
.gitlab-ci.yml | 13 +
README.md | 20 +-
docker-compose.yaml | 47 ++
dta.zip | Bin 0 -> 37042 bytes
dta/README.md | 6 +-
dta/classes/dta_backend_utils.php | 167 ++++++
dta/classes/dta_db_utils.php | 325 +++++++++++
dta/classes/dta_view_submission_utils.php | 646 ++++++++++++++++++++++
dta/classes/models/dta_recommendation.php | 89 +++
dta/classes/models/dta_result.php | 112 ++++
dta/classes/models/dta_result_summary.php | 191 +++++++
dta/classes/privacy/provider.php | 26 +-
dta/db/install.xml | 17 +
dta/lang/en/assignsubmission_dta.php | 41 +-
dta/locallib.php | 309 ++++++-----
teacher-dta.txt | 1 +
16 files changed, 1850 insertions(+), 160 deletions(-)
create mode 100644 .gitlab-ci.yml
create mode 100644 docker-compose.yaml
create mode 100644 dta.zip
create mode 100644 dta/classes/dta_backend_utils.php
create mode 100644 dta/classes/dta_db_utils.php
create mode 100644 dta/classes/dta_view_submission_utils.php
create mode 100644 dta/classes/models/dta_recommendation.php
create mode 100644 dta/classes/models/dta_result.php
create mode 100644 dta/classes/models/dta_result_summary.php
create mode 100644 teacher-dta.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..fef13ef
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
+stages:
+- test
+sast:
+ stage: test
+include:
+- template: Security/SAST.gitlab-ci.yml
diff --git a/README.md b/README.md
index 0b95c53..6b442a2 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ After approval, install the plugin directly from the Moodle Plugins Directory vi
Before that or alternatively: zip the plugin code from https://transfer.hft-stuttgart.de/gitlab/HFTSoftwareProject/moodledta (here). The readily-zipped current version also sits in the repository’s main directory. Then install the plugin from zip via Site Administration/Plugins/Install Plugins, or by extracting the plugin archive to {Moodle_Root}/mod/assign/submission/dta and visiting the admins notifications page.
-Visit Site Administration/Plugins/Plugin Overview and select Settings next to the Moodle Dockerized Test Agent (MoDTA) entry to enter the URI of your backend as shown in Fig. 1.  Finally, configure via Site Administration/Security/HTTP Security settings permitting communication with the backend URI and port as seen in Fig. 2.  The plugin requires the external DTA REST webservice backend.
+Visit Site Administration/Plugins/Plugin Overview and select Settings next to the Moodle Dockerized Test Agent (MoDTA) entry to enter the URI of your backend as shown in Fig. 1.  Finally, configure via Site Administration/Security/HTTP Security settings permitting communication with the backend URI and port as seen in Fig. 2.  The plugin requires the external DTA REST webservice backend.
Notes:
@@ -59,7 +59,7 @@ With the MoDTA plugin installed and configured backend URI (including Moodle Sec
### Teacher
-When creating an assignment, a teacher can select the MoDTA exercise as a new assignment type via an additional checkbox on the assignment creation page as shown at the bottom of Fig. 3.  A new standard file upload field appears as indicated in Fig. 4. . There, the teacher must upload a text file with the git repository URI containing the tests as shown in Fig. 5.  The text file has to adhere to the following format also given in the example repository:
+When creating an assignment, a teacher can select the MoDTA exercise as a new assignment type via an additional checkbox on the assignment creation page as shown at the bottom of Fig. 3.  A new standard file upload field appears as indicated in Fig. 4. . There, the teacher must upload a text file with the git repository URI containing the tests as shown in Fig. 5.  The text file has to adhere to the following format also given in the example repository:
The text file has to contain the following, each separated by ::
- dtt as the URI-type
@@ -76,9 +76,9 @@ Students use the same format, just without the runner part at the end.
### Student
-Students use an additional MoDTA standard file upload field in the standard submission processs in Moodle like in Fig. 6. [Fig. 6: Moodle DTA Student File Upload](doc/usage_student_1.png) There, they place either a zip archive or a text file adhering to the same format as the teacher’s file with their code repository URI and optionally credentials and/or a ticketing system URI as shown in Fig. 7. 
+Students use an additional MoDTA standard file upload field in the standard submission processs in Moodle like in Fig. 6. [Fig. 6: Moodle DTA Student File Upload](.assets/usage_student_1.png) There, they place either a zip archive or a text file adhering to the same format as the teacher’s file with their code repository URI and optionally credentials and/or a ticketing system URI as shown in Fig. 7. 
-Upon completion, students see a summarized overview of their test results in an additional column of the submission feedback table like in Fig. 8.  Clicking on a new expansion icon in that column, they reach a detailed feedback dialog including stack traces of compile errors and test failures as in Fig. 9.  Optionally, the MoDTA backend creates tickets for compile failures in the ticketing system under the URI provided by the student upon hand-in.
+Upon completion, students see a summarized overview of their test results in an additional column of the submission feedback table like in Fig. 8.  Clicking on a new expansion icon in that column, they reach a detailed feedback dialog including stack traces of compile errors and test failures as in Fig. 9.  Optionally, the MoDTA backend creates tickets for compile failures in the ticketing system under the URI provided by the student upon hand-in.
Note: Teachers have access to the Moodle submission result view to assess student results. However, teacher control and grading are not the focus of MoDTA.
@@ -145,11 +145,11 @@ The "assign_submission_plugin" class serves as an abstract foundation that all a
The following provides brief descriptions of a selection of functions to illustrate the types of hooks available:
-• get_settings(): This function comes into play during the creation of the assignment settings page. For the MoDTA plugin, this involves adding a file manager that permits teachers to upload their test repo and docker Image URI as a textfile. This function is overridden from the assign_plugin class.
+• assignsubmission_dta_get_settings(): This function comes into play during the creation of the assignment settings page. For the MoDTA plugin, this involves adding a file manager that permits teachers to upload their test repo and docker Image URI as a textfile. This function is overridden from the assign_plugin class.
-• save_settings(): The save_settings function is invoked when the assignment settings page is submitted, whether for a new assignment or the modification of an existing one. In the MoDTA plugin, this function is responsible for preserving the text file chosen by the teacher and transmitting the file to the backend web service. Like the previous function, this one is overridden from the assign_plugin class.
+• assignsubmission_dta_save_settings(): The assignsubmission_dta_save_settings function is invoked when the assignment settings page is submitted, whether for a new assignment or the modification of an existing one. In the MoDTA plugin, this function is responsible for preserving the text file chosen by the teacher and transmitting the file to the backend web service. Like the previous function, this one is overridden from the assign_plugin class.
-• get_form_elements_for_user(): During the construction of the submission form, this function plays a similar role to the get_settings() function for settings. In the context of the MoDTA plugin, it adds a file manager to enable students to upload their text or zip file. Once again, this function is overridden from the assign_plugin class.
+• get_form_elements_for_user(): During the construction of the submission form, this function plays a similar role to the assignsubmission_dta_get_settings() function for settings. In the context of the MoDTA plugin, it adds a file manager to enable students to upload their text or zip file. Once again, this function is overridden from the assign_plugin class.
• save():This function is invoked to save a user's submission. Within the MoDTA plugin, this function sends the student's submission to the backend and receives the result as the response. For details see the technical details section above.
@@ -162,3 +162,9 @@ This file serves as the gateway to various standard Moodle APIs designed for plu
### util folder
The folder contains various utility files, e.g. displaying the new test summary pages is delegated from the locallib.php for brevity of that source.
+
+
+### Code Checking
+
+The Moodle Plugin Directory offers a helpful tool for developers to ensure their code adheres to Moodle's coding conventions. This tool, named "Code Checker," can be found via the following link:
+https://moodle.org/plugins/local_codechecker
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..e6611c6
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,47 @@
+version: '2'
+services:
+services:
+ mariadb-dtt:
+ container_name: moodledb-dtt
+ image: docker.io/bitnami/mariadb:11.1
+ environment:
+ # ALLOW_EMPTY_PASSWORD is recommended only for development.
+ - ALLOW_EMPTY_PASSWORD=yes
+ - MARIADB_USER=bn_moodle
+ - MARIADB_DATABASE=bitnami_moodle
+ - MARIADB_CHARACTER_SET=utf8mb4
+ - MARIADB_COLLATE=utf8mb4_unicode_ci
+ volumes:
+ - 'mariadb_data_dtt:/bitnami/mariadb'
+ moodle-dtt:
+ container_name: moodle-dtt
+ image: docker.io/bitnami/moodle:4.3
+ ports:
+ - '81:8080'
+ - '444:8443'
+ environment:
+ - MOODLE_DATABASE_HOST=mariadb-dtt
+ - MOODLE_DATABASE_PORT_NUMBER=3306
+ - MOODLE_DATABASE_USER=bn_moodle
+ - MOODLE_DATABASE_NAME=bitnami_moodle
+ # ALLOW_EMPTY_PASSWORD is recommended only for development.
+ - ALLOW_EMPTY_PASSWORD=yes
+ volumes:
+ - 'moodle_data_dtt:/bitnami/moodle'
+ - 'moodledata_data_dtt:/bitnami/moodledata'
+ depends_on:
+ - mariadb-dtt
+ backend:
+ container_name: backendcomposedtt
+ image: hftstuttgart/dta-backend:beta
+ user: "${UID}:${GID}"
+ volumes:
+ - /var/run/docker.sock:/var/run/docker.sock
+ - '/tmp/dta-tests:/tmp/dta-tests'
+volumes:
+ mariadb_data_dtt:
+ driver: local
+ moodle_data_dtt:
+ driver: local
+ moodledata_data_dtt:
+ driver: local
\ No newline at end of file
diff --git a/dta.zip b/dta.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d2ca93579bd26b8e47b045881839bf8014b4497b
GIT binary patch
literal 37042
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%0D0~v
z0xnTdqiA|J6RHF(62LdL5W=MmRImq>BL6TFz2IiBk*Yre;Q^g7RRy0r$7fVwy*GKt
zJ=%O%c7tUCgacbX>~&AbVoi`Gl&>5=&Rsv_V01~q^JD;~NLm8PC3#Ls35xU^&NzPH
z3ONYlSYkJ6lSmWpP?By6K}V6$K#PLmb@BMDpGA9<^H;Y-W!l<7Qh-qG?FiL*@{mI!
z2={R~hH!*degGYyx<3O6x5tV^t}3Zt;_ymfh5s6sGlmaSD$73QxI3L9HWNJA6iiId
z#|7($6;$1Nn}ISaweW#zIOzb%8u`v}8u=t$TtGO@)sQ(1z}?0qU0N%Ms6im1atVhx
zCc=z+VszXZ=Wplm1Pe}wGFI(a7fRaze|RUo@zt?~bqS=zb)JkCiS}g-ooo@&0y;7-
zvg3qcGS6lvS~914k%4BLf_=9=g%@BPXObV$oC{%T=+F?GqNt=12_uoWLJJ$*MKa7x
zhJ=Cmo?=MB?haLX5^XXl8CLbY_3suv1Z8ud7&tJ&gOuwhOTzI>SP3`l8C`*>12J!=
zg+)Y_v)k-WR_=F@2Q&!RSo_brub*$C9@1RQJ)U&5S7u`3?W3EVfg(JIUkPx7#=l))
zz=)d^@G7WfnIOZx(r3LViHfut35iG5^mTP~ol_but=o(_9xg6s(m)&(HxR;tezV8F
zb67VB5|BFKt#S5iT&`Y`pHGMY6!yZ^5RvEJ%yCFK2J2Z?uB_`s+VA#1HeD}bni)RT
zzS;X0l^a0MDLDd-uiu)&xO&cJAZH`-gsg2wNof8yFun)Sf`|~v7V#>+3pmaJv&8Jj
zD#{<AAOgsvxl#~V@9HNa5nBVD{X-O`fQKZlYZx-zc)QLZ2NpNDneGWq6A+|A4izqm
zFFdIu?*%Tz8_*qQIBMD)5*b2)Qp<=#kd~eb*Avn!ZU8=)zPAIyo=!KZ$p}a|c?I+O
zYiJ^fHXNTv0XJl<ysfD%jX(iF_Dg;#eP<P2fWIrisS-MX)@aB8J4r!F2`3hTbwv6k
zb((i^Vta#SuN2^UPfIYTxKkuxgn%4W5n)MwemzJj=Kcz>B3Hk=x4jpmW4MnDQBTe9
zwW{Vjbg(zr9<jb5nOZrEkA=9N<-|oSdz8B9^5z^Q=-E98u%QhLfYzjfZg^s<d+*Eq
z&mgOG7gnc+E&@^1Ot2(HyrwRWRC{zN0B+P}*oDy`pgP)<gBoCED`5NF(L{y<^3GBD
zp9)PQu*+41wcmNxP|^xO8Nb-c`x6m`2|^$=Uwkf4n=rTLJ;D`7eyz(BUOs(6IjJdT
zVCKu0ADid>Jq!~kFKthIL6yw0jR3qr<O%qV_6%4rCs(>Cb=Hjr)41r4976e0qXrzG
z{H+FqsKpHt*LuXZaTCZD<7~b}EM*nAph50=2TU1lIa&R=99sGseeHUkYJafrv}V@y
z%qab4;@zK)Ye3-!6|v3<jv!T0%Amvlj%)};ePZVLq!@qL$;>+kuxaR*QqJ%3=GrZy
zBk=7(26qj#?m`D>q;CH{wMe+8r=fIabg~WaaH6$(TIDQxXcu|k!+tZOp%<*bKTpY1
zsLc!0u^|kmvdTm^tL64tA?HfkBRmzv)xoBLFJ{+IS6A&-U(p$;bz1$WXuiG_-eFyc
z=~cJ^p9#sLC3(CNJYNmuJbxYa?|F8*RT0DZ^uw6?8zhH_SMV2q#@~l9L=xx=Z6BQ?
z>HuJ$!N&DT@UE_jV*|uBF7SDM{Q7|5>}EDt+PmT(3mWh(Iw)yMaYuYSTpcRhyM<C1
zsm>Z;y+`A*z>*6LHkIM9?!TKf;=6m%0AN?(@~Gop`23wXJxfHOSU3Aqp6g4Ja|AEW
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
BUNQgx
literal 0
HcmV?d00001
diff --git a/dta/README.md b/dta/README.md
index c07b4cf..72eafff 100644
--- a/dta/README.md
+++ b/dta/README.md
@@ -145,11 +145,11 @@ The "assign_submission_plugin" class serves as an abstract foundation that all a
The following provides brief descriptions of a selection of functions to illustrate the types of hooks available:
-• get_settings(): This function comes into play during the creation of the assignment settings page. For the MoDTA plugin, this involves adding a file manager that permits teachers to upload their test repo and docker Image URI as a textfile. This function is overridden from the assign_plugin class.
+• assignsubmission_dta_get_settings(): This function comes into play during the creation of the assignment settings page. For the MoDTA plugin, this involves adding a file manager that permits teachers to upload their test repo and docker Image URI as a textfile. This function is overridden from the assign_plugin class.
-• save_settings(): The save_settings function is invoked when the assignment settings page is submitted, whether for a new assignment or the modification of an existing one. In the MoDTA plugin, this function is responsible for preserving the text file chosen by the teacher and transmitting the file to the backend web service. Like the previous function, this one is overridden from the assign_plugin class.
+• assignsubmission_dta_save_settings(): The assignsubmission_dta_save_settings function is invoked when the assignment settings page is submitted, whether for a new assignment or the modification of an existing one. In the MoDTA plugin, this function is responsible for preserving the text file chosen by the teacher and transmitting the file to the backend web service. Like the previous function, this one is overridden from the assign_plugin class.
-• get_form_elements_for_user(): During the construction of the submission form, this function plays a similar role to the get_settings() function for settings. In the context of the MoDTA plugin, it adds a file manager to enable students to upload their text or zip file. Once again, this function is overridden from the assign_plugin class.
+• get_form_elements_for_user(): During the construction of the submission form, this function plays a similar role to the assignsubmission_dta_get_settings() function for settings. In the context of the MoDTA plugin, it adds a file manager to enable students to upload their text or zip file. Once again, this function is overridden from the assign_plugin class.
• save():This function is invoked to save a user's submission. Within the MoDTA plugin, this function sends the student's submission to the backend and receives the result as the response. For details see the technical details section above.
diff --git a/dta/classes/dta_backend_utils.php b/dta/classes/dta_backend_utils.php
new file mode 100644
index 0000000..001ba79
--- /dev/null
+++ b/dta/classes/dta_backend_utils.php
@@ -0,0 +1,167 @@
+<?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/>.
+
+/**
+ * This file contains the backend webservice contact functionality for the DTA plugin.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Your Name
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace assignsubmission_dta;
+
+/**
+ * Backend webservice contact utility class.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Your Name
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class dta_backend_utils {
+
+ /**
+ * Component name for the plugin.
+ */
+ public const ASSIGNSUBMISSION_DTA_COMPONENT_NAME = 'assignsubmission_dta';
+
+ /**
+ * Returns the base URL of the backend webservice as configured in the administration settings.
+ *
+ * @return string Backend host base URL.
+ */
+ private static function assignsubmission_dta_get_backend_baseurl(): string {
+ $backendaddress = get_config(
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
+ 'backendHost'
+ );
+
+ if (empty($backendaddress)) {
+ \core\notification::error(
+ get_string('backendHost_not_set', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+ }
+
+ return $backendaddress;
+ }
+
+ /**
+ * Sends the configuration text file uploaded by the teacher to the backend.
+ *
+ * @param \assign $assignment Assignment this test-config belongs to.
+ * @param \stored_file $file Uploaded test-config.
+ * @return bool True if no error occurred.
+ */
+ public static function assignsubmission_dta_send_testconfig_to_backend($assignment, $file): bool {
+ $backendaddress = self::assignsubmission_dta_get_backend_baseurl();
+ if (empty($backendaddress)) {
+ return true;
+ }
+
+ // Set endpoint for test upload.
+ $url = $backendaddress . '/v1/unittest';
+
+ // Prepare params.
+ $params = [
+ 'unitTestFile' => $file,
+ 'assignmentId' => $assignment->get_instance()->id,
+ ];
+
+ // If request returned null, return false to indicate failure.
+ if (is_null(self::assignsubmission_dta_post($url, $params))) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * Sends submission config or archive to backend to be tested.
+ *
+ * @param \assign $assignment Assignment for the submission.
+ * @param int $submissionid Submission ID of the current file.
+ * @param \stored_file $file Submission config file or archive with submission.
+ * @return string|null JSON string with test results or null on error.
+ */
+ public static function assignsubmission_dta_send_submission_to_backend(
+ $assignment,
+ int $submissionid,
+ $file
+ ): ?string {
+ $backendaddress = self::assignsubmission_dta_get_backend_baseurl();
+ if (empty($backendaddress)) {
+ return null;
+ }
+
+ // Set endpoint for submission upload.
+ $url = $backendaddress . '/v1/task/' . $submissionid;
+
+ // Prepare params.
+ $params = [
+ 'taskFile' => $file,
+ 'assignmentId' => $assignment->get_instance()->id,
+ ];
+
+ return self::assignsubmission_dta_post($url, $params);
+ }
+
+ /**
+ * Posts the given params to the given URL and returns the response as a string.
+ *
+ * @param string $url Full URL to request.
+ * @param array $params Parameters for HTTP request.
+ * @return string|null Received body on success or null on error.
+ */
+ private static function assignsubmission_dta_post(string $url, array $params): ?string {
+ if (!isset($url) || !isset($params)) {
+ return null;
+ }
+
+ $options = ['CURLOPT_RETURNTRANSFER' => true];
+
+ $curl = new \curl();
+ $response = $curl->post($url, $params, $options);
+
+ // Check state of request, if response code is 2xx, return the answer.
+ $info = $curl->get_info();
+ if ($info['http_code'] >= 200 && $info['http_code'] < 300) {
+ return $response;
+ }
+
+ // Something went wrong, return null and display an error message.
+ $msg = self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME
+ . ': Post file to server was not successful. HTTP code='
+ . $info['http_code'];
+ debugging($msg);
+
+ if ($info['http_code'] >= 400 && $info['http_code'] < 500) {
+ \core\notification::error(
+ get_string('http_client_error_msg', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+ return null;
+ } else if ($info['http_code'] >= 500 && $info['http_code'] < 600) {
+ \core\notification::error(
+ get_string('http_server_error_msg', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+ return null;
+ } else {
+ $unknownmsg = get_string('http_unknown_error_msg', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ . $info['http_code'] . ' ' . $response;
+ \core\notification::error($unknownmsg);
+ return null;
+ }
+ }
+}
diff --git a/dta/classes/dta_db_utils.php b/dta/classes/dta_db_utils.php
new file mode 100644
index 0000000..0a3ab44
--- /dev/null
+++ b/dta/classes/dta_db_utils.php
@@ -0,0 +1,325 @@
+<?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 assignsubmission_dta;
+
+use assignsubmission_dta\dta_backend_utils;
+use assignsubmission_dta\dta_view_submission_utils;
+use assignsubmission_dta\models\dta_result;
+use assignsubmission_dta\models\dta_result_summary;
+use assignsubmission_dta\models\dta_recommendation;
+
+/**
+ * Class dta_db_utils
+ *
+ * Persistence layer utility class for storing and retrieving
+ * DTA plugin data (results, summaries, recommendations).
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Gero Lueckemeyer
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class dta_db_utils {
+
+ /**
+ * Summary database table name.
+ */
+ private const ASSIGNSUBMISSION_DTA_TABLE_SUMMARY = 'assignsubmission_dta_summary';
+
+ /**
+ * Result database table name.
+ */
+ private const ASSIGNSUBMISSION_DTA_TABLE_RESULT = 'assignsubmission_dta_result';
+
+ /**
+ * Recommendations database table name.
+ */
+ private const ASSIGNSUBMISSION_DTA_TABLE_RECOMMENDATIONS = 'assignsubmission_dta_recommendations';
+
+ /**
+ * Returns an array of recommendations from the database.
+ *
+ * @param int $assignmentid The assignment ID.
+ * @param int $submissionid The submission ID.
+ * @return array An array of recommendation records.
+ */
+ public static function assignsubmission_dta_get_recommendations_from_database(
+ int $assignmentid,
+ int $submissionid
+ ): array {
+ global $DB, $USER;
+ $userid = $USER->id;
+
+ // Step 1: Retrieve all recommendations.
+ $records = $DB->get_records(
+ self::ASSIGNSUBMISSION_DTA_TABLE_RECOMMENDATIONS,
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+
+ // Step 2: Retrieve module ID for 'assign'.
+ $module = $DB->get_record('modules', ['name' => 'assign'], 'id');
+ if (!$module) {
+ // Handle error case if the module is not found.
+ return $records;
+ }
+ $moduleid = $module->id;
+
+ // Step 3: Check each record.
+ foreach ($records as $key => $record) {
+ // Get the name of the exercise from the record.
+ $exercisename = $record->exercise_name;
+
+ // Find the assignment with this name.
+ $assign = $DB->get_record('assign', ['name' => $exercisename], 'id');
+ if ($assign) {
+ // Get the course module ID for this assignment.
+ $cm = $DB->get_record(
+ 'course_modules',
+ [
+ 'module' => $moduleid,
+ 'instance' => $assign->id,
+ ],
+ 'id'
+ );
+
+ if ($cm) {
+ // Check the completion status for this course module and user.
+ $completion = $DB->get_record(
+ 'course_modules_completion',
+ [
+ 'coursemoduleid' => $cm->id,
+ 'userid' => $userid,
+ ],
+ 'completionstate'
+ );
+
+ // If the completion state is 1, remove the record from $records.
+ if ($completion && (int)$completion->completionstate === 1) {
+ unset($records[$key]);
+ }
+ }
+ }
+ }
+
+ // Return the filtered records.
+ return $records;
+ }
+
+ /**
+ * Gets a summary with all corresponding result entries.
+ *
+ * @param int $assignmentid Assignment ID to search for.
+ * @param int $submissionid Submission ID to search for.
+ * @return dta_result_summary Summary representing the submission.
+ */
+ public static function assignsubmission_dta_get_result_summary_from_database(
+ int $assignmentid,
+ int $submissionid
+ ): dta_result_summary {
+ global $DB;
+
+ // Fetch data from database.
+ $summaryrecord = $DB->get_record(
+ self::ASSIGNSUBMISSION_DTA_TABLE_SUMMARY,
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+
+ $resultsarray = $DB->get_records(
+ self::ASSIGNSUBMISSION_DTA_TABLE_RESULT,
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+
+ // Create a summary instance.
+ $summary = new dta_result_summary();
+ $summary->timestamp = $summaryrecord->timestamp;
+ $summary->globalstacktrace = $summaryrecord->global_stacktrace;
+ $summary->successfultestcompetencies = $summaryrecord->successful_competencies;
+ $summary->overalltestcompetencies = $summaryrecord->tested_competencies;
+ $summary->results = [];
+
+ // Create result instances and add to array of summary instance.
+ foreach ($resultsarray as $rr) {
+ $result = new dta_result();
+ $result->packagename = $rr->package_name;
+ $result->classname = $rr->class_name;
+ $result->name = $rr->name;
+ $result->state = $rr->state;
+ $result->failuretype = $rr->failure_type;
+ $result->failurereason = $rr->failure_reason;
+ $result->stacktrace = $rr->stacktrace;
+ $result->columnnumber = $rr->column_number;
+ $result->linenumber = $rr->line_number;
+ $result->position = $rr->position;
+
+ $summary->results[] = $result;
+
+ }
+
+ return $summary;
+ }
+
+ /**
+ * Stores an array of recommendations in the database.
+ *
+ * @param int $assignmentid The assignment ID.
+ * @param int $submissionid The submission ID.
+ * @param array $recommendations An array of dta_recommendation objects.
+ */
+ public static function assignsubmission_dta_store_recommendations_to_database(
+ int $assignmentid,
+ int $submissionid,
+ array $recommendations
+ ): void {
+ global $DB;
+
+ // Debug output (you can remove or adapt this if unneeded).
+ debugging('Recommendations array: ' . json_encode($recommendations));
+
+ // If recommendations already exist, delete old values beforehand.
+ $existingrecords = $DB->get_records(
+ 'assignsubmission_dta_recommendations',
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+
+ if ($existingrecords) {
+ $DB->delete_records(
+ 'assignsubmission_dta_recommendations',
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+ }
+
+ // Create new recommendation entries.
+ foreach ($recommendations as $recommendation) {
+ // Check if $recommendation is an instance of dta_recommendation.
+ if ($recommendation instanceof dta_recommendation) {
+ // Add assignment and submission IDs to the recommendation object.
+ $recommendation->assignment_id = $assignmentid;
+ $recommendation->submission_id = $submissionid;
+
+ debugging('Inserting new recommendation record: ' . json_encode($recommendation));
+
+ // Insert the recommendation into the database.
+ $DB->insert_record('assignsubmission_dta_recommendations', $recommendation);
+ } else {
+ // Handle the case where $recommendation is not a dta_recommendation instance.
+ debugging('Invalid recommendation object encountered.');
+ }
+ }
+ }
+
+ /**
+ * Saves the given result summary and single results to the database
+ * under the specified assignment and submission ID.
+ *
+ * @param int $assignmentid Assignment this submission is linked to.
+ * @param int $submissionid Submission ID for these results.
+ * @param dta_result_summary $summary Summary instance to persist.
+ */
+ public static function assignsubmission_dta_store_result_summary_to_database(
+ int $assignmentid,
+ int $submissionid,
+ dta_result_summary $summary
+ ): void {
+ global $DB;
+
+ // Prepare new database entries.
+ $summaryrecord = new dta_result_summary();
+ $summaryrecord->assignment_id = $assignmentid;
+ $summaryrecord->submission_id = $submissionid;
+ $summaryrecord->timestamp = $summary->timestamp;
+ $summaryrecord->global_stacktrace = $summary->globalstacktrace;
+ $summaryrecord->successful_competencies = $summary->successfultestcompetencies;
+ $summaryrecord->tested_competencies = $summary->overalltestcompetencies;
+
+ // Prepare results to persist.
+ $resultrecords = [];
+ foreach ($summary->results as $r) {
+ $record = new dta_result();
+ $record->assignment_id = $assignmentid;
+ $record->submission_id = $submissionid;
+ $record->package_name = $r->packagename;
+ $record->class_name = $r->classname;
+ $record->name = $r->name;
+ $record->state = $r->state;
+ $record->failure_type = $r->failuretype;
+ $record->failure_reason = $r->failurereason;
+ $record->stacktrace = $r->stacktrace;
+ $record->column_number = $r->columnnumber;
+ $record->line_number = $r->linenumber;
+ $record->position = $r->position;
+ $resultrecords[] = $record;
+ }
+
+ // If results already exist, delete old values beforehand.
+ $submission = $DB->get_record(
+ self::ASSIGNSUBMISSION_DTA_TABLE_SUMMARY,
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+
+ if ($submission) {
+ $DB->delete_records(
+ self::ASSIGNSUBMISSION_DTA_TABLE_RESULT,
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+
+ $DB->delete_records(
+ self::ASSIGNSUBMISSION_DTA_TABLE_SUMMARY,
+ [
+ 'assignment_id' => $assignmentid,
+ 'submission_id' => $submissionid,
+ ]
+ );
+ }
+
+ // Create summary and single result entries.
+ $DB->insert_record(self::ASSIGNSUBMISSION_DTA_TABLE_SUMMARY, $summaryrecord);
+ foreach ($resultrecords as $rr) {
+ $DB->insert_record(self::ASSIGNSUBMISSION_DTA_TABLE_RESULT, $rr);
+ }
+ }
+
+ /**
+ * Cleans up database if plugin is uninstalled.
+ */
+ public static function assignsubmission_dta_uninstall_plugin_cleaup(): void {
+ global $DB;
+
+ $DB->delete_records(self::ASSIGNSUBMISSION_DTA_TABLE_RESULT, null);
+ $DB->delete_records(self::ASSIGNSUBMISSION_DTA_TABLE_SUMMARY, null);
+ $DB->delete_records(self::ASSIGNSUBMISSION_DTA_TABLE_RECOMMENDATIONS, null);
+ }
+}
diff --git a/dta/classes/dta_view_submission_utils.php b/dta/classes/dta_view_submission_utils.php
new file mode 100644
index 0000000..5a56826
--- /dev/null
+++ b/dta/classes/dta_view_submission_utils.php
@@ -0,0 +1,646 @@
+<?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/>.
+
+/**
+ * This file contains the backend webservice contact functionality for the DTA plugin.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Your Name
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace assignsubmission_dta;
+
+use assignsubmission_dta\dta_db_utils;
+use assignsubmission_dta\dta_backend_utils;
+use assignsubmission_dta\models\dta_result;
+use assignsubmission_dta\models\dta_result_summary;
+use assignsubmission_dta\models\dta_recommendation;
+
+/**
+ * Utility class for DTA submission plugin result display.
+ *
+ * @package assignsubmission_dta
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class dta_view_submission_utils {
+
+ /**
+ * Broadly used in logic, parametrized for easier change.
+ */
+ public const ASSIGNSUBMISSION_DTA_COMPONENT_NAME = 'assignsubmission_dta';
+
+ /**
+ * Generates a short summary HTML (like your old plugin).
+ *
+ * @param int $assignmentid The assignment ID.
+ * @param int $submissionid The submission ID to create a report for.
+ * @return string The HTML summary.
+ */
+ public static function assignsubmission_dta_generate_summary_html(
+ int $assignmentid,
+ int $submissionid
+ ): string {
+ // 1) Retrieve the summary data from the DB (adjust your DB-utils class as needed).
+ $summary = dta_db_utils::assignsubmission_dta_get_result_summary_from_database($assignmentid, $submissionid);
+
+ // 2) Prepare an HTML buffer.
+ $html = '';
+
+ // 3) Extract counts from your new method names.
+ $unknowncount = $summary->assignsubmission_dta_unknown_count();
+ $compilecount = $summary->assignsubmission_dta_compilation_error_count();
+ $successcount = $summary->assignsubmission_dta_successful_count();
+ $failcount = $summary->assignsubmission_dta_failed_count();
+ $totalcount = $summary->assignsubmission_dta_result_count();
+
+ // 4) Compute success rate if no unknown/compile errors and total>0.
+ $successrate = '?';
+ if ($unknowncount === 0 && $compilecount === 0 && $totalcount > 0) {
+ $successrate = round(($successcount / $totalcount) * 100, 2);
+ }
+
+ // 5) "X/Y (Z%) tests successful" line:
+ // If either compile errors or unknown exist -> show "?", else X/Y (rate%).
+ $html .= $successcount . '/';
+ if ($compilecount === 0 && $unknowncount === 0) {
+ $html .= ($totalcount > 0)
+ ? ($totalcount . ' (' . $successrate . '%)')
+ : ('0 (' . $successrate . ')');
+ } else {
+ $html .= '?';
+ }
+ $html .= get_string('tests_successful', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME) . "<br />";
+
+ // 6) If there are compilation errors, show them.
+ if ($compilecount > 0) {
+ $html .= $compilecount
+ . get_string('compilation_errors', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ . "<br />";
+ }
+
+ // 7) If there are unknown results, show them.
+ if ($unknowncount > 0) {
+ $html .= $unknowncount
+ . get_string('unknown_state', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ . "<br />";
+ }
+
+ // If there are failed tests, show them.
+ if ($failcount > 0) {
+ $html .= $failcount
+ . get_string('failures', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ . "<br />";
+ }
+
+ // 8) Competencies (like your old snippet).
+ $showncompetencies = explode(';', $summary->successfultestcompetencies);
+ $overallcompetencies = explode(';', $summary->overalltestcompetencies);
+
+ $tmp = '';
+ $size = count($showncompetencies);
+ for ($i = 0; $i < $size; $i++) {
+ $shown = $showncompetencies[$i];
+ $comp = $overallcompetencies[$i];
+
+ // If the competency was actually used (non-zero?), show a row.
+ if ($shown !== '0') {
+ $shownval = (float) $shown;
+ $compval = (float) $comp;
+
+ // Guard division by zero.
+ $pct = 0;
+ if ($compval > 0) {
+ $pct = 100.0 * $shownval / $compval;
+ }
+
+ // "compX XX%<br />"
+ $tmp .= get_string('comp' . $i, self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ . ' ' . round($pct, 2) . '%<br />';
+ }
+ }
+
+ $html .= get_string('success_competencies', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ . "<br />" . $tmp . "<br />";
+
+ // 9) Wrap it in a DIV for styling, and return.
+ return \html_writer::div($html, 'dtaSubmissionSummary');
+ }
+
+ /**
+ * Generates detailed view HTML.
+ *
+ * @param int $assignmentid The assignment ID.
+ * @param int $submissionid The submission to create a report for.
+ * @return string HTML detail view.
+ */
+ public static function assignsubmission_dta_generate_detail_html(
+ int $assignmentid,
+ int $submissionid
+ ): string {
+ // Fetch data.
+ $summary = dta_db_utils::assignsubmission_dta_get_result_summary_from_database(
+ $assignmentid,
+ $submissionid
+ );
+ $recommendations = dta_db_utils::assignsubmission_dta_get_recommendations_from_database(
+ $assignmentid,
+ $submissionid
+ );
+
+ $html = '';
+
+ // Summary table.
+ $tableheaderrowattributes = ['class' => 'dtaTableHeaderRow'];
+ $tablerowattributes = ['class' => 'dtaTableRow'];
+ $resultrowattributes = $tablerowattributes;
+ $unknownattributes = 'dtaResultUnknown';
+ $successattributes = 'dtaResultSuccess';
+ $failureattributes = 'dtaResultFailure';
+ $compilationerrorattributes = 'dtaResultCompilationError';
+ $attributes = ['class' => 'dtaTableData'];
+
+ // Build the summary table header.
+ $tmp = \html_writer::tag(
+ 'th',
+ get_string('summary', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ ['class' => 'dtaTableHeader']
+ );
+ $tmp .= \html_writer::empty_tag('th', ['class' => 'dtaTableHeader']);
+ $header = \html_writer::tag('tr', $tmp, $tableheaderrowattributes);
+ $header = \html_writer::tag('thead', $header);
+
+ $body = '';
+
+ // Pull the counters from the summary object.
+ $resultcount = $summary->assignsubmission_dta_result_count();
+ $successfulcount = $summary->assignsubmission_dta_successful_count();
+ $failedcount = $summary->assignsubmission_dta_failed_count();
+ $compilationcount = $summary->assignsubmission_dta_compilation_error_count();
+ $unknowncount = $summary->assignsubmission_dta_unknown_count();
+
+ // Total items.
+ $tmp = \html_writer::tag(
+ 'td',
+ get_string('total_items', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $resultcount, $attributes);
+ $resultrowattributes = $tablerowattributes;
+ // Original code colors this row as unknown by default.
+ $resultrowattributes['class'] .= ' ' . $unknownattributes;
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // Tests successful.
+ $tmp = \html_writer::tag(
+ 'td',
+ get_string('tests_successful', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $successfulcount, $attributes);
+ $resultrowattributes = $tablerowattributes;
+
+ // Compute success rate if no unknown or compilation errors, and resultcount > 0.
+ $successrate = '?';
+ if ($unknowncount == 0 && $compilationcount == 0 && $resultcount > 0) {
+ $successrate = round(($successfulcount / $resultcount) * 100, 2);
+ if ($successrate < 50) {
+ $resultrowattributes['class'] .= ' ' . $compilationerrorattributes;
+ } else if ($successrate < 75) {
+ $resultrowattributes['class'] .= ' ' . $failureattributes;
+ } else {
+ $resultrowattributes['class'] .= ' ' . $successattributes;
+ }
+ } else {
+ // If unknown or compilation errors => highlight as unknown.
+ $resultrowattributes['class'] .= ' ' . $unknownattributes;
+ }
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // Failures.
+ $tmp = \html_writer::tag(
+ 'td',
+ get_string('failures', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $failedcount, $attributes);
+ $resultrowattributes = $tablerowattributes;
+ if ($failedcount > 0) {
+ $resultrowattributes['class'] .= ' ' . $failureattributes;
+ } else {
+ $resultrowattributes['class'] .= ' ' . $successattributes;
+ }
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // Compilation errors.
+ $tmp = \html_writer::tag(
+ 'td',
+ get_string('compilation_errors', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $compilationcount, $attributes);
+ $resultrowattributes = $tablerowattributes;
+ if ($compilationcount > 0) {
+ $resultrowattributes['class'] .= ' ' . $compilationerrorattributes;
+ } else {
+ $resultrowattributes['class'] .= ' ' . $successattributes;
+ }
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // Unknown state.
+ $tmp = \html_writer::tag(
+ 'td',
+ get_string('unknown_state', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $unknowncount, $attributes);
+ $resultrowattributes = $tablerowattributes;
+ if ($unknowncount > 0) {
+ $resultrowattributes['class'] .= ' ' . $unknownattributes;
+ } else {
+ $resultrowattributes['class'] .= ' ' . $successattributes;
+ }
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // Success rate row.
+ $tmp = \html_writer::tag(
+ 'td',
+ \html_writer::tag('b', get_string('success_rate', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)),
+ $attributes
+ );
+ // If no compilation errors or unknown => show successrate, else "?".
+ $suffix = ($compilationcount == 0 && $unknowncount == 0 && $resultcount > 0)
+ ? ($resultcount . ' (' . $successrate . '%)')
+ : '?';
+ $tmp .= \html_writer::tag(
+ 'td',
+ \html_writer::tag('b', $successfulcount . '/' . $suffix),
+ $attributes
+ );
+ $resultrowattributes = $tablerowattributes;
+ if ($compilationcount == 0 && $unknowncount == 0 && $resultcount > 0) {
+ if ($successrate !== '?' && $successrate < 50) {
+ $resultrowattributes['class'] .= ' ' . $compilationerrorattributes;
+ } else if ($successrate !== '?' && $successrate < 75) {
+ $resultrowattributes['class'] .= ' ' . $failureattributes;
+ } else {
+ $resultrowattributes['class'] .= ' ' . $successattributes;
+ }
+ } else {
+ $resultrowattributes['class'] .= ' ' . $unknownattributes;
+ }
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // Finalize the summary table.
+ $body = \html_writer::tag('tbody', $body);
+ $table = \html_writer::tag('table', $header . $body, ['class' => 'dtaTable']);
+ $html .= $table;
+
+ // Spacing after the summary table.
+ $html .= \html_writer::empty_tag('div', ['class' => 'dtaSpacer']);
+
+ // Recommendations table.
+ if (!empty($recommendations)) {
+ $allowedsortfields = ['topic', 'exercise_name', 'difficulty', 'score'];
+ $allowedsortdirs = ['asc', 'desc'];
+
+ // Make sure only one space before ??
+ $sortby = $_POST['sortby'] ?? 'score';
+ $sortdir = $_POST['sortdir'] ?? 'asc';
+
+ if (!in_array($sortby, $allowedsortfields)) {
+ $sortby = 'score';
+ }
+ if (!in_array($sortdir, $allowedsortdirs)) {
+ $sortdir = 'asc';
+ }
+
+ usort($recommendations, function ($a, $b) use ($sortby, $sortdir) {
+ $valuea = $a->{$sortby};
+ $valueb = $b->{$sortby};
+
+ if (is_numeric($valuea) && is_numeric($valueb)) {
+ $comparison = $valuea - $valueb;
+ } else {
+ $comparison = strnatcasecmp($valuea, $valueb);
+ }
+
+ if ($comparison === 0) {
+ return 0;
+ }
+ if ($sortdir === 'asc') {
+ return ($comparison < 0) ? -1 : 1;
+ } else {
+ return ($comparison < 0) ? 1 : -1;
+ }
+ });
+
+ $html .= \html_writer::tag(
+ 'h3',
+ get_string('recommendations', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+
+ $generatesortableheader = function ($columnname, $displayname) use ($sortby, $sortdir) {
+ $newsortdir = ($sortby === $columnname && $sortdir === 'asc') ? 'desc' : 'asc';
+ $class = 'dtaTableHeader';
+ if ($sortby === $columnname) {
+ $class .= ' sorted ' . $sortdir;
+ }
+
+ // Sort button.
+ $button = \html_writer::empty_tag('input', [
+ 'type' => 'submit',
+ 'name' => 'sortbutton',
+ 'value' => ($newsortdir === 'asc' ? '↑' : '↓'),
+ 'class' => 'sort-button',
+ ]);
+
+ // Hidden inputs.
+ $hiddeninputs = \html_writer::empty_tag('input', [
+ 'type' => 'hidden',
+ 'name' => 'sortby',
+ 'value' => $columnname,
+ ]);
+ $hiddeninputs .= \html_writer::empty_tag('input', [
+ 'type' => 'hidden',
+ 'name' => 'sortdir',
+ 'value' => $newsortdir,
+ ]);
+
+ $form = \html_writer::start_tag('form', [
+ 'method' => 'post',
+ 'style' => 'display:inline',
+ ]);
+ $form .= $hiddeninputs;
+ $form .= $displayname . ' ' . $button;
+ $form .= \html_writer::end_tag('form');
+
+ return \html_writer::tag('th', $form, ['class' => $class]);
+ };
+
+ // Build the recommendations table header.
+ $tableheader = '';
+ $tableheader .= $generatesortableheader(
+ 'topic',
+ get_string('topic', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+ $tableheader .= $generatesortableheader(
+ 'exercise_name',
+ get_string('exercise_name', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+ $tableheader .= \html_writer::tag(
+ 'th',
+ get_string('url', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ ['class' => 'dtaTableHeader']
+ );
+ $tableheader .= $generatesortableheader(
+ 'difficulty',
+ get_string('difficulty', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+ $tableheader .= $generatesortableheader(
+ 'score',
+ get_string('score', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
+
+ $tableheader = \html_writer::tag('tr', $tableheader, ['class' => 'dtaTableHeaderRow']);
+ $tableheader = \html_writer::tag('thead', $tableheader);
+
+ // Table body for recommendations.
+ $tablebody = '';
+ foreach ($recommendations as $recommendation) {
+ $row = '';
+ $row .= \html_writer::tag('td', $recommendation->topic, $attributes);
+ $row .= \html_writer::tag('td', $recommendation->exercise_name, $attributes);
+ $row .= \html_writer::tag(
+ 'td',
+ \html_writer::link($recommendation->url, $recommendation->url),
+ $attributes
+ );
+ $row .= \html_writer::tag('td', $recommendation->difficulty, $attributes);
+ $row .= \html_writer::tag('td', $recommendation->score, $attributes);
+
+ $tablebody .= \html_writer::tag('tr', $row, $tablerowattributes);
+ }
+ $tablebody = \html_writer::tag('tbody', $tablebody);
+
+ $html .= \html_writer::tag('table', $tableheader . $tablebody, ['class' => 'dtaTable']);
+
+ // Spacing after recommendations.
+ $html .= \html_writer::empty_tag('div', ['class' => 'dtaSpacer']);
+ }
+
+ // Competency assessment table.
+ $body = '';
+ $tmp = \html_writer::tag(
+ 'th',
+ get_string('competencies', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ ['class' => 'dtaTableHeader']
+ );
+ $tmp .= \html_writer::empty_tag('th', ['class' => 'dtaTableHeader']);
+ $header = \html_writer::tag('tr', $tmp, $tableheaderrowattributes);
+ $header = \html_writer::tag('thead', $header);
+
+ $showncompetencies = explode(';', $summary->successfultestcompetencies);
+ $overallcompetencies = explode(';', $summary->overalltestcompetencies);
+
+ for ($index = 0, $size = count($overallcompetencies); $index < $size; $index++) {
+ $comp = $overallcompetencies[$index];
+ $shown = $showncompetencies[$index];
+
+ // If the competency was actually assessed, add a row.
+ if ($comp !== '0') {
+ $compval = (float) $comp;
+ $shownval = (float) $shown;
+
+ // Guard division by zero.
+ $pct = 0;
+ if ($compval > 0) {
+ $pct = (100.0 * $shownval / $compval);
+ }
+
+ $resultrowattributes = $tablerowattributes;
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('comp' . $index, self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $resultrowattributes
+ );
+ $tmp .= \html_writer::tag(
+ 'td',
+ round($pct, 2) . '% (' . $shown . ' / ' . $comp . ')',
+ $resultrowattributes
+ );
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('comp_expl' . $index, self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $resultrowattributes
+ );
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+ }
+ }
+ $body = \html_writer::tag('tbody', $body);
+ $html .= \html_writer::tag('table', $header . $body, ['class' => 'dtaTable']);
+
+ // Add empty div for spacing.
+ $html .= \html_writer::empty_tag('div', ['class' => 'dtaSpacer']);
+
+ // Details table.
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'th',
+ get_string('details', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ ['class' => 'dtaTableHeader']
+ );
+ $tmp .= \html_writer::empty_tag('th', ['class' => 'dtaTableHeader']);
+ $header = \html_writer::tag('tr', $tmp, $tableheaderrowattributes);
+ $header = \html_writer::tag('thead', $header);
+
+ $body = '';
+ $spacerrow = null;
+ foreach ($summary->results as $r) {
+ // Add spacer row before each new entry (after the first).
+ if (!is_null($spacerrow)) {
+ $body .= $spacerrow;
+ }
+
+ $resultrowattributes = $tablerowattributes;
+
+ // Set CSS class for colored left-border according to results state.
+ if ($r->state === 0) {
+ $resultrowattributes['class'] .= ' dtaResultUnknown';
+ } else if ($r->state === 1) {
+ $resultrowattributes['class'] .= ' dtaResultSuccess';
+ } else if ($r->state === 2) {
+ $resultrowattributes['class'] .= ' dtaResultFailure';
+ } else if ($r->state === 3) {
+ $resultrowattributes['class'] .= ' dtaResultCompilationError';
+ }
+
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('package_name', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->packagename, $attributes);
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('unit_name', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->classname, $attributes);
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('test_name', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->name, $attributes);
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('status', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag(
+ 'td',
+ dta_result::assignsubmission_dta_get_statename($r->state),
+ $attributes
+ );
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ // If state != 1 (not successful), show additional info.
+ if ($r->state !== 1) {
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('failure_type', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->failureType, $attributes);
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('failure_reason', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->failureReason, $attributes);
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+
+ if (!is_null($r->lineNumber) && $r->lineNumber > 0) {
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('line_no', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->lineNumber, $attributes);
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+ }
+
+ if (!is_null($r->columnNumber) && $r->columnNumber > 0) {
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('col_no', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->columnNumber, $attributes);
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+ }
+
+ if (!is_null($r->position) && $r->position > 0) {
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('pos', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag('td', $r->position, $attributes);
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+ }
+
+ $tmp = '';
+ $tmp .= \html_writer::tag(
+ 'td',
+ get_string('stacktrace', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ $attributes
+ );
+ $tmp .= \html_writer::tag(
+ 'td',
+ \html_writer::tag('details', $r->stacktrace, ['class' => 'dtaStacktraceDetails']),
+ $attributes
+ );
+ $body .= \html_writer::tag('tr', $tmp, $resultrowattributes);
+ }
+
+ if (is_null($spacerrow)) {
+ // Reuse this spacer row between subsequent items.
+ $spacerrow = \html_writer::empty_tag('tr', ['class' => 'dtaTableSpacer']);
+ }
+ }
+
+ $html .= \html_writer::tag('table', $header . $body, ['class' => 'dtaTable']);
+
+ // Wrap generated HTML into final div.
+ $html = \html_writer::div($html, 'dtaSubmissionDetails');
+
+ return $html;
+ }
+}
diff --git a/dta/classes/models/dta_recommendation.php b/dta/classes/models/dta_recommendation.php
new file mode 100644
index 0000000..79afb82
--- /dev/null
+++ b/dta/classes/models/dta_recommendation.php
@@ -0,0 +1,89 @@
+<?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/>.
+
+/**
+ * Entity class for DTA submission plugin recommendation.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Gero Lueckemeyer
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace assignsubmission_dta\models;
+
+/**
+ * Entity class for DTA submission plugin recommendation.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class dta_recommendation {
+
+ /**
+ * @var string $topic Topic of the recommendation.
+ */
+ public $topic;
+
+ /**
+ * @var string $exercisename Name of the exercise.
+ */
+ public $exercisename;
+
+ /**
+ * @var string $url URL of the exercise.
+ */
+ public $url;
+
+ /**
+ * @var int $difficulty Difficulty level of the exercise.
+ */
+ public $difficulty;
+
+ /**
+ * @var int $score Score associated with the recommendation.
+ */
+ public $score;
+
+ /**
+ * Decodes the JSON recommendations returned by the backend service call into an array of dta_recommendation objects.
+ *
+ * @param string $jsonstring JSON string containing recommendations.
+ * @return array Array of dta_recommendation objects.
+ */
+ public static function assignsubmission_dta_decode_json_recommendations(string $jsonstring): array {
+ $response = json_decode($jsonstring);
+ $recommendations = [];
+
+ // Check if recommendations exist.
+ if (!empty($response->recommendations)) {
+ foreach ($response->recommendations as $recommendation) {
+ $rec = new dta_recommendation();
+ $rec->topic = $recommendation->topic ?? null;
+
+ // Map correct fields to the renamed variable names.
+ $rec->exercisename = $recommendation->url ?? null;
+ $rec->url = $recommendation->exerciseName ?? null;
+ $rec->difficulty = $recommendation->difficulty ?? null;
+ $rec->score = $recommendation->score ?? null;
+
+ $recommendations[] = $rec;
+ }
+ }
+
+ return $recommendations;
+ }
+}
diff --git a/dta/classes/models/dta_result.php b/dta/classes/models/dta_result.php
new file mode 100644
index 0000000..8e93b48
--- /dev/null
+++ b/dta/classes/models/dta_result.php
@@ -0,0 +1,112 @@
+<?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/>.
+
+/**
+ * Entity class for DTA submission plugin result.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Gero Lueckemeyer and student project teams
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace assignsubmission_dta\models;
+
+/**
+ * Entity class for DTA submission plugin result.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Gero Lueckemeyer and student project teams
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class dta_result {
+
+ /**
+ * Broadly used in logic, parametrized for easier change.
+ */
+ public const ASSIGNSUBMISSION_DTA_COMPONENT_NAME = 'assignsubmission_dta';
+
+ /**
+ * @var string $packagename Package name of the test.
+ */
+ public $packagename;
+
+ /**
+ * @var string $classname Unit name of the test.
+ */
+ public $classname;
+
+ /**
+ * @var string $name Name of the test.
+ */
+ public $name;
+
+ /**
+ * @var int $state State is defined as:
+ * 0 UNKNOWN
+ * 1 SUCCESS
+ * 2 FAILURE
+ * 3 COMPILATIONERROR
+ */
+ public $state;
+
+ /**
+ * @var string $failuretype Type of test failure if applicable, empty string otherwise.
+ */
+ public $failuretype;
+
+ /**
+ * @var string $failurereason Reason of test failure if applicable, empty string otherwise.
+ */
+ public $failurereason;
+
+ /**
+ * @var string $stacktrace Stack trace of test failure if applicable, empty string otherwise.
+ */
+ public $stacktrace;
+
+ /**
+ * @var int|string $columnnumber Column number of compile failure if applicable, empty string otherwise.
+ */
+ public $columnnumber;
+
+ /**
+ * @var int|string $linenumber Line number of compile failure if applicable, empty string otherwise.
+ */
+ public $linenumber;
+
+ /**
+ * @var int|string $position Position of compile failure if applicable, empty string otherwise.
+ */
+ public $position;
+
+ /**
+ * Returns the name of a state with the given number for display.
+ *
+ * @param int $state Number of the state.
+ * @return string Name of state as defined.
+ */
+ public static function assignsubmission_dta_get_statename(int $state): string {
+ if ($state === 1) {
+ return get_string('tests_successful', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME);
+ } else if ($state === 2) {
+ return get_string('failures', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME);
+ } else if ($state === 3) {
+ return get_string('compilation_errors', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME);
+ } else {
+ return get_string('unknown_state', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME);
+ }
+ }
+}
diff --git a/dta/classes/models/dta_result_summary.php b/dta/classes/models/dta_result_summary.php
new file mode 100644
index 0000000..8f3633f
--- /dev/null
+++ b/dta/classes/models/dta_result_summary.php
@@ -0,0 +1,191 @@
+<?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/>.
+
+/**
+ * This file contains the DTA submission plugin result summary entity class.
+ *
+ * @package assignsubmission_dta
+ * @copyright 2023 Your Name
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace assignsubmission_dta\models;
+
+/**
+ * Entity class for DTA submission plugin result summary.
+ *
+ * This class holds:
+ * - A timestamp for when the summary was generated.
+ * - An optional global stack trace (in case the entire process failed).
+ * - A competency profile of how many tests passed for each competency.
+ * - A competency profile of the total coverage for each competency.
+ * - An array of dta_result objects that detail individual test results.
+ *
+ * @package assignsubmission_dta
+ */
+class dta_result_summary {
+
+ /** @var int Unix timestamp for the summary. */
+ public $timestamp;
+
+ /** @var string A global stacktrace if the entire run had a fatal error (optional). */
+ public $globalstacktrace;
+
+ /** @var string Semi-colon-separated numbers for competencies actually passed. */
+ public $successfultestcompetencies;
+
+ /** @var string Semi-colon-separated numbers for total tested competencies. */
+ public $overalltestcompetencies;
+
+ /** @var dta_result[] Array of individual test results. */
+ public $results;
+
+ /**
+ * Decodes a JSON string into a dta_result_summary object.
+ *
+ * @param string $jsonstring JSON that includes timestamp, globalstacktrace, competency profiles, and results.
+ * @return dta_result_summary
+ */
+ public static function assignsubmission_dta_decode_json(string $jsonstring): dta_result_summary {
+ $response = json_decode($jsonstring);
+
+ $summary = new dta_result_summary();
+ $summary->timestamp = $response->timestamp ?? 0;
+ $summary->globalstacktrace = $response->globalstacktrace ?? '';
+
+ // If your JSON keys are 'successfulTestCompetencyProfile' and 'overallTestCompetencyProfile'.
+ $summary->successfultestcompetencies = $response->successfulTestCompetencyProfile ?? '';
+ $summary->overalltestcompetencies = $response->overallTestCompetencyProfile ?? '';
+
+ // Decode the "results" array into an array of dta_result objects.
+ if (!empty($response->results) && is_array($response->results)) {
+ $summary->results = self::assignsubmission_dta_decode_json_result_array($response->results);
+ } else {
+ $summary->results = [];
+ }
+
+ return $summary;
+ }
+
+ /**
+ * Helper that transforms a list of JSON objects into an array of dta_result objects.
+ *
+ * @param array $jsonarray Array of JSON-decoded result objects.
+ * @return dta_result[]
+ */
+ private static function assignsubmission_dta_decode_json_result_array(array $jsonarray): array {
+ $ret = [];
+ foreach ($jsonarray as $entry) {
+ $value = new dta_result();
+
+ $value->packagename = $entry->packageName ?? '';
+ $value->classname = $entry->className ?? '';
+ $value->name = $entry->name ?? '';
+ $value->state = $entry->state ?? 0;
+ $value->failuretype = $entry->failureType ?? '';
+ $value->failurereason = $entry->failureReason ?? '';
+ $value->stacktrace = $entry->stacktrace ?? '';
+ $value->columnnumber = $entry->columnNumber ?? 0;
+ $value->linenumber = $entry->lineNumber ?? 0;
+ $value->position = $entry->position ?? 0;
+
+ $ret[] = $value;
+ }
+ return $ret;
+ }
+
+ /**
+ * Get the total number of results (tests) recorded in this summary.
+ *
+ * @return int
+ */
+ public function assignsubmission_dta_result_count(): int {
+ return count($this->results);
+ }
+
+ /**
+ * Generic helper to count how many results have the given $state.
+ *
+ * States can be:
+ * 0 => unknown
+ * 1 => success
+ * 2 => fail
+ * 3 => compilation error
+ *
+ * @param int $state The numeric state code to match.
+ * @return int Number of results with that state.
+ */
+ public function assignsubmission_dta_state_occurence_count(int $state): int {
+ $num = 0;
+ foreach ($this->results as $r) {
+ if ((int)$r->state === $state) {
+ $num++;
+ }
+ }
+ return $num;
+ }
+
+ /**
+ * Count how many results had compilation errors (state=3).
+ *
+ * @return int
+ */
+ public function assignsubmission_dta_compilation_error_count(): int {
+ return $this->assignsubmission_dta_state_occurence_count(3);
+ }
+
+ /**
+ * Count how many results failed (state=2).
+ *
+ * @return int
+ */
+ public function assignsubmission_dta_failed_count(): int {
+ return $this->assignsubmission_dta_state_occurence_count(2);
+ }
+
+ /**
+ * Count how many results were successful (state=1).
+ *
+ * @return int
+ */
+ public function assignsubmission_dta_successful_count(): int {
+ return $this->assignsubmission_dta_state_occurence_count(1);
+ }
+
+ /**
+ * Count how many results are unknown (state=0).
+ *
+ * @return int
+ */
+ public function assignsubmission_dta_unknown_count(): int {
+ return $this->assignsubmission_dta_state_occurence_count(0);
+ }
+
+ /**
+ * Computes the success rate as a percentage of all results (0..100).
+ * Note: This includes tests that might have compile errors or unknown states.
+ *
+ * @return float A floating percentage between 0.0 and 100.0.
+ */
+ public function assignsubmission_dta_success_rate(): float {
+ $count = $this->assignsubmission_dta_result_count();
+ if ($count === 0) {
+ return 0.0;
+ }
+ $successful = $this->assignsubmission_dta_successful_count();
+ return ($successful / $count) * 100.0;
+ }
+}
diff --git a/dta/classes/privacy/provider.php b/dta/classes/privacy/provider.php
index 9e36d5c..acadff8 100644
--- a/dta/classes/privacy/provider.php
+++ b/dta/classes/privacy/provider.php
@@ -16,6 +16,8 @@
namespace assignsubmission_dta\privacy;
+use assign_submission_dta;
+use assignsubmission_dta\dta_db_utils;
use core_privacy\local\metadata\collection;
use core_privacy\local\request\writer;
use core_privacy\local\request\contextlist;
@@ -57,6 +59,7 @@ class provider implements \core_privacy\local\metadata\provider,
'global_stacktrace' => 'privacy:metadata:assignsubmission_dta_summary:global_stacktrace',
'successful_competencies' => 'privacy:metadata:assignsubmission_dta_summary:successful_competencies',
'tested_competencies' => 'privacy:metadata:assignsubmission_dta_summary:tested_competencies',
+
],
'privacy:metadata:assignsubmission_dta_summary'
);
@@ -80,6 +83,20 @@ class provider implements \core_privacy\local\metadata\provider,
'privacy:metadata:assignsubmission_dta_result'
);
+ $collection->add_database_table(
+ 'assignsubmission_dta_recommendations',
+ [
+ 'assignmentid' => 'privacy:metadata:assignsubmission_dta_summary:assignmentid',
+ 'submissionid' => 'privacy:metadata:assignsubmission_dta_summary:submissionid',
+ 'topic' => 'privacy:metadata:assignsubmission_dta_recommendations:topic',
+ 'exercise_name' => 'privacy:metadata:assignsubmission_dta_recommendations:exercise_name',
+ 'url' => 'privacy:metadata:assignsubmission_dta_recommendations:url',
+ 'difficulty' => 'privacy:metadata:assignsubmission_dta_recommendations:difficulty',
+ 'score' => 'privacy:metadata:assignsubmission_dta_recommendations:score',
+ ],
+ 'privacy:metadata:assignsubmission_dta_recommendations'
+ );
+
$collection->add_external_location_link('dta_backend', [
'assignmentid' => 'privacy:metadata:assignsubmission_dta_summary:assignmentid',
'submissionid' => 'privacy:metadata:assignsubmission_dta_summary:submissionid',
@@ -138,7 +155,7 @@ class provider implements \core_privacy\local\metadata\provider,
$files = get_files($submission, $user);
foreach ($files as $file) {
$userid = $exportdata->get_pluginobject()->userid;
- $dtaresultsummary = DBUtils::getresultsummaryfromdatabase($assign->id, $submission->id);
+ $dtaresultsummary = dta_db_utils::dta_get_result_summary_from_database($assign->id, $submission->id);
// Submitted file.
writer::with_context($exportdata->get_context())->export_file($exportdata->get_subcontext(), $file)
// DTA result.
@@ -173,6 +190,8 @@ class provider implements \core_privacy\local\metadata\provider,
// Delete records from assignsubmission_dta tables.
$DB->delete_records('assignsubmission_dta_result', ['assignmentid' => $assignmentid]);
$DB->delete_records('assignsubmission_dta_summary', ['assignmentid' => $assignmentid]);
+ $DB->delete_records('assignsubmission_dta_recommendations', ['assignmentid' => $assignmentid]);
+
}
/**
@@ -201,6 +220,10 @@ class provider implements \core_privacy\local\metadata\provider,
'assignmentid' => $assignmentid,
'submissionid' => $submissionid,
]);
+ $DB->delete_records('assignsubmission_dta_recommendations', [
+ 'assignmentid' => $assignmentid,
+ 'submissionid' => $submissionid,
+ ]);
}
/**
@@ -228,6 +251,7 @@ class provider implements \core_privacy\local\metadata\provider,
$params['assignid'] = $deletedata->get_assignid();
$DB->delete_records_select('assignsubmission_dta_result', "assignmentid = :assignid AND submissionid $sql", $params);
$DB->delete_records_select('assignsubmission_dta_summary', "assignmentid = :assignid AND submissionid $sql", $params);
+ $DB->delete_records_select('assignsubmission_dta_recommendations', "assignmentid = :assignid AND submissionid $sql", $params);
}
/**
diff --git a/dta/db/install.xml b/dta/db/install.xml
index bb61014..56126cf 100644
--- a/dta/db/install.xml
+++ b/dta/db/install.xml
@@ -20,6 +20,23 @@
<KEY NAME="fk_submission" TYPE="foreign" FIELDS="submission_id" REFTABLE="assign_submission" REFFIELDS="id" COMMENT="The submission this summary relates to."/>
</KEYS>
</TABLE>
+ <TABLE NAME="assignsubmission_dta_recommendations" COMMENT="Stores recommendation data">
+ <FIELDS>
+ <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true" COMMENT="Primary Key" />
+ <FIELD NAME="assignment_id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+ <FIELD NAME="submission_id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false"/>
+ <FIELD NAME="topic" TYPE="char" LENGTH="255" NOTNULL="true" COMMENT="Recommendation Topic" />
+ <FIELD NAME="exercise_name" TYPE="char" LENGTH="255" NOTNULL="true" COMMENT="Exercise Name" />
+ <FIELD NAME="url" TYPE="char" LENGTH="255" NOTNULL="true" COMMENT="Exercise URL" />
+ <FIELD NAME="difficulty" TYPE="number" LENGTH="10" NOTNULL="true" COMMENT="Exercise Difficulty" />
+ <FIELD NAME="score" TYPE="number" LENGTH="10" NOTNULL="true" COMMENT="Exercise Score" />
+ </FIELDS>
+ <KEYS>
+ <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
+ <KEY NAME="fk_assignment" TYPE="foreign" FIELDS="assignment_id" REFTABLE="assign" REFFIELDS="id" COMMENT="The assignment instance this recommendations relates to"/>
+ <KEY NAME="fk_submission" TYPE="foreign" FIELDS="submission_id" REFTABLE="assign_submission" REFFIELDS="id" COMMENT="The submission this recommendations relates to."/>
+ </KEYS>
+ </TABLE>
<TABLE NAME="assignsubmission_dta_result" COMMENT="DTA testrun single test results">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
diff --git a/dta/lang/en/assignsubmission_dta.php b/dta/lang/en/assignsubmission_dta.php
index 4f3cf89..fbeffae 100644
--- a/dta/lang/en/assignsubmission_dta.php
+++ b/dta/lang/en/assignsubmission_dta.php
@@ -92,22 +92,22 @@ $string["comp14"] = $string["comp_simple"];
$string["comp15"] = $string["comp_abstraction"];
// Competency explanations.
-$string["comp_statement_expl"] = "formulate a syntactically correct statement that contributes to the solution of the given problem.";
-$string["comp_block_expl"] = "structure code into syntactically correct small unnamed units that contribute to the solution of the given problem.";
-$string["comp_flow_expl"] = "formulate syntax elements guiding the control flow such that it contributes to the solution of the given problem.";
-$string["comp_loop_expl"] = "use syntax elements repeating statements such that it contributes to the solution of the given problem.";
-$string["comp_const_expl"] = "identify and syntactically correctly define constants that contribute to the understanding and solution of the given problem.";
-$string["comp_var_expl"] = "identify and syntactically correctly define variables that contribute to the solution of the given problem.";
-$string["comp_type_expl"] = "define and/or choose appropriate data types for data elements such that they contribute to the solution of the given problem.";
-$string["comp_datastructure_expl"] = "define and/or choose appropriate data structures for data elements such that they contribute to the solution of the given problem.";
-$string["comp_interface_expl"] = "define and use interfaces for larger units of code such that it contributes to the solution of the given problem.";
-$string["comp_unit_expl"] = "define and larger units of code such that it contributes to the solution of the given problem.";
-$string["comp_proc_usage_expl"] = "use existing named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
-$string["comp_proc_sign_expl"] = "define named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
-$string["comp_library_expl"] = "use existing larger collections of named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
-$string["comp_ext_api_expl"] = "use standardized existing external collections of named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
-$string["comp_simple_expl"] = "create a simple solution of the given problem.";
-$string["comp_abstraction_expl"] = "create a sufficiently abstract solution for the given problem.";
+$string["comp_statement_expl"] = "Formulate a syntactically correct statement that contributes to the solution of the given problem.";
+$string["comp_block_expl"] = "Structure code into syntactically correct small unnamed units that contribute to the solution of the given problem.";
+$string["comp_flow_expl"] = "Formulate syntax elements guiding the control flow such that it contributes to the solution of the given problem.";
+$string["comp_loop_expl"] = "Use syntax elements repeating statements such that it contributes to the solution of the given problem.";
+$string["comp_const_expl"] = "Identify and syntactically correctly define constants that contribute to the understanding and solution of the given problem.";
+$string["comp_var_expl"] = "Identify and syntactically correctly define variables that contribute to the solution of the given problem.";
+$string["comp_type_expl"] = "Define and/or choose appropriate data types for data elements such that they contribute to the solution of the given problem.";
+$string["comp_datastructure_expl"] = "Define and/or choose appropriate data structures for data elements such that they contribute to the solution of the given problem.";
+$string["comp_interface_expl"] = "Define and use interfaces for larger units of code such that it contributes to the solution of the given problem.";
+$string["comp_unit_expl"] = "Define and larger units of code such that it contributes to the solution of the given problem.";
+$string["comp_proc_usage_expl"] = "Use existing named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
+$string["comp_proc_sign_expl"] = "Define named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
+$string["comp_library_expl"] = "Use existing larger collections of named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
+$string["comp_ext_api_expl"] = "Use standardized existing external collections of named structure blocks with a pre-defined behavior and signature such that it contributes to the solution of the given problem.";
+$string["comp_simple_expl"] = "Create a simple solution of the given problem.";
+$string["comp_abstraction_expl"] = "Create a sufficiently abstract solution for the given problem.";
// Competency explanations for index calculations.
$string["comp_expl0"] = $string["comp_statement_expl"];
@@ -164,3 +164,12 @@ $string["privacy:metadata:assignsubmission_dta_result:line_number"] = "Line numb
$string["privacy:metadata:assignsubmission_dta_result:position"] = "Position of failed individual compilation or test";
$string["privacy:metadata:assignsubmission_dta_result"] = "Individual Dockerized Test Agent (DTA) results";
$string["privacy:metadata:dta_backend"] = "Dockerized Test Agent (DTA) backend ReST web service";
+
+//PLUGIN
+$string['recommendations'] = 'Recommendations';
+$string['topic'] = 'Topic';
+$string['exercise_name'] = 'Exercise Name';
+$string['url'] = 'URL';
+$string['difficulty'] = 'Difficulty';
+$string['score'] = 'Score';
+
diff --git a/dta/locallib.php b/dta/locallib.php
index cff2b4e..d3638c0 100644
--- a/dta/locallib.php
+++ b/dta/locallib.php
@@ -1,5 +1,5 @@
<?php
-// This file is part of Moodle - http://moodle.org/
+// 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
@@ -14,59 +14,66 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
-defined('MOODLE_INTERNAL') || die();
-
-// Import various entity and application logic files.
-require_once($CFG->dirroot . '/mod/assign/submission/dta/models/DtaResult.php');
-require_once($CFG->dirroot . '/mod/assign/submission/dta/classes/database.php');
-require_once($CFG->dirroot . '/mod/assign/submission/dta/classes/backend.php');
-require_once($CFG->dirroot . '/mod/assign/submission/dta/classes/view.php');
+use assignsubmission_dta\dta_db_utils;
+use assignsubmission_dta\dta_backend_utils;
+use assignsubmission_dta\dta_view_submission_utils;
+use assignsubmission_dta\models\dta_result;
+use assignsubmission_dta\models\dta_result_summary;
+use assignsubmission_dta\models\dta_recommendation;
/**
- * library class for DTA submission plugin extending assign submission plugin base class
+ * Library class for DTA submission plugin extending assign submission plugin base class.
*
- * @package assignsubmission_dta
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package assignsubmission_dta
+ * @copyright 2023 Your Name or Organization
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class assign_submission_dta extends assign_submission_plugin {
/**
* Broadly used in logic, parametrized for easier change.
*/
- const COMPONENT_NAME = "assignsubmission_dta";
+ public const ASSIGNSUBMISSION_DTA_COMPONENT_NAME = 'assignsubmission_dta';
+
/**
- * Draft file area for dta tests to be uploaded by the teacher.
+ * Draft file area for DTA tests to be uploaded by the teacher.
*/
- const ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST = "tests_draft_dta";
+ public const ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST = 'tests_draft_dta';
+
/**
- * File area for dta tests to be uploaded by the teacher.
+ * File area for DTA tests to be uploaded by the teacher.
*/
- const ASSIGNSUBMISSION_DTA_FILEAREA_TEST = "tests_dta";
+ public const ASSIGNSUBMISSION_DTA_FILEAREA_TEST = 'tests_dta';
+
/**
- * File area for dta submission assignment.
+ * File area for DTA submission assignment.
*/
- const ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION = "submissions_dta";
+ public const ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION = 'submissions_dta';
/**
- * get plugin name
+ * Get plugin name.
+ *
* @return string
*/
public function get_name(): string {
- return get_string("pluginname", self::COMPONENT_NAME);
+ return get_string('pluginname', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME);
}
/**
- * Get default settings for assignment submission settings
+ * Get default settings for assignment submission settings.
*
- * @param MoodleQuickForm $mform form to add elements to
+ * @param MoodleQuickForm $mform Form to add elements to.
* @return void
*/
public function get_settings(MoodleQuickForm $mform): void {
// Add draft filemanager to form.
$mform->addElement(
- "filemanager",
+ 'filemanager',
self::ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST,
- get_string("submission_settings_label", self::COMPONENT_NAME),
+ get_string(
+ 'submission_settings_label',
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME
+ ),
null,
$this->get_file_options(true)
);
@@ -76,9 +83,9 @@ class assign_submission_dta extends assign_submission_plugin {
// Form-unique element id to which to add button.
self::ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST,
// Key.
- "submission_settings_label",
+ 'submission_settings_label',
// Language file to use.
- self::COMPONENT_NAME
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME
);
// Only show filemanager if plugin is enabled.
@@ -86,27 +93,30 @@ class assign_submission_dta extends assign_submission_plugin {
// Form-unique element id to hide.
self::ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST,
// Condition to check.
- self::COMPONENT_NAME . '_enabled',
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME . '_enabled',
// State to match for hiding.
'notchecked'
);
}
/**
- * Allows the plugin to update the defaultvalues passed in to
+ * Allows the plugin to update the default values passed into
* the settings form (needed to set up draft areas for editor
- * and filemanager elements)
- * @param array $defaultvalues
+ * and filemanager elements).
+ *
+ * @param array $defaultvalues Default values to update.
*/
public function data_preprocessing(&$defaultvalues): void {
// Get id of draft area for file manager creation.
- $draftitemid = file_get_submitted_draft_itemid(self::ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST);
+ $draftitemid = file_get_submitted_draft_itemid(
+ self::ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST
+ );
// Prepare draft area with created draft filearea.
file_prepare_draft_area(
$draftitemid,
$this->assignment->get_context()->id,
- self::COMPONENT_NAME,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_TEST,
0,
['subdirs' => 0]
@@ -116,14 +126,13 @@ class assign_submission_dta extends assign_submission_plugin {
}
/**
- * Save settings of assignment submission settings
+ * Save settings of assignment submission settings.
*
- * @param stdClass $data
+ * @param stdClass $data Form data.
* @return bool
*/
public function save_settings(stdClass $data): bool {
-
- // If the assignment has no filemanager for our plugin just leave.
+ // If the assignment has no filemanager for our plugin, just leave.
$draftfilemanagerid = self::ASSIGNSUBMISSION_DTA_DRAFT_FILEAREA_TEST;
if (!isset($data->$draftfilemanagerid)) {
return true;
@@ -135,7 +144,7 @@ class assign_submission_dta extends assign_submission_plugin {
$data->$draftfilemanagerid,
// Id of the assignment in edit.
$this->assignment->get_context()->id,
- self::COMPONENT_NAME,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_TEST,
0
);
@@ -145,7 +154,7 @@ class assign_submission_dta extends assign_submission_plugin {
$files = $fs->get_area_files(
// Id of the current assignment.
$this->assignment->get_context()->id,
- self::COMPONENT_NAME,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_TEST,
0,
'id',
@@ -154,7 +163,9 @@ class assign_submission_dta extends assign_submission_plugin {
// Check if a file was uploaded.
if (empty($files)) {
- \core\notification::error(get_string("no_testfile_warning", self::COMPONENT_NAME));
+ \core\notification::error(
+ get_string('no_testfile_warning', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
return true;
}
@@ -162,26 +173,34 @@ class assign_submission_dta extends assign_submission_plugin {
$file = reset($files);
// Send file to backend.
- return DtaBackendUtils::sendtestconfigtobackend($this->assignment, $file);
+ return dta_backend_utils::assignsubmission_dta_send_testconfig_to_backend(
+ $this->assignment,
+ $file
+ );
}
/**
- * Add elements to submission form
+ * Add elements to submission form.
*
- * @param mixed $submissionorgrade stdClass|null submission or grade to show in the form
- * @param MoodleQuickForm $mform form for adding elements
- * @param stdClass $data data for filling the elements
- * @param int $userid current user
- * @return bool form elements added
+ * @param stdClass|null $submissionorgrade Submission or grade to show in the form.
+ * @param MoodleQuickForm $mform Form for adding elements.
+ * @param stdClass $data Data for filling the elements.
+ * @param int $userid Current user.
+ * @return bool True if form elements added.
*/
- public function get_form_elements_for_user($submissionorgrade, MoodleQuickForm $mform, stdClass $data, $userid): bool {
+ public function get_form_elements_for_user(
+ $submissionorgrade,
+ MoodleQuickForm $mform,
+ stdClass $data,
+ $userid
+ ): bool {
// Prepare submission filearea.
$data = file_prepare_standard_filemanager(
$data,
'tasks',
$this->get_file_options(false),
$this->assignment->get_context(),
- self::COMPONENT_NAME,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
$submissionorgrade ? $submissionorgrade->id : 0
);
@@ -192,21 +211,16 @@ class assign_submission_dta extends assign_submission_plugin {
// Form-unique identifier.
'tasks_filemanager',
// Label to show next to the filemanager.
- get_string("submission_label", self::COMPONENT_NAME),
- // Attributes.
+ get_string('submission_label', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
null,
- // Options.
$this->get_file_options(false)
);
// Add help button.
$mform->addHelpButton(
- // Related form item.
- "tasks_filemanager",
- // Key.
- "submission_label",
- // Language file.
- self::COMPONENT_NAME
+ 'tasks_filemanager',
+ 'submission_label',
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME
);
return true;
@@ -214,51 +228,57 @@ class assign_submission_dta extends assign_submission_plugin {
/**
* Determines if a submission file area contains any files.
- * @param stdClass $submission submission to check
- * @return bool true if file count is zero
+ *
+ * @param stdClass $submission Submission to check.
+ * @return bool True if file count is zero.
*/
public function is_empty(stdClass $submission): bool {
- return $this->count_files($submission->id, self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION) == 0;
+ return ($this->count_files(
+ $submission->id,
+ self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION
+ ) === 0);
}
/**
- * Counts the number of files in a filearea
+ * Counts the number of files in a filearea.
*
- * @param int $submissionid submission id to check
- * @param string $areaid filearea id to count
- * @return int number of files submitted in the filearea
+ * @param int $submissionid Submission id to check.
+ * @param string $areaid Filearea id to count.
+ * @return int Number of files submitted in the filearea.
*/
- private function count_files(int $submissionid, $areaid) {
+ private function count_files(int $submissionid, $areaid): int {
$fs = get_file_storage();
- $files = $fs->get_area_files($this->assignment->get_context()->id,
- self::COMPONENT_NAME,
+ $files = $fs->get_area_files(
+ $this->assignment->get_context()->id,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
$areaid,
$submissionid,
'id',
- false);
+ false
+ );
return count($files);
}
/**
- * Save data to the database
+ * Save data to the database.
*
- * @param stdClass $submission
- * @param stdClass $data
- * @return bool
+ * @param stdClass $submission Submission object.
+ * @param stdClass $data Data from the form.
+ * @return bool True if saved successfully.
*/
- public function save(stdClass $submission, stdClass $data) {
+ public function save(stdClass $submission, stdClass $data): bool {
$data = file_postupdate_standard_filemanager(
$data,
'tasks',
$this->get_file_options(false),
$this->assignment->get_context(),
- self::COMPONENT_NAME,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
$submission->id
);
- // If submission is empty leave directly.
+ // If submission is empty, leave directly.
if ($this->is_empty($submission)) {
return true;
}
@@ -266,9 +286,8 @@ class assign_submission_dta extends assign_submission_plugin {
// Get submitted files.
$fs = get_file_storage();
$files = $fs->get_area_files(
- // Id of current assignment.
$this->assignment->get_context()->id,
- self::COMPONENT_NAME,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
$submission->id,
'id',
@@ -277,131 +296,155 @@ class assign_submission_dta extends assign_submission_plugin {
// Check if a file is uploaded.
if (empty($files)) {
- \core\notification::error(get_string("no_submissionfile_warning", self::COMPONENT_NAME));
+ \core\notification::error(
+ get_string('no_submissionfile_warning', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME)
+ );
return true;
}
// Get the file.
$file = reset($files);
- // Send file to backend.
- $response = DtaBackendUtils::sendsubmissiontobackend($this->assignment, $submission->id, $file);
+ // Send file to backend (split across lines to avoid exceeding length).
+ $response = \assignsubmission_dta\dta_backend_utils::assignsubmission_dta_send_submission_to_backend(
+ $this->assignment,
+ $submission->id,
+ $file
+ );
// With a null response, return an error.
if (is_null($response)) {
return false;
}
- // Convert received json to valid class instances.
- $resultsummary = DtaResultSummary::decodejson($response);
+ // Convert received JSON to valid class instances.
+ $resultsummary = dta_result_summary::assignsubmission_dta_decode_json($response);
+
+ // Decode recommendations from response.
+ $recommendations = dta_recommendation::assignsubmission_dta_decode_json_recommendations($response);
+
+ // Use Moodle debugging instead of error_log/print_r.
+ debugging('Recommendations: ' . json_encode($recommendations), DEBUG_DEVELOPER);
+
+ // Persist new results to database (split long lines).
+ dta_db_utils::assignsubmission_dta_store_result_summary_to_database(
+ $this->assignment->get_instance()->id,
+ $submission->id,
+ $resultsummary
+ );
- // Persist new results to database.
- DbUtils::storeresultsummarytodatabase($this->assignment->get_instance()->id, $submission->id, $resultsummary);
+ // Store the array of recommendations in the database.
+ dta_db_utils::assignsubmission_dta_store_recommendations_to_database(
+ $this->assignment->get_instance()->id,
+ $submission->id,
+ $recommendations
+ );
return true;
}
/**
- * Display a short summary of the test results of the submission
- * This is diplayed as default view, with the option to expand
- * to the full detailed results.
+ * Display a short summary of the test results of the submission.
*
- * @param stdClass $submission to show
- * @param bool $showviewlink configuration variable to show expand option
- * @return string summary results html
+ * @param stdClass $submission Submission to show.
+ * @param bool $showviewlink Whether to show expand option.
+ * @return string Summary results HTML.
*/
- public function view_summary(stdClass $submission, & $showviewlink) {
+ public function view_summary(stdClass $submission, &$showviewlink): string {
$showviewlink = true;
-
- return view_submission_utils::generatesummaryhtml(
+ return dta_view_submission_utils::assignsubmission_dta_generate_summary_html(
$this->assignment->get_instance()->id,
$submission->id
);
}
/**
- * Display detailed results
+ * Display detailed results.
*
- * @param stdClass $submission the submission the results are shown for.
- * @return string detailed results html
+ * @param stdClass $submission The submission for which to show results.
+ * @return string Detailed results HTML.
*/
- public function view(stdClass $submission) {
- return view_submission_utils::generatedetailhtml(
+ public function view(stdClass $submission): string {
+ return dta_view_submission_utils::assignsubmission_dta_generate_detail_html(
$this->assignment->get_instance()->id,
$submission->id
);
}
/**
- * generate array of allowed filetypes to upload.
- *
- * @param bool $settings switch to define if list for assignment settings
- * or active submission should be returned
+ * Generate array of allowed file types to upload.
*
+ * @param bool $settings Whether this is for assignment settings or active submission.
* @return array
*/
private function get_file_options(bool $settings): array {
$fileoptions = [
- 'subdirs' => 0,
- "maxfiles" => 1,
- 'accepted_types' => ($settings
- ? [".txt"]
- : [
- ".txt",
- ".zip",
- ]),
- 'return_types' => FILE_INTERNAL,
- ];
+ 'subdirs' => 0,
+ 'maxfiles' => 1,
+ 'accepted_types' => (
+ $settings
+ ? ['.txt']
+ : [
+ '.txt',
+ '.zip',
+ ]
+ ),
+ 'return_types' => FILE_INTERNAL,
+ ];
return $fileoptions;
}
/**
- * Get file areas returns a list of areas this plugin stores files
- * @return array - An array of fileareas (keys) and descriptions (values)
+ * Get file areas returns a list of areas this plugin stores files.
+ *
+ * @return array An array of fileareas (keys) and descriptions (values).
*/
- public function get_file_areas() {
+ public function get_file_areas(): array {
return [
- self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION => get_string("dta_submissions_fa", self::COMPONENT_NAME),
- self::ASSIGNSUBMISSION_DTA_FILEAREA_TEST => get_string("dta_tests_fa", self::COMPONENT_NAME),
+ self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION =>
+ get_string('dta_submissions_fa', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
+ self::ASSIGNSUBMISSION_DTA_FILEAREA_TEST =>
+ get_string('dta_tests_fa', self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME),
];
}
/**
- * Produce a list of files suitable for export that represent this feedback or submission
+ * Produce a list of files suitable for export that represent this feedback or submission.
*
- * @param stdClass $submission The submission
- * @param stdClass $user The user record - unused
- * @return array - return an array of files indexed by filename
+ * @param stdClass $submission The submission object.
+ * @param stdClass $user The user record (unused).
+ * @return array An array of files indexed by filename.
*/
- public function get_files(stdClass $submission, stdClass $user) {
+ public function get_files(stdClass $submission, stdClass $user): array {
$result = [];
$fs = get_file_storage();
- $files = $fs->get_area_files($this->assignment->get_context()->id,
- self::COMPONENT_NAME,
+ $files = $fs->get_area_files(
+ $this->assignment->get_context()->id,
+ self::ASSIGNSUBMISSION_DTA_COMPONENT_NAME,
self::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
$submission->id,
'timemodified',
- false);
+ false
+ );
- foreach ($files as $file) {
+ foreach ($files as $fileobj) {
// Do we return the full folder path or just the file name?
- if (isset($submission->exportfullpath) && $submission->exportfullpath == false) {
- $result[$file->get_filename()] = $file;
+ if (isset($submission->exportfullpath) && $submission->exportfullpath === false) {
+ $result[$fileobj->get_filename()] = $fileobj;
} else {
- $result[$file->get_filepath().$file->get_filename()] = $file;
+ $result[$fileobj->get_filepath() . $fileobj->get_filename()] = $fileobj;
}
}
return $result;
}
/**
- * The plugin is beeing uninstalled - cleanup
+ * The plugin is being uninstalled - cleanup.
*
* @return bool
*/
- public function delete_instance() {
- DbUtils::uninstallplugincleanup();
-
+ public function delete_instance(): bool {
+ dta_db_utils::assignsubmission_dta_uninstall_plugin_cleaup();
return true;
}
}
diff --git a/teacher-dta.txt b/teacher-dta.txt
new file mode 100644
index 0000000..276c40c
--- /dev/null
+++ b/teacher-dta.txt
@@ -0,0 +1 @@
+dtt::https://transfer.hft-stuttgart.de/gitlab/dtt/example_openjdk11-junit5-calculator-test.git::none::none::hftstuttgart/dta-jdk17-junit5-testrunner:latest
--
GitLab