mario-teacher-student-client 2.2.2-beta → 2.2.4-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/components/StepComponents/ModelSendSurvey.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { MODEL_CONFIRM_SURVEY } from "../../constants/types";
-declare const ModelSendSurvey: ({ open, handleClose, handlePublishSurvey, listEduTeacher, handleToggleSuggestedTeacher, handleChangeInputSender, textValueSender, handleEnterAddSender, senderList, handleChangeEmailContent, emailContent }: MODEL_CONFIRM_SURVEY) => JSX.Element;
+declare const ModelSendSurvey: ({ open, handleClose, handlePublishSurvey, handleDeleteEmail, listEduTeacher, handleToggleSuggestedTeacher, handleChangeInputSender, textValueSender, handleEnterAddSender, senderList, handleChangeEmailContent, emailContent }: MODEL_CONFIRM_SURVEY) => JSX.Element;
 export default ModelSendSurvey;

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

@@ -4406,6 +4406,14 @@ h2._2HVLw {
   border-radius: 12px;
   padding: 10px 15px; }
 
+._ymo8r ._3dIQu:hover {
+  background-color: #154729; }
+
+._ymo8r ._3dIQu:disabled {
+  background-color: #69af86; }
+  ._ymo8r ._3dIQu:disabled > span {
+    color: #ffffff; }
+
 @font-face {
   font-family: "Lato-Regular";
   src: url("/fonts/Lato-Regular.ttf");
@@ -14790,6 +14798,11 @@ h4._3lNz0 {
 ._3LneM ._17NxN:hover {
   background: #22543d; }
 
+._3LneM ._17NxN:disabled {
+  background-color: #69af86; }
+  ._3LneM ._17NxN:disabled > span {
+    color: #ffffff; }
+
 ._3LneM ._xXGSG {
   font-size: 16px;
   font-weight: 400; }

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,
@@ -14166,7 +14171,14 @@ var usePreviewSurvey = function usePreviewSurvey() {
     }
   }, [surveyId]);
   React.useEffect(function () {
-    !!openDialogShareSurvey && isTeacher && getAllListTeacher();
+    if (!!openDialogShareSurvey && isTeacher) {
+      getAllListTeacher();
+      setDataFormEmail({
+        emails: [],
+        emailContent: "",
+        surveyId: parseInt(surveyId)
+      });
+    }
   }, [openDialogShareSurvey]);
   return {
     currentUser: currentUser,
@@ -14251,6 +14263,8 @@ var useStyles$9 = core.makeStyles(function (theme) {
 });
 
 var ShareSurveyDialog = function ShareSurveyDialog(_ref) {
+  var _dataFormEmail$emails;
+
   var open = _ref.open,
       handleClose = _ref.handleClose,
       handleShareSurvey = _ref.handleShareSurvey,
@@ -14322,6 +14336,7 @@ var ShareSurveyDialog = function ShareSurveyDialog(_ref) {
       return handleClose();
     }
   }, "Cancel"), React__default.createElement(core.Button, {
+    disabled: !!(dataFormEmail !== null && dataFormEmail !== void 0 && dataFormEmail.emails) && (dataFormEmail === null || dataFormEmail === void 0 ? void 0 : (_dataFormEmail$emails = dataFormEmail.emails) === null || _dataFormEmail$emails === void 0 ? void 0 : _dataFormEmail$emails.length) > 0 ? false : true,
     color: "primary",
     endIcon: React__default.createElement(SendIcon, null),
     onClick: function onClick() {
@@ -61934,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) {
@@ -62100,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]);
@@ -62113,7 +62153,8 @@ var useListSurvey = function useListSurvey() {
     listSurvey: listSurvey,
     setListSurvey: setListSurvey,
     isTeacher: isTeacher,
-    listTotal: listTotal
+    listTotal: listTotal,
+    handleUpdateFavorite: handleUpdateFavorite
   };
 };
 
@@ -62172,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, {
@@ -62427,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",
@@ -62931,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,
@@ -62957,17 +62995,12 @@ 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"
 }];
@@ -62983,7 +63016,7 @@ var tableActionNeedSurvey = [{
   align: "center"
 }, {
   name: "Session",
-  tableWidth: 15,
+  tableWidth: 20,
   sortName: "session",
   align: "left"
 }, {
@@ -62991,14 +63024,9 @@ var tableActionNeedSurvey = [{
   tableWidth: 20,
   sortName: "Date",
   align: "left"
-}, {
-  name: "Favorite",
-  tableWidth: 10,
-  sortName: "Favorite",
-  align: "center"
 }, {
   name: "",
-  tableWidth: 5,
+  tableWidth: 10,
   sortName: null,
   align: "center"
 }];
@@ -63152,21 +63180,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",
@@ -63278,16 +63291,6 @@ var RepliedSurvey = function RepliedSurvey() {
       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, {
-      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"],
@@ -63386,16 +63389,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"],
@@ -63653,6 +63646,12 @@ 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);
@@ -64856,9 +64855,12 @@ var ReviewSurveyDetail = function ReviewSurveyDetail(_ref) {
 };
 
 var ModelSendSurvey = function ModelSendSurvey(_ref) {
+  var _listEduTeacher$filte;
+
   var open = _ref.open,
       handleClose = _ref.handleClose,
       handlePublishSurvey = _ref.handlePublishSurvey,
+      handleDeleteEmail = _ref.handleDeleteEmail,
       listEduTeacher = _ref.listEduTeacher,
       handleToggleSuggestedTeacher = _ref.handleToggleSuggestedTeacher,
       handleChangeInputSender = _ref.handleChangeInputSender,
@@ -64911,14 +64913,16 @@ var ModelSendSurvey = function ModelSendSurvey(_ref) {
     freeSolo: true,
     id: "tags-filled",
     options: [],
-    renderTags: function renderTags(_value, getTagProps) {
-      return !!senderList && senderList.map(function (option, index) {
-        return React__default.createElement(core.Chip, Object.assign({
+    renderTags: function renderTags(_value) {
+      return !!senderList && senderList.map(function (option) {
+        return React__default.createElement(core.Chip, {
           color: "primary",
-          label: option
-        }, getTagProps({
-          index: index
-        })));
+          label: option,
+          deleteIcon: React__default.createElement(CancelIcon, null),
+          onDelete: function onDelete() {
+            return handleDeleteEmail === null || handleDeleteEmail === void 0 ? void 0 : handleDeleteEmail(option);
+          }
+        });
       });
     },
     renderInput: function renderInput(params) {
@@ -64953,6 +64957,9 @@ var ModelSendSurvey = function ModelSendSurvey(_ref) {
       return handleClose();
     }
   }, "Cancel"), React__default.createElement(core.Button, {
+    disabled: (listEduTeacher === null || listEduTeacher === void 0 ? void 0 : (_listEduTeacher$filte = listEduTeacher.filter(function (r) {
+      return r.isSelected;
+    })) === null || _listEduTeacher$filte === void 0 ? void 0 : _listEduTeacher$filte.length) === 0 && (senderList === null || senderList === void 0 ? void 0 : senderList.length) === 0 ? true : false,
     color: "primary",
     endIcon: React__default.createElement(SendIcon, null),
     onClick: function onClick() {
@@ -66169,7 +66176,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", {
@@ -66182,6 +66190,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,
@@ -66295,7 +66304,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);
@@ -66469,8 +66479,6 @@ var SurveyTop$1 = function SurveyTop(_ref) {
 };
 
 var ExternalSurvey = function ExternalSurvey() {
-  var _questionSummarize$an;
-
   var _useExternalSurvey = useExternalSurvey$1(),
       listQuestionStudents = _useExternalSurvey.listQuestionStudents,
       updateQuestionAnswer = _useExternalSurvey.updateQuestionAnswer,
@@ -66526,17 +66534,17 @@ 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;
   return React__default.createElement("div", {
     className: styles$R["page-conduct"] + " " + styles$R[classFontSize]
   }, React__default.createElement(CustomHeaderComponent, {
-    title: !isDone ? "External survey" : "Completed External survey",
+    title: !isDone ? "External survey" : "Completed",
     contentButton: !isDone ? "Done" : "",
-    handleChangePage: finishSurvey,
+    handleChangePage: handleToggleModalSession,
     iconButton: React__default.createElement(SendIcon, {
       className: "" + styles$R["icon-done-header"]
     })
@@ -66547,7 +66555,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", {
@@ -66577,9 +66586,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"
     }
@@ -66607,15 +66614,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
+      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"]
@@ -66631,6 +66640,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,
@@ -66653,7 +66663,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",
@@ -66665,12 +66675,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"