mario-education 2.4.498-feedback → 2.4.499-feedback

package/dist/containers/SurveyDashboard/apiClient/surveyService.d.ts

@@ -19,7 +19,7 @@ export declare const updateSurvey: (surveyId: number, model: any) => Promise<imp
 export declare const deleteSurvey: (surveyId: number) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getListExternal: (surveyId: number, params: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getListQuestionSurvey: (surveyId: number) => Promise<import("axios").AxiosResponse<any>>;
-export declare const getSurveyDetail: (surveyId: number) => Promise<import("axios").AxiosResponse<any>>;
+export declare const getSurveyDetail: (surveyId: number, language: string) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getDashboardTotalSurvey: (filters: FILTER_OVERVIEW_SURVEY) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getDashboardFlagSurvey: (filters: FILTER_OVERVIEW_SURVEY) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getDashboardTemplateSurvey: (filters: FILTER_OVERVIEW_SURVEY) => Promise<import("axios").AxiosResponse<any>>;

package/dist/containers/SurveyDashboard/configs/constants.d.ts

@@ -112,7 +112,6 @@ export declare const initialValues: {
     studentIds: never[];
     templateQuestions: never[];
     activeStep: number;
-    listSelectTemplate: never[];
     staffIds: never[];
     summarizeQuestions: never[];
 };

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

@@ -588,7 +588,6 @@ export interface FORM_SURVEY {
     templateQuestions: TEMPLATE_SURVEY[];
     studentIds: number[];
     staffIds: string[];
-    listSelectTemplate: TEMPLATE_SURVEY[];
     summarizeQuestions: QuestionSummarizeType[];
 }
 export interface STUDENT_SURVEY {

package/dist/index.js

@@ -38822,7 +38822,6 @@ var initialValues = {
   studentIds: [],
   templateQuestions: [],
   activeStep: 0,
-  listSelectTemplate: [],
   staffIds: [],
   summarizeQuestions: []
 };
@@ -50578,8 +50577,12 @@ var deleteSurvey = function deleteSurvey(surveyId) {
 var getListQuestionSurvey = function getListQuestionSurvey(surveyId) {
   return marioCore.api.get(SURVEY_API + "/" + surveyId + "/questions");
 };
-var getSurveyDetail = function getSurveyDetail(surveyId) {
-  return marioCore.api.get(SURVEY_API + "/" + surveyId + "/favorite-results");
+var getSurveyDetail = function getSurveyDetail(surveyId, language) {
+  return marioCore.api.get(SURVEY_API + "/" + surveyId + "/favorite-results", {
+    params: {
+      language: language
+    }
+  });
 };
 var getSurveysExport = function getSurveysExport(filter) {
   return marioCore.api.get(SURVEY_API + "/export-csv", {
@@ -56044,6 +56047,7 @@ var MultiChoiceComponent = function MultiChoiceComponent(_ref) {
     className: styles["radio-choice"] + " " + (!!isPageResult && styles["pointer-page-result"])
   }, questionAnswer === null || questionAnswer === void 0 ? void 0 : questionAnswer.map(function (label) {
     return React__default.createElement(core$1.FormControlLabel, {
+      key: label,
       disabled: !isUserChangeSession,
       className: "" + styles["checkbox-control"],
       control: React__default.createElement(core$1.Checkbox, {
@@ -66200,14 +66204,14 @@ var usePreviewSurvey = function usePreviewSurvey() {
 
   React.useEffect(function () {
     if (localStorage.getItem("dataFormSurvey") != null && !surveyId) {
-      var _dataLocalStorage$lis, _dataLocalStorage$add, _dataLocalStorage$lis2;
+      var _dataLocalStorage$tem, _dataLocalStorage$add, _dataLocalStorage$tem2;
 
       var dataLocalStorage = JSON.parse(localStorage.getItem("dataFormSurvey") || "null");
-      var templateQuestions = (_dataLocalStorage$lis = dataLocalStorage.listSelectTemplate) === null || _dataLocalStorage$lis === void 0 ? void 0 : _dataLocalStorage$lis.map(function (item) {
-        var _item$questionTemplat;
+      var templateQuestions = (_dataLocalStorage$tem = dataLocalStorage.templateQuestions) === null || _dataLocalStorage$tem === void 0 ? void 0 : _dataLocalStorage$tem.map(function (item) {
+        var _item$questionTemplat, _item$questionTemplat2;
 
         return _extends({}, item, {
-          questionTemplates: (_item$questionTemplat = item.questionTemplates) === null || _item$questionTemplat === void 0 ? void 0 : _item$questionTemplat.map(function (record) {
+          questionTemplates: (_item$questionTemplat = item.questionTemplates) === null || _item$questionTemplat === void 0 ? void 0 : (_item$questionTemplat2 = _item$questionTemplat.map(function (record) {
             var _record$answers;
 
             return _extends({}, record, {
@@ -66217,7 +66221,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
                 return r.text;
               })) || []
             });
-          }).sort(function (a, b) {
+          })) === null || _item$questionTemplat2 === void 0 ? void 0 : _item$questionTemplat2.sort(function (a, b) {
             if (a.orderDefaultQuestionTemplate > b.orderDefaultQuestionTemplate) {
               return 1;
             } else if ((a.questionId || 0) > (b.questionId || 0)) {
@@ -66228,7 +66232,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
           })
         });
       });
-      setListQuestionTemplate(templateQuestions.sort(function (a, b) {
+      setListQuestionTemplate(templateQuestions === null || templateQuestions === void 0 ? void 0 : templateQuestions.sort(function (a, b) {
         if (a.orderDefaultSurvey > b.orderDefaultSurvey) {
           return 1;
         } else if (a.id > b.id) {
@@ -66253,7 +66257,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
       });
       setListAdditionalQuestion(additionalQuestion);
       var additionalList = dataLocalStorage.additionalQuestions || [];
-      var numberQuestionTemplate = (_dataLocalStorage$lis2 = dataLocalStorage.listSelectTemplate) === null || _dataLocalStorage$lis2 === void 0 ? void 0 : _dataLocalStorage$lis2.reduce(function (prev, next) {
+      var numberQuestionTemplate = (_dataLocalStorage$tem2 = dataLocalStorage.templateQuestions) === null || _dataLocalStorage$tem2 === void 0 ? void 0 : _dataLocalStorage$tem2.reduce(function (prev, next) {
         var _next$questionTemplat, _next$questionTemplat2;
 
         return prev + ((_next$questionTemplat = next.questionTemplates) === null || _next$questionTemplat === void 0 ? void 0 : (_next$questionTemplat2 = _next$questionTemplat.filter(function (r) {
@@ -66263,7 +66267,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
       var summarizeQuestions = dataLocalStorage.summarizeQuestions.map(function (e) {
         return {
           answer: e.answer,
-          text: e.questionText,
+          text: e.text,
           type: e.type
         };
       });
@@ -66290,10 +66294,10 @@ var usePreviewSurvey = function usePreviewSurvey() {
 
           var data = res.data;
           var templateQuestions = (_data$templateQuestio = data.templateQuestions) === null || _data$templateQuestio === void 0 ? void 0 : _data$templateQuestio.map(function (item) {
-            var _item$questionTemplat2;
+            var _item$questionTemplat3;
 
             return _extends({}, item, {
-              questionTemplates: (_item$questionTemplat2 = item.questionTemplates) === null || _item$questionTemplat2 === void 0 ? void 0 : _item$questionTemplat2.map(function (record) {
+              questionTemplates: (_item$questionTemplat3 = item.questionTemplates) === null || _item$questionTemplat3 === void 0 ? void 0 : _item$questionTemplat3.map(function (record) {
                 var _record$answers2;
 
                 return _extends({}, record, {
@@ -67127,7 +67131,7 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
     var questionTemplate = (_dataFormCreateSurvey = dataFormCreateSurvey.templateQuestions.find(function (i) {
       return i.id === template.id;
     })) === null || _dataFormCreateSurvey === void 0 ? void 0 : _dataFormCreateSurvey.questionTemplates;
-    var templateSelect = dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey2 = dataFormCreateSurvey.listSelectTemplate) === null || _dataFormCreateSurvey2 === void 0 ? void 0 : (_dataFormCreateSurvey3 = _dataFormCreateSurvey2.find(function (r) {
+    var templateSelect = dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey2 = dataFormCreateSurvey.templateQuestions) === null || _dataFormCreateSurvey2 === void 0 ? void 0 : (_dataFormCreateSurvey3 = _dataFormCreateSurvey2.find(function (r) {
       return r.id === template.id;
     })) === null || _dataFormCreateSurvey3 === void 0 ? void 0 : _dataFormCreateSurvey3.questionTemplates;
     var result = questionTemplate !== null && questionTemplate !== void 0 && questionTemplate.find(function (i) {
@@ -67167,14 +67171,12 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
     if (indexQuestion === -1) {
       questionTemplate[templateResultIndex].questionTemplates.push(question);
       setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-        templateQuestions: [].concat(questionTemplate),
-        listSelectTemplate: [].concat(questionTemplate)
+        templateQuestions: [].concat(questionTemplate)
       }));
     } else if (indexQuestion && indexQuestion > 0 || indexQuestion === 0) {
       questionTemplate[templateResultIndex].questionTemplates.splice(indexQuestion, 1);
       setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-        templateQuestions: [].concat(questionTemplate),
-        listSelectTemplate: [].concat(questionTemplate)
+        templateQuestions: [].concat(questionTemplate)
       }));
     }
 
@@ -67235,7 +67237,7 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
   var handleCheckSelectTemplate = function handleCheckSelectTemplate(template) {
     var _dataFormCreateSurvey4;
 
-    var existTemplateSelect = dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey4 = dataFormCreateSurvey.listSelectTemplate) === null || _dataFormCreateSurvey4 === void 0 ? void 0 : _dataFormCreateSurvey4.find(function (r) {
+    var existTemplateSelect = dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey4 = dataFormCreateSurvey.templateQuestions) === null || _dataFormCreateSurvey4 === void 0 ? void 0 : _dataFormCreateSurvey4.find(function (r) {
       return r.id === template.id;
     });
 
@@ -67248,15 +67250,15 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
 
   var handleInsertQuestion = React.useCallback(function () {
     setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-      templateQuestions: dataFormCreateSurvey.listSelectTemplate
+      templateQuestions: dataFormCreateSurvey.templateQuestions
     }));
     setOpenModelSelectTemplate(false);
-  }, [dataFormCreateSurvey.listSelectTemplate]);
+  }, [dataFormCreateSurvey.templateQuestions]);
   var handleSelectTemplate = React.useCallback(function (template) {
     var _dataFormCreateSurvey5;
 
-    var listTemplate = dataFormCreateSurvey.listSelectTemplate;
-    var indexItem = dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey5 = dataFormCreateSurvey.listSelectTemplate) === null || _dataFormCreateSurvey5 === void 0 ? void 0 : _dataFormCreateSurvey5.findIndex(function (r) {
+    var listTemplate = dataFormCreateSurvey.templateQuestions;
+    var indexItem = dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey5 = dataFormCreateSurvey.templateQuestions) === null || _dataFormCreateSurvey5 === void 0 ? void 0 : _dataFormCreateSurvey5.findIndex(function (r) {
       return r.id === template.id;
     });
 
@@ -67279,7 +67281,7 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
       });
     });
     setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-      listSelectTemplate: [].concat(listTemplate),
+      templateQuestions: [].concat(listTemplate),
       summarizeQuestions: summarizeQuestions
     }));
     handleCloseModelEdit();
@@ -67299,7 +67301,7 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
     setContentModelQuestion({
       open: true,
       template: template,
-      selectQuestion: ((_dataFormCreateSurvey6 = dataFormCreateSurvey.listSelectTemplate.find(function (r) {
+      selectQuestion: ((_dataFormCreateSurvey6 = dataFormCreateSurvey.templateQuestions.find(function (r) {
         return r.id === template.id;
       })) === null || _dataFormCreateSurvey6 === void 0 ? void 0 : _dataFormCreateSurvey6.questionTemplates) || []
     });
@@ -67308,11 +67310,11 @@ var useSelectQuestion = function useSelectQuestion(_ref) {
   var handleToggleModel = function handleToggleModel() {
     if (!openModelSelectTemplate) {
       setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-        listSelectTemplate: dataFormCreateSurvey.templateQuestions
+        templateQuestions: dataFormCreateSurvey.templateQuestions
       }));
     } else {
       setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-        listSelectTemplate: []
+        templateQuestions: []
       }));
     }
 
@@ -67478,6 +67480,10 @@ var useListFavoriteSurvey = function useListFavoriteSurvey(_ref) {
       filterFavorite = _useState2[0],
       setFilters = _useState2[1];
 
+  var language = reactRedux.useSelector(function (state) {
+    return state.common.language;
+  });
+
   var changeFilters = function changeFilters(updatedFilters) {
     return setFilters(_extends({}, filterFavorite, updatedFilters));
   };
@@ -67511,7 +67517,7 @@ var useListFavoriteSurvey = function useListFavoriteSurvey(_ref) {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getSurveyDetail(surveyId)).then(function (res) {
+        return Promise.resolve(getSurveyDetail(surveyId, language)).then(function (res) {
           var _students$items;
 
           var studentIdLists = (students === null || students === void 0 ? void 0 : (_students$items = students.items) === null || _students$items === void 0 ? void 0 : _students$items.map(function (item) {
@@ -68218,7 +68224,7 @@ var useListSurveyDetail = function useListSurveyDetail() {
 
       var _temp8 = _catch(function () {
         return Promise.resolve(createSurvey$1(_extends({}, dataFormCreateSurvey, {
-          templateQuestions: dataFormCreateSurvey.listSelectTemplate.filter(function (r) {
+          templateQuestions: dataFormCreateSurvey.templateQuestions.filter(function (r) {
             return r.questionTemplates.length > 0;
           }),
           isAdmin: true
@@ -68258,14 +68264,17 @@ var useListSurveyDetail = function useListSurveyDetail() {
             var findTemp = res.data.find(function (t) {
               return t.id === temp.id;
             });
-            var ids = temp.questionTemplates.map(function (q) {
-              return q.questionId;
-            });
 
             if (findTemp) {
-              findTemp.questionTemplates.filter(function (e) {
-                return ids.includes(e.questionId);
+              var newFindTemp = _extends({}, findTemp, {
+                questionTemplates: findTemp.questionTemplates.filter(function (e) {
+                  return temp.questionTemplates.some(function (q) {
+                    return q.questionId === e.questionId;
+                  });
+                })
               });
+
+              return newFindTemp;
             }
 
             return findTemp;
@@ -68811,7 +68820,7 @@ var ModelSelectSurveyTemplate = function ModelSelectSurveyTemplate(_ref) {
     }
   }, React__default.createElement(core$1.Typography, {
     className: "" + styles$6["confirm_btn_title"]
-  }, t("insert_template") + " [" + (dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey = dataFormCreateSurvey.listSelectTemplate) === null || _dataFormCreateSurvey === void 0 ? void 0 : _dataFormCreateSurvey.length) + "]"), React__default.createElement(AddCircleOutlinedIcon, {
+  }, t("insert_template") + " [" + (dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey = dataFormCreateSurvey.templateQuestions) === null || _dataFormCreateSurvey === void 0 ? void 0 : _dataFormCreateSurvey.length) + "]"), React__default.createElement(AddCircleOutlinedIcon, {
     className: "" + styles$6["confirm_btn_icon"]
   }))))));
 };
@@ -69288,6 +69297,7 @@ var CreateSurveyComponent = function CreateSurveyComponent(_ref) {
       }
     }))), handleCheckTypeQuestion(r).map(function (i) {
       return React__default.createElement(core$1.Typography, {
+        key: i,
         className: "" + styles$6["description-template-left"]
       }, i + " \u2022 " + handleCheckCountQuestionByType(r, i) + " questions");
     })), React__default.createElement(core$1.Collapse, {
@@ -69442,7 +69452,7 @@ var CardNameButton = function CardNameButton(_ref) {
 };
 
 var ReviewSurveyDetail = function ReviewSurveyDetail(_ref) {
-  var _dataFormCreateSurvey, _dataFormCreateSurvey2, _dataFormCreateSurvey3, _dataFormCreateSurvey4;
+  var _dataFormCreateSurvey, _dataFormCreateSurvey2, _dataFormCreateSurvey3, _dataFormCreateSurvey4, _dataFormCreateSurvey5;
 
   var dataFormCreateSurvey = _ref.dataFormCreateSurvey,
       handleNextStep = _ref.handleNextStep,
@@ -69511,17 +69521,19 @@ var ReviewSurveyDetail = function ReviewSurveyDetail(_ref) {
     classFontSize: classFontSize
   }), React__default.createElement(core$1.Grid, {
     className: "" + styles$6["box-content"]
-  }, React__default.createElement(core$1.Grid, null, dataFormCreateSurvey.listSelectTemplate.map(function (r) {
-    var _r$questionTemplates;
+  }, React__default.createElement(core$1.Grid, null, dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey5 = dataFormCreateSurvey.templateQuestions) === null || _dataFormCreateSurvey5 === void 0 ? void 0 : _dataFormCreateSurvey5.map(function (r) {
+    var _handleCheckTypeQuest, _r$questionTemplates;
 
     return React__default.createElement(core$1.Grid, {
-      className: "" + styles$6["block-template-review"]
+      className: "" + styles$6["block-template-review"],
+      key: r.id
     }, React__default.createElement(core$1.Grid, {
       className: "" + styles$6["block-template-left"]
     }, React__default.createElement(core$1.Typography, {
       className: "" + styles$6["name-template-left"]
-    }, r.name), handleCheckTypeQuestion(r).map(function (i) {
+    }, r.name), (_handleCheckTypeQuest = handleCheckTypeQuestion(r)) === null || _handleCheckTypeQuest === void 0 ? void 0 : _handleCheckTypeQuest.map(function (i) {
       return React__default.createElement(core$1.Typography, {
+        key: i,
         className: "" + styles$6["description-template-left"]
       }, i + " \u2022 " + handleCheckCountQuestionByType(r, i) + " " + t("questions"));
     })), React__default.createElement(core$1.Typography, {
@@ -69537,8 +69549,9 @@ var ReviewSurveyDetail = function ReviewSurveyDetail(_ref) {
     classFontSize: classFontSize
   }), React__default.createElement(core$1.Grid, {
     className: "" + styles$6["box-content"]
-  }, React__default.createElement(core$1.Grid, null, dataFormCreateSurvey.additionalQuestions.map(function (r) {
+  }, React__default.createElement(core$1.Grid, null, dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : dataFormCreateSurvey.additionalQuestions.map(function (r) {
     return React__default.createElement(core$1.Grid, {
+      key: r.id,
       className: "" + styles$6["block-template-review"]
     }, React__default.createElement(core$1.Grid, {
       className: "" + styles$6["block-template-left"]
@@ -69927,6 +69940,8 @@ var TableSelectStaff = function TableSelectStaff(_ref) {
 };
 
 var CreateSurveyAdmin = function CreateSurveyAdmin() {
+  var _dataFormCreateSurvey, _dataFormCreateSurvey2;
+
   var history = reactRouterDom.useHistory();
 
   var _useTranslation = marioCore.useTranslation(),
@@ -70166,8 +70181,8 @@ var CreateSurveyAdmin = function CreateSurveyAdmin() {
     open: openModelConfirmShare,
     handleClose: handleToggleModelConfirmShare,
     onOpenModelExternal: handleGoToSurveyDashboard,
-    numberStaff: dataFormCreateSurvey.staffIds.length || 0,
-    numberStudent: dataFormCreateSurvey.studentIds.length || 0
+    numberStaff: (dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey = dataFormCreateSurvey.staffIds) === null || _dataFormCreateSurvey === void 0 ? void 0 : _dataFormCreateSurvey.length) || 0,
+    numberStudent: (dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey2 = dataFormCreateSurvey.studentIds) === null || _dataFormCreateSurvey2 === void 0 ? void 0 : _dataFormCreateSurvey2.length) || 0
   }), React__default.createElement(ModelSendSurvey, {
     handleClose: handleToggleModelShare,
     open: openModelShare,