touchstudy-core 0.1.151 → 0.1.152

package/dist/containers/ExamResult/components/MyAnswer/Textbook.d.ts

@@ -1,10 +1,8 @@
 import { FC } from "react";
-import { CategoryResponse } from "../../../../utils/types/examResults";
 import { TextbookResult } from "../../configs/types";
 interface Props {
     data: TextbookResult;
     questionIdContextMenu?: number;
-    categories: CategoryResponse[];
     itemProps?: any;
     isStudent: boolean;
 }

package/dist/containers/ExamResult/components/MyAnswer/configs/interfaces.d.ts

@@ -14,7 +14,7 @@ export interface TextbookAnswerItemProps extends TextbookAnswerItemBaseProps {
     nextData?: StudentQuestionResult;
     isLast?: boolean;
     isFirst?: boolean;
-    categoryId: number;
+    questionGroupId: number;
 }
 export interface TextbookAnswerItemBaseProps {
     menuContextActions?: Action<StudentQuestionResult>[];

package/dist/containers/ExamResult/configs/types.d.ts

@@ -55,6 +55,7 @@ export declare type TextbookResult = {
 };
 export declare type StudentQuestionResult = {
     id: number;
+    questionGroupId: number;
     selectedAnswers?: number[] | string;
     correctAnswers?: number[] | string;
     textualAnswers?: string[];

package/dist/index.js

@@ -6516,26 +6516,23 @@ var formatDataMyAnswer = function formatDataMyAnswer(inputData, categories) {
   });
   return questionsByCategory;
 };
-var formatTextbookDataMyAnswer = function formatTextbookDataMyAnswer(inputData, categories) {
-  var uniqueCategories = new Set();
-  var filterCategories = categories.filter(function (category) {
-    if (!uniqueCategories.has(category.name)) {
-      uniqueCategories.add(category.name);
-      return true;
-    }
-    return false;
-  });
-  var questionsByCategory = filterCategories.map(function (category) {
+var formatTextbookDataMyAnswer = function formatTextbookDataMyAnswer(inputData, questionGroupIds) {
+  var questionsByCategories = questionGroupIds.map(function (questionGroupId) {
+    var _questions$, _questions$$categorie, _questions$2, _questions$2$categori;
+    var questions = inputData.studentQuestionResults.filter(function (question) {
+      return question.questionGroupId === questionGroupId;
+    });
+    var category = questions === null || questions === void 0 ? void 0 : (_questions$ = questions[0]) === null || _questions$ === void 0 ? void 0 : (_questions$$categorie = _questions$.categories) === null || _questions$$categorie === void 0 ? void 0 : _questions$$categorie[0];
+    var subcategory = !category ? null : questions === null || questions === void 0 ? void 0 : (_questions$2 = questions[0]) === null || _questions$2 === void 0 ? void 0 : (_questions$2$categori = _questions$2.categories) === null || _questions$2$categori === void 0 ? void 0 : _questions$2$categori.find(function (c) {
+      return !!c.parentCategoryId && c.parentCategoryId === (category === null || category === void 0 ? void 0 : category.id);
+    });
     return {
-      category: category,
-      questions: inputData.studentQuestionResults.filter(function (question) {
-        return !!question.categories.find(function (i) {
-          return i.name === category.name;
-        });
-      })
+      categories: category && subcategory ? [category, subcategory] : category ? [category] : [],
+      questions: questions,
+      questionGroupId: questionGroupId
     };
   });
-  return questionsByCategory;
+  return questionsByCategories;
 };
 var totalSolveTimeCategories = function totalSolveTimeCategories(inputData, categories) {
   var uniqueCategories = new Set();
@@ -18498,7 +18495,7 @@ var TextbookAnswerItem = function TextbookAnswerItem(_ref) {
     nextData = _ref.nextData,
     isFirst = _ref.isFirst,
     isLast = _ref.isLast,
-    categoryId = _ref.categoryId,
+    questionGroupId = _ref.questionGroupId,
     _ref$menuContextActio = _ref.menuContextActions,
     menuContextActions = _ref$menuContextActio === void 0 ? [] : _ref$menuContextActio,
     openContextMenu = _ref.openContextMenu,
@@ -18510,14 +18507,14 @@ var TextbookAnswerItem = function TextbookAnswerItem(_ref) {
   var isLearningSpace = getLearningSpace();
   var handleCloseContextMenu = function handleCloseContextMenu() {
     onCloseContextMenu === null || onCloseContextMenu === void 0 ? void 0 : onCloseContextMenu(_extends({}, data, {
-      id: ((data === null || data === void 0 ? void 0 : data.id) || 0) + categoryId
+      id: ((data === null || data === void 0 ? void 0 : data.id) || 0) + questionGroupId
     }));
   };
   var handleMoreClick = function handleMoreClick(e) {
     e.preventDefault();
     e.stopPropagation();
     onOpenContextMenu === null || onOpenContextMenu === void 0 ? void 0 : onOpenContextMenu(_extends({}, data, {
-      id: ((data === null || data === void 0 ? void 0 : data.id) || 0) + categoryId
+      id: ((data === null || data === void 0 ? void 0 : data.id) || 0) + questionGroupId
     }));
   };
   return React__default.createElement("div", {
@@ -18644,24 +18641,28 @@ var TextbookAnswerItem = function TextbookAnswerItem(_ref) {
 
 var TextbookMyAnswer = function TextbookMyAnswer(_ref) {
   var data = _ref.data,
-    categories = _ref.categories,
     itemProps = _ref.itemProps,
     questionIdContextMenu = _ref.questionIdContextMenu,
     isStudent = _ref.isStudent;
-  var formattedData = formatTextbookDataMyAnswer(data, categories);
+  var questionGroupIds = Array.from(new Set(data.studentQuestionResults.map(function (i) {
+    return i.questionGroupId;
+  }))).sort(function (a, b) {
+    return a - b;
+  });
+  var formattedData = formatTextbookDataMyAnswer(data, questionGroupIds);
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var renderAnswer = function renderAnswer(item, index, questions, categoryId) {
+  var renderAnswer = function renderAnswer(item, index, questions, questionGroupId) {
     var nextItem = index < questions.length - 1 ? questions[index + 1] : undefined;
     var isLast = index === questions.length - 1;
     var isFirst = index === 0;
-    var isSelected = (item === null || item === void 0 ? void 0 : item.id) + categoryId === questionIdContextMenu;
+    var isSelected = (item === null || item === void 0 ? void 0 : item.id) + questionGroupId === questionIdContextMenu;
     return React__default.createElement(TextbookAnswerItem, Object.assign({
       key: index
     }, itemProps, {
       openContextMenu: isSelected,
       data: item,
-      categoryId: categoryId,
+      questionGroupId: questionGroupId,
       nextData: nextItem,
       isLast: isLast,
       isFirst: isFirst,
@@ -18671,8 +18672,9 @@ var TextbookMyAnswer = function TextbookMyAnswer(_ref) {
   return React__default.createElement("div", {
     className: "" + styles$4["myanswer"]
   }, formattedData && formattedData.length > 0 && formattedData.map(function (item) {
+    var _item$categories;
     return React__default.createElement("div", {
-      key: item.category.id
+      key: item.questionGroupId
     }, React__default.createElement("div", {
       className: "" + printStyles["avoid-break-inside"]
     }, React__default.createElement(material.Stack, {
@@ -18770,12 +18772,14 @@ var TextbookMyAnswer = function TextbookMyAnswer(_ref) {
         fontSize: "12px",
         fontWeight: 700
       }
-    }, item.category.name))), React__default.createElement("div", {
+    }, (_item$categories = item.categories) === null || _item$categories === void 0 ? void 0 : _item$categories.map(function (i) {
+      return i.name;
+    }).join(" / ")))), React__default.createElement("div", {
       className: styles$4["contentMyAnswer"]
     }, React__default.createElement(ListView, {
       data: item.questions,
       render: function render(question, index) {
-        return renderAnswer(question, index, item.questions, item.category.id);
+        return renderAnswer(question, index, item.questions, item.questionGroupId);
       }
     })));
   }));
@@ -20887,7 +20891,6 @@ var ExamResultV2 = function ExamResultV2(props) {
     index: 0
   }, chapterId ? textbookResult && React__default.createElement(TextbookMyAnswer, {
     data: textbookResult,
-    categories: categoryResponses,
     isStudent: isStudent,
     questionIdContextMenu: questionIdContextMenu,
     itemProps: questionItemProp