Render advanced answerable question

kbss-cvut · Mar 22, 2021 · 73ebca6 · 73ebca6
1 parent 11dffd5
commit 73ebca6
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/components/FormManager.jsx b/src/components/FormManager.jsx
@@ -25,7 +25,7 @@ class FormManager extends React.Component {
 
     const advancedQuestionMap = q => {
 
-      if (!FormUtils.isSection(q)) {
+      if (!FormUtils.isSection(q) && !FormUtils.isAnswerable(q)) {
         return false;
       }
       let subQuestions = q[Constants.HAS_SUBQUESTION];

diff --git a/src/components/QuestionWithAdvanced.jsx b/src/components/QuestionWithAdvanced.jsx
@@ -112,6 +112,32 @@ export default class QuestionWithAdvanced extends Question {
       return null;
     }
 
+    const showAdvancedQuestion = this._getShowAdvancedQuestion(question).question;
+    const advancedQuestionLabel = JsonldUtils.getLocalized(showAdvancedQuestion[Constants.RDFS_LABEL], this.context.options.intl);
+
+    if (FormUtils.isAnswerable(question)) {
+      return (
+        <div id={question['@id']}>
+          {this.renderAnswers()}
+          <div className="ml-4 mt-n2">
+            <div>
+              <Form.Switch
+                onChange={this._toggleAdvanced}
+                id={'--switch-' + showAdvancedQuestion['@id']}
+                label={advancedQuestionLabel}
+                checked={this.state.showAdvanced}
+                inline
+              />
+
+              {this._renderShowAdvancedHelp()}
+            </div>
+
+            {this.renderSubQuestions()}
+          </div>
+        </div>
+      );
+    }
+
     const { collapsible, withoutCard } = this.props;
     const categoryClass = Question._getQuestionCategoryClass(question);
 
@@ -129,9 +155,6 @@ export default class QuestionWithAdvanced extends Question {
       collapsible ? 'cursor-pointer' : ''
     );
 
-    const showAdvancedQuestion = this._getShowAdvancedQuestion(question).question;
-    const advancedQuestionLabel = JsonldUtils.getLocalized(showAdvancedQuestion[Constants.RDFS_LABEL], this.context.options.intl);
-
     return (
       <Accordion defaultActiveKey={!this.state.expanded ? label : undefined}>
         <Card className="mb-3">