From 1a725964085269bd577ad231da0b45946998337f Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 3 Mar 2022 18:03:36 +0200
Subject: [PATCH] fix-schema

---
 editors/demo/src/HHMI/HHMI.js                                 | 4 ++--
 .../src/EssayService/schema/essayContainerNode.js             | 2 +-
 .../schema/fillTheGapContainerNode.js                         | 4 +---
 .../src/FillTheGapQuestionService/schema/fillTheGapNode.js    | 2 ++
 .../schema/multipleChoiceSingleCorrectContainerNode.js        | 2 +-
 .../TrueFalseQuestionService/schema/trueFalseContainerNode.js | 2 +-
 .../schema/trueFalseSingleCorrectContainerNode.js             | 2 +-
 .../schema/multipleChoiceContainerNode.js                     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 09c338aa8..08eff7d30 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -40,7 +40,7 @@ const t = `<p class="paragraph"></p>
       <p class="paragraph">answer 2</p>
    </div>
 </div>
-<div id="" class="fill-the-gap"><p class="paragraph">some text with a <span id="e88faa82-ff79-4b5a-9aa5-cb10b4236e98" class="fill-the-gap">gap</span> and </p></div>
+<p class="paragraph"></p><div id="d4fa43fc-3a92-4591-a8a4-e6271e42fc02" class="fill-the-gap" feedback=""><p class="paragraph">sdsd</p></div>
 `;
 
 const Hhmi = () => {
@@ -67,7 +67,7 @@ const Hhmi = () => {
         fileUpload={file => renderImage(file)}
         value={t}
         readonly={readOnly}
-        layout={HhmiLayout}
+        // layout={HhmiLayout}
         onChange={source => console.log(source)}
       />
     </>
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
index 72f12448c..0afacd6dd 100644
--- a/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
+++ b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
@@ -13,7 +13,7 @@ const essayContainerNode = {
       tag: 'div.essay',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
index 11b09b05f..ff020897e 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
@@ -2,7 +2,6 @@ const fillTheGapContainerNode = {
   attrs: {
     id: { default: '' },
     class: { default: 'fill-the-gap' },
-    answer: { default: false },
     feedback: { default: '' },
   },
   group: 'block questions',
@@ -16,9 +15,8 @@ const fillTheGapContainerNode = {
       tag: 'div.fill-the-gap',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
-          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
         };
       },
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
index d8b64096c..c437d1b3b 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
@@ -2,6 +2,7 @@ const fillTheGapNode = {
   attrs: {
     id: { default: '' },
     class: { default: 'fill-the-gap' },
+    anser: { default: '' },
   },
   group: 'inline',
   content: 'text*',
@@ -15,6 +16,7 @@ const fillTheGapNode = {
         return {
           id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
+          answer: dom.getAttribute('answer'),
         };
       },
     },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
index e599b8c6d..832cb0404 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
@@ -14,7 +14,7 @@ const multipleChoiceSingleCorrectContainerNode = {
       tag: 'div.multiple-choice-single-correct',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
           correctId: dom.getAttribute('correctId'),
         };
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
index e8ef98456..1964b6413 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
@@ -13,7 +13,7 @@ const trueFalseContainerNode = {
       tag: 'div.true-false',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js
index c4dbe99b0..b3be9922b 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js
@@ -13,7 +13,7 @@ const trueFalseSingleCorrectContainerNode = {
       tag: 'div.true-false-single-correct',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index ffe3c9801..8e556bf26 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -11,7 +11,7 @@ const multipleChoiceContainerNode = {
       tag: 'div.multiple-choice',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
-- 
GitLab