From fc9f3084612265bc0534d2b2ad193c6dc9780b48 Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Mon, 17 Apr 2023 13:05:09 +0200 Subject: [PATCH 1/7] added a fully qualified reference survey to provide a consistent basis for further testing. The survey contains four question pages and one answer page. The four question pages contain all question types provided by the survey-bundle. The answer page presents the results. This is still done incorrectly. check each \strlen() in FormOpenEndedQuestion.php individually and replace with !empty() if needed, fixes some bugs in survey_question_matrix.html5 fixes some bugs in SurveyQuestionMatrix.php so that the code continues to run, but the result of the survey is not correct in every case added a simple workaround to keep survey_question_constantsum.html5 alive added a @ to SurveyQuestionConstantsum.php to keep it alive during the search for a suitable solution --- CHANGELOG.md | 7 + README.md | 12 +- _misc/reference-survey.sql | 307 ++++++++++++++++++ .../classes/SurveyQuestionConstantsum.php | 3 +- .../contao/classes/SurveyQuestionMatrix.php | 7 +- .../classes/SurveyQuestionMultiplechoice.php | 7 +- .../contao/forms/FormOpenEndedQuestion.php | 30 +- .../survey/survey_answers_matrix.html5 | 18 +- .../survey/survey_question_constantsum.html5 | 38 ++- .../survey/survey_question_matrix.html5 | 22 +- 10 files changed, 406 insertions(+), 45 deletions(-) create mode 100644 _misc/reference-survey.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index a78bcf9..3791887 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ Types of changes Security in case of vulnerabilities. ) +## [3.4.3](https://github.com/pdir/contao-survey/tree/3.4.3) – 2023-04-17 + +- [Added] ...survey reference tables to define a consistent basis for survey testing. +- [Fixed] ...an error in the widget title display [#33](https://github.com/pdir/contao-survey/issues/33). +- [Fixed] ...some more PHP8 warnings caused by wrong array keys. The answer option 'other' is now displayed correctly in all cases [#31](https://github.com/pdir/contao-survey/issues/31). +- [Fixed] ...some PHP8 warnings caused by wrong array keys [#30](https://github.com/pdir/contao-survey/issues/30). + ## [3.4.2](https://github.com/pdir/contao-survey/tree/3.4.2) – 2023-02-27 - [Fixed] An error in the condition that determines the necessity of choices field migration. 🤗 [akroii](https://github.com/akroii) for the financial support. diff --git a/README.md b/README.md index deb8856..4cd67c8 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,14 @@ A special thanks goes to Georg Rehfeld for his development of the detailed surve Made with [contributors-img](https://contrib.rocks). -# run before commit +# Notes for developers + +#### run before commit + + vendor/bin/ecs check src tests + +#### Test your changes using the survey tables included in the package. + +With version 3.4.3, we have added survey tables to the bundle to enable consistent testing. So if you want to test the behavior of a survey in a reproducible way, use these tables. At the moment you still have to manually load these tables into your DB, but we are working on automating the tests a bit more. + - vendor/bin/ecs check src tests \ No newline at end of file diff --git a/_misc/reference-survey.sql b/_misc/reference-survey.sql new file mode 100644 index 0000000..115fc28 --- /dev/null +++ b/_misc/reference-survey.sql @@ -0,0 +1,307 @@ +-- -------------------------------------------------------- +-- Host: localhost +-- Server Version: 10.5.10-MariaDB-log - mariadb.org binary distribution +-- Server Betriebssystem: Win64 +-- HeidiSQL Version: 12.3.0.6589 +-- -------------------------------------------------------- + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- Exportiere Struktur von Tabelle tl_survey +DROP TABLE IF EXISTS `tl_survey`; +CREATE TABLE IF NOT EXISTS `tl_survey` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `resultCategories` blob DEFAULT NULL, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `language` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `author` smallint(5) unsigned NOT NULL DEFAULT 0, + `online_start` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `online_end` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `access` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `usecookie` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `limit_groups` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0', + `show_title` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1', + `show_cancel` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1', + `allowed_groups` blob DEFAULT NULL, + `introduction` text COLLATE utf8mb4_unicode_ci NOT NULL, + `finalsubmission` text COLLATE utf8mb4_unicode_ci NOT NULL, + `allowback` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `immediate_start` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `jumpto` int(10) unsigned NOT NULL DEFAULT 0, + `useResultCategories` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `sendConfirmationMail` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `sendConfirmationMailAlternate` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailAlternateCondition` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailRecipientField` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailRecipient` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailAlternateRecipient` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailSender` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailAlternateSender` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailReplyto` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailAlternateReplyto` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailSubject` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailAlternateSubject` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailText` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `confirmationMailAlternateText` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `confirmationMailTemplate` binary(16) DEFAULT NULL, + `confirmationMailAlternateTemplate` binary(16) DEFAULT NULL, + `sendFormattedMail` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `formattedMailRecipient` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `formattedMailSubject` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `formattedMailText` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `formattedMailTemplate` binary(16) DEFAULT NULL, + `formattedMailSkipEmpty` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `addConfirmationMailAttachments` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `addConfirmationMailAlternateAttachments` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `confirmationMailAttachments` blob DEFAULT NULL, + `confirmationMailAlternateAttachments` blob DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey: ~1 rows (ungefähr) +DELETE FROM `tl_survey`; +INSERT INTO `tl_survey` (`id`, `resultCategories`, `tstamp`, `title`, `language`, `author`, `online_start`, `online_end`, `description`, `access`, `usecookie`, `limit_groups`, `show_title`, `show_cancel`, `allowed_groups`, `introduction`, `finalsubmission`, `allowback`, `immediate_start`, `jumpto`, `useResultCategories`, `sendConfirmationMail`, `sendConfirmationMailAlternate`, `confirmationMailAlternateCondition`, `confirmationMailRecipientField`, `confirmationMailRecipient`, `confirmationMailAlternateRecipient`, `confirmationMailSender`, `confirmationMailAlternateSender`, `confirmationMailReplyto`, `confirmationMailAlternateReplyto`, `confirmationMailSubject`, `confirmationMailAlternateSubject`, `confirmationMailText`, `confirmationMailAlternateText`, `confirmationMailTemplate`, `confirmationMailAlternateTemplate`, `sendFormattedMail`, `formattedMailRecipient`, `formattedMailSubject`, `formattedMailText`, `formattedMailTemplate`, `formattedMailSkipEmpty`, `addConfirmationMailAttachments`, `addConfirmationMailAlternateAttachments`, `confirmationMailAttachments`, `confirmationMailAlternateAttachments`) VALUES + (3, _binary 0x613a323a7b693a313b613a323a7b733a383a2263617465676f7279223b733a31383a22416e74776f72746b617465676f7269652031223b733a323a226964223b693a303b7d693a323b613a323a7b733a383a2263617465676f7279223b733a31383a22416e74776f72746b617465676f7269652032223b733a323a226964223b693a313b7d7d, 1681719816, 'Referenzumfrage zum Testen des Bundles contao-survey', 'de', 1, '', '', 'Umfrage zum Testen von Multiple-Choice Fragen', 'anon', '', '0', '1', '1', NULL, '', '

Vielen Dank, dass Sie an der Umfrage teilgenommen haben.

', '1', '', 0, '', '', '', '', '', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, '', NULL, '', NULL, NULL, '', '', '', NULL, NULL); + +-- Exportiere Struktur von Tabelle tl_survey_condition +DROP TABLE IF EXISTS `tl_survey_condition`; +CREATE TABLE IF NOT EXISTS `tl_survey_condition` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `grp` int(10) unsigned NOT NULL DEFAULT 0, + `qid` int(10) unsigned NOT NULL DEFAULT 0, + `pageid` int(10) unsigned NOT NULL DEFAULT 0, + `relation` varchar(2) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '=', + `condition` varchar(1024) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `pid` (`pid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_condition: ~0 rows (ungefähr) +DELETE FROM `tl_survey_condition`; + +-- Exportiere Struktur von Tabelle tl_survey_navigation +DROP TABLE IF EXISTS `tl_survey_navigation`; +CREATE TABLE IF NOT EXISTS `tl_survey_navigation` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `pin` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `uid` int(10) unsigned NOT NULL DEFAULT 0, + `frompage` int(10) unsigned NOT NULL DEFAULT 0, + `topage` int(10) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `pid` (`pid`) +) ENGINE=InnoDB AUTO_INCREMENT=305 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_navigation: ~0 rows (ungefähr) +DELETE FROM `tl_survey_navigation`; + +-- Exportiere Struktur von Tabelle tl_survey_page +DROP TABLE IF EXISTS `tl_survey_page`; +CREATE TABLE IF NOT EXISTS `tl_survey_page` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `type` varchar(8) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'default', + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `sorting` int(10) unsigned NOT NULL DEFAULT 0, + `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `language` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `introduction` text COLLATE utf8mb4_unicode_ci NOT NULL, + `conditions` varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `page_template` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'survey_questionblock', + `pagetype` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'standard', + `useCustomNextButtonTitle` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `customNextButtonTitle` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `hideBackButton` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `pid` (`pid`) +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_page: ~5 rows (ungefähr) +DELETE FROM `tl_survey_page`; +INSERT INTO `tl_survey_page` (`id`, `type`, `tstamp`, `pid`, `sorting`, `title`, `description`, `language`, `introduction`, `conditions`, `page_template`, `pagetype`, `useCustomNextButtonTitle`, `customNextButtonTitle`, `hideBackButton`) VALUES + (5, 'default', 1681716850, 3, 128, 'Frageseite 1 - Multiple-Choice-Fragen', 'Auf dieser Seite können die drei Typen der Multiple-Choice-Fragen getestet werden', '', '

Im Contao-Survey gibt es drei Typen von Miltiple-Choice-Fragen.

\n
    \n
  1. Multiple-Choice-Frage mit Einfachauswahl. Einfachauswahl meint hier, dass man unter allen angebotenen Antworten nur eine einzige wählen kann. Wird die Option Andere Antwort erlauben aktiviert, so kann zusätzlich zu den vorgegebenen Antworten noch eine 'freie', also vom Proband festgelegte, Antwort gegeben werden.

    2. \n
  2. Multiple-Choice-Frage mit Mehrfachauswahl. Mehrfachauswahl meint hier, dass man unter allen angebotenen Antworten mehrere wählen kann. Wird die Option Andere Antwort erlauben aktiviert, so kann zusätzlich zu den vorgegebenen Antworten noch eine 'freie', also vom Proband festgelegte, Antwort gegeben werden.

    3. \n
  3. Multiple-Choice-Frage mit binärer/dichotomer Auswahl. Dichotom meint hier, dass man nur zwischen zwei Antworten wählen kann. In der Regel[nbsp] sind das hier Ja und Nein. Die Option Andere Antwort erlauben existiert für diesen Fragetyp nicht.
    4. \n
\n

[nbsp]

', '', 'survey_questionblock', 'standard', '', '', ''), + (6, 'result', 1680082351, 3, 256, 'Ergebnisseite', 'Alle Ergebnisse der Umfrage 1', '', '', '', '', 'standard', '', '', ''), + (7, 'default', 1681723042, 3, 192, 'Frageseite 2 - Offene Fragen', 'Auf dieser Seite können die sechs Typen der Offenen Fragen getestet werden.', '', '

Im Contao-Survey gibt es sechs Typen von Offenen Fragen.

\n
    \n
  1. Einzeilig.
    2. \n
  2. Mehrzeilig.
    3. \n
  3. Ganzzahl.
    4. \n
  4. Kommazahl.
    5. \n
  5. Datum.
    6. \n
  6. Uhrzeit.
    7. \n
\n

[nbsp]

', '', 'survey_questionblock', 'standard', '', '', ''), + (8, 'default', 1681722683, 3, 224, 'Frageseite 3 - Matrixfragen', 'Auf dieser Seite können die zwei Typen der Matrixfragen getestet werden.', '', '

Im Contao-Survey gibt es zwei Typen von Matrixfragen.

\n
    \n
  1. Matrixfrage mit Einfachauswahl.
    2. \n
  2. Matrixfrage mit Mehfachauswahl.
    3. \n
\n

[nbsp]

', '', 'survey_questionblock', 'standard', '', '', ''), + (9, 'default', 1681726099, 3, 240, 'Frageseite 4 - Feste Summe', 'Auf dieser Seite kann der Fragetyp Feste Summe getestet werden.', '', '

Im Contao-Survey gibt es keinen Subtyp für die Frage Feste Summe!

', '', 'survey_questionblock', 'standard', '', '', ''); + +-- Exportiere Struktur von Tabelle tl_survey_participant +DROP TABLE IF EXISTS `tl_survey_participant`; +CREATE TABLE IF NOT EXISTS `tl_survey_participant` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `uid` int(10) unsigned NOT NULL DEFAULT 0, + `pin` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `lastpage` int(10) unsigned NOT NULL DEFAULT 1, + `finished` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `firstname` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `lastname` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `company` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `category` int(10) unsigned DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `pid` (`pid`) +) ENGINE=InnoDB AUTO_INCREMENT=126 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_participant: ~0 rows (ungefähr) +DELETE FROM `tl_survey_participant`; + +-- Exportiere Struktur von Tabelle tl_survey_pin_tan +DROP TABLE IF EXISTS `tl_survey_pin_tan`; +CREATE TABLE IF NOT EXISTS `tl_survey_pin_tan` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `pin` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `tan` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `used` int(10) unsigned NOT NULL DEFAULT 0, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `pid` (`pid`), + KEY `pin` (`pin`), + KEY `tan` (`tan`) +) ENGINE=InnoDB AUTO_INCREMENT=126 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_pin_tan: ~0 rows (ungefähr) +DELETE FROM `tl_survey_pin_tan`; + +-- Exportiere Struktur von Tabelle tl_survey_question +DROP TABLE IF EXISTS `tl_survey_question`; +CREATE TABLE IF NOT EXISTS `tl_survey_question` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `sorting` int(10) unsigned NOT NULL DEFAULT 0, + `alias` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `questiontype` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `author` smallint(5) unsigned NOT NULL DEFAULT 0, + `language` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `question` text COLLATE utf8mb4_unicode_ci NOT NULL, + `introduction` text COLLATE utf8mb4_unicode_ci NOT NULL, + `obligatory` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `complete` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `original` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `help` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `hidetitle` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `lower_bound` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `upper_bound` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `lower_bound_date` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `upper_bound_date` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `lower_bound_time` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `upper_bound_time` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `openended_subtype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `openended_textbefore` varchar(150) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `openended_textafter` varchar(150) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `openended_rows` smallint(5) unsigned NOT NULL DEFAULT 5, + `openended_cols` smallint(5) unsigned NOT NULL DEFAULT 40, + `openended_width` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `openended_maxlen` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `openended_textinside` varchar(150) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `multiplechoice_subtype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `matrix_subtype` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `mc_style` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `choices` blob DEFAULT NULL, + `matrixrows` blob DEFAULT NULL, + `matrixcolumns` blob DEFAULT NULL, + `addneutralcolumn` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `neutralcolumn` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `addother` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `addbipolar` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `adjective1` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `adjective2` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `bipolarposition` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `othertitle` varchar(150) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `inputfirst` char(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `sumoption` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `sumchoices` blob DEFAULT NULL, + `sum` double NOT NULL DEFAULT 0, + `cssClass` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + PRIMARY KEY (`id`), + KEY `pid` (`pid`) +) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_question: ~12 rows (ungefähr) +DELETE FROM `tl_survey_question`; +INSERT INTO `tl_survey_question` (`id`, `tstamp`, `pid`, `sorting`, `alias`, `questiontype`, `title`, `description`, `author`, `language`, `question`, `introduction`, `obligatory`, `complete`, `original`, `help`, `hidetitle`, `lower_bound`, `upper_bound`, `lower_bound_date`, `upper_bound_date`, `lower_bound_time`, `upper_bound_time`, `openended_subtype`, `openended_textbefore`, `openended_textafter`, `openended_rows`, `openended_cols`, `openended_width`, `openended_maxlen`, `openended_textinside`, `multiplechoice_subtype`, `matrix_subtype`, `mc_style`, `choices`, `matrixrows`, `matrixcolumns`, `addneutralcolumn`, `neutralcolumn`, `addother`, `addbipolar`, `adjective1`, `adjective2`, `bipolarposition`, `othertitle`, `inputfirst`, `sumoption`, `sumchoices`, `sum`, `cssClass`) VALUES + (9, 1681715744, 5, 128, 'multiple-choice-frage-mit-einfachauswahl', 'multiplechoice', 'Multiple-Choice-Frage mit Einfachauswahl', 'Multiple-Choice-Frage mit Einfachauswahl', 1, 'de', '

Fragetext zur Multiple-Choice-Frage mit Einfachauswahl

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', '', '', 5, 40, '', '', '', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', _binary 0x613a333a7b693a313b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742031223b7d693a323b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742032223b7d693a333b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742033223b7d7d, NULL, NULL, '', '', '1', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (10, 1681715706, 5, 256, 'multiple-choice-frage-mit-mehrfachauswahl', 'multiplechoice', 'Multiple-Choice-Frage mit Mehrfachauswahl', 'Multiple-Choice-Frage mit Mehrfachauswahl', 1, 'de', '

Fragetext Multiple-Choice-Frage mit Mehrfachauswahl

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', '', '', 5, 40, '', '', '', 'mc_multipleresponse', 'matrix_singleresponse', 'vertical', _binary 0x613a333a7b693a313b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742031223b7d693a323b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742032223b7d693a333b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742033223b7d7d, NULL, NULL, '', '', '1', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (11, 1681716699, 5, 384, 'multiple-choice-frage-mit-zwei-antworten-ja-nein-dichotom', 'multiplechoice', 'Multiple-Choice-Frage mit zwei Antworten Ja/Nein - Dichotom', 'Multiple-Choice-Frage mit zwei Antworten Ja/Nein - DichotomMulti-Choice - Dichotom', 1, 'de', '

Fragetext Multiple-Choice-Frage mit zwei Antworten Ja/Nein - Dichotom

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', '', '', 5, 40, '', '', '', 'mc_dichotomous', 'matrix_singleresponse', 'vertical', _binary 0x613a333a7b693a313b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742031223b7d693a323b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742032223b7d693a333b613a313a7b733a363a2263686f696365223b733a393a22416e74776f72742033223b7d7d, NULL, NULL, '', '', '1', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (12, 1681720144, 7, 128, 'offene-frage-einzeilig', 'openended', 'Offene Frage - Einzeilig', 'Offene Frage - Einzeilig', 1, 'de', '

Fragetext zur offenen Frage - Einzeilig

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', 'Vorbelegung', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, NULL, NULL, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (13, 1681720194, 7, 256, 'offene-frage-mehrzeilig', 'openended', 'Offene Frage - Mehrzeilig', 'Offene Frage - Mehrzeilig', 1, 'de', '

Fragetext zur offenen Frage - Mehrzeilig

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_multiline', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', 'Vorbelegung', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, NULL, NULL, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (14, 1681723117, 7, 384, 'offene-frage-ganzzahl', 'openended', 'Offene Frage - Ganzzahl', 'Offene Frage - Ganzzahl', 1, 'de', '

Fragetext zur offenen Frage - Ganzzahl

\n', '', '', '1', '1', '', '', '0', '100', '', '', '', '', 'oe_integer', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', '42', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, NULL, NULL, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (15, 1681723130, 7, 512, 'offene-frage-kommazahl', 'openended', 'Offene Frage - Kommazahl', 'Offene Frage - Kommazahl', 1, 'de', '

Fragetext zur offenen Frage - Kommazahl

\n', '', '', '1', '1', '', '', '0.9', '92.5', '', '', '', '', 'oe_float', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', '4,2', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, NULL, NULL, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (16, 1681723147, 7, 640, 'offene-frage-datum', 'openended', 'Offene Frage - Datum', 'Offene Frage - Datum', 1, 'de', '

Fragetext zur offenen Frage - Datum

\n', '', '', '1', '1', '', '', '0.9', '92.5', '1672531200', '1703980800', '', '', 'oe_date', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', '01.05.2023', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, NULL, NULL, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (17, 1681723158, 7, 768, 'offene-frage-uhrzeit', 'openended', 'Offene Frage - Uhrzeit', 'Offene Frage - Uhrzeit', 1, 'de', '

Fragetext zur offenen Frage - Uhrzeit

\n', '', '', '1', '1', '', '', '0.9', '92.5', '1672531200', '1703980800', '36000', '43200', 'oe_time', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', '11:00', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, NULL, NULL, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (18, 1681721642, 8, 128, 'matrixfrage-einfachauswahl', 'matrix', 'Matrixfrage - Einfachauswahl', 'Matrixfrage - Einfachauswahl', 1, 'de', '

Fragetext zur Matrixfrage - Einfachauswahl

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', 'Vorbelegung', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, _binary 0x613a343a7b693a303b733a373a225a65696c652031223b693a313b733a373a225a65696c652032223b693a323b733a373a225a65696c652033223b693a333b733a373a225a65696c652034223b7d, _binary 0x613a343a7b693a303b733a383a225370616c74652031223b693a313b733a383a225370616c74652032223b693a323b733a383a225370616c74652033223b693a333b733a383a225370616c74652034223b7d, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (24, 1681722976, 8, 256, 'matrixfrage-mehrfachauswahl', 'matrix', 'Matrixfrage - Mehrfachauswahl', 'Matrixfrage - Mehrfachauswahl', 1, 'de', '

Fragetext zur Matrixfrage - Mehrfachauswahl

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', 'Vorbelegung', 'mc_singleresponse', 'matrix_multipleresponse', 'vertical', NULL, _binary 0x613a343a7b693a303b733a373a225a65696c652031223b693a313b733a373a225a65696c652032223b693a323b733a373a225a65696c652033223b693a333b733a373a225a65696c652034223b7d, _binary 0x613a343a7b693a303b733a383a225370616c74652031223b693a313b733a383a225370616c74652032223b693a323b733a383a225370616c74652033223b693a333b733a383a225370616c74652034223b7d, '', '', '', '', '', '', 'top', '', '', 'exact', NULL, 100, ''), + (25, 1681724831, 9, 128, 'feste-summe', 'constantsum', 'Feste Summe', 'Feste Summe', 1, 'de', '

Fragetext zum Fragetyp Festen Summe

\n', '', '', '1', '1', '', '', '', '', '', '', '', '', 'oe_singleline', 'Beschriftung vor Textfeld', 'Beschirftung nach Textfeld', 5, 40, '20', '20', 'Vorbelegung', 'mc_singleresponse', 'matrix_singleresponse', 'vertical', NULL, _binary 0x613a343a7b693a303b733a373a225a65696c652031223b693a313b733a373a225a65696c652032223b693a323b733a373a225a65696c652033223b693a333b733a373a225a65696c652034223b7d, _binary 0x613a343a7b693a303b733a383a225370616c74652031223b693a313b733a383a225370616c74652032223b693a323b733a383a225370616c74652033223b693a333b733a383a225370616c74652034223b7d, '', '', '', '', '', '', 'top', '', '', 'exact', _binary 0x613a343a7b693a303b733a31303a22416e74776f7274203235223b693a313b733a31303a22416e74776f7274203235223b693a323b733a31303a22416e74776f7274203235223b693a333b733a31303a22416e74776f7274203235223b7d, 100, ''); + +-- Exportiere Struktur von Tabelle tl_survey_result +DROP TABLE IF EXISTS `tl_survey_result`; +CREATE TABLE IF NOT EXISTS `tl_survey_result` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `pin` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `uid` int(10) unsigned NOT NULL DEFAULT 0, + `qid` int(10) unsigned NOT NULL DEFAULT 0, + `result` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `pid` (`pid`), + KEY `qid` (`qid`) +) ENGINE=InnoDB AUTO_INCREMENT=892 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_result: ~0 rows (ungefähr) +DELETE FROM `tl_survey_result`; + +-- Exportiere Struktur von Tabelle tl_survey_scale +DROP TABLE IF EXISTS `tl_survey_scale`; +CREATE TABLE IF NOT EXISTS `tl_survey_scale` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `sorting` int(10) unsigned NOT NULL DEFAULT 0, + `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `pid` int(10) unsigned NOT NULL DEFAULT 0, + `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `scale` blob DEFAULT NULL, + `language` varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_scale: ~0 rows (ungefähr) +DELETE FROM `tl_survey_scale`; + +-- Exportiere Struktur von Tabelle tl_survey_scale_folder +DROP TABLE IF EXISTS `tl_survey_scale_folder`; +CREATE TABLE IF NOT EXISTS `tl_survey_scale_folder` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `tstamp` int(10) unsigned NOT NULL DEFAULT 0, + `sorting` int(10) unsigned NOT NULL DEFAULT 0, + `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', + `description` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC; + +-- Exportiere Daten aus Tabelle tl_survey_scale_folder: ~0 rows (ungefähr) +DELETE FROM `tl_survey_scale_folder`; + +/*!40103 SET TIME_ZONE=IFNULL(@OLD_TIME_ZONE, 'system') */; +/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; +/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40111 SET SQL_NOTES=IFNULL(@OLD_SQL_NOTES, 1) */; diff --git a/src/Resources/contao/classes/SurveyQuestionConstantsum.php b/src/Resources/contao/classes/SurveyQuestionConstantsum.php index c144ff0..95ef539 100644 --- a/src/Resources/contao/classes/SurveyQuestionConstantsum.php +++ b/src/Resources/contao/classes/SurveyQuestionConstantsum.php @@ -203,7 +203,8 @@ protected function calculateCumulated(): void if (\is_array($arrAnswer)) { foreach ($arrAnswer as $answerkey => $answervalue) { - ++$cumulated[$answerkey][$answervalue]; + // ToDo: fix the following workaround + @++$cumulated[$answerkey][$answervalue]; } } } diff --git a/src/Resources/contao/classes/SurveyQuestionMatrix.php b/src/Resources/contao/classes/SurveyQuestionMatrix.php index e868f51..6e7b83a 100644 --- a/src/Resources/contao/classes/SurveyQuestionMatrix.php +++ b/src/Resources/contao/classes/SurveyQuestionMatrix.php @@ -216,7 +216,12 @@ protected function calculateCumulated(): void ++$cumulated[$row][$singleanswervalue]; } } else { - ++$cumulated[$row][$answervalue]; + // ToDo: fix this workaround + try { + ++$cumulated[$row][$answervalue]; + } catch (\Exception $e) { + + } } } } diff --git a/src/Resources/contao/classes/SurveyQuestionMultiplechoice.php b/src/Resources/contao/classes/SurveyQuestionMultiplechoice.php index 94b4de7..5d876a0 100644 --- a/src/Resources/contao/classes/SurveyQuestionMultiplechoice.php +++ b/src/Resources/contao/classes/SurveyQuestionMultiplechoice.php @@ -63,8 +63,7 @@ public function getResultData(): array * an array of the form question.id => result, where result can be array or string|int * like * [5 => "1", 6 => [2 => "1", 4 => "1"]] - * where "1" means selected, - * + * where "1" means that the answer was selected, */ if (null === $this->resultData) { $result = []; @@ -102,6 +101,7 @@ public function getResultData(): array public function getAnswersAsHTML() { if (!empty($resultData = $this->getResultData())) { + $survey = SurveyModel::findByQuestionId((int) $this->id); $template = new FrontendTemplate('survey_answers_multiplechoice'); @@ -118,7 +118,8 @@ public function getAnswersAsHTML() if (\count($this->statistics['cumulated']['other'])) { foreach ($this->statistics['cumulated']['other'] as $value) { - ++$otherchoices[StringUtil::specialchars($value)]; + $key = StringUtil::specialchars($value); + if(array_key_exists($key, $otherchoices)) ++$otherchoices[$key]; else $otherchoices[$key] = 1; } } $template->otherchoices = $otherchoices; diff --git a/src/Resources/contao/forms/FormOpenEndedQuestion.php b/src/Resources/contao/forms/FormOpenEndedQuestion.php index 1dc268f..9a954d6 100644 --- a/src/Resources/contao/forms/FormOpenEndedQuestion.php +++ b/src/Resources/contao/forms/FormOpenEndedQuestion.php @@ -55,7 +55,7 @@ public function __set($strKey, $varValue): void switch ($strKey) { case 'surveydata': parent::__set($strKey, $varValue); - $this->strClass = 'openended'.((\strlen($varValue['cssClass']) ? ' '.$varValue['cssClass'] : '')); + $this->strClass = 'openended'.((!empty($varValue['cssClass']) ? ' '.$varValue['cssClass'] : '')); $this->strTextBefore = $varValue['openended_textbefore']; $this->strTextAfter = $varValue['openended_textafter']; $this->questiontype = $varValue['openended_subtype']; @@ -143,7 +143,7 @@ public function generate() $template = new FrontendTemplate('survey_question_openended'); $template->ctrl_name = StringUtil::specialchars($this->strName); $template->ctrl_id = StringUtil::specialchars($this->strId); - $template->ctrl_class = (\strlen($this->strClass) ? ' '.$this->strClass : ''); + $template->ctrl_class = (!empty($this->strClass) ? ' '.$this->strClass : ''); $template->multiLine = 0 === strcmp($this->questiontype, 'oe_multiline'); $template->singleLine = 0 === strcmp($this->questiontype, 'oe_singleline'); $template->value = $this->varValue; @@ -151,7 +151,7 @@ public function generate() $template->textAfter = $this->strTextAfter; $template->attributes = $this->getAttributes(); $strError = $this->getErrorAsHTML(); - $template->blnError = (\strlen($strError) ? true : false); + $template->blnError = (!empty($strError) ? true : false); $widget = $template->parse(); $widget .= $this->addSubmit(); @@ -160,19 +160,19 @@ public function generate() protected function setData_oe_singleline($varValue): void { - if (\strlen($varValue['openended_width'])) { + if (!empty($varValue['openended_width'])) { $this->arrAttributes['size'] = StringUtil::specialchars($varValue['openended_width']); } - if (\strlen($varValue['openended_maxlen'])) { + if (!empty($varValue['openended_maxlen'])) { $this->arrAttributes['maxlength'] = StringUtil::specialchars($varValue['openended_maxlen']); } - if (\strlen($varValue['openended_textinside'])) { + if (!empty($varValue['openended_textinside'])) { $this->arrAttributes['value'] = StringUtil::specialchars($varValue['openended_textinside']); } - if (\strlen($this->varValue)) { + if (!empty($this->varValue)) { $this->arrAttributes['value'] = StringUtil::specialchars($this->varValue); } } @@ -199,16 +199,16 @@ protected function setData_oe_time($varValue): void protected function setData_oe_multiline($varValue): void { - if (\strlen($varValue['openended_rows'])) { + if (!empty($varValue['openended_rows'])) { $this->arrAttributes['rows'] = StringUtil::specialchars($varValue['openended_rows']); } - if (\strlen($varValue['openended_cols'])) { + if (!empty($varValue['openended_cols'])) { $this->arrAttributes['cols'] = StringUtil::specialchars($varValue['openended_cols']); } - if (!\strlen($this->varValue)) { - if (\strlen($varValue['openended_textinside'])) { + if (!!empty($this->varValue)) { + if (!empty($varValue['openended_textinside'])) { $this->varValue = $varValue['openended_textinside']; } } @@ -225,7 +225,7 @@ protected function setData_oe_multiline($varValue): void protected function validator($varInput) { $oldlabel = $this->label; - $label = \strlen($this->label) ? $this->label : $this->title; + $label = !empty($this->label) ? $this->label : $this->title; $this->label = $label; if (\is_array($varInput)) { @@ -249,14 +249,14 @@ protected function validator($varInput) */ protected function check_bounds($varInput) { - if ($this->hasErrors() || !\strlen($varInput)) { + if ($this->hasErrors() || empty($varInput)) { // Don't check any further, value might not be a valid string to be compared against bounds return $varInput; } $result = $varInput; - if (\strlen($this->strLowerBound)) { + if (!empty($this->strLowerBound)) { $strErrMsg = $GLOBALS['TL_LANG']['ERR']['lower_bound']; $lower = (int) ($this->strLowerBound); @@ -306,7 +306,7 @@ protected function check_bounds($varInput) } } - if (\strlen($this->strUpperBound)) { + if (!empty($this->strUpperBound)) { $strErrMsg = $GLOBALS['TL_LANG']['ERR']['upper_bound']; $upper = (int) ($this->strUpperBound); diff --git a/src/Resources/contao/templates/survey/survey_answers_matrix.html5 b/src/Resources/contao/templates/survey/survey_answers_matrix.html5 index 74e40bb..fa89e28 100644 --- a/src/Resources/contao/templates/survey/survey_answers_matrix.html5 +++ b/src/Resources/contao/templates/survey/survey_answers_matrix.html5 @@ -10,11 +10,25 @@ -choices as $choiceid => $choice): ?> +choices as $choiceid => $choice): +dump(array_key_exists($counter, $this->statistics['cumulated'])); +?> . - statistics['cumulated'][$counter][$colcounter]) ? $this->statistics['cumulated'][$counter][$colcounter] : 0); ?> + + statistics['cumulated'])): + if(array_key_exists($colcounter, $this->statistics['cumulated'][$colcounter])): + echo (($this->statistics['cumulated'][$counter][$colcounter]) ? $this->statistics['cumulated'][$counter][$colcounter] : 0); + else: + echo '?'; + endif; + else: + echo '?'; + endif; + ?> + diff --git a/src/Resources/contao/templates/survey/survey_question_constantsum.html5 b/src/Resources/contao/templates/survey/survey_question_constantsum.html5 index 0aee5f2..96bf4b2 100644 --- a/src/Resources/contao/templates/survey/survey_question_constantsum.html5 +++ b/src/Resources/contao/templates/survey/survey_question_constantsum.html5 @@ -1,15 +1,25 @@ - - -choices as $choice): ?> - -blnInputFirst): ?> - - - - - - - - - +
values[$counter])): ?>value="values[$counter]); ?>" />values[$counter])): ?>value="values[$counter]); ?>" />
choices as $choice): ?> + blnInputFirst): + if(is_null($this->values)): ?> + + + + values)): ?> + + + + +
values[$counter])): ?>value="values[$counter]); ?>" />values[$counter])): ?>value="values[$counter]); ?>" />
diff --git a/src/Resources/contao/templates/survey/survey_question_matrix.html5 b/src/Resources/contao/templates/survey/survey_question_matrix.html5 index bfd648a..4855fda 100644 --- a/src/Resources/contao/templates/survey/survey_question_matrix.html5 +++ b/src/Resources/contao/templates/survey/survey_question_matrix.html5 @@ -52,13 +52,21 @@ columns as $column): ?> - -singleResponse): ?> - values[$rowcounter] == $colcounter): ?> checked="checked" /> - -values[$rowcounter]) ? $this->values[$rowcounter] : array(); ?> - checked="checked" /> - + singleResponse): + if(is_null($this->values)): ?> + + values[$rowcounter] == $colcounter): ?> checked="checked" />values)): ?> + + $foundvalues = is_array($this->values[$rowcounter]) ? $this->values[$rowcounter] : array(); ?> + checked="checked" / From 1735b919398c6b22f313118769f9c733f5675dda Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Mon, 17 Apr 2023 13:27:53 +0200 Subject: [PATCH 2/7] suppressed another error and marked it as ToDo, fixed two templates for further use in the backend --- src/Resources/contao/classes/SurveyQuestionMatrix.php | 10 ++++------ .../templates/survey/survey_question_constantsum.html5 | 4 ++-- .../templates/survey/survey_question_matrix.html5 | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Resources/contao/classes/SurveyQuestionMatrix.php b/src/Resources/contao/classes/SurveyQuestionMatrix.php index 6e7b83a..4602d3f 100644 --- a/src/Resources/contao/classes/SurveyQuestionMatrix.php +++ b/src/Resources/contao/classes/SurveyQuestionMatrix.php @@ -181,7 +181,9 @@ public function resultAsString($res) $arrAnswer = deserialize($res, true); if (\is_array($arrAnswer)) { - return implode(', ', $arrAnswer); + // ToDo: fix the following workaround + // $arrAnswer can also be a multidimensional array here, which then does not work + return @implode(', ', $arrAnswer); } return ''; @@ -217,11 +219,7 @@ protected function calculateCumulated(): void } } else { // ToDo: fix this workaround - try { - ++$cumulated[$row][$answervalue]; - } catch (\Exception $e) { - - } + @++$cumulated[$row][$answervalue]; } } } diff --git a/src/Resources/contao/templates/survey/survey_question_constantsum.html5 b/src/Resources/contao/templates/survey/survey_question_constantsum.html5 index 96bf4b2..c5c830b 100644 --- a/src/Resources/contao/templates/survey/survey_question_constantsum.html5 +++ b/src/Resources/contao/templates/survey/survey_question_constantsum.html5 @@ -4,7 +4,7 @@ blnInputFirst): if(is_null($this->values)): ?> - + values[$counter])): ?>value="values[$counter]); ?>" /> @@ -12,7 +12,7 @@ endif; else: if(is_null($this->values)): ?> - + diff --git a/src/Resources/contao/templates/survey/survey_question_matrix.html5 b/src/Resources/contao/templates/survey/survey_question_matrix.html5 index 4855fda..50656b3 100644 --- a/src/Resources/contao/templates/survey/survey_question_matrix.html5 +++ b/src/Resources/contao/templates/survey/survey_question_matrix.html5 @@ -62,8 +62,8 @@ else: if(is_null($this->values)): ?> - $foundvalues = is_array($this->values[$rowcounter]) ? $this->values[$rowcounter] : array(); ?> + else: + $foundvalues = (!is_null($this->values) && is_array($this->values[$rowcounter])) ? $this->values[$rowcounter] : []; ?> checked="checked" / From 2286498adc06bf1c9fb3b4c90688921057a55742 Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Mon, 17 Apr 2023 13:52:05 +0200 Subject: [PATCH 3/7] developer notes added in README.md --- README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4cd67c8..0b9080c 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,24 @@ Made with [contributors-img](https://contrib.rocks). # Notes for developers -#### run before commit +#### run before your commit vendor/bin/ecs check src tests #### Test your changes using the survey tables included in the package. -With version 3.4.3, we have added survey tables to the bundle to enable consistent testing. So if you want to test the behavior of a survey in a reproducible way, use these tables. At the moment you still have to manually load these tables into your DB, but we are working on automating the tests a bit more. +With version 3.4.3 we have added survey tables to the package to allow consistent testing. You can find the tables in the +reference-survey.sql file in the _misc folder. So if you want to test the behavior of your changed code in a +reproducible way, please use these tables. + +If you make changes to the survey tables, please commit them also to the reference-survey.sql so developers can +test their own code against this reference survey. + +Load the tables into your DB and activate Survey 1, which consists of +five question pages and one results page. For now, you'll need to manually load these tables into your DB, but +we're working on automating the tests a bit more. + +The question pages cover all the questions that the package currently offers. The results page shows the results +of the question pages. Currently, however, there are unfortunately still errors on the results page. From 1a15fd4bc1f2197273c871ebca28eabca332aba1 Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Tue, 18 Apr 2023 07:56:53 +0200 Subject: [PATCH 4/7] added new Date in CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3791887..f8714ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Types of changes Security in case of vulnerabilities. ) -## [3.4.3](https://github.com/pdir/contao-survey/tree/3.4.3) – 2023-04-17 +## [3.4.3](https://github.com/pdir/contao-survey/tree/3.4.3) – 2023-04-18 - [Added] ...survey reference tables to define a consistent basis for survey testing. - [Fixed] ...an error in the widget title display [#33](https://github.com/pdir/contao-survey/issues/33). From 43cd5aedb8cb83a94fcdf8e39c5b764941f54836 Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Tue, 18 Apr 2023 12:34:56 +0200 Subject: [PATCH 5/7] added new Date in CHANGELOG.md, remove dump(), use the suggestions from koertho --- .../contao/classes/SurveyQuestionConstantsum.php | 11 +++++++++-- .../templates/survey/survey_answers_matrix.html5 | 8 +++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Resources/contao/classes/SurveyQuestionConstantsum.php b/src/Resources/contao/classes/SurveyQuestionConstantsum.php index 95ef539..244831f 100644 --- a/src/Resources/contao/classes/SurveyQuestionConstantsum.php +++ b/src/Resources/contao/classes/SurveyQuestionConstantsum.php @@ -203,8 +203,15 @@ protected function calculateCumulated(): void if (\is_array($arrAnswer)) { foreach ($arrAnswer as $answerkey => $answervalue) { - // ToDo: fix the following workaround - @++$cumulated[$answerkey][$answervalue]; + if(array_key_exists($answerkey, $cumulated)) { + if(array_key_exists($answervalue, $cumulated[$answerkey])) { + ++$cumulated[$answerkey][$answervalue]; + } else { + $cumulated[$answerkey][$answervalue] = 0; + } + } else { + $cumulated[$answerkey] = []; + } } } } diff --git a/src/Resources/contao/templates/survey/survey_answers_matrix.html5 b/src/Resources/contao/templates/survey/survey_answers_matrix.html5 index fa89e28..7f3b1b3 100644 --- a/src/Resources/contao/templates/survey/survey_answers_matrix.html5 +++ b/src/Resources/contao/templates/survey/survey_answers_matrix.html5 @@ -10,17 +10,15 @@ -choices as $choiceid => $choice): -dump(array_key_exists($counter, $this->statistics['cumulated'])); -?> +choices as $choiceid => $choice): ?> . statistics['cumulated'])): - if(array_key_exists($colcounter, $this->statistics['cumulated'][$colcounter])): - echo (($this->statistics['cumulated'][$counter][$colcounter]) ? $this->statistics['cumulated'][$counter][$colcounter] : 0); + if(array_key_exists($colcounter, $this->statistics['cumulated'][$counter])): + echo ($this->statistics['cumulated'][$counter][$colcounter] ?? '?'); else: echo '?'; endif; From 91e393c5476b7c1a8d102b807d251804cb62f883 Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Tue, 18 Apr 2023 14:07:56 +0200 Subject: [PATCH 6/7] indentation fixed in some templates, the obsolete attribute summary were replaced by the attribute details in the templates --- .editorconfig | 21 ++ CHANGELOG.md | 5 +- README.md | 18 +- .../backend/be_question_result_details.html5 | 7 +- .../backend/be_survey_result_cumulated.html5 | 84 ++++---- .../survey/survey_answers_constantsum.html5 | 39 ++-- .../survey/survey_answers_matrix.html5 | 57 +++--- .../survey_answers_multiplechoice.html5 | 79 ++++---- .../survey/survey_question_constantsum.html5 | 80 +++++--- .../survey/survey_question_matrix.html5 | 186 +++++++++++------- 10 files changed, 343 insertions(+), 233 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1f0ba4e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{php,yml}] +indent_style = space +indent_size = 4 + +[*.{css,scss,js,twig,html5}] +indent_style = space +indent_size = 2 + +[*.{html5,svg,min.css,min.js}] +insert_final_newline = false diff --git a/CHANGELOG.md b/CHANGELOG.md index f8714ee..951ef8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,9 @@ Types of changes ## [3.4.3](https://github.com/pdir/contao-survey/tree/3.4.3) – 2023-04-18 -- [Added] ...survey reference tables to define a consistent basis for survey testing. -- [Fixed] ...an error in the widget title display [#33](https://github.com/pdir/contao-survey/issues/33). +- [Removed] ...the obsolete attribute **summary** were replaced by the html5-attribute **details** in the templates. +- [Added] ...survey reference tables to define a consistent basis for survey testing [#36](https://github.com/pdir/contao-survey/issues/36). +- [Fixed] ...an error in the widget title display [#33](https://github.com/pdir/contao-survey/issues/33). - [Fixed] ...some more PHP8 warnings caused by wrong array keys. The answer option 'other' is now displayed correctly in all cases [#31](https://github.com/pdir/contao-survey/issues/31). - [Fixed] ...some PHP8 warnings caused by wrong array keys [#30](https://github.com/pdir/contao-survey/issues/30). diff --git a/README.md b/README.md index 0b9080c..34dce26 100644 --- a/README.md +++ b/README.md @@ -35,24 +35,24 @@ Made with [contributors-img](https://contrib.rocks). # Notes for developers -#### run before your commit +#### Run before commit vendor/bin/ecs check src tests #### Test your changes using the survey tables included in the package. -With version 3.4.3 we have added survey tables to the package to allow consistent testing. You can find the tables in the -reference-survey.sql file in the _misc folder. So if you want to test the behavior of your changed code in a -reproducible way, please use these tables. +With version 3.4.3 we have added survey tables to the package to allow consistent testing. You can find the tables in the +reference-survey.sql file in the _misc folder. So if you want to test the behavior of your changed code in a +reproducible way, please use these tables. -If you make changes to the survey tables, please commit them also to the reference-survey.sql so developers can +If you make changes to the survey tables, please commit them also to the reference-survey.sql so developers can test their own code against this reference survey. -Load the tables into your DB and activate Survey 1, which consists of -five question pages and one results page. For now, you'll need to manually load these tables into your DB, but +Load the tables into your DB and activate Survey 1, which consists of +five question pages and one results page. For now, you'll need to manually load these tables into your DB, but we're working on automating the tests a bit more. -The question pages cover all the questions that the package currently offers. The results page shows the results -of the question pages. Currently, however, there are unfortunately still errors on the results page. +The question pages cover all the questions that the package currently offers. The results page shows the results +of the question pages. Currently, however, there are unfortunately still errors on the results page. diff --git a/src/Resources/contao/templates/backend/be_question_result_details.html5 b/src/Resources/contao/templates/backend/be_question_result_details.html5 index b021fb0..5f962e7 100644 --- a/src/Resources/contao/templates/backend/be_question_result_details.html5 +++ b/src/Resources/contao/templates/backend/be_question_result_details.html5 @@ -2,11 +2,12 @@ back; ?>

heading; ?>

- -data as $data): ?> +
+
summary; ?>
+ data as $data): ?> - +
"> ">
diff --git a/src/Resources/contao/templates/backend/be_survey_result_cumulated.html5 b/src/Resources/contao/templates/backend/be_survey_result_cumulated.html5 index fa2460e..2536a20 100644 --- a/src/Resources/contao/templates/backend/be_survey_result_cumulated.html5 +++ b/src/Resources/contao/templates/backend/be_survey_result_cumulated.html5 @@ -1,47 +1,61 @@ categories)): ?> -
-

+
+

- - - - - - - - - - categories as $id => $category): ?> - - - - - - - - -
.%
+ + + + + + + + + + categories as $id => $category): ?> + + + + + + + + +
.%
-
+
-
-

heading; ?>

- - data as $data): ?> - - - - - -
. []
lngAnswered ?>:
lngSkipped; ?>:
" title=""><?php echo $data[" />
-
+
+

heading; ?>

+ +
summary; ?>
+ data as $data): ?> + + + + + +
+
. []
+
+
lngAnswered ?>:
+
lngSkipped; ?>:
+
+ 		" + title=""><?php echo $data[" />
+
diff --git a/src/Resources/contao/templates/survey/survey_answers_constantsum.html5 b/src/Resources/contao/templates/survey/survey_answers_constantsum.html5 index ef857e6..6d0f6c1 100644 --- a/src/Resources/contao/templates/survey/survey_answers_constantsum.html5 +++ b/src/Resources/contao/templates/survey/survey_answers_constantsum.html5 @@ -1,24 +1,25 @@ choices as $id => $choice): ?>

.

- - - - - - - - - -cumulated[$counter] as $answervalue => $nrOfAnswers): ?> - - - - - - - - - +
answer; ?>nrOfSelections; ?>
.
+
summary; ?>
+ + + + + + + + + cumulated[$counter] as $answervalue => $nrOfAnswers): ?> + + + + + + + + +
answer; ?>nrOfSelections; ?>
.
\ No newline at end of file diff --git a/src/Resources/contao/templates/survey/survey_answers_matrix.html5 b/src/Resources/contao/templates/survey/survey_answers_matrix.html5 index 7f3b1b3..c69617d 100644 --- a/src/Resources/contao/templates/survey/survey_answers_matrix.html5 +++ b/src/Resources/contao/templates/survey/survey_answers_matrix.html5 @@ -1,36 +1,35 @@ rows as $id => $row): ?>

.

- - - - - - - - - -choices as $choiceid => $choice): ?> - - - - + + + + + + + + choices as $choiceid => $choice): ?> + + + + - - - - + if(array_key_exists($colcounter, $this->statistics['cumulated'][$counter])): + echo ($this->statistics['cumulated'][$counter][$colcounter] ?? '?'); + else: + echo '?'; + endif; + else: + echo '?'; + endif; ?> + + + + +
answer; ?>nrOfSelections; ?>
. - +
summary; ?>
+
answer; ?>nrOfSelections; ?>
.statistics['cumulated'])): - if(array_key_exists($colcounter, $this->statistics['cumulated'][$counter])): - echo ($this->statistics['cumulated'][$counter][$colcounter] ?? '?'); - else: - echo '?'; - endif; - else: - echo '?'; - endif; - ?> -
\ No newline at end of file diff --git a/src/Resources/contao/templates/survey/survey_answers_multiplechoice.html5 b/src/Resources/contao/templates/survey/survey_answers_multiplechoice.html5 index 48e8f9f..0dec341 100644 --- a/src/Resources/contao/templates/survey/survey_answers_multiplechoice.html5 +++ b/src/Resources/contao/templates/survey/survey_answers_multiplechoice.html5 @@ -1,38 +1,43 @@ - - - - - - - - - -choices ?? []) > 0): ?> - choices as $id => $choice): ?> - - - - - - - - -other): ?> - - - - - -otherchoices)): ?> -otherchoices as $key => $count): ?> - - - - - - - - - +
answer; ?>nrOfSelections; ?>
.useCategories && (isset($choice['category']) && null !== $choice['category'])):?> - [survey->getCategoryName((int) $choice['category']) ?>]statistics['cumulated'][$id] ?? 0); ?>
.othertitle; ?>(statistics['cumulated']['other']) ? count($this->statistics['cumulated']['other']) : 0); ?>)
+
summary; ?>
+ + + + + + + + + choices ?? []) > 0): ?> + choices as $id => $choice): ?> + + + + + + + + + other): ?> + + + + + + otherchoices)): ?> + otherchoices as $key => $count): ?> + + + + + + + + +
answer; ?>nrOfSelections; ?>
.useCategories && (isset($choice['category']) && + null !== $choice['category'])):?> + [survey->getCategoryName((int) $choice['category']) ?>] + statistics['cumulated'][$id] ?? 0); ?>
.othertitle; ?>(statistics['cumulated']['other']) ? + count($this->statistics['cumulated']['other']) : 0); ?>) +
diff --git a/src/Resources/contao/templates/survey/survey_question_constantsum.html5 b/src/Resources/contao/templates/survey/survey_question_constantsum.html5 index c5c830b..05be1ee 100644 --- a/src/Resources/contao/templates/survey/survey_question_constantsum.html5 +++ b/src/Resources/contao/templates/survey/survey_question_constantsum.html5 @@ -1,25 +1,59 @@ -choices as $choice): ?> - blnInputFirst): - if(is_null($this->values)): ?> - - - - values)): ?> - - - - - + choices as $choice): + ?> + + blnInputFirst): + if(is_null($this->values)): + ?> + + + + + + values)): ?> + + + + + + + + + endforeach; ?>
values[$counter])): ?>value="values[$counter]); ?>" />values[$counter])): ?>value="values[$counter]); ?>" />
+ + + + + values[$counter])): + ?>value="values[$counter]); ?>" /> + + + + + + + + + values[$counter])): + ?>value="values[$counter]); ?>" /> +
diff --git a/src/Resources/contao/templates/survey/survey_question_matrix.html5 b/src/Resources/contao/templates/survey/survey_question_matrix.html5 index 50656b3..0bd9062 100644 --- a/src/Resources/contao/templates/survey/survey_question_matrix.html5 +++ b/src/Resources/contao/templates/survey/survey_question_matrix.html5 @@ -1,86 +1,120 @@ - - -bipolar && $this->bipolarAside): ?> - - - -columns as $column): ?> - - - -bipolar && $this->bipolarAside): ?> - - -hasNeutralColumn): ?> - - - -bipolar && $this->bipolarTop): ?> - - - -columns); $i++): ?> - - - -hasNeutralColumn): ?> - - - - - - -bipolar && $this->bipolarAside): ?> - - - -columns as $column): ?> - - - -bipolar && $this->bipolarAside): ?> - - -hasNeutralColumn): ?> - - - - -rows as $row): ?> - - - -columns as $column): ?> - + bipolar && $this->bipolarAside): ?> + + + + columns as $column): ?> + + + + bipolar && $this->bipolarAside): ?> + + + hasNeutralColumn): ?> + + + + bipolar && $this->bipolarTop): ?> + + + + columns); $i++): ?> + + + + hasNeutralColumn): ?> + + + + + + + bipolar && $this->bipolarAside): ?> + + + + columns as $column): ?> + + + + bipolar && $this->bipolarAside): ?> + + + hasNeutralColumn): ?> + + + + + rows as $row): ?> + + + + columns as $column): ?> + - - -hasNeutralColumn): ?> - - - - - + + + + hasNeutralColumn): ?> + + + + +
leftadjective; ?>rightadjective; ?>
leftadjective; ?>rightadjective; ?>neutralColumn; ?>
+
+ leftadjective; ?> + rightadjective; ?>
leftadjective; ?> + rightadjective; ?> + neutralColumn; ?> +
singleResponse): - if(is_null($this->values)): ?> - values)): ?> + - values[$rowcounter] == $colcounter): ?> checked="checked" />ctrl_name; ?>[]" + id="ctrl_ctrl_id; ?>__" + class="radioctrl_class; ?>" value="" + values[$rowcounter] == $colcounter): ?> checked="checked" />values)): ?> - ctrl_name; ?>[]" + id="ctrl_ctrl_id; ?>__" + class="radioctrl_class; ?>" value=""/>values) && is_array($this->values[$rowcounter])) ? $this->values[$rowcounter] : []; ?> - checked="checked" /values) && is_array($this->values[$rowcounter])) ? + $this->values[$rowcounter] : []; ?> + + checked="checked" / - -singleResponse): ?> - values[$rowcounter] == $colcounter): ?> checked="checked" /> - -values[$rowcounter]) ? $this->values[$rowcounter] : array(); ?> - checked="checked" /> - -
+ singleResponse): ?> + + values[$rowcounter] == $colcounter): ?> checked="checked" /> + + values[$rowcounter]) ? $this->values[$rowcounter] : array(); ?> + + checked="checked" /> + +
From 18e2d895fe9e32cf335db2c413a33bbc24a64146 Mon Sep 17 00:00:00 2001 From: Christian Mette Date: Tue, 18 Apr 2023 14:15:19 +0200 Subject: [PATCH 7/7] fix = 0 to =1 --- src/Resources/contao/classes/SurveyQuestionConstantsum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/contao/classes/SurveyQuestionConstantsum.php b/src/Resources/contao/classes/SurveyQuestionConstantsum.php index 244831f..ad6dd0c 100644 --- a/src/Resources/contao/classes/SurveyQuestionConstantsum.php +++ b/src/Resources/contao/classes/SurveyQuestionConstantsum.php @@ -207,7 +207,7 @@ protected function calculateCumulated(): void if(array_key_exists($answervalue, $cumulated[$answerkey])) { ++$cumulated[$answerkey][$answervalue]; } else { - $cumulated[$answerkey][$answervalue] = 0; + $cumulated[$answerkey][$answervalue] = 1; } } else { $cumulated[$answerkey] = [];