mario-teacher-student-client 2.1.98-beta → 2.2.1-beta

package/dist/components/selector/CustomFilterComponent.d.ts

@@ -11,6 +11,7 @@ interface PROPS_FILTER {
     inputSearch: any;
     isShowSelectRight?: boolean;
     handleChangeStatus?: Function;
+    placeholderSearch?: string;
 }
-declare const CustomFilterComponent: ({ filters, handleChangeStartDate, handleChangeEndDate, handleChangeInputSearch, inputSearch, isShowSelectRight, handleChangeStatus }: PROPS_FILTER) => JSX.Element;
+declare const CustomFilterComponent: ({ filters, handleChangeStartDate, handleChangeEndDate, handleChangeInputSearch, inputSearch, isShowSelectRight, handleChangeStatus, placeholderSearch }: PROPS_FILTER) => JSX.Element;
 export default CustomFilterComponent;

package/dist/containers/Surveys/constants/types.d.ts

@@ -209,8 +209,11 @@ export interface STUDENT_SURVEY_DETAIL {
     timeSession: string;
     studentName: string;
     teacherName: string;
+    avatar: string;
+    profileImage: string;
     status: string;
     sendDate: string;
+    isDone: boolean;
     isFavorite: boolean;
     flag: number;
     dayLeft: number;

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

@@ -13,5 +13,6 @@ declare const useListSurveyDetail: ({ type }: SURVEY_STUDENT_PROPS) => {
     dayLeftCellBgColor: (dayLeft: number) => "" | "bg-red" | "bg-yellow" | "bg-green";
     handleStartSurvey: (surveyId: number, studentId: number) => void;
     goToBookSession: (studentId: number, surveyId: number) => void;
+    handleShowSession: (status: string, schedule: string, isDone: boolean) => false | "Completed" | "Not Required" | "No Response yet" | "Scheduled";
 };
 export default useListSurveyDetail;

package/dist/index.css

@@ -722,7 +722,7 @@ p._1YLGi {
   background: #F6F4C6; }
 
 ._3oAH- {
-  color: #22543D;
+  color: #22543D !important;
   background: #C6F6D5; }
 
 ._3XmhO {
@@ -14847,6 +14847,9 @@ h4._3lNz0 {
   ._3tbAL ._1Vgmy:hover {
     background-color: #308252; }
 
+._3tbAL ._1m1n9 {
+  color: rgba(0, 0, 0, 0.54); }
+
 ._3tbAL ._oItGm {
   display: flex;
   justify-content: center;
@@ -14868,6 +14871,10 @@ h4._3lNz0 {
   background-color: #ffd9d7;
   color: #822727; }
 
+._3tbAL ._1T4kH {
+  background-color: #ffd9d7;
+  color: #822727; }
+
 ._3tbAL ._S8XOD {
   background-color: #f6f4c6;
   color: #744210;

package/dist/index.js

@@ -13868,7 +13868,7 @@ var usePreviewSurvey = function usePreviewSurvey() {
           questionTemplates: item.questionTemplates.map(function (r) {
             return {
               questionId: r.id,
-              text: r.text,
+              questionText: r.text,
               type: r.type,
               fromLabel: r.fromLabel,
               toLabel: r.toLabel
@@ -61669,7 +61669,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","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","row-status":"_oItGm","pending":"_3Yw4h","replied":"_1zClB","actionneeded":"_2K_LM","bg-yellow":"_S8XOD","bg-green":"_3M-Iu","bg-red":"_1kk0-","noscheduled":"_Qmz2t","scheduled":"_HLo9e","completed":"_3U4Kw","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","title-content":"_2qWnj","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","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","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","title-content":"_2qWnj","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,
@@ -62350,7 +62350,8 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
       handleChangeInputSearch = _ref.handleChangeInputSearch,
       inputSearch = _ref.inputSearch,
       isShowSelectRight = _ref.isShowSelectRight,
-      handleChangeStatus = _ref.handleChangeStatus;
+      handleChangeStatus = _ref.handleChangeStatus,
+      placeholderSearch = _ref.placeholderSearch;
   return React__default.createElement(core.Grid, {
     className: "" + styles["box-filter"]
   }, React__default.createElement(core.Grid, {
@@ -62420,7 +62421,7 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
   }, React__default.createElement(core.Grid, {
     className: "" + styles["search-input-icon"]
   }, React__default.createElement(SearchIcon, null)), React__default.createElement(core.InputBase, {
-    placeholder: "Search student",
+    placeholder: !placeholderSearch ? "Search student" : placeholderSearch,
     inputProps: {
       "aria-label": "search"
     },
@@ -62463,6 +62464,18 @@ var useListSurveyDetail = function useListSurveyDetail(_ref) {
     });
   };
 
+  var handleShowSession = function handleShowSession(status, schedule, isDone) {
+    if (status === "Completed") {
+      return "Not Required";
+    } else if (status === "Pending") {
+      return "No Response yet";
+    } else if (status === "ActionNeed" && !!schedule) {
+      return !!isDone ? "Completed" : "Scheduled";
+    } else {
+      return false;
+    }
+  };
+
   var handleChangeInputSearch = function handleChangeInputSearch(e) {
     var inputValue = e.target.value;
 
@@ -62556,7 +62569,8 @@ var useListSurveyDetail = function useListSurveyDetail(_ref) {
     handleChangeRowsPerPage: handleChangeRowsPerPage,
     dayLeftCellBgColor: dayLeftCellBgColor,
     handleStartSurvey: handleStartSurvey,
-    goToBookSession: goToBookSession
+    goToBookSession: goToBookSession,
+    handleShowSession: handleShowSession
   };
 };
 
@@ -62696,7 +62710,7 @@ var tablePendingSurvey = [{
   name: "Day left",
   tableWidth: 10,
   sortName: "DayLeft",
-  align: "left"
+  align: "center"
 }, {
   name: "Favorite",
   tableWidth: 10,
@@ -62753,7 +62767,7 @@ var tableActionNeedSurvey = [{
   name: "Date",
   tableWidth: 20,
   sortName: "Date",
-  align: "center"
+  align: "left"
 }, {
   name: "Favorite",
   tableWidth: 10,
@@ -62777,7 +62791,9 @@ var AllStudentSurvey = function AllStudentSurvey() {
       handleSort = _useListSurveyDetail.handleSort,
       handleChangePage = _useListSurveyDetail.handleChangePage,
       handleChangeRowsPerPage = _useListSurveyDetail.handleChangeRowsPerPage,
-      handleStartSurvey = _useListSurveyDetail.handleStartSurvey;
+      handleStartSurvey = _useListSurveyDetail.handleStartSurvey,
+      handleShowSession = _useListSurveyDetail.handleShowSession,
+      goToBookSession = _useListSurveyDetail.goToBookSession;
 
   return React__default.createElement("div", null, React__default.createElement(core.Box, {
     pl: 3,
@@ -62803,7 +62819,7 @@ var AllStudentSurvey = function AllStudentSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$s,
+      src: !row.avatar ? DEFAULT_USER_AVATAR$s : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.avatar),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row === null || row === void 0 ? void 0 : row.studentName), React__default.createElement(core.TableCell, {
@@ -62813,12 +62829,19 @@ var AllStudentSurvey = function AllStudentSurvey() {
       className: "" + styles$O["table-class-type"]
     }, React__default.createElement(core.Typography, {
       className: styles$O["row-status"] + " " + styles$O[row === null || row === void 0 ? void 0 : (_row$status = row.status) === null || _row$status === void 0 ? void 0 : (_row$status$replace = _row$status.replace(/\s/g, "")) === null || _row$status$replace === void 0 ? void 0 : _row$status$replace.toLowerCase()]
-    }, row === null || row === void 0 ? void 0 : row.status)), React__default.createElement(core.TableCell, {
+    }, (row === null || row === void 0 ? void 0 : row.status) !== "ActionNeed" ? row === null || row === void 0 ? void 0 : row.status : "Action Need")), React__default.createElement(core.TableCell, {
       component: "th",
       scope: "row",
       height: 80,
       className: "" + styles$O["table-class-type"]
-    }, row.session), React__default.createElement(core.TableCell, {
+    }, handleShowSession(row.status, row.schedule, row.isDone) || React__default.createElement(core.Typography, {
+      className: "" + styles$O["schedule-now"],
+      onClick: function onClick() {
+        return goToBookSession(row.studentId, row.id);
+      }
+    }, "Scheduled Now"), !!row.schedule && React__default.createElement(core.Typography, {
+      className: "" + styles$O["date-schedule"]
+    }, marioCore.utcToLocalTime(row.schedule, "Do MMM yyyy - hh:mm A").toString())), React__default.createElement(core.TableCell, {
       align: "center",
       component: "th",
       scope: "row",
@@ -62886,7 +62909,7 @@ var PendingSurvey = function PendingSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$t,
+      src: !row.avatar ? DEFAULT_USER_AVATAR$t : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.avatar),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row === null || row === void 0 ? void 0 : row.studentName), React__default.createElement(core.TableCell, {
@@ -63006,7 +63029,7 @@ var RepliedSurvey = function RepliedSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$u,
+      src: !row.avatar ? DEFAULT_USER_AVATAR$u : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.avatar),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row === null || row === void 0 ? void 0 : row.studentName), React__default.createElement(core.TableCell, {
@@ -63103,7 +63126,7 @@ var ActionNeededSurvey = function ActionNeededSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$v,
+      src: !row.avatar ? DEFAULT_USER_AVATAR$v : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.avatar),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row === null || row === void 0 ? void 0 : row.studentName), React__default.createElement(core.TableCell, {
@@ -63584,7 +63607,8 @@ var useListSurveyDetail$1 = function useListSurveyDetail() {
       return selectIds.indexOf(v) == i;
     });
     setDataFormCreateSurvey(_extends({}, dataFormCreateSurvey, {
-      studentIds: result
+      studentIds: result,
+      activeStep: 0
     }));
   }, [students, dataFormCreateSurvey]);
 
@@ -63703,7 +63727,11 @@ var useListSurveyDetail$1 = function useListSurveyDetail() {
       dispatch(marioCore.setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(createSurvey(dataFormCreateSurvey)).then(function () {
+        return Promise.resolve(createSurvey(_extends({}, dataFormCreateSurvey, {
+          templateQuestions: dataFormCreateSurvey.templateQuestions.filter(function (r) {
+            return r.questionTemplates.length > 0;
+          })
+        }))).then(function () {
           history.push("/list-survey");
           localStorage.removeItem("dataFormSurvey");
           dispatch(marioCore.setAlert({
@@ -63748,7 +63776,11 @@ var useListSurveyDetail$1 = function useListSurveyDetail() {
     }
   }, []);
   React.useEffect(function () {
-    localStorage.setItem("dataFormSurvey", JSON.stringify(dataFormCreateSurvey));
+    localStorage.setItem("dataFormSurvey", JSON.stringify(_extends({}, dataFormCreateSurvey, {
+      templateQuestions: dataFormCreateSurvey.templateQuestions.filter(function (r) {
+        return r.questionTemplates.length > 0;
+      })
+    })));
   }, [dataFormCreateSurvey]);
   React.useEffect(function () {
     getData();
@@ -63821,7 +63853,7 @@ var TableSelectStudent = function TableSelectStudent(_ref) {
       return React__default.createElement("div", {
         className: "" + styles$O["row_name"]
       }, React__default.createElement("img", {
-        src: DEFAULT_USER_AVATAR$s,
+        src: !params.row.avatar ? DEFAULT_USER_AVATAR$s : marioCore.getFileUrl(params.row.avatar),
         alt: "",
         className: "" + styles$O["avatar_user"]
       }), params.row.studentName);
@@ -64700,7 +64732,7 @@ var PendingStudentSurvey = function PendingStudentSurvey() {
   }, "New Survey"), React__default.createElement("div", {
     className: "" + styles$O["box-survey"]
   }, React__default.createElement("img", {
-    src: newSurvey.profileImage,
+    src: !newSurvey.profileImage ? DEFAULT_USER_AVATAR$w : marioCore.getFileUrl(newSurvey.profileImage),
     alt: "",
     className: "" + styles$O["avt-user"]
   }), React__default.createElement("div", {
@@ -64734,7 +64766,7 @@ var PendingStudentSurvey = function PendingStudentSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$w,
+      src: !row.profileImage ? DEFAULT_USER_AVATAR$w : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.profileImage),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row.teacherName), React__default.createElement(core.TableCell, {
@@ -64806,7 +64838,8 @@ var CompletedStudentSurvey = function CompletedStudentSurvey() {
   }, React__default.createElement(CustomFilterComponent, {
     handleChangeInputSearch: handleChangeInputSearch,
     filters: filters,
-    inputSearch: inputSearch
+    inputSearch: inputSearch,
+    placeholderSearch: "Search survey"
   })), React__default.createElement(core.TableContainer, null, React__default.createElement(core.Table, {
     "aria-label": "simple table",
     className: "" + styles$O["table-border"]
@@ -64822,7 +64855,7 @@ var CompletedStudentSurvey = function CompletedStudentSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$x,
+      src: !row.profileImage ? DEFAULT_USER_AVATAR$x : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.profileImage),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row.teacherName), React__default.createElement(core.TableCell, {
@@ -64896,7 +64929,8 @@ var MissedStudentSurvey = function MissedStudentSurvey() {
   }, React__default.createElement(CustomFilterComponent, {
     handleChangeInputSearch: handleChangeInputSearch,
     filters: filters,
-    inputSearch: inputSearch
+    inputSearch: inputSearch,
+    placeholderSearch: "Search survey"
   })), React__default.createElement(core.TableContainer, null, React__default.createElement(core.Table, {
     "aria-label": "simple table",
     className: "" + styles$O["table-border"]
@@ -64912,7 +64946,7 @@ var MissedStudentSurvey = function MissedStudentSurvey() {
       align: "left",
       className: "" + styles$O["row_name"]
     }, React__default.createElement("img", {
-      src: DEFAULT_USER_AVATAR$y,
+      src: !row.profileImage ? DEFAULT_USER_AVATAR$y : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.profileImage),
       alt: "",
       className: "" + styles$O["avatar_user"]
     }), row.teacherName), React__default.createElement(core.TableCell, {