mario-teacher-student-client 2.2.3-beta → 2.2.5-beta

package/dist/components/Input/TextFieldComponent.d.ts

@@ -6,6 +6,7 @@ interface Props {
     isPageResult?: boolean;
     isPageSessionResult?: boolean;
     isUserChangeSession?: boolean;
+    isMultiline?: boolean;
 }
-declare const TextFieldComponent: ({ questionId, valueText, onChangeQuestionAnswer, isPageResult, isPageSessionResult, isUserChangeSession }: Props) => JSX.Element;
+declare const TextFieldComponent: ({ questionId, valueText, onChangeQuestionAnswer, isPageResult, isPageSessionResult, isUserChangeSession, isMultiline }: Props) => JSX.Element;
 export default TextFieldComponent;

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

@@ -17,6 +17,7 @@ interface Props {
     isRedToRed?: boolean;
     isUserChangeSession?: boolean;
     questionAnswer?: string[];
+    isMultiline?: boolean;
 }
 declare const QuestionComponent: FC<Props>;
 export default QuestionComponent;

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

@@ -7,6 +7,7 @@ interface Props {
     isPageSessionResult?: boolean;
     avatar?: string;
     isUserChangeSession?: boolean;
+    isMultiline?: boolean;
 }
 declare const QuestionConduct: FC<Props>;
 export default QuestionConduct;

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

@@ -10,3 +10,4 @@ export declare const getDetailSurvey: (surveyId: number) => Promise<import("axio
 export declare const getSurveyCountStudent: () => Promise<import("axios").AxiosResponse<any>>;
 export declare const getAllEduTeacher: () => Promise<import("axios").AxiosResponse<any>>;
 export declare const shareSurvey: (data: any) => void;
+export declare const updateSurvey: (surveyId: number, model: any) => Promise<import("axios").AxiosResponse<any>>;

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

@@ -7,5 +7,6 @@ declare const useListSurvey: () => {
     setListSurvey: import("react").Dispatch<import("react").SetStateAction<SURVEY_RESPONSE | undefined>>;
     isTeacher: any;
     listTotal: TOTAL_TYPE[];
+    handleUpdateFavorite: (surveyId: number, isFavorite: boolean) => Promise<void>;
 };
 export default useListSurvey;

package/dist/index.css

@@ -15000,7 +15000,8 @@ h4._3lNz0 {
 .__12h2 {
   padding: 16px;
   border-radius: 50px;
-  width: 100%; }
+  width: 140px;
+  margin: 0 auto !important; }
 
 th > ._3tbAL ._3N7z7 {
   font-size: 1.4rem !important; }
@@ -15149,6 +15150,9 @@ th > ._3tbAL ._3N7z7 {
   ._1Oqku ._2zK6C {
     color: #ffffff; }
 
+._2BJFc {
+  margin-right: 10px; }
+
 ._1Oqku:disabled {
   background: #6b6b6b; }
 

package/dist/index.js

@@ -8409,7 +8409,8 @@ var TextFieldComponent = function TextFieldComponent(_ref) {
       onChangeQuestionAnswer = _ref.onChangeQuestionAnswer,
       isPageResult = _ref.isPageResult,
       isPageSessionResult = _ref.isPageSessionResult,
-      isUserChangeSession = _ref.isUserChangeSession;
+      isUserChangeSession = _ref.isUserChangeSession,
+      isMultiline = _ref.isMultiline;
   var classes = useStyles$5();
   var currentUser = reactRedux.useSelector(function (state) {
     var _state$common;
@@ -8443,6 +8444,7 @@ var TextFieldComponent = function TextFieldComponent(_ref) {
     className: classes.root
   }, React__default.createElement(core.Box, null, React__default.createElement(core.OutlinedInput, {
     fullWidth: true,
+    multiline: !!isMultiline,
     value: inputValue,
     onChange: function onChange(event) {
       return onChangeQuestionAnswer === null || onChangeQuestionAnswer === void 0 ? void 0 : onChangeQuestionAnswer(questionId, event.target.value);
@@ -8793,7 +8795,8 @@ var QuestionComponent = function QuestionComponent(_ref) {
       isRedToRed = _ref$isRedToRed === void 0 ? false : _ref$isRedToRed,
       isUserChangeSession = _ref.isUserChangeSession,
       _ref$questionAnswer = _ref.questionAnswer,
-      questionAnswer = _ref$questionAnswer === void 0 ? [] : _ref$questionAnswer;
+      questionAnswer = _ref$questionAnswer === void 0 ? [] : _ref$questionAnswer,
+      isMultiline = _ref.isMultiline;
   var defaultFontSmall = 12;
   var defaultFontLarge = 20;
   var defaultFont = reactRedux.useSelector(function (state) {
@@ -8833,6 +8836,7 @@ var QuestionComponent = function QuestionComponent(_ref) {
 
       case QuestionType.TextInput:
         return React__default.createElement(TextFieldComponent, {
+          isMultiline: isMultiline,
           questionId: questionId,
           valueText: valueText,
           onChangeQuestionAnswer: onChangeQuestionAnswer,
@@ -13611,6 +13615,7 @@ var SurveyIndex = function SurveyIndex() {
         borderRadius: "4px"
       }
     }, React__default.createElement(TextFieldComponent, {
+      isMultiline: true,
       questionId: item.id,
       valueText: item === null || item === void 0 ? void 0 : item.answer,
       isPageResult: false,
@@ -61883,7 +61888,7 @@ var CustomHeaderComponent = function CustomHeaderComponent(_ref) {
   }, contentButton), !!iconButton && iconButton)));
 };
 
-var styles$O = {"icon-add-header":"_3msvE","sup-require":"_3cLXA","span-title":"_2zJd0","checked-favorite":"_-DbRo","model-confirm-publish":"_3LneM","btn-cancel":"_3YQho","btn-send-survey":"_17NxN","content-confirm-model":"_xXGSG","dialog-title":"_SCqos","box-email-content":"_I7jVk","title-content":"_2qWnj","input-mail-content":"_2DLVt","list-chip-email":"_1NjUv","box-chip-email":"_LXTJT","chip-email-default":"_3vu3m","chip-email-checked":"_2SfCN","table-desktop":"_1F8xx","data-grid":"_3TDU4","MuiDataGrid-columnSeparator":"_3ig99","block-list-survey":"_U4jvh","box-filter":"_20SVW","block-total":"_2RcnX","filter-select":"_2WWzW","box-filter-left":"_MEKLd","filter-item":"_3KQ0G","btn-favorite-text":"_2HxpA","box-filter-right":"_wfMx1","search-input-icon":"_2pk-H","inputInput":"_TfkuE","table-border":"_OEcTC","time-Date":"_3N7z7","time-Hours-Minute":"_1jOw7","table-row":"_2jcL8","arrow-icon":"_10hwb","table-cell":"_3YpBx","btn-function":"__J0jK","avatar_user":"_2nLvF","data-grid-content":"_3sCAB","row_name":"_2fnqB","innerHtml":"_3r42i","table-class-type":"_3tbAL","btn-open":"_1Vgmy","date-schedule":"_1m1n9","row-status":"_oItGm","pending":"_3Yw4h","replied":"_1zClB","actionneeded":"_2K_LM","actionneed":"_1T4kH","bg-yellow":"_S8XOD","bg-green":"_3M-Iu","bg-red":"_1kk0-","noscheduled":"_Qmz2t","scheduled":"_HLo9e","completed":"_3U4Kw","session":"__12h2","schedule-now":"_w2de6","block-filter":"_3boYk","block-filter-right":"_Jb-VQ","title-filter":"_EkM6A","create-survey-container":"_13Als","box-create-survey":"_3ZeD0","box-form-input":"_2_Lbs","form-input-title":"_2eMwZ","check-box-btn":"_2SP5U","stepper":"_2dIQT","step-label":"_2fUwq","dialog-select-template":"_3N8Q3","icon-btn":"_1rTF7","icon-remove":"_2vYxh","title-btn":"_82x3C","title-box-model":"_3wglS","box-content-select":"_3nfCh","title-content-select":"_1mLDw","description-content-select":"_Hg1l5","box-function":"_3aIy7","cancel_btn":"_33pHa","confirm_btn":"_1Oqku","confirm_btn_title":"_lxY0i","confirm_btn_icon":"_2zK6C","box-function-flex":"_3MS9Q","box-collapse":"_82XGO","box-collapse-top":"_7DXq2","box-collapse-right":"_3ZAAk","collapse-chip":"_3vGgC","collapse-left-title":"_1a4Re","box-collapse-content-item":"_37Ftp","block-review-detail":"_1Lmrp","title-block":"_25k4D","block-content-review":"_2MyxF","box-content":"_2M2ub","block-template-review":"_26NEY","block-template-left":"_lrxw0","name-template-left":"_1ubim","select-right":"_3b0L0","description-template-left":"_1erRk","additional-box":"_3d0rZ","space-content":"_3rWo3","table-title":"_2v5b5","table-status":"_3Zgbw","Close":"_3_Z98","Active":"_1UqNT","box-header-select":"_1wJqN","header-select-name":"_Q-qNa","header-select-icon":"_3UAh4","list-question-select":"_AgPAZ","new-survey":"_3RD_x","title":"_21CPc","box-survey":"_1ikO6","avt-user":"_38Qdy","infor":"_2W6Cn","content-text":"_3fS-4","name":"_2V9ri","time":"_3LxCt"};
+var styles$O = {"icon-add-header":"_3msvE","sup-require":"_3cLXA","span-title":"_2zJd0","checked-favorite":"_-DbRo","model-confirm-publish":"_3LneM","btn-cancel":"_3YQho","btn-send-survey":"_17NxN","content-confirm-model":"_xXGSG","dialog-title":"_SCqos","box-email-content":"_I7jVk","title-content":"_2qWnj","input-mail-content":"_2DLVt","list-chip-email":"_1NjUv","box-chip-email":"_LXTJT","chip-email-default":"_3vu3m","chip-email-checked":"_2SfCN","table-desktop":"_1F8xx","data-grid":"_3TDU4","MuiDataGrid-columnSeparator":"_3ig99","block-list-survey":"_U4jvh","box-filter":"_20SVW","block-total":"_2RcnX","filter-select":"_2WWzW","box-filter-left":"_MEKLd","filter-item":"_3KQ0G","btn-favorite-text":"_2HxpA","box-filter-right":"_wfMx1","search-input-icon":"_2pk-H","inputInput":"_TfkuE","table-border":"_OEcTC","time-Date":"_3N7z7","time-Hours-Minute":"_1jOw7","table-row":"_2jcL8","arrow-icon":"_10hwb","table-cell":"_3YpBx","btn-function":"__J0jK","avatar_user":"_2nLvF","data-grid-content":"_3sCAB","row_name":"_2fnqB","innerHtml":"_3r42i","table-class-type":"_3tbAL","btn-open":"_1Vgmy","date-schedule":"_1m1n9","row-status":"_oItGm","pending":"_3Yw4h","replied":"_1zClB","actionneeded":"_2K_LM","actionneed":"_1T4kH","bg-yellow":"_S8XOD","bg-green":"_3M-Iu","bg-red":"_1kk0-","noscheduled":"_Qmz2t","scheduled":"_HLo9e","completed":"_3U4Kw","session":"__12h2","schedule-now":"_w2de6","block-filter":"_3boYk","block-filter-right":"_Jb-VQ","title-filter":"_EkM6A","create-survey-container":"_13Als","box-create-survey":"_3ZeD0","box-form-input":"_2_Lbs","form-input-title":"_2eMwZ","check-box-btn":"_2SP5U","stepper":"_2dIQT","step-label":"_2fUwq","dialog-select-template":"_3N8Q3","icon-btn":"_1rTF7","icon-remove":"_2vYxh","title-btn":"_82x3C","title-box-model":"_3wglS","box-content-select":"_3nfCh","title-content-select":"_1mLDw","description-content-select":"_Hg1l5","box-function":"_3aIy7","cancel_btn":"_33pHa","confirm_btn":"_1Oqku","confirm_btn_title":"_lxY0i","confirm_btn_icon":"_2zK6C","mid_btn":"_2BJFc","box-function-flex":"_3MS9Q","box-collapse":"_82XGO","box-collapse-top":"_7DXq2","box-collapse-right":"_3ZAAk","collapse-chip":"_3vGgC","collapse-left-title":"_1a4Re","box-collapse-content-item":"_37Ftp","block-review-detail":"_1Lmrp","title-block":"_25k4D","block-content-review":"_2MyxF","box-content":"_2M2ub","block-template-review":"_26NEY","block-template-left":"_lrxw0","name-template-left":"_1ubim","select-right":"_3b0L0","description-template-left":"_1erRk","additional-box":"_3d0rZ","space-content":"_3rWo3","table-title":"_2v5b5","table-status":"_3Zgbw","Close":"_3_Z98","Active":"_1UqNT","box-header-select":"_1wJqN","header-select-name":"_Q-qNa","header-select-icon":"_3UAh4","list-question-select":"_AgPAZ","new-survey":"_3RD_x","title":"_21CPc","box-survey":"_1ikO6","avt-user":"_38Qdy","infor":"_2W6Cn","content-text":"_3fS-4","name":"_2V9ri","time":"_3LxCt"};
 
 var CardTotal = function CardTotal(_ref) {
   var title = _ref.title,
@@ -61944,6 +61949,9 @@ var getAllEduTeacher$2 = function getAllEduTeacher() {
 var shareSurvey$1 = function shareSurvey(data) {
   marioCore.api.post(EXTERNAL_SURVEY$1 + "/share-survey", data);
 };
+var updateSurvey$1 = function updateSurvey(surveyId, model) {
+  return marioCore.api.put(SURVEY_API + "/setting-survey/" + surveyId, model);
+};
 
 var STEP_MODEL = ["Select student", "Create a survey", "Review"];
 var lableStep = function lableStep(activeStep) {
@@ -62110,6 +62118,28 @@ var useListSurvey = function useListSurvey() {
       return Promise.reject(e);
     }
   }, []);
+  var handleUpdateFavorite = React.useCallback(function (surveyId, isFavorite) {
+    try {
+      var _temp10 = _catch(function () {
+        return Promise.resolve(updateSurvey$1(surveyId, {
+          isFavorite: isFavorite
+        })).then(function () {
+          getListSurvey();
+        });
+      }, function (err) {
+        var _err$response3, _err$response3$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [filters]);
   React.useEffect(function () {
     getListSurvey();
   }, [filters]);
@@ -62123,7 +62153,8 @@ var useListSurvey = function useListSurvey() {
     listSurvey: listSurvey,
     setListSurvey: setListSurvey,
     isTeacher: isTeacher,
-    listTotal: listTotal
+    listTotal: listTotal,
+    handleUpdateFavorite: handleUpdateFavorite
   };
 };
 
@@ -62182,7 +62213,8 @@ var ListSurveys = function ListSurveys() {
       changeFilters = _useListSurvey.changeFilters,
       listSurvey = _useListSurvey.listSurvey,
       isTeacher = _useListSurvey.isTeacher,
-      listTotal = _useListSurvey.listTotal;
+      listTotal = _useListSurvey.listTotal,
+      handleUpdateFavorite = _useListSurvey.handleUpdateFavorite;
 
   var handleChangeStartDate = function handleChangeStartDate(date) {
     changeFilters(_extends({}, filters, {
@@ -62437,15 +62469,16 @@ var ListSurveys = function ListSurveys() {
     }, React__default.createElement(core.Typography, {
       className: styles$O["table-status"] + " " + styles$O[e.status]
     }, e.status)), React__default.createElement(core.TableCell, {
-      align: "center",
-      style: {
-        fontWeight: 700,
-        fontSize: 14,
-        textTransform: "uppercase"
-      }
+      align: "center"
     }, e.isFavorite ? React__default.createElement(StarIcon, {
+      onClick: function onClick() {
+        return handleUpdateFavorite(e.id, !e.isFavorite);
+      },
       className: "" + styles$O["checked-favorite"]
     }) : React__default.createElement(StarBorderIcon, {
+      onClick: function onClick() {
+        return handleUpdateFavorite(e.id, !e.isFavorite);
+      },
       className: "" + styles$O["checked-favorite"]
     })), React__default.createElement(core.TableCell, {
       component: "th",
@@ -62941,14 +62974,9 @@ var tablePendingSurvey = [{
   align: "left"
 }, {
   name: "Day left",
-  tableWidth: 10,
+  tableWidth: 15,
   sortName: "DayLeft",
   align: "center"
-}, {
-  name: "Favorite",
-  tableWidth: 10,
-  sortName: "Favorite",
-  align: "center"
 }, {
   name: "",
   tableWidth: 5,
@@ -62967,48 +62995,33 @@ var tableCompleteSurvey = [{
   align: "left"
 }, {
   name: "Flag",
-  tableWidth: 15,
+  tableWidth: 20,
   sortName: null,
   align: "center"
-}, {
-  name: "Favorite",
-  tableWidth: 10,
-  sortName: "Favorite",
-  align: "center"
 }, {
   name: "",
-  tableWidth: 5,
+  tableWidth: 10,
   sortName: null,
   align: "center"
 }];
 var tableActionNeedSurvey = [{
   name: "Student name",
-  tableWidth: 35,
+  tableWidth: 45,
   sortName: "Name",
   align: "left"
 }, {
   name: "Flag",
-  tableWidth: 15,
+  tableWidth: 20,
   sortName: null,
   align: "center"
-}, {
-  name: "Session",
-  tableWidth: 15,
-  sortName: "session",
-  align: "left"
 }, {
   name: "Date",
-  tableWidth: 20,
+  tableWidth: 25,
   sortName: "Date",
   align: "left"
-}, {
-  name: "Favorite",
-  tableWidth: 10,
-  sortName: "Favorite",
-  align: "center"
 }, {
   name: "",
-  tableWidth: 5,
+  tableWidth: 10,
   sortName: null,
   align: "center"
 }];
@@ -63162,21 +63175,6 @@ var PendingSurvey = function PendingSurvey() {
     }, React__default.createElement(core.Typography, {
       className: styles$O["row-status"] + " " + styles$O[dayLeftCellBgColor(row.dayLeft)]
     }, row.dayLeft)), React__default.createElement(core.TableCell, {
-      align: "center",
-      component: "th",
-      scope: "row",
-      height: 80,
-      className: "" + styles$O["table-class-type"],
-      style: {
-        fontWeight: 700,
-        fontSize: 14,
-        textTransform: "uppercase"
-      }
-    }, row.isFavorite ? React__default.createElement(StarIcon, {
-      className: "" + styles$O["checked-favorite"]
-    }) : React__default.createElement(StarBorderIcon, {
-      className: "" + styles$O["checked-favorite"]
-    })), React__default.createElement(core.TableCell, {
       align: "center",
       component: "th",
       scope: "row",
@@ -63219,7 +63217,8 @@ var RepliedSurvey = function RepliedSurvey() {
       inputSearch = _useListSurveyDetail.inputSearch,
       handleSort = _useListSurveyDetail.handleSort,
       handleChangePage = _useListSurveyDetail.handleChangePage,
-      handleChangeRowsPerPage = _useListSurveyDetail.handleChangeRowsPerPage;
+      handleChangeRowsPerPage = _useListSurveyDetail.handleChangeRowsPerPage,
+      sessionBackground = _useListSurveyDetail.sessionBackground;
 
   return React__default.createElement("div", null, React__default.createElement(core.Box, {
     pl: 3,
@@ -63282,17 +63281,9 @@ var RepliedSurvey = function RepliedSurvey() {
       className: "" + styles$O["table-class-type"]
     }, React__default.createElement(core.Typography, {
       className: styles$O["row-status"] + " " + styles$O[flagCellBgColor()]
-    }, row.flag)), React__default.createElement(core.TableCell, {
-      align: "center",
-      component: "th",
-      scope: "row",
-      height: 80,
-      className: "" + styles$O["table-class-type"]
-    }, row.favorite ? React__default.createElement(StarIcon, {
-      className: "" + styles$O["checked-favorite"]
-    }) : React__default.createElement(StarBorderIcon, {
-      className: "" + styles$O["checked-favorite"]
-    })), React__default.createElement(core.TableCell, {
+    }, React__default.createElement(core.Typography, {
+      className: styles$O["session"] + " " + styles$O[sessionBackground(row.actionScore)]
+    }))), React__default.createElement(core.TableCell, {
       align: "center",
       component: "th",
       scope: "row",
@@ -63364,12 +63355,6 @@ var ActionNeededSurvey = function ActionNeededSurvey() {
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row === null || row === void 0 ? void 0 : row.studentName), React__default.createElement(core.TableCell, {
-      align: "center",
-      component: "th",
-      scope: "row",
-      height: 80,
-      className: "" + styles$O["table-class-type"]
-    }, row.flag), React__default.createElement(core.TableCell, {
       align: "right",
       component: "th",
       scope: "row",
@@ -63396,16 +63381,6 @@ var ActionNeededSurvey = function ActionNeededSurvey() {
       scope: "row",
       height: 80,
       className: "" + styles$O["table-class-type"]
-    }, row.isFavorite ? React__default.createElement(StarIcon, {
-      className: "" + styles$O["checked-favorite"]
-    }) : React__default.createElement(StarBorderIcon, {
-      className: "" + styles$O["checked-favorite"]
-    })), React__default.createElement(core.TableCell, {
-      align: "center",
-      component: "th",
-      scope: "row",
-      height: 80,
-      className: "" + styles$O["table-class-type"]
     }, React__default.createElement(core.Button, {
       variant: "contained",
       className: "" + styles$O["btn-open"],
@@ -64409,7 +64384,7 @@ var TableSelectStudent = function TableSelectStudent(_ref) {
 };
 
 var ModelSelectQuestion = function ModelSelectQuestion(_ref) {
-  var _template$questionTem, _template$questionTem2;
+  var _template$questionTem, _template$questionTem2, _template$questionTem3, _template$questionTem4;
 
   var open = _ref.open,
       handleClose = _ref.handleClose,
@@ -64457,7 +64432,7 @@ var ModelSelectQuestion = function ModelSelectQuestion(_ref) {
     }), React__default.createElement("div", {
       className: "" + styles$O["innerHtml"],
       dangerouslySetInnerHTML: {
-        __html: r.questionText.replace(/<br\s*\/?>/gi, '\n')
+        __html: r.questionText.replace(/<br\s*\/?>/gi, "\n")
       }
     }));
   })), React__default.createElement(core.Grid, {
@@ -64470,6 +64445,16 @@ var ModelSelectQuestion = function ModelSelectQuestion(_ref) {
       return handleClose();
     }
   }, "Cancel"), React__default.createElement("button", {
+    className: styles$O["confirm_btn"] + " " + styles$O["mid_btn"],
+    disabled: (template === null || template === void 0 ? void 0 : (_template$questionTem3 = template.questionTemplates) === null || _template$questionTem3 === void 0 ? void 0 : _template$questionTem3.length) === (selectQuestion === null || selectQuestion === void 0 ? void 0 : selectQuestion.length),
+    onClick: function onClick() {
+      return handleSelectTemplate(template);
+    }
+  }, React__default.createElement(core.Typography, {
+    className: "" + styles$O["confirm_btn_title"]
+  }, "Insert All questions [" + (template === null || template === void 0 ? void 0 : (_template$questionTem4 = template.questionTemplates) === null || _template$questionTem4 === void 0 ? void 0 : _template$questionTem4.length) + "]"), React__default.createElement(AddCircleOutlinedIcon, {
+    className: "" + styles$O["confirm_btn_icon"]
+  })), React__default.createElement("button", {
     className: "" + styles$O["confirm_btn"],
     disabled: handleCheckInsertQuestion(template, selectQuestion === null || selectQuestion === void 0 ? void 0 : selectQuestion.length),
     onClick: function onClick() {
@@ -66193,7 +66178,8 @@ var QuestionConduct$2 = function QuestionConduct(_ref) {
       isPageResult = _ref.isPageResult,
       isPageSessionResult = _ref.isPageSessionResult,
       avatar = _ref.avatar,
-      isUserChangeSession = _ref.isUserChangeSession;
+      isUserChangeSession = _ref.isUserChangeSession,
+      isMultiline = _ref.isMultiline;
   return React__default.createElement("div", {
     className: styles$R["box-question"]
   }, !!questionName && React__default.createElement("h2", {
@@ -66206,6 +66192,7 @@ var QuestionConduct$2 = function QuestionConduct(_ref) {
     }, React__default.createElement(QuestionComponent, {
       questionId: item.id,
       avatar: avatar,
+      isMultiline: isMultiline,
       questionItemName: item.text,
       minText: item === null || item === void 0 ? void 0 : item.fromLabel,
       maxText: item === null || item === void 0 ? void 0 : item.toLabel,
@@ -66319,7 +66306,8 @@ var useExternalSurvey$1 = function useExternalSurvey() {
             deadline: res.data.deadline,
             teacherName: res.data.teacherName,
             teacherProfileImage: res.data.teacherProfileImage,
-            dayLeft: 0
+            dayLeft: res.data.dayLeft,
+            startTime: res.data.startTime
           };
           setIsDone(res.data.isDone);
           setInformationUser(body);
@@ -66493,8 +66481,6 @@ var SurveyTop$1 = function SurveyTop(_ref) {
 };
 
 var ExternalSurvey = function ExternalSurvey() {
-  var _questionSummarize$an;
-
   var _useExternalSurvey = useExternalSurvey$1(),
       listQuestionStudents = _useExternalSurvey.listQuestionStudents,
       updateQuestionAnswer = _useExternalSurvey.updateQuestionAnswer,
@@ -66550,8 +66536,8 @@ var ExternalSurvey = function ExternalSurvey() {
     setOpenModalSession(true);
   };
 
-  var handleModalSessionClose = function handleModalSessionClose() {
-    setOpenModalSession(false);
+  var handleToggleModalSession = function handleToggleModalSession() {
+    setOpenModalSession(!openModalSession);
   };
 
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
@@ -66560,7 +66546,7 @@ var ExternalSurvey = function ExternalSurvey() {
   }, React__default.createElement(CustomHeaderComponent, {
     title: !isDone ? "External survey" : "Completed",
     contentButton: !isDone ? "Done" : "",
-    handleChangePage: finishSurvey,
+    handleChangePage: handleToggleModalSession,
     iconButton: React__default.createElement(SendIcon, {
       className: "" + styles$R["icon-done-header"]
     })
@@ -66571,7 +66557,8 @@ var ExternalSurvey = function ExternalSurvey() {
     name: informationUser.teacherName,
     imageUrl: informationUser.teacherProfileImage,
     isResultSurvey: false,
-    dayLeft: informationUser.dayLeft
+    dayLeft: informationUser.dayLeft,
+    startTime: informationUser.startTime
   }), React__default.createElement("div", {
     className: styles$R["block-question"] + " mt-4"
   }, React__default.createElement("div", {
@@ -66601,9 +66588,7 @@ var ExternalSurvey = function ExternalSurvey() {
     dangerouslySetInnerHTML: {
       __html: !!questionSummarize ? questionSummarize.text : ""
     }
-  }), React__default.createElement("div", {
-    className: "" + (((_questionSummarize$an = questionSummarize.answer) === null || _questionSummarize$an === void 0 ? void 0 : _questionSummarize$an.length) > 0 && styles$R["box-talk"])
-  }, React__default.createElement("div", {
+  }), React__default.createElement("div", null, React__default.createElement("div", {
     style: {
       borderRadius: "4px"
     }
@@ -66631,16 +66616,17 @@ var ExternalSurvey = function ExternalSurvey() {
     }, React__default.createElement(core.Grid, {
       xs: 12
     }, !isDone ? React__default.createElement(QuestionConduct$2, {
+      isMultiline: true,
       avatar: informationUser.studentProfileImage,
       questionName: record.templateName,
       questionList: record.questions,
       onChangeQuestionAnswer: _onChangeQuestionAnswer,
       isUserChangeSession: true
     }) : React__default.createElement(QuestionConduct$2, {
+      isMultiline: true,
       avatar: informationUser.studentProfileImage,
       questionName: record.templateName,
-      questionList: record.questions,
-      isPageSessionResult: true
+      questionList: record.questions
     }))));
   }), React__default.createElement("div", {
     className: styles$R["talk-conduct"]
@@ -66656,6 +66642,7 @@ var ExternalSurvey = function ExternalSurvey() {
         borderRadius: "4px"
       }
     }, React__default.createElement(TextFieldComponent, {
+      isMultiline: true,
       questionId: item.id,
       valueText: item === null || item === void 0 ? void 0 : item.answer,
       isPageResult: false,
@@ -66678,7 +66665,7 @@ var ExternalSurvey = function ExternalSurvey() {
     className: "fas fa-check-circle"
   }))), React__default.createElement(core.Dialog, {
     open: openModalSession,
-    onClose: handleModalSessionClose,
+    onClose: handleToggleModalSession,
     className: styles$R["modal-finished"]
   }, React__default.createElement(core.DialogTitle, {
     id: "alert-dialog-title",
@@ -66690,12 +66677,21 @@ var ExternalSurvey = function ExternalSurvey() {
   }, React__default.createElement("h4", {
     className: styles$R["tite-body"]
   }, checkQuestionAnswer ? "Make sure with your teacher that you talked about everything you needed." : "There are several questions you have not answered yet. Are you sure to complete?"))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
-    onClick: handleModalSessionClose,
+    onClick: handleToggleModalSession,
     color: "primary",
     className: styles$R["btn-cancel"]
   }, "Cancel"), React__default.createElement(core.Button, {
     color: "primary",
     autoFocus: true,
+    onClick: function () {
+      try {
+        return Promise.resolve(finishSurvey()).then(function () {
+          handleToggleModalSession();
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    },
     className: styles$R["btn-submit"]
   }, React__default.createElement("img", {
     src: "/images/send-mess.png"