mario-teacher-student-client 1.2.4 → 1.2.5

package/dist/containers/MyOneToOne/hooks/useSessionCompleted.d.ts

@@ -1,8 +1,7 @@
-import { FILTER_SESSION } from "../constants/types";
 declare const useSessionCompleted: () => {
     sessionDataHistory: any;
-    changeFilters: (updatedFilters: any) => void;
-    filters: FILTER_SESSION;
+    changeFilters: (updatedFilters: any) => any;
+    filters: any;
     selectFavourite: (itemID: string) => Promise<void>;
 };
 export default useSessionCompleted;

package/dist/containers/MyOneToOne/hooks/useUpComing.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import { FILTER_SESSION } from "../constants/types";
 declare const useUpComing: () => {
     studentData: any;
     setStudentData: import("react").Dispatch<any>;
@@ -8,9 +7,9 @@ declare const useUpComing: () => {
     studentNoteData: any;
     privateNoteData: any;
     bookSession: (data: any) => Promise<void>;
-    setFilters: import("react").Dispatch<import("react").SetStateAction<FILTER_SESSION>>;
-    changeFilters: (updatedFilters: any) => void;
-    filters: FILTER_SESSION;
+    setFilters: any;
+    changeFilters: (updatedFilters: any) => any;
+    filters: any;
     changRouteQuestion: (studentId: number) => Promise<void>;
     getAllNoteSession: (sessionId: any) => Promise<void>;
     createSessionSingleNote: (note: any, sessionResultId: any, sessionId: any) => Promise<void>;

package/dist/index.css

@@ -2260,7 +2260,7 @@ h4._pDCgR {
         color: #fff;
         text-transform: uppercase; }
     ._23ZHZ thead tr th:not(:last-child) {
-      border-right: 1px solid #E2E8F0; }
+      border-right: 1px solid #e2e8f0; }
   ._23ZHZ ._3DiW6 > div {
     display: inline-block; }
 
@@ -2340,3 +2340,10 @@ h2._1KpSK {
       margin-right: 8px;
       width: 15px;
       height: 15px; }
+
+._2_UXR img,
+._1fQy_ img,
+._q3ph4 img {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%; }

package/dist/index.js

@@ -1135,36 +1135,54 @@ var useUpComing = function useUpComing() {
       studentData = _useState2[0],
       setStudentData = _useState2[1];
 
-  var _useState3 = React.useState({
-    startDate: Date.now(),
-    endDate: moment().add(7, "days").valueOf(),
-    currentPage: 1,
-    pageSize: 20,
-    searchString: "",
-    sortBy: "StartTime",
-    sortOrder: "DESC"
-  }),
-      filters = _useState3[0],
-      setFilters = _useState3[1];
-
   var currentUser = reactRedux.useSelector(function (state) {
     var _state$common;
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
   var isTeacher = currentUser.roles.includes("Teacher");
+  var filters = null;
+  var setFilters = null;
+
+  if (!isTeacher) {
+    var _useState3 = React.useState({
+      startDate: undefined,
+      endDate: undefined,
+      currentPage: 1,
+      pageSize: 20,
+      searchString: "",
+      sortBy: "StartTime",
+      sortOrder: "DESC"
+    });
 
-  var _useState4 = React.useState(),
-      teacherNoteData = _useState4[0],
-      setTeacherNoteData = _useState4[1];
+    filters = _useState3[0];
+    setFilters = _useState3[1];
+  } else {
+    var _useState4 = React.useState({
+      startDate: Date.now(),
+      endDate: moment().add(7, "days").valueOf(),
+      currentPage: 1,
+      pageSize: 20,
+      searchString: "",
+      sortBy: "StartTime",
+      sortOrder: "DESC"
+    });
+
+    filters = _useState4[0];
+    setFilters = _useState4[1];
+  }
 
   var _useState5 = React.useState(),
-      studentNoteData = _useState5[0],
-      setStudentNoteData = _useState5[1];
+      teacherNoteData = _useState5[0],
+      setTeacherNoteData = _useState5[1];
 
   var _useState6 = React.useState(),
-      privateNoteData = _useState6[0],
-      setPrivateNoteData = _useState6[1];
+      studentNoteData = _useState6[0],
+      setStudentNoteData = _useState6[1];
+
+  var _useState7 = React.useState(),
+      privateNoteData = _useState7[0],
+      setPrivateNoteData = _useState7[1];
 
   var changeFilters = function changeFilters(updatedFilters) {
     return setFilters(_extends({}, filters, updatedFilters));
@@ -1464,9 +1482,9 @@ var useUpComing = function useUpComing() {
     }
   };
 
-  var _useState7 = React.useState(),
-      nextSession = _useState7[0],
-      setNextSession = _useState7[1];
+  var _useState8 = React.useState(),
+      nextSession = _useState8[0],
+      setNextSession = _useState8[1];
 
   var nextTimeMeeting = function nextTimeMeeting() {
     try {
@@ -1997,13 +2015,6 @@ var UpComing = function UpComing() {
 
   React.useEffect(function () {
     document.title = "My 1-To-1";
-
-    if (!isTeacher) {
-      changeFilters({
-        startDate: undefined,
-        endDate: undefined
-      });
-    }
   }, [isTeacher]);
   var open = React.useCallback(function (row) {
     var resultId = isTeacher ? row.teacherResultId : row.studentResultId;
@@ -2338,18 +2349,44 @@ var useSessionCompleted = function useSessionCompleted() {
       sessionDataHistory = _useState[0],
       setSessionDataHistory = _useState[1];
 
-  var _useState2 = React.useState({
-    startDate: moment().subtract(30, 'days').valueOf(),
-    endDate: Date.now(),
-    currentPage: 1,
-    pageSize: 20,
-    searchString: "",
-    sortBy: 'StartTime',
-    sortOrder: 'DESC',
-    onlyShowFavourite: false
-  }),
-      filters = _useState2[0],
-      setFilters = _useState2[1];
+  var roles = reactRedux.useSelector(function (state) {
+    var _state$common, _state$common$user;
+
+    return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
+  });
+  var isTeacher = roles.includes("Teacher");
+  var filters = null;
+  var setFilters = null;
+
+  if (!isTeacher) {
+    var _useState2 = React.useState({
+      startDate: undefined,
+      endDate: undefined,
+      currentPage: 1,
+      pageSize: 20,
+      searchString: "",
+      sortBy: 'StartTime',
+      sortOrder: 'DESC',
+      onlyShowFavourite: false
+    });
+
+    filters = _useState2[0];
+    setFilters = _useState2[1];
+  } else {
+    var _useState3 = React.useState({
+      startDate: moment().subtract(30, 'days').valueOf(),
+      endDate: Date.now(),
+      currentPage: 1,
+      pageSize: 20,
+      searchString: "",
+      sortBy: 'StartTime',
+      sortOrder: 'DESC',
+      onlyShowFavourite: false
+    });
+
+    filters = _useState3[0];
+    setFilters = _useState3[1];
+  }
 
   var changeFilters = function changeFilters(updatedFilters) {
     return setFilters(_extends({}, filters, updatedFilters));
@@ -2378,13 +2415,6 @@ var useSessionCompleted = function useSessionCompleted() {
     }
   };
 
-  var roles = reactRedux.useSelector(function (state) {
-    var _state$common, _state$common$user;
-
-    return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
-  });
-  var isTeacher = roles.includes("Teacher");
-
   var selectFavourite = function selectFavourite(itemID) {
     try {
       var _temp4 = _catch(function () {
@@ -8644,7 +8674,7 @@ var InformationUser = function InformationUser(_ref) {
   }, React__default.createElement("div", {
     className: styles$2["infor-image"]
   }, React__default.createElement("img", {
-    src: informationUser !== null && informationUser !== void 0 && informationUser.avatarImage ? marioCore.getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.avatarImage) : "/images/image-default.png",
+    src: !!(informationUser !== null && informationUser !== void 0 && informationUser.avatarImage) ? informationUser === null || informationUser === void 0 ? void 0 : informationUser.avatarImage : "/images/image-default.png",
     alt: ""
   })), React__default.createElement("div", {
     className: styles$2["infor-text"]
@@ -11248,7 +11278,7 @@ var Table = function Table(props) {
 Table.propTypes = propTypes$1;
 Table.defaultProps = defaultProps;
 
-var styles$3 = {"block-question":"_12tWP","box-last":"_1WNMT","top-session":"_3BU0L","table-rubrics":"_23ZHZ","conference-td":"_3DiW6","result-page":"_1QPtC","title-strategories":"_2CRbt","strategories-image":"_EqDo0","block-conference":"_5sdsU","question-block":"_2jjjz","img-session":"_1N_R5","switch-session":"_2w7-X","body-session":"_Avpph","font-title":"_1KpSK","modal-finished":"_342x6","title-modal":"_1GUG4","body-modal":"_YnLTE","tite-body":"_22zyk","btn-cancel":"_1o-mw","btn-submit":"_18HUG"};
+var styles$3 = {"block-question":"_12tWP","box-last":"_1WNMT","top-session":"_3BU0L","table-rubrics":"_23ZHZ","conference-td":"_3DiW6","result-page":"_1QPtC","title-strategories":"_2CRbt","strategories-image":"_EqDo0","block-conference":"_5sdsU","question-block":"_2jjjz","img-session":"_1N_R5","switch-session":"_2w7-X","body-session":"_Avpph","font-title":"_1KpSK","modal-finished":"_342x6","title-modal":"_1GUG4","body-modal":"_YnLTE","tite-body":"_22zyk","btn-cancel":"_1o-mw","btn-submit":"_18HUG","teacher":"_2_UXR","agreement":"_1fQy_","student":"_q3ph4"};
 
 var RubricTable = function RubricTable(_ref) {
   var _rubric$rows;
@@ -11359,7 +11389,7 @@ var RubricTable = function RubricTable(_ref) {
       scope: "row",
       className: "align-middle"
     }, row === null || row === void 0 ? void 0 : row.text), rubric === null || rubric === void 0 ? void 0 : (_rubric$columns = rubric.columns) === null || _rubric$columns === void 0 ? void 0 : _rubric$columns.map(function (column, index) {
-      var _choiceTeacherItem, _choiceStudentItem, _choiceTeacherItem2, _choiceStudentItem2;
+      var _choiceTeacherItem, _choiceStudentItem, _choiceTeacherItem2, _choiceStudentItem2, _choiceTeacherItem3, _choiceStudentItem3;
 
       return React__default.createElement("td", {
         className: "text-center align-middle " + styles$3["conference-td"],
@@ -11368,13 +11398,20 @@ var RubricTable = function RubricTable(_ref) {
         onClick: function onClick() {
           choiceAnswerRubric(rubric === null || rubric === void 0 ? void 0 : rubric.id, row === null || row === void 0 ? void 0 : row.id, column.order, false);
         }
-      }, React__default.createElement("div", {
+      }, ((_choiceTeacherItem = choiceTeacherItem(row.id)) === null || _choiceTeacherItem === void 0 ? void 0 : _choiceTeacherItem.choice) != "Default" || ((_choiceStudentItem = choiceStudentItem(row.id)) === null || _choiceStudentItem === void 0 ? void 0 : _choiceStudentItem.choice) != "Default" ? React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
         className: "" + styles$3["teacher"]
-      }, ((_choiceTeacherItem = choiceTeacherItem(row.id)) === null || _choiceTeacherItem === void 0 ? void 0 : _choiceTeacherItem.choice) === colIndex[index] && React__default.createElement(Teacher, null)), React__default.createElement("div", {
+      }, ((_choiceTeacherItem2 = choiceTeacherItem(row.id)) === null || _choiceTeacherItem2 === void 0 ? void 0 : _choiceTeacherItem2.choice) === colIndex[index] && React__default.createElement(Teacher, null)), React__default.createElement("div", {
         className: "" + styles$3["agreement"]
-      }, ((_choiceStudentItem = choiceStudentItem(row.id)) === null || _choiceStudentItem === void 0 ? void 0 : _choiceStudentItem.choice) === colIndex[index] && ((_choiceTeacherItem2 = choiceTeacherItem(row.id)) === null || _choiceTeacherItem2 === void 0 ? void 0 : _choiceTeacherItem2.choice) === colIndex[index] && React__default.createElement(Agreement, null)), React__default.createElement("div", {
+      }, ((_choiceStudentItem2 = choiceStudentItem(row.id)) === null || _choiceStudentItem2 === void 0 ? void 0 : _choiceStudentItem2.choice) === colIndex[index] && ((_choiceTeacherItem3 = choiceTeacherItem(row.id)) === null || _choiceTeacherItem3 === void 0 ? void 0 : _choiceTeacherItem3.choice) === colIndex[index] && React__default.createElement(Agreement, null)), React__default.createElement("div", {
         className: "" + styles$3["student"]
-      }, ((_choiceStudentItem2 = choiceStudentItem(row.id)) === null || _choiceStudentItem2 === void 0 ? void 0 : _choiceStudentItem2.choice) === colIndex[index] && React__default.createElement(Student, null)));
+      }, ((_choiceStudentItem3 = choiceStudentItem(row.id)) === null || _choiceStudentItem3 === void 0 ? void 0 : _choiceStudentItem3.choice) === colIndex[index] && React__default.createElement(Student, null))) : React__default.createElement("div", {
+        className: "" + styles$3["row-default"],
+        style: {
+          textAlign: "center"
+        }
+      }, React__default.createElement("img", {
+        src: "/images/default-conference.png"
+      })));
     }));
   })));
 };