mario-teacher-student-client 2.2.15-beta → 2.2.16-beta

package/dist/containers/Surveys/hook/useAdditionalQuestion.d.ts

@@ -19,6 +19,6 @@ declare const useAdditionalQuestion: ({ setAdditionalQuestionForm, dataFormCreat
     handleChangeAdditionalType: (type: string) => void;
     handleCheckFormConfirm: (question: QUESTION_ADDITIONAL) => boolean;
     handleAddAnswerQuestion: () => void;
-    handleRemoveAnswer: (answer: IAnswer) => void;
+    handleRemoveAnswer: (answer: IAnswer, additionalQuestion: QUESTION_ADDITIONAL) => void;
 };
 export default useAdditionalQuestion;

package/dist/containers/Surveys/hook/useCreateSurvey.d.ts

@@ -68,7 +68,7 @@ declare const useListSurveyDetail: () => {
     handleChangeAdditionalType: (type: string) => void;
     handleCheckFormConfirm: (question: QUESTION_ADDITIONAL) => boolean;
     handleAddAnswerQuestion: () => void;
-    handleRemoveAnswer: (answer: import("../constants/questionModelType").IAnswer) => void;
+    handleRemoveAnswer: (answer: import("../constants/questionModelType").IAnswer, additionalQuestion: QUESTION_ADDITIONAL) => void;
     filterFavorite: import("../constants/types").FILTER_SURVEY;
     handleSortTableFavorite: (e: string) => void;
     handleChangeRowsPerPageFavorite: (event: import("react").ChangeEvent<HTMLInputElement>) => void;

package/dist/index.js

@@ -13505,6 +13505,8 @@ var IBLearnerComponent = function IBLearnerComponent(_ref) {
 var SurveyIndex = function SurveyIndex() {
   var _questionSummarize$an;
 
+  document.title = "Start Survey";
+
   var _useConductSurvey = useConductSurvey(),
       isTeacher = _useConductSurvey.isTeacher,
       listQuestionStudents = _useConductSurvey.listQuestionStudents,
@@ -13764,6 +13766,8 @@ var SurveyIndex = function SurveyIndex() {
 var SurveyResult = function SurveyResult() {
   var _questionSummarize$an;
 
+  document.title = "Result Survey";
+
   var _useConductSurvey = useConductSurvey(),
       isTeacher = _useConductSurvey.isTeacher,
       listQuestionStudents = _useConductSurvey.listQuestionStudents,
@@ -14036,7 +14040,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
       return "font-small";
     }
 
-    return '';
+    return "";
   }, [defaultFont]);
 
   var handleChangeDeadline = function handleChangeDeadline(date) {
@@ -14145,7 +14149,9 @@ var usePreviewSurvey = function usePreviewSurvey() {
           })
         });
       });
-      setListQuestionTemplate(templateQuestions);
+      setListQuestionTemplate(templateQuestions.sort(function (a, b) {
+        return a.id > b.id ? 1 : -1;
+      }));
       var additionalQuestion = (_dataLocalStorage$add = dataLocalStorage.additionalQuestions) === null || _dataLocalStorage$add === void 0 ? void 0 : _dataLocalStorage$add.map(function (item) {
         var _item$answers;
 
@@ -14360,6 +14366,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
     }
 
     getDataQuestionSummarize();
+    document.title = "Preview Survey";
   }, [surveyId]);
   React.useEffect(function () {
     if (!!openDialogShareSurvey && isTeacher) {
@@ -14626,7 +14633,7 @@ var PreviewSurvey = function PreviewSurvey() {
     color: "#153E75",
     backgroundColor: "#CEEDFF",
     label: "Deadline " + moment(surveyDetail === null || surveyDetail === void 0 ? void 0 : surveyDetail.deadline).format("Do MMMM YYYY - hh:mm A")
-  }))))), React__default.createElement("div", {
+  }))))), !!(questionSummarize !== null && questionSummarize !== void 0 && questionSummarize.text) && React__default.createElement("div", {
     className: styles$8["talk-conduct"]
   }, React__default.createElement("div", {
     className: styles$8["font-question"],
@@ -65749,6 +65756,7 @@ var useSurveyDetail = function useSurveyDetail() {
   React.useEffect(function () {
     !!id && getStudentSurveyCount();
   }, [activeTab]);
+  document.title = "Student Survey";
   return {
     detailSurvey: detailSurvey,
     handleChange: handleChange,
@@ -65900,12 +65908,6 @@ var useExternalSurvey = function useExternalSurvey(_ref) {
     var emailIndex = senderList.findIndex(function (r) {
       return r === email;
     });
-    console.log({
-      emailIndex: emailIndex
-    });
-    console.log({
-      email: email
-    });
 
     if (emailIndex !== -1) {
       listEmail.splice(emailIndex, 1);
@@ -66164,9 +66166,6 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
   var handleChangeModelQuestion = React.useCallback(function (template) {
     var _dataFormCreateSurvey6;
 
-    console.log({
-      dataFormCreateSurvey: dataFormCreateSurvey
-    });
     setContentModelQuestion({
       open: true,
       template: template,
@@ -66448,11 +66447,32 @@ var useAdditionalQuestion = function useAdditionalQuestion(_ref) {
       additionalQuestionForm = _ref.additionalQuestionForm,
       openModelAdditional = _ref.openModelAdditional,
       setOpenModelAdditional = _ref.setOpenModelAdditional;
+
+  var additionalDataFormByType = function additionalDataFormByType(additionalQuestionForm) {
+    var question = _extends({}, initialAdditionalQuestion, {
+      type: additionalQuestionForm.type,
+      questionText: additionalQuestionForm.questionText,
+      id: charactersRandom.charAt(Math.floor(Math.random() * 5)),
+      answers: []
+    });
+
+    switch (additionalQuestionForm.type) {
+      case QuestionType$3.Rating:
+        question.fromLabel = additionalQuestionForm.fromLabel;
+        question.toLabel = additionalQuestionForm.toLabel;
+        break;
+
+      case QuestionType$3.SingleChoice:
+        question.answers = additionalQuestionForm.answers;
+        break;
+    }
+
+    return question;
+  };
+
   var handleAddAdditionalQuestion = React.useCallback(function () {
     var additionalQuestions = dataFormCreateSurvey.additionalQuestions;
-    additionalQuestions.push(_extends({}, additionalQuestionForm, {
-      id: charactersRandom.charAt(Math.floor(Math.random() * 5))
-    }));
+    additionalQuestions.push(additionalDataFormByType(additionalQuestionForm));
     setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
       additionalQuestions: [].concat(additionalQuestions)
     }));
@@ -66488,7 +66508,7 @@ var useAdditionalQuestion = function useAdditionalQuestion(_ref) {
     var question = additionalQuestions.find(function (r) {
       return r.id === id;
     });
-    setAdditionalQuestionForm(question);
+    setAdditionalQuestionForm(_extends({}, question));
     handleToggleModelAdditional();
   };
 
@@ -66497,7 +66517,7 @@ var useAdditionalQuestion = function useAdditionalQuestion(_ref) {
     var questionIndex = additionalQuestions.findIndex(function (r) {
       return r.id == questions.id;
     });
-    additionalQuestions[questionIndex] = questions;
+    additionalQuestions[questionIndex] = additionalDataFormByType(questions);
     setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
       additionalQuestions: [].concat(additionalQuestions)
     }));
@@ -66505,27 +66525,31 @@ var useAdditionalQuestion = function useAdditionalQuestion(_ref) {
   };
 
   var handleToggleModelAdditional = function handleToggleModelAdditional() {
-    !!openModelAdditional && setAdditionalQuestionForm(initialAdditionalQuestion);
+    if (!!openModelAdditional) {
+      setAdditionalQuestionForm(_extends({}, initialAdditionalQuestion, {
+        answers: []
+      }));
+    }
+
     setOpenModelAdditional(!openModelAdditional);
   };
 
   var handleAddAnswerQuestion = React.useCallback(function () {
-    var answers = additionalQuestionForm.answers || [];
-    answers.push({
+    var _additionalQuestionFo;
+
+    var answers = (_additionalQuestionFo = additionalQuestionForm.answers) === null || _additionalQuestionFo === void 0 ? void 0 : _additionalQuestionFo.concat([{
       text: additionalQuestionForm.textAnswer.trim()
-    });
+    }]);
     setAdditionalQuestionForm(_extends({}, additionalQuestionForm, {
       answers: answers,
       textAnswer: ""
     }));
   }, [additionalQuestionForm]);
-  var handleRemoveAnswer = React.useCallback(function (answer) {
-    var answers = additionalQuestionForm.answers;
-    var answerIndex = answers.findIndex(function (r) {
-      return r === answer;
+  var handleRemoveAnswer = React.useCallback(function (answer, additionalQuestion) {
+    var answers = additionalQuestion.answers.filter(function (r) {
+      return r !== answer;
     });
-    answerIndex !== -1 && answers.splice(answerIndex, 1);
-    setAdditionalQuestionForm(_extends({}, additionalQuestionForm, {
+    setAdditionalQuestionForm(_extends({}, additionalQuestion, {
       answers: answers
     }));
   }, [additionalQuestionForm]);
@@ -66818,6 +66842,7 @@ var useListSurveyDetail$1 = function useListSurveyDetail() {
   }, [filters]);
   React.useEffect(function () {
     getAllTemplateSurvey();
+    document.title = "Create Survey";
   }, []);
   return {
     filters: filters,
@@ -67162,6 +67187,7 @@ var ModelSelectSurveyTemplate = function ModelSelectSurveyTemplate(_ref) {
       className: "" + styles$N["title-content-select"]
     }, r.name), handleCheckTypeQuestion(r).map(function (i) {
       return React__default.createElement(core.Typography, {
+        key: i,
         className: "" + styles$N["description-content-select"]
       }, i + " \u2022 " + handleCheckCountQuestionByType(r, i) + " questions \u2022 " + r.name);
     })));
@@ -67367,13 +67393,14 @@ var AdditionalQuestionModel = function AdditionalQuestionModel(_ref) {
         className: styles$N["icon-btn"]
       }))
     }
-  }), additionalQuestionForm.answers.map(function (r) {
+  }), additionalQuestionForm.answers.map(function (r, index) {
     return React__default.createElement(core.Grid, {
+      key: index,
       className: styles$N["flex-between"] + " " + styles$N["item-answer"]
     }, React__default.createElement(core.Typography, null, r.text), React__default.createElement(CancelIcon, {
       className: styles$N["pointer"] + " " + styles$N["sup-require"],
       onClick: function onClick() {
-        return onRemoveAnswer(r);
+        return onRemoveAnswer(r, additionalQuestionForm);
       }
     }));
   }))), React__default.createElement(core.DialogActions, {
@@ -67577,9 +67604,9 @@ var CreateSurveyComponent = function CreateSurveyComponent(_ref) {
     onCheckFormConfirm: handleCheckFormConfirm,
     onAddAnswerQuestion: handleAddAnswerQuestion,
     onRemoveAnswer: handleRemoveAnswer
-  }), dataFormCreateSurvey.additionalQuestions.map(function (r) {
+  }), dataFormCreateSurvey.additionalQuestions.map(function (r, index) {
     return React__default.createElement(core.Grid, {
-      key: r.id,
+      key: index,
       className: "" + styles$N["additional-box"]
     }, React__default.createElement(core.Grid, {
       className: "" + styles$N["header-item"]
@@ -67729,7 +67756,17 @@ var ReviewSurveyDetail = function ReviewSurveyDetail(_ref) {
     handleEdit: function handleEdit() {
       return handleNextStep(1);
     }
-  })), React__default.createElement(core.Grid, {
+  }), React__default.createElement(core.Grid, {
+    className: "" + styles$N["box-content"]
+  }, React__default.createElement(core.Grid, null, dataFormCreateSurvey.additionalQuestions.map(function (r) {
+    return React__default.createElement(core.Grid, {
+      className: "" + styles$N["block-template-review"]
+    }, React__default.createElement(core.Grid, {
+      className: "" + styles$N["block-template-left"]
+    }, React__default.createElement(core.Typography, {
+      className: "" + styles$N["name-template-left"]
+    }, r.questionText)));
+  })))), React__default.createElement(core.Grid, {
     className: "" + styles$N["block-content-review"]
   }, React__default.createElement(CardNameButton, {
     title: "Deadline",
@@ -68627,6 +68664,7 @@ var useSurveyViewStudent = function useSurveyViewStudent() {
   }, []);
   React.useEffect(function () {
     getStudentSurvey();
+    document.title = "My Survey";
   }, [pathname]);
   return {
     tabs: tabs
@@ -69585,9 +69623,7 @@ var ExternalSurvey = function ExternalSurvey() {
       questionName: record.templateName,
       questionList: record.questions
     }))));
-  }), React__default.createElement("div", {
-    className: styles$Q["talk-conduct"]
-  }, (listAdditionalQuestionAnswer === null || listAdditionalQuestionAnswer === void 0 ? void 0 : listAdditionalQuestionAnswer.length) > 0 && React__default.createElement("div", {
+  }), (listAdditionalQuestionAnswer === null || listAdditionalQuestionAnswer === void 0 ? void 0 : listAdditionalQuestionAnswer.length) > 0 && React__default.createElement("div", {
     className: styles$Q["block-question"]
   }, React__default.createElement(core.Grid, {
     className: styles$Q["radia-chart"]
@@ -69603,7 +69639,7 @@ var ExternalSurvey = function ExternalSurvey() {
   }) : React__default.createElement(QuestionConduct$2, {
     isMultiline: true,
     questionList: listAdditionalQuestionAnswer
-  })))))), React__default.createElement(ScrollToTopBtn, null), screenWidth < 600 && !externalSurveyId && React__default.createElement("div", {
+  }))))), React__default.createElement(ScrollToTopBtn, null), screenWidth < 600 && !externalSurveyId && React__default.createElement("div", {
     className: styles$Q["btn-done"]
   }, React__default.createElement(core.Button, {
     variant: "contained",