mario-teacher-student-client 1.4.1 → 1.4.2

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

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-declare const StudentSelector: ({ setStudentId, setStudentUserId, setStudentName, setStudentProfileImage, studentUserId }: any) => JSX.Element | null;
+declare const StudentSelector: ({ setStudentId, setStudentUserId, setStudentName, setStudentProfileImage, studentUserId, setIsCheckStudent }: any) => JSX.Element | null;
 export default StudentSelector;

package/dist/index.css

@@ -37,7 +37,8 @@
       cursor: pointer;
       font-size: 18px;
       color: "#2D3748";
-      font-weight: 700; }
+      font-weight: 700;
+      margin-bottom: 0; }
       ._vnH2n ._11kCD p ._dqAoB {
         padding-right: 15;
         font-size: 18px; }
@@ -1643,7 +1644,7 @@ p._1YLGi {
   ._T1fJ4 ._2hOFE {
     padding-right: 20px;
     font-weight: 800;
-    margin-top: 10px; }
+    margin-top: 5px; }
 
 ._3-Mx5 p:nth-child(1) {
   color: #2d3748;
@@ -2310,7 +2311,7 @@ h2._1OAmb {
 
 ._2QGnx {
   text-align: center;
-  padding: 10px 0 0;
+  padding: 20px 10px 10px 10px;
   width: 205px;
   margin-right: 16px;
   border-radius: 9px;
@@ -2318,7 +2319,8 @@ h2._1OAmb {
   ._2QGnx ._175nT {
     font-size: 17px;
     font-weight: 700;
-    color: rgba(102, 102, 112, 0.75); }
+    color: rgba(102, 102, 112, 0.75);
+    white-space: nowrap; }
   ._2QGnx ._fEaRj {
     color: #252733;
     font-weight: 700;

package/dist/index.js

@@ -15,7 +15,10 @@ var MenuIcon = _interopDefault(require('@material-ui/icons/Menu'));
 var core = require('@material-ui/core');
 var icons = require('@material-ui/icons');
 var HomeIcon = _interopDefault(require('@material-ui/icons/Home'));
-var AccessibilityIcon = _interopDefault(require('@material-ui/icons/Accessibility'));
+var GroupIcon = _interopDefault(require('@material-ui/icons/Group'));
+var SettingsIcon = _interopDefault(require('@material-ui/icons/Settings'));
+var StudentsIcon = _interopDefault(require('@material-ui/icons/Wc'));
+var SchoolIcon = _interopDefault(require('@material-ui/icons/School'));
 var dateFns = require('date-fns');
 var moment = _interopDefault(require('moment'));
 var FullCalendar = _interopDefault(require('@fullcalendar/react'));
@@ -144,20 +147,22 @@ var ICON_NAV = [{
   name: "Home",
   icon: React__default.createElement(HomeIcon, null)
 }, {
-  name: "My Student",
-  icon: React__default.createElement(AccessibilityIcon, null)
+  name: "My Students",
+  icon: React__default.createElement(StudentsIcon, null)
 }, {
   name: "My Class Reflections",
-  icon: React__default.createElement(AccessibilityIcon, null)
+  icon: React__default.createElement(SchoolIcon, null)
 }, {
   name: "My 1-to-1",
-  icon: React__default.createElement(HomeIcon, null)
+  icon: React__default.createElement(GroupIcon, null)
 }, {
   name: "My Conferences",
-  icon: React__default.createElement(HomeIcon, null)
+  icon: React__default.createElement("i", {
+    className: "fas fa-chalkboard-teacher"
+  })
 }, {
   name: "Settings",
-  icon: React__default.createElement(HomeIcon, null)
+  icon: React__default.createElement(SettingsIcon, null)
 }];
 
 var HeaderSideBar = function HeaderSideBar(_ref) {
@@ -1582,7 +1587,8 @@ var StudentSelector = function StudentSelector(_ref) {
       setStudentUserId = _ref.setStudentUserId,
       setStudentName = _ref.setStudentName,
       setStudentProfileImage = _ref.setStudentProfileImage,
-      studentUserId = _ref.studentUserId;
+      studentUserId = _ref.studentUserId,
+      setIsCheckStudent = _ref.setIsCheckStudent;
 
   var _useUpComing = useUpComing(),
       studentData = _useUpComing.studentData;
@@ -1595,6 +1601,9 @@ var StudentSelector = function StudentSelector(_ref) {
       open = _React$useState2[0],
       setOpen = _React$useState2[1];
 
+  React.useEffect(function () {
+    (studentData === null || studentData === void 0 ? void 0 : studentData.length) > 0 ? setIsCheckStudent === null || setIsCheckStudent === void 0 ? void 0 : setIsCheckStudent(true) : setIsCheckStudent === null || setIsCheckStudent === void 0 ? void 0 : setIsCheckStudent(false);
+  }, [studentData]);
   if (!studentData || !studentData.length) return null;
   var value = studentData === null || studentData === void 0 ? void 0 : studentData.find(function (item) {
     return item.id == studentUserId;
@@ -1662,6 +1671,10 @@ var DialogRequestOneToOne = function DialogRequestOneToOne(_ref) {
       selectData = _useState[0],
       setSelectData = _useState[1];
 
+  var _useState2 = React.useState(false),
+      isCheckStudent = _useState2[0],
+      setIsCheckStudent = _useState2[1];
+
   var history = reactRouterDom.useHistory();
   var dispatch = reactRedux.useDispatch();
 
@@ -1728,7 +1741,8 @@ var DialogRequestOneToOne = function DialogRequestOneToOne(_ref) {
     }
   }, React__default.createElement(StudentSelector, {
     setStudentId: setStudentId,
-    setStudentName: setStudentName
+    setStudentName: setStudentName,
+    setIsCheckStudent: setIsCheckStudent
   }), !selectData && React__default.createElement(core.Typography, {
     style: {
       fontSize: "14px",
@@ -1738,7 +1752,7 @@ var DialogRequestOneToOne = function DialogRequestOneToOne(_ref) {
     style: {
       fontSize: "18px"
     }
-  }, "Select a student, launch a new session or book one for later.")), React__default.createElement(core.Box, {
+  }, !!isCheckStudent ? "Select a student, launch a new session or book one for later." : "You have no student")), (isTeacher && isCheckStudent || !isTeacher) && React__default.createElement(React__default.Fragment, null, React__default.createElement(core.Box, {
     pt: 2,
     className: "" + stylesOto["btn-session"]
   }, React__default.createElement(core.Button, {
@@ -1767,7 +1781,7 @@ var DialogRequestOneToOne = function DialogRequestOneToOne(_ref) {
       padding: "13px 27px"
     },
     onClick: handlePushBookSession
-  }, "BOOK FOR LATER")));
+  }, "BOOK FOR LATER"))));
 };
 
 var _excluded = ["children", "value", "index"];
@@ -3245,10 +3259,14 @@ var DialogRequestConferences = function DialogRequestConferences(_ref) {
   var currentStudentId = currentUser.studentId;
   var isTeacher = currentUser.roles.includes("Teacher");
 
-  var _useState = React.useState(),
+  var _useState = React.useState('0'),
       selectData = _useState[0],
       setSelectData = _useState[1];
 
+  var _useState2 = React.useState(false),
+      isCheckStudent = _useState2[0],
+      setIsCheckStudent = _useState2[1];
+
   var history = reactRouterDom.useHistory();
   var dispatch = reactRedux.useDispatch();
 
@@ -3315,7 +3333,8 @@ var DialogRequestConferences = function DialogRequestConferences(_ref) {
     }
   }, React__default.createElement(StudentSelector, {
     setStudentId: setStudentId,
-    setStudentName: setStudentName
+    setStudentName: setStudentName,
+    setIsCheckStudent: setIsCheckStudent
   }), !selectData && React__default.createElement(core.Typography, {
     style: {
       fontSize: "14px",
@@ -3325,7 +3344,7 @@ var DialogRequestConferences = function DialogRequestConferences(_ref) {
     style: {
       fontSize: "18px"
     }
-  }, "Select a student, launch a new session or book one for later.")), React__default.createElement(core.Box, {
+  }, isCheckStudent ? "Select a student, launch a new session or book one for later." : "You have no student")), (isTeacher && isCheckStudent || !isTeacher) && React__default.createElement(React__default.Fragment, null, React__default.createElement(core.Box, {
     pt: 2,
     className: "" + styles$1["btn-session"]
   }, React__default.createElement(core.Button, {
@@ -3356,7 +3375,7 @@ var DialogRequestConferences = function DialogRequestConferences(_ref) {
       padding: "13px 27px"
     },
     onClick: handlePushBookSession
-  }, "BOOK FOR LATER")));
+  }, "BOOK FOR LATER"))));
 };
 
 var SEARCH_LEARNING$1 = marioCore.BASE_URL + "/api/SearchLearning";
@@ -5004,12 +5023,12 @@ var ConductTop = function ConductTop(_ref) {
     backgroundColor: "#FED7E2"
   }];
   var teacherRequest = {
-    label: "Teacher request",
+    label: isConference ? "" : "Teacher request",
     color: "#702459",
     backgroundColor: "#FED7E2"
   };
   var studentRequest = {
-    label: "Student request",
+    label: isConference ? "" : "Student request",
     color: "#702459",
     backgroundColor: "#FED7E2"
   };
@@ -10482,7 +10501,7 @@ var StudentList = function StudentList() {
     history.push(url);
   }, [isTeacher]);
   React.useEffect(function () {
-    document.title = "My Student";
+    document.title = "My Students";
   }, []);
   return React__default.createElement(core.Grid, null, React__default.createElement(core.Grid, {
     className: "" + myStudent["title-student-gr"]
@@ -11045,7 +11064,7 @@ var OverviewLeft = function OverviewLeft(props) {
     sm: 6,
     justifyContent: "flex-end",
     style: {
-      paddingRight: "30px",
+      paddingRight: "15px",
       textAlign: "right"
     }
   }, React__default.createElement(core.Button, {
@@ -11262,10 +11281,10 @@ var useOverview = function useOverview(studentId) {
     var timeResult = "";
 
     if (time >= 60) {
-      hour = time / 60;
-      minute = time - hour * 60;
+      hour = Math.floor(time / 60);
+      minute = Math.round(time - hour * 60);
     } else {
-      minute = time;
+      minute = Math.round(time);
     }
 
     if (hour > 0) {
@@ -12746,7 +12765,7 @@ var InformationUser = function InformationUser(_ref) {
     className: styles$6["grey-desc"]
   }, "Time and date"), React__default.createElement("h5", {
     className: styles$6["science-class"]
-  }, moment(informationUser.time).format("MMMM Do YYYY, h:mm A"))));
+  }, moment(informationUser.time).format("DD/MM/YY - HH:mm A"))));
 };
 
 var useStartReflection = function useStartReflection() {