mario-education 2.4.268-release → 2.4.271-release

package/dist/components/QuestionTypes/QuestionSurveyComponent.d.ts

@@ -29,6 +29,7 @@ interface Props {
     isQuestionIntervention?: boolean;
     correctQuestionAnswer?: string[];
     isPreviewPage?: boolean;
+    answer?: any;
 }
 declare const QuestionSurveyComponent: FC<Props>;
 export default QuestionSurveyComponent;

package/dist/containers/ConductSurvey/components/QuestionConduct.d.ts

@@ -11,6 +11,7 @@ interface Props {
     isStudent?: boolean;
     isStartRecord?: boolean;
     isPreviewPage?: boolean;
+    checkIsQuestionFlag?: any;
 }
 declare const QuestionConduct: FC<Props>;
 export default QuestionConduct;

package/dist/containers/ConductSurvey/hooks/useConductSurvey.d.ts

@@ -27,5 +27,6 @@ declare const useConductSurvey: () => {
     isDone: boolean;
     currentPage: import("react").ReactText;
     updateAnswerInterventionLog: (answer: any, callback?: Function | undefined) => Promise<void>;
+    checkIsQuestionFlag: (arrData?: any) => boolean;
 };
 export default useConductSurvey;

package/dist/index.js

@@ -47410,6 +47410,42 @@ var startExternalSurvey = function startExternalSurvey(body) {
   return marioCore.api.put(EXTERNAL_SURVEY$2 + "/external-link", body);
 };
 
+var QuestionType$2;
+
+(function (QuestionType) {
+  QuestionType["Default"] = "Default";
+  QuestionType["SingleChoice"] = "SingleChoice";
+  QuestionType["MultipleChoice"] = "MultipleChoice";
+  QuestionType["TextInput"] = "TextInput";
+  QuestionType["Slider"] = "Slider";
+  QuestionType["ProgressBar"] = "ProgressBar";
+  QuestionType["StarRating"] = "StarRating";
+  QuestionType["TextInputWithSuggestions"] = "TextInputWithSuggestions";
+  QuestionType["Emotional"] = "Emotional";
+  QuestionType["Summarize"] = "Summarize";
+  QuestionType["Rating"] = "Rating";
+  QuestionType["LearningStrategy"] = "LearningStrategy";
+  QuestionType["DropDown"] = "DropDown";
+})(QuestionType$2 || (QuestionType$2 = {}));
+
+var TypeTime;
+
+(function (TypeTime) {
+  TypeTime[TypeTime["Default"] = 0] = "Default";
+  TypeTime[TypeTime["StartTime"] = 1] = "StartTime";
+  TypeTime[TypeTime["StopTime"] = 2] = "StopTime";
+})(TypeTime || (TypeTime = {}));
+
+var RoleStartSessionEnum;
+
+(function (RoleStartSessionEnum) {
+  RoleStartSessionEnum[RoleStartSessionEnum["Assistant"] = 0] = "Assistant";
+  RoleStartSessionEnum[RoleStartSessionEnum["Teacher"] = 1] = "Teacher";
+  RoleStartSessionEnum[RoleStartSessionEnum["Student"] = 2] = "Student";
+  RoleStartSessionEnum[RoleStartSessionEnum["Counselor"] = 3] = "Counselor";
+  RoleStartSessionEnum[RoleStartSessionEnum["SecondaryTeacher"] = 4] = "SecondaryTeacher";
+})(RoleStartSessionEnum || (RoleStartSessionEnum = {}));
+
 var LegalGenderType$2;
 
 (function (LegalGenderType) {
@@ -47449,6 +47485,90 @@ var getAnswerType = function getAnswerType(text, isAlert) {
   if (val <= 100 && !isAlert) return ANSWER_TYPES.ALL_THE_TIME;
   return null;
 };
+var getAnswerTypeV2 = function getAnswerTypeV2(answer) {
+  var _answer$answer;
+
+  switch (answer === null || answer === void 0 ? void 0 : answer.type) {
+    case QuestionType$2.Emotional:
+      var findItem = ((answer === null || answer === void 0 ? void 0 : answer.emotionalQuestionAnswers) || []).find(function (e) {
+        return e.text === answer.answer;
+      });
+
+      if (findItem) {
+        switch (findItem.flag) {
+          case "RedFlag":
+            return ANSWER_TYPES.NEVER;
+
+          case "YellowFlag":
+            return ANSWER_TYPES.SOMETIMES;
+
+          case "GreenFlag":
+            return null;
+
+          default:
+            return null;
+        }
+      }
+
+      break;
+
+    case QuestionType$2.MultipleChoice:
+      var answered = (answer === null || answer === void 0 ? void 0 : (_answer$answer = answer.answer) === null || _answer$answer === void 0 ? void 0 : _answer$answer.split(";")) || [];
+      var dataAnswer = (answer === null || answer === void 0 ? void 0 : answer.dataAnswer) || [];
+
+      if (answered.length <= 0 && dataAnswer.length <= 0) {
+        return;
+      }
+
+      var filtered = dataAnswer.filter(function (data) {
+        return answered.includes(data.text);
+      }).map(function (e) {
+        return e === null || e === void 0 ? void 0 : e.flag;
+      });
+
+      if (filtered.includes("RedFlag")) {
+        return ANSWER_TYPES.NEVER;
+      } else if (filtered.includes("YellowFlag")) {
+        return ANSWER_TYPES.SOMETIMES;
+      } else if (filtered.includes("GreenFlag")) {
+        return null;
+      } else {
+        return null;
+      }
+
+    case QuestionType$2.SingleChoice:
+    case QuestionType$2.DropDown:
+      var dataAnswerSingleChoice = (answer === null || answer === void 0 ? void 0 : answer.dataAnswer) || [];
+
+      if (dataAnswerSingleChoice.length <= 0) {
+        return;
+      }
+
+      var findItemChoice = dataAnswerSingleChoice.find(function (data) {
+        return data.text === (answer === null || answer === void 0 ? void 0 : answer.answer);
+      });
+
+      if (findItemChoice) {
+        switch (findItemChoice.flag) {
+          case "RedFlag":
+            return ANSWER_TYPES.NEVER;
+
+          case "YellowFlag":
+            return ANSWER_TYPES.SOMETIMES;
+
+          case "GreenFlag":
+            return null;
+
+          default:
+            return null;
+        }
+      }
+
+      break;
+  }
+
+  return null;
+};
 
 var useSurveyDetail = function useSurveyDetail() {
   var dispatch = reactRedux.useDispatch();
@@ -50210,13 +50330,13 @@ var NOTIFICATION_HEIGHT = 36;
 var LOGO = "" + marioCore.getStaticFileUrl("/images/logo-white.svg");
 
 var _templateObject$1;
-var TypeTime;
+var TypeTime$1;
 
 (function (TypeTime) {
   TypeTime[TypeTime["Default"] = 0] = "Default";
   TypeTime[TypeTime["StartTime"] = 1] = "StartTime";
   TypeTime[TypeTime["StopTime"] = 2] = "StopTime";
-})(TypeTime || (TypeTime = {}));
+})(TypeTime$1 || (TypeTime$1 = {}));
 
 var Header = styled.div(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteralLoose(["\n    position: fixed;\n    top: ", "px;\n    width: 100%;\n    display: flex;\n    height: 76px;\n    justify-content: space-between;\n    align-items: center;\n    padding: 20px 16px;\n    border-bottom: 1px solid #a3a2a2;\n    background: #fff;\n    z-index: 99;\n    width: ", "px;\n    transition: width 200ms;\n    @media (max-width: 600px) {\n        width: 100%;\n        top: ", "px;\n    }\n"])), function (props) {
   return HEADER_DESKTOP_HEIGHT + (props.isOpenNotificationAlert ? NOTIFICATION_HEIGHT : 0);
@@ -50553,42 +50673,6 @@ var SliderSurveyComponent = function SliderSurveyComponent(_ref) {
   }));
 };
 
-var QuestionType$2;
-
-(function (QuestionType) {
-  QuestionType["Default"] = "Default";
-  QuestionType["SingleChoice"] = "SingleChoice";
-  QuestionType["MultipleChoice"] = "MultipleChoice";
-  QuestionType["TextInput"] = "TextInput";
-  QuestionType["Slider"] = "Slider";
-  QuestionType["ProgressBar"] = "ProgressBar";
-  QuestionType["StarRating"] = "StarRating";
-  QuestionType["TextInputWithSuggestions"] = "TextInputWithSuggestions";
-  QuestionType["Emotional"] = "Emotional";
-  QuestionType["Summarize"] = "Summarize";
-  QuestionType["Rating"] = "Rating";
-  QuestionType["LearningStrategy"] = "LearningStrategy";
-  QuestionType["DropDown"] = "DropDown";
-})(QuestionType$2 || (QuestionType$2 = {}));
-
-var TypeTime$1;
-
-(function (TypeTime) {
-  TypeTime[TypeTime["Default"] = 0] = "Default";
-  TypeTime[TypeTime["StartTime"] = 1] = "StartTime";
-  TypeTime[TypeTime["StopTime"] = 2] = "StopTime";
-})(TypeTime$1 || (TypeTime$1 = {}));
-
-var RoleStartSessionEnum;
-
-(function (RoleStartSessionEnum) {
-  RoleStartSessionEnum[RoleStartSessionEnum["Assistant"] = 0] = "Assistant";
-  RoleStartSessionEnum[RoleStartSessionEnum["Teacher"] = 1] = "Teacher";
-  RoleStartSessionEnum[RoleStartSessionEnum["Student"] = 2] = "Student";
-  RoleStartSessionEnum[RoleStartSessionEnum["Counselor"] = 3] = "Counselor";
-  RoleStartSessionEnum[RoleStartSessionEnum["SecondaryTeacher"] = 4] = "SecondaryTeacher";
-})(RoleStartSessionEnum || (RoleStartSessionEnum = {}));
-
 var useStyles$2 = core$1.makeStyles(function (theme) {
   var _container, _title, _activeImg, _node, _pNthChild, _active, _answers;
 
@@ -51047,7 +51131,8 @@ var QuestionSurveyComponent = function QuestionSurveyComponent(_ref) {
       isStartRecord = _ref.isStartRecord,
       isQuestionIntervention = _ref.isQuestionIntervention,
       correctQuestionAnswer = _ref.correctQuestionAnswer,
-      isPreviewPage = _ref.isPreviewPage;
+      isPreviewPage = _ref.isPreviewPage,
+      answer = _ref.answer;
   var defaultFontSmall = 12;
   var defaultFontLarge = 20;
   var defaultFont = reactRedux.useSelector(function (state) {
@@ -51165,15 +51250,20 @@ var QuestionSurveyComponent = function QuestionSurveyComponent(_ref) {
   };
 
   var checkHasIntervention = function checkHasIntervention(_key) {
-    if (questionTypeId !== QuestionType$2.Slider && questionTypeId !== QuestionType$2.Rating && questionTypeId !== QuestionType$2.SingleChoice) return false;
+    if (questionTypeId !== QuestionType$2.Slider && questionTypeId !== QuestionType$2.Rating && questionTypeId !== QuestionType$2.SingleChoice && questionTypeId !== QuestionType$2.MultipleChoice && questionTypeId !== QuestionType$2.Emotional && questionTypeId !== QuestionType$2.DropDown) return false;
     return isQuestionIntervention;
   };
 
   var getAnswerValueType = function getAnswerValueType() {
-    var _getAnswerType;
+    if (questionTypeId !== QuestionType$2.Slider && questionTypeId !== QuestionType$2.Rating && questionTypeId !== QuestionType$2.SingleChoice && questionTypeId !== QuestionType$2.MultipleChoice && questionTypeId !== QuestionType$2.Emotional && questionTypeId !== QuestionType$2.DropDown) return null;
 
-    if (questionTypeId !== QuestionType$2.Slider && questionTypeId !== QuestionType$2.Rating && questionTypeId !== QuestionType$2.SingleChoice) return null;
-    return (_getAnswerType = getAnswerType(valueText, true)) === null || _getAnswerType === void 0 ? void 0 : _getAnswerType.replaceAll(" ", "-");
+    if (questionTypeId === QuestionType$2.Slider || questionTypeId === QuestionType$2.Rating) {
+      var _getAnswerType;
+
+      return (_getAnswerType = getAnswerType(valueText, true)) === null || _getAnswerType === void 0 ? void 0 : _getAnswerType.replaceAll(" ", "-");
+    } else {
+      return getAnswerTypeV2(answer);
+    }
   };
 
   var answerType = React.useMemo(function () {
@@ -51247,13 +51337,14 @@ var QuestionConduct = function QuestionConduct(_ref) {
       onOpenIntervention = _ref.onOpenIntervention,
       isStudent = _ref.isStudent,
       isStartRecord = _ref.isStartRecord,
-      isPreviewPage = _ref.isPreviewPage;
+      isPreviewPage = _ref.isPreviewPage,
+      checkIsQuestionFlag = _ref.checkIsQuestionFlag;
   return React__default.createElement("div", {
     className: styles$7["box-question"]
   }, !!questionName && React__default.createElement("h2", {
     className: styles$7["font-title"]
   }, questionName), !!questionList && questionList.length > 0 && questionList.map(function (item) {
-    var _item$text, _item$text$toLowerCas, _item$isQuestionInter;
+    var _item$text, _item$text$toLowerCas;
 
     return React__default.createElement(React__default.Fragment, {
       key: item.id
@@ -51281,9 +51372,10 @@ var QuestionConduct = function QuestionConduct(_ref) {
       onOpenIntervention: onOpenIntervention,
       isStudent: isStudent,
       isStartRecord: isStartRecord,
-      isQuestionIntervention: (_item$isQuestionInter = item === null || item === void 0 ? void 0 : item.isQuestionIntervention) != null ? _item$isQuestionInter : false,
+      isQuestionIntervention: (item === null || item === void 0 ? void 0 : item.isQuestionIntervention) || (item !== null && item !== void 0 && item.dataAnswer || item !== null && item !== void 0 && item.emotionalQuestionAnswers ? checkIsQuestionFlag(item.type === QuestionType$2.Emotional ? item === null || item === void 0 ? void 0 : item.emotionalQuestionAnswers : item === null || item === void 0 ? void 0 : item.dataAnswer) : false),
       correctQuestionAnswer: item === null || item === void 0 ? void 0 : item.correctQuestionAnswer,
-      isPreviewPage: isPreviewPage
+      isPreviewPage: isPreviewPage,
+      answer: item
     }));
   }));
 };
@@ -59102,6 +59194,25 @@ var useConductSurvey = function useConductSurvey() {
       pusher && pusher.unsubscribe("SURVEY_PLAYER_" + surveyId + "_" + studentId);
     };
   }, []);
+
+  var checkIsQuestionFlag = function checkIsQuestionFlag(arrData) {
+    if (arrData === void 0) {
+      arrData = [];
+    }
+
+    if (arrData && arrData.length) {
+      for (var _iterator = _createForOfIteratorHelperLoose(arrData), _step; !(_step = _iterator()).done;) {
+        var item = _step.value;
+
+        if (item.hasOwnProperty('flag')) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
   return {
     currentUser: currentUser,
     isTeacher: isTeacher,
@@ -59129,7 +59240,8 @@ var useConductSurvey = function useConductSurvey() {
     isSchedule: isSchedule,
     isDone: isDone,
     currentPage: currentPage,
-    updateAnswerInterventionLog: updateAnswerInterventionLog
+    updateAnswerInterventionLog: updateAnswerInterventionLog,
+    checkIsQuestionFlag: checkIsQuestionFlag
   };
 };
 
@@ -77140,7 +77252,8 @@ var SurveyResultAdmin = function SurveyResultAdmin() {
       isSchedule = _useConductSurvey.isSchedule,
       isDone = _useConductSurvey.isDone,
       currentPage = _useConductSurvey.currentPage,
-      updateAnswerInterventionLog = _useConductSurvey.updateAnswerInterventionLog;
+      updateAnswerInterventionLog = _useConductSurvey.updateAnswerInterventionLog,
+      checkIsQuestionFlag = _useConductSurvey.checkIsQuestionFlag;
 
   var _useState = React.useState(undefined),
       question = _useState[0],
@@ -77288,7 +77401,8 @@ var SurveyResultAdmin = function SurveyResultAdmin() {
       isPageSessionResult: false,
       isPageResult: true,
       onOpenIntervention: handleOpenIntervention,
-      isStudent: isStudent
+      isStudent: isStudent,
+      checkIsQuestionFlag: checkIsQuestionFlag
     }))));
   }), React__default.createElement("div", {
     className: styles$7["talk-conduct"]
@@ -77301,7 +77415,8 @@ var SurveyResultAdmin = function SurveyResultAdmin() {
     questionList: listAdditionalQuestionAnswer,
     isPageSessionResult: false,
     onOpenIntervention: handleOpenIntervention,
-    isPageResult: true
+    isPageResult: true,
+    checkIsQuestionFlag: checkIsQuestionFlag
   }))))), React__default.createElement(ScrollToTopBtn, null));
 };