mario-teacher-student-client 1.7.3 → 1.7.4

package/dist/containers/SettingsPage/components/NotificationsPage.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export default function NotificationsPage(): JSX.Element;

package/dist/index.d.ts

@@ -19,4 +19,5 @@ import UpdateStudentProfile from "./containers/MyStudent/components/UpdateStuden
 import CreateStudent from "./containers/MyStudent/components/CreateStudent";
 import ChangePassword from "./containers/MyProfile/views/ChangePassword";
 import StageDebugPage from "./containers/StageDebug/views/StageDebugPage";
-export { MainLayout, HomePage, MyOneToOne, MyConferences, ConductIndex, MyStudent, SessionResultComponent, BookSession, StudentDetail, StartReflection, ResultReflection, StudentReflection, ConferenceRubric, ResultConferenceRubric, BookSessionConferences, MyProfile, NewLearningPlan, UpdateStudentProfile, CreateStudent, ChangePassword, StageDebugPage };
+import NotificarionsPage from "./containers/SettingsPage/components/NotificationsPage";
+export { MainLayout, HomePage, MyOneToOne, MyConferences, ConductIndex, MyStudent, SessionResultComponent, BookSession, StudentDetail, StartReflection, ResultReflection, StudentReflection, ConferenceRubric, ResultConferenceRubric, BookSessionConferences, MyProfile, NewLearningPlan, UpdateStudentProfile, CreateStudent, ChangePassword, StageDebugPage, NotificarionsPage };

package/dist/index.js

@@ -70,6 +70,7 @@ require('react-datepicker/dist/react-datepicker.css');
 var DatePicker = _interopDefault(require('react-datepicker'));
 var jsPDF = _interopDefault(require('jspdf'));
 var SaveIcon = _interopDefault(require('@material-ui/icons/Save'));
+var Button = _interopDefault(require('@material-ui/core/Button'));
 
 // A type of promise-like that resolves synchronously and supports only one observer
 
@@ -904,7 +905,7 @@ var CurrentFullCalendar = function CurrentFullCalendar(props) {
       isTeacher = props.isTeacher;
   var history = reactRouterDom.useHistory();
   var map = eventList === null || eventList === void 0 ? void 0 : eventList.map(function (event) {
-    var _event$sessionResult, _event$sessionResult2;
+    var _event$sessionResult, _event$sessionResult2, _event$conferenceAnsw;
 
     return {
       id: event.location,
@@ -917,7 +918,9 @@ var CurrentFullCalendar = function CurrentFullCalendar(props) {
         studentResultId: (_event$sessionResult2 = event.sessionResult) === null || _event$sessionResult2 === void 0 ? void 0 : _event$sessionResult2.find(function (r) {
           return !r.isTeacherResult;
         }).id,
-        sessionResult: event.sessionId
+        sessionResult: event.sessionId,
+        studentId: (_event$conferenceAnsw = event.conferenceAnswers) === null || _event$conferenceAnsw === void 0 ? void 0 : _event$conferenceAnsw.studentId,
+        conferenceId: event.conferenceId
       }
     };
   });
@@ -926,12 +929,18 @@ var CurrentFullCalendar = function CurrentFullCalendar(props) {
     var _event$event$_def$ext = event.event._def.extendedProps,
         teacherResultId = _event$event$_def$ext.teacherResultId,
         studentResultId = _event$event$_def$ext.studentResultId,
-        sessionResult = _event$event$_def$ext.sessionResult;
+        sessionResult = _event$event$_def$ext.sessionResult,
+        studentId = _event$event$_def$ext.studentId,
+        conferenceId = _event$event$_def$ext.conferenceId;
 
     if (!!teacherResultId && isTeacher) {
-      history.push("start-question/" + sessionResult + "/" + teacherResultId);
+      history.push("/start-question/" + sessionResult + "/" + teacherResultId);
     } else if (!!studentResultId && !isTeacher) {
-      history.push("start-question/" + sessionResult + "/" + studentResultId);
+      history.push("/start-question/" + sessionResult + "/" + studentResultId);
+    }
+
+    if (!!studentId && !!conferenceId) {
+      history.push("/start-conference/" + studentId + "/" + conferenceId + "/conferenceRubric");
     }
   };
 
@@ -5773,7 +5782,9 @@ var LearningStrategyComponent = function LearningStrategyComponent(_ref) {
       setAnswerLearningStrategory = _useState[1];
 
   var onChangeLearingStategory = function onChangeLearingStategory(answerId) {
-    var arrNew = [].concat(answerLearningStrategy);
+    var arrNew = answerLearningStrategy.filter(function (item) {
+      return item != '';
+    });
     var newLearningStategory = [];
 
     if (arrNew.includes(answerId)) {
@@ -5785,12 +5796,12 @@ var LearningStrategyComponent = function LearningStrategyComponent(_ref) {
     }
 
     setAnswerLearningStrategory(newLearningStategory);
-    var textValue = "," + newLearningStategory.join(",") + ",";
+    var textValue = newLearningStategory.join(";");
     onChangeQuestionAnswer === null || onChangeQuestionAnswer === void 0 ? void 0 : onChangeQuestionAnswer(questionId, textValue);
   };
 
   React.useEffect(function () {
-    var newInitAnswers = (valueText === null || valueText === void 0 ? void 0 : valueText.split(",")) || [];
+    var newInitAnswers = (valueText === null || valueText === void 0 ? void 0 : valueText.split(";")) || [];
     setAnswerLearningStrategory(newInitAnswers);
   }, [valueText]);
   return React__default.createElement("div", {
@@ -8020,7 +8031,7 @@ var ConductIndex = function ConductIndex() {
   }, React__default.createElement(core.DialogTitle, {
     id: "alert-dialog-title",
     className: styles$2["title-modal"]
-  }, "finished"), React__default.createElement(core.DialogContent, {
+  }, "Before clicking submit"), React__default.createElement(core.DialogContent, {
     className: styles$2["body-modal"]
   }, React__default.createElement(core.DialogContentText, {
     id: "alert-dialog-description"
@@ -8058,7 +8069,7 @@ var ConductIndex = function ConductIndex() {
     value: 60
   }, "1 hour")))) : React__default.createElement(React__default.Fragment, null, React__default.createElement("h4", {
     className: styles$2["tite-body"]
-  }, "Make sure with your teacher that you talked about everything you needed")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
+  }, "be sure to check with your teacher that you have completed all that is required")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
     onClick: handleModalSessionClose,
     color: "primary",
     className: styles$2["btn-cancel"]
@@ -11379,8 +11390,8 @@ var useStyles$6 = styles$b.makeStyles(function () {
     }, _span), _tabLabel),
     tabLabelMobile: {
       height: "55px",
-      maxWidth: "150px",
-      width: "150px",
+      maxWidth: "153px",
+      width: "153px",
       opacity: 1,
       padding: "auto",
       background: "#156DA1",
@@ -14390,13 +14401,13 @@ var StartReflection = function StartReflection() {
   }, React__default.createElement(core.DialogTitle, {
     id: "alert-dialog-title",
     className: styles$6["title-modal"]
-  }, "finished"), React__default.createElement(core.DialogContent, {
+  }, "Before clicking submit"), React__default.createElement(core.DialogContent, {
     className: styles$6["body-modal"]
   }, React__default.createElement(core.DialogContentText, {
     id: "alert-dialog-description"
   }, React__default.createElement(React__default.Fragment, null, React__default.createElement("h4", {
     className: styles$6["tite-body"]
-  }, "Make sure with your teacher that you talked about everything you needed")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
+  }, "Be sure to check with your teacher that you have completed all that is required")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
     onClick: handleModalSessionClose,
     color: "primary",
     className: styles$6["btn-cancel"]
@@ -16818,7 +16829,7 @@ var ConferenceRubric = function ConferenceRubric() {
   }, React__default.createElement(core.DialogTitle, {
     id: "alert-dialog-title",
     className: styles$7["title-modal"]
-  }, "finished"), React__default.createElement(core.DialogContent, {
+  }, "Before clicking submit"), React__default.createElement(core.DialogContent, {
     className: styles$7["body-modal"]
   }, React__default.createElement(core.DialogContentText, {
     id: "alert-dialog-description"
@@ -16856,7 +16867,7 @@ var ConferenceRubric = function ConferenceRubric() {
     value: 360
   }, "6h")))) : React__default.createElement(React__default.Fragment, null, React__default.createElement("h4", {
     className: styles$7["tite-body"]
-  }, "Make sure with your teacher that you talked about everything you needed")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
+  }, "be sure to check with your teacher that you have completed all that is required")))), React__default.createElement(core.DialogActions, null, React__default.createElement(core.Button, {
     onClick: handleModalConferenceClose,
     color: "primary",
     className: styles$7["btn-cancel"]
@@ -20782,6 +20793,90 @@ var StageDebugPage = function StageDebugPage() {
   });
 };
 
+var useStyles$8 = styles$b.makeStyles(function (theme) {
+  return styles$b.createStyles({
+    container: {
+      display: 'flex',
+      flexWrap: 'wrap',
+      marginLeft: "15px"
+    },
+    textField: {
+      marginLeft: theme.spacing(1),
+      marginRight: theme.spacing(1),
+      width: 200
+    },
+    paddindNotificationsPage: {
+      padding: "50px"
+    },
+    buttonsubmit: {
+      width: "100px",
+      "float": "right"
+    }
+  });
+});
+function NotificationsPage() {
+  var classes = useStyles$8();
+  return React__default.createElement("div", {
+    className: classes.paddindNotificationsPage
+  }, React__default.createElement(core.Typography, {
+    variant: "h3",
+    component: "h2"
+  }, "Activity Notifications"), React__default.createElement(core.FormControl, {
+    component: "fieldset"
+  }, React__default.createElement(core.FormGroup, {
+    "aria-label": "position"
+  }, React__default.createElement(core.FormControlLabel, {
+    value: "start",
+    control: React__default.createElement(core.Switch, {
+      color: "primary"
+    }),
+    label: "Notifications ON/OFF",
+    labelPlacement: "start"
+  }), React__default.createElement("div", null, React__default.createElement(core.Typography, null, " Time to mute notifications "), React__default.createElement(core.TextField, {
+    id: "datetime-local",
+    label: "From",
+    type: "datetime-local",
+    defaultValue: "2017-05-24T10:30",
+    className: classes.textField,
+    InputLabelProps: {
+      shrink: true
+    }
+  }), React__default.createElement(core.TextField, {
+    id: "datetime-local",
+    label: "To",
+    type: "datetime-local",
+    defaultValue: "2017-05-24T10:30",
+    className: classes.textField,
+    InputLabelProps: {
+      shrink: true
+    }
+  })), React__default.createElement(core.FormControlLabel, {
+    value: "start",
+    control: React__default.createElement(core.Switch, {
+      color: "primary"
+    }),
+    label: "Booked ON/OFF",
+    labelPlacement: "start"
+  }), React__default.createElement(core.FormControlLabel, {
+    value: "start",
+    control: React__default.createElement(core.Switch, {
+      color: "primary"
+    }),
+    label: "Prebooked ON/OFF",
+    labelPlacement: "start"
+  }), React__default.createElement(core.FormControlLabel, {
+    value: "start",
+    control: React__default.createElement(core.Switch, {
+      color: "primary"
+    }),
+    label: " Silence notifications",
+    labelPlacement: "start"
+  })), React__default.createElement(Button, {
+    variant: "contained",
+    color: "primary"
+  }, "Submit")));
+}
+
 exports.BookSession = BookSession;
 exports.BookSessionConferences = BookSessionConferences;
 exports.ChangePassword = ChangePassword;
@@ -20795,6 +20890,7 @@ exports.MyOneToOne = MyOneToOne;
 exports.MyProfile = MyProfile;
 exports.MyStudent = MyStudent;
 exports.NewLearningPlan = NewLearningPlan;
+exports.NotificarionsPage = NotificationsPage;
 exports.ResultConferenceRubric = ResultConferenceRubric;
 exports.ResultReflection = ResultReflection;
 exports.SessionResultComponent = SessionResultComponent;