mario-teacher-student-client 9000.0.18 → 9000.0.19

package/dist/containers/ActionPoint/components/TodoList/hooks/useTodoList.d.ts

@@ -12,5 +12,6 @@ declare const useTodoList: () => {
     }>) => void;
     handleChangeSearchString: (e: React.ChangeEvent<HTMLInputElement>) => void;
     getActionPointList: () => Promise<void>;
+    isTeacher: any;
 };
 export default useTodoList;

package/dist/containers/Note/type/note.d.ts

@@ -1,4 +1,5 @@
 export interface INote {
+    avatarStudent: string;
     createAt: string;
     grade: string;
     id: number;

package/dist/index.css

@@ -2892,7 +2892,8 @@ h2._1OAmb {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  align-items: center; }
+  align-items: center;
+  margin-bottom: 20px; }
 
 ._1RMJt {
   margin: 8px 0;

package/dist/index.js

@@ -3806,6 +3806,10 @@ var useSessionCompleted = function useSessionCompleted() {
     var m = Math.floor(d % 3600 / 60);
     var s = Math.floor(d % 3600 % 60);
 
+    if (d == 0) {
+      return '0s';
+    }
+
     if (h > 0) {
       hTime += h + (h == 1 ? "hour" : " hours");
     }
@@ -3814,7 +3818,7 @@ var useSessionCompleted = function useSessionCompleted() {
       hTime += m + (m == 1 ? " min " : " mins ");
     }
 
-    if (s >= 0) {
+    if (s > 0) {
       hTime += s + "s";
     }
 
@@ -6475,6 +6479,10 @@ var ConductTop = function ConductTop(_ref) {
     var m = Math.floor(d % 3600 / 60);
     var s = Math.floor(d % 3600 % 60);
 
+    if (d == 0) {
+      return '0s';
+    }
+
     if (h > 0) {
       hTime += h + (h == 1 ? "hour" : " hours");
     }
@@ -6483,7 +6491,7 @@ var ConductTop = function ConductTop(_ref) {
       hTime += m + (m == 1 ? " min " : " mins ");
     }
 
-    if (s >= 0) {
+    if (s > 0) {
       hTime += s + "s";
     }
 
@@ -6887,7 +6895,7 @@ var QuestionComponent = function QuestionComponent(_ref) {
           questionId: questionId,
           valueText: valueText,
           onChangeQuestionAnswer: onChangeQuestionAnswer,
-          isPageResult: isPageResult
+          isPageResult: isPageSessionResult
         });
 
       case QuestionType.Emotional:
@@ -7140,7 +7148,7 @@ var useCountDown = function useCountDown(typeTime, sessionResultId) {
 
   var run = function run() {
     if (second >= 0) {
-      if (second == 60) {
+      if (second == 59) {
         setMinute(minute + 1);
         setSecond(0);
       } else {
@@ -7148,7 +7156,7 @@ var useCountDown = function useCountDown(typeTime, sessionResultId) {
       }
     }
 
-    if (minute == 60) {
+    if (minute == 59) {
       setHour(hour + 1);
       setMinute(0);
     }
@@ -8281,9 +8289,6 @@ var ScaffoldingQuestionAndAnswer = function ScaffoldingQuestionAndAnswer(_ref) {
       onRemoveQuestion = _ref.onRemoveQuestion,
       onUpdateNote = _ref.onUpdateNote,
       onRemoveQuestionAnswer = _ref.onRemoveQuestionAnswer;
-  console.log({
-    answer: answer
-  });
 
   var _useState = React.useState(answer != null ? answer : ""),
       _answer = _useState[0],
@@ -9625,9 +9630,8 @@ var ScaffoldingFloatTab = function ScaffoldingFloatTab(props) {
   var isTeacher = (_useSelector = reactRedux.useSelector(function (state) {
     return state.common.user;
   })) === null || _useSelector === void 0 ? void 0 : (_useSelector$roles = _useSelector.roles) === null || _useSelector$roles === void 0 ? void 0 : _useSelector$roles.includes("Teacher");
-  console.log({
-    informationUser: informationUser
-  });
+  var mineAvatar = isTeacher ? marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage) : marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage);
+  var otherAvatar = isTeacher ? marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage) : marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage);
 
   var renderTabs = function renderTabs() {
     if (screenNoteTab === 1) {
@@ -9672,7 +9676,7 @@ var ScaffoldingFloatTab = function ScaffoldingFloatTab(props) {
   }, React__default.createElement("div", {
     className: "" + styles$6["subject-avatar"]
   }, React__default.createElement("img", {
-    src: isTeacher ? !!(informationUser !== null && informationUser !== void 0 && informationUser.studentProfileImage) ? marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage) : marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage) : DEFAULT_USER_AVATAR$5,
+    src: !!mineAvatar ? mineAvatar : DEFAULT_USER_AVATAR$5,
     className: "" + styles$6["avatar"],
     onClick: function onClick() {
       return onChangeScreenNoteTab(1);
@@ -9682,7 +9686,7 @@ var ScaffoldingFloatTab = function ScaffoldingFloatTab(props) {
   }, "Me")), React__default.createElement("div", {
     className: "" + styles$6["subject-avatar"]
   }, React__default.createElement("img", {
-    src: isTeacher ? !!(informationUser !== null && informationUser !== void 0 && informationUser.studentProfileImage) ? marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage) : marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage) : DEFAULT_USER_AVATAR$5,
+    src: !!otherAvatar ? otherAvatar : DEFAULT_USER_AVATAR$5,
     className: "" + styles$6["avatar"],
     onClick: function onClick() {
       return onChangeScreenNoteTab(2);
@@ -14444,7 +14448,7 @@ var useStudentList = function useStudentList() {
       hTime += m + (m == 1 ? " min " : " mins ");
     }
 
-    if (s >= 0) {
+    if (s > 0) {
       hTime += s + "s";
     }
 
@@ -15973,6 +15977,10 @@ var useOverview = function useOverview(studentId) {
     var m = Math.floor(d % 3600 / 60);
     var s = Math.floor(d % 3600 % 60);
 
+    if (d == 0) {
+      return '0s';
+    }
+
     if (h > 0) {
       hTime += h + (h == 1 ? "hour" : " hours");
     }
@@ -15981,7 +15989,7 @@ var useOverview = function useOverview(studentId) {
       hTime += m + (m == 1 ? " min " : " mins ");
     }
 
-    if (s >= 0) {
+    if (s > 0) {
       hTime += s + "s";
     }
 
@@ -23323,7 +23331,8 @@ var ConferenceRubric = function ConferenceRubric() {
   }))), React__default.createElement(ScrollToTopBtn, null), React__default.createElement(MainViewScaffolding$1, {
     conferenceId: conferenceId,
     conferenceResultId: conferenceResultId,
-    second: second
+    second: second,
+    informationUser: informationUser
   }), React__default.createElement(core.Dialog, {
     open: openModalConference,
     onClose: handleModalConferenceClose,
@@ -32346,38 +32355,96 @@ var Note = function Note() {
       category = _useNote.category,
       handleChangeCategory = _useNote.handleChangeCategory;
 
+  var renderNoteList = function renderNoteList(note) {
+    var _note$type;
+
+    return React__default.createElement(core.Grid, {
+      container: true,
+      spacing: 2
+    }, React__default.createElement(core.Grid, {
+      item: true,
+      xs: 12
+    }, React__default.createElement("div", {
+      className: "" + styles$t["header-item"]
+    }, React__default.createElement("div", {
+      className: "" + styles$t["title-content-note"]
+    }, React__default.createElement(core.Avatar, {
+      alt: "Remy Sharp",
+      src: !!note.avatarStudent ? marioCore.getFileUrl(note.avatarStudent) : DEFAULT_USER_AVATAR$j
+    }), React__default.createElement("p", {
+      className: "" + styles$t["name"]
+    }, note.nameStudent), React__default.createElement("p", null, "."), React__default.createElement("div", {
+      className: "date"
+    }, React__default.createElement("p", null, marioCore.utcToLocalTime(note.createAt, "DD MMMM YYYY")))), React__default.createElement("div", {
+      className: "" + styles$t["view"]
+    }, ((_note$type = note.type) === null || _note$type === void 0 ? void 0 : _note$type.toLowerCase()) === "personalized" && React__default.createElement(StarIcon, {
+      className: "" + (note.isFavorite ? styles$t["iconstart"] : styles$t["iconstartf"]),
+      onClick: function onClick() {
+        return updateFavorite(note.id, note.isFavorite);
+      }
+    }), React__default.createElement(core.Button, {
+      className: "" + styles$t["button-view"],
+      onClick: function onClick() {
+        return viewItemNoteLink(note.id, note.type);
+      }
+    }, "VIEW  ", React__default.createElement(ArrowForwardIcon, {
+      className: "" + styles$t["arrow-view"]
+    })), " "), " ")), React__default.createElement(core.Grid, {
+      item: true,
+      xs: 12
+    }, React__default.createElement("div", {
+      className: "" + styles$t["item-content"]
+    }, React__default.createElement(core.Grid, {
+      item: true,
+      xs: 7
+    }, renderNote(note)), React__default.createElement(core.Grid, {
+      item: true,
+      xs: 5
+    }, React__default.createElement("div", {
+      className: "" + styles$t["item-right"]
+    }, React__default.createElement("p", {
+      className: "" + styles$t["title-right"]
+    }, "Note Type & Class"), React__default.createElement("div", {
+      className: "" + styles$t["content-right"]
+    }, React__default.createElement("p", {
+      className: "" + styles$t["personalized"]
+    }, note.type), React__default.createElement("p", {
+      className: "" + styles$t["grade"]
+    }, "Grade ", note.grade)))))));
+  };
+
   var renderNote = function renderNote(note) {
     switch (note.type) {
       case "Personalized":
-        return React__default.createElement("div", null, React__default.createElement("p", {
+        return React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
           className: "" + styles$t["title"]
-        }, note.title), React__default.createElement("p", {
+        }, note.title), note.text && React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
           className: "" + styles$t["content-title-left"]
         }, "Detail"), React__default.createElement("p", {
           className: "" + styles$t["content-text"]
-        }, note.text));
+        }, note.text)));
 
       case "OnoToOne":
         if (note.text) {
           var noteItem = note.text.split("[/]");
 
-          if (noteItem.length === 1) {
-            return React__default.createElement("div", null, React__default.createElement("p", {
+          if (noteItem.length < 3) {
+            return React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
               className: "" + styles$t["title"]
             }, note.text));
           } else {
-            return React__default.createElement("div", null, React__default.createElement("p", {
+            return React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
               className: "" + styles$t["title"]
-            }, noteItem[1]), React__default.createElement("p", {
+            }, noteItem[1]), noteItem[2] && React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
               className: "" + styles$t["content-title-left"]
             }, "Detail"), React__default.createElement("p", {
               className: "" + styles$t["content-text"]
-            }, noteItem[2]));
+            }, noteItem[2])));
           }
         }
 
       default:
-        return React__default.createElement("div", null, React__default.createElement("p", {
+        return React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
           className: "" + styles$t["title"]
         }, note.text));
     }
@@ -32515,63 +32582,9 @@ var Note = function Note() {
     },
     ref: inputSearch
   }))))), allNoteList.length > 0 ? allNoteList.map(function (item) {
-    var _item$type;
-
     return React__default.createElement("div", {
       className: "" + styles$t["content-note"]
-    }, (item === null || item === void 0 ? void 0 : item.type) === "OnoToOne" && (item === null || item === void 0 ? void 0 : item.text) && React__default.createElement(core.Grid, {
-      container: true,
-      spacing: 2
-    }, React__default.createElement(core.Grid, {
-      item: true,
-      xs: 12
-    }, React__default.createElement("div", {
-      className: "" + styles$t["header-item"]
-    }, React__default.createElement("div", {
-      className: "" + styles$t["title-content-note"]
-    }, React__default.createElement(core.Avatar, {
-      alt: "Remy Sharp",
-      src: !!(item !== null && item !== void 0 && item.avatarStudent) ? marioCore.getFileUrl(item === null || item === void 0 ? void 0 : item.avatarStudent) : DEFAULT_USER_AVATAR$j
-    }), React__default.createElement("p", {
-      className: "" + styles$t["name"]
-    }, item === null || item === void 0 ? void 0 : item.nameStudent), React__default.createElement("p", null, "."), React__default.createElement("div", {
-      className: "date"
-    }, React__default.createElement("p", null, marioCore.utcToLocalTime(item === null || item === void 0 ? void 0 : item.createAt, "DD MMMM YYYY")))), React__default.createElement("div", {
-      className: "" + styles$t["view"]
-    }, (item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.toLowerCase()) === "personalized" && React__default.createElement(StarIcon, {
-      className: "" + (item !== null && item !== void 0 && item.isFavorite ? styles$t["iconstart"] : styles$t["iconstartf"]),
-      onClick: function onClick() {
-        return updateFavorite(item === null || item === void 0 ? void 0 : item.id, item === null || item === void 0 ? void 0 : item.isFavorite);
-      }
-    }), React__default.createElement(core.Button, {
-      className: "" + styles$t["button-view"],
-      onClick: function onClick() {
-        return viewItemNoteLink(item === null || item === void 0 ? void 0 : item.id, item === null || item === void 0 ? void 0 : item.type);
-      }
-    }, "VIEW  ", React__default.createElement(ArrowForwardIcon, {
-      className: "" + styles$t["arrow-view"]
-    })), " "), " ")), React__default.createElement(core.Grid, {
-      item: true,
-      xs: 12
-    }, React__default.createElement("div", {
-      className: "" + styles$t["item-content"]
-    }, React__default.createElement(core.Grid, {
-      item: true,
-      xs: 7
-    }, renderNote(item)), React__default.createElement(core.Grid, {
-      item: true,
-      xs: 5
-    }, React__default.createElement("div", {
-      className: "" + styles$t["item-right"]
-    }, React__default.createElement("p", {
-      className: "" + styles$t["title-right"]
-    }, "Note Type & Class"), React__default.createElement("div", {
-      className: "" + styles$t["content-right"]
-    }, React__default.createElement("p", {
-      className: "" + styles$t["personalized"]
-    }, item === null || item === void 0 ? void 0 : item.type), React__default.createElement("p", {
-      className: "" + styles$t["grade"]
-    }, "Grade ", item === null || item === void 0 ? void 0 : item.grade))))))));
+    }, (item === null || item === void 0 ? void 0 : item.type) === "Personalized" ? renderNoteList(item) : React__default.createElement(React__default.Fragment, null, (item === null || item === void 0 ? void 0 : item.text) && renderNoteList(item)));
   }) : React__default.createElement("div", {
     className: "" + styles$t["no-data"]
   }, React__default.createElement("p", {
@@ -36108,7 +36121,8 @@ var useTodoList = function useTodoList() {
     handleChangeDeadline: handleChangeDeadline,
     handleChangeClassName: handleChangeClassName,
     handleChangeSearchString: handleChangeSearchString,
-    getActionPointList: getActionPointList
+    getActionPointList: getActionPointList,
+    isTeacher: isTeacher
   };
 };
 
@@ -36121,7 +36135,8 @@ var TodoList = function TodoList(props) {
       filters = _useTodoList.filters,
       handleChangeClassName = _useTodoList.handleChangeClassName,
       handleChangeSearchString = _useTodoList.handleChangeSearchString,
-      getActionPointList = _useTodoList.getActionPointList;
+      getActionPointList = _useTodoList.getActionPointList,
+      isTeacher = _useTodoList.isTeacher;
 
   if (props.reloadRef) {
     props.reloadRef.current = {
@@ -36135,7 +36150,7 @@ var TodoList = function TodoList(props) {
     className: "" + styles$x["wrapper"]
   }, React__default.createElement("div", {
     className: "" + styles$x["filter-box"]
-  }, React__default.createElement(core.FormControl, {
+  }, !isTeacher && React__default.createElement(core.FormControl, {
     variant: "outlined",
     style: {
       marginRight: "10px"