mario-teacher-student-client 2.1.78-beta → 2.1.82-beta

package/dist/containers/Goals/constants/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const StatusDefault: {
+    key: string;
+    value: string;
+}[];
+export declare const handleShowStatus: (status: string) => string | undefined;

package/dist/index.css

@@ -4274,7 +4274,6 @@ h2._1OAmb {
               transform-origin: top left;
               top: 2;
               left: 0;
-              margin-left: 20px;
               padding: 0 10px 0 5px;
               position: absolute;
               color: rgba(0, 0, 0, 0.54);
@@ -5084,7 +5083,8 @@ h2._1OAmb {
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
-  margin: auto; }
+  margin: auto;
+  white-space: nowrap; }
 
 ._3KX9R {
   color: #22543d;

package/dist/index.js

@@ -25,8 +25,6 @@ var Pusher = _interopDefault(require('pusher-js/with-encryption'));
 var TimelineIcon = _interopDefault(require('@material-ui/icons/Timeline'));
 var DateRangeIcon = _interopDefault(require('@material-ui/icons/DateRange'));
 var LinkIcon = _interopDefault(require('@material-ui/icons/Link'));
-var reactRouter = require('react-router');
-var constants = require('mario-core/dist/utils/constants');
 var dateFns = require('date-fns');
 var moment = _interopDefault(require('moment'));
 var Alert = _interopDefault(require('@material-ui/lab/Alert'));
@@ -807,14 +805,14 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     }
   }, [isLoading]);
   React.useEffect(function () {
-    if (isLoginFirst) {
+    if (!!user && isLoginFirst) {
       dispatch(marioCore.initAmplitude({
         name: user.email,
         first_login: new Date().toISOString().slice(0, 10),
         event: "general: first login"
       }));
     }
-  }, [isLoginFirst]);
+  }, [user === null || user === void 0 ? void 0 : user.id]);
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
   var classes = useStyles();
 
@@ -1430,7 +1428,7 @@ var MainLayout = function MainLayout(_ref) {
       pathName = _useState3[0],
       setPathName = _useState3[1];
 
-  var location = reactRouter.useLocation();
+  var location = reactRouterDom.useLocation();
   var authRoutes = React.useMemo(function () {
     return routes.filter(function (route) {
       return marioCore.canAccessRoute(user === null || user === void 0 ? void 0 : user.roles, route.roles);
@@ -1444,8 +1442,6 @@ var MainLayout = function MainLayout(_ref) {
     });
   }, [user]);
   React.useEffect(function () {
-    console.log("amplitude", amplitude);
-
     if (amplitude.user_id) {
       var event = amplitude.event,
           other = _objectWithoutPropertiesLoose(amplitude, _excluded);
@@ -1456,29 +1452,29 @@ var MainLayout = function MainLayout(_ref) {
   React.useEffect(function () {
     if (!!user) {
       marioCore.amplitudeClient.resetSessionId();
-      marioCore.amplitudeClient.init(constants.INIT_AMPLITUDE_KEY, user.email, {
+      marioCore.amplitudeClient.init(marioCore.INIT_AMPLITUDE_KEY, user.email, {
         includeReferrer: true,
         includeUtm: true
       });
       marioCore.amplitudeClient.enableTracking();
-      console.log("session start");
       dispatch(marioCore.initAmplitude({
         name: user.email,
         event: "general: session start"
       }));
     }
-
+  }, [user === null || user === void 0 ? void 0 : user.id]);
+  React.useEffect(function () {
     return function () {
-      marioCore.initAmplitude({
+      (user === null || user === void 0 ? void 0 : user.id) && dispatch(marioCore.initAmplitude({
         name: user.email,
         event: "general: end start"
-      });
+      }));
     };
-  }, [user === null || user === void 0 ? void 0 : user.id]);
+  }, []);
   React.useEffect(function () {
     var newCurTime = new Date();
 
-    if (curTime != DATEDEFAULT) {
+    if (curTime != DATEDEFAULT && !!user) {
       dispatch(marioCore.initAmplitude({
         name: user.email,
         event: "general: duration url",
@@ -17474,6 +17470,23 @@ function CheckPoint(_ref) {
   }));
 }
 
+var StatusDefault = [{
+  key: "Active",
+  value: "Active"
+}, {
+  key: "InProgress",
+  value: "In progress"
+}, {
+  key: "NotYetStarted",
+  value: "Not yet started"
+}];
+var handleShowStatus = function handleShowStatus(status) {
+  var result = StatusDefault.find(function (r) {
+    return r.key === status;
+  });
+  return result === null || result === void 0 ? void 0 : result.value;
+};
+
 var GoalProgress = function GoalProgress(props) {
   var studentId = props.studentId,
       classFontSize = props.classFontSize;
@@ -17543,7 +17556,7 @@ var GoalProgress = function GoalProgress(props) {
       className: "" + styles$8["box-status"]
     }, React__default.createElement(core.Typography, {
       className: styles$8["status-item"] + "\n                                " + styles$8["status-item-margin"] + "\n                                " + styles$8[i.status === "Completed" ? "completed" : i.status === "NotYetStarted" ? "inactive" : "in-progress"]
-    }, i.status === "InProgress" ? "In Progress" : i.status), React__default.createElement(core.Typography, {
+    }, handleShowStatus(i.status)), React__default.createElement(core.Typography, {
       className: "" + styles$8["category-item"]
     }, i.source)));
   }) : null);
@@ -24947,7 +24960,7 @@ var Goals = function Goals(_ref) {
       className: "" + styles$8["right-item"]
     }, React__default.createElement(core.Typography, {
       className: styles$8["status-item"] + " " + styles$8[i.status === "Completed" ? "completed" : i.status === "NotYetStarted" ? "inactive" : "in-progress"]
-    }, camelCaseToNomal(i.status))));
+    }, handleShowStatus(i.status))));
   }) : null)) : React__default.createElement(React__default.Fragment, null, React__default.createElement("p", {
     className: "" + styles$8["title-mobile"]
   }, "Goals"), React__default.createElement("div", {
@@ -40486,9 +40499,22 @@ var NewLearningPlan = function NewLearningPlan() {
       setInitialValues(_extends({}, cloneData));
     };
 
-    var handleRemoveGoalItem = function handleRemoveGoalItem(index) {
+    var handleRemoveGoalItem = function handleRemoveGoalItem(index, type, goalLearningPlanOder) {
       var cloneData = values;
-      cloneData.goalLearningPlans.splice(index, 1);
+
+      if (type === "Annual" && !!goalLearningPlanOder) {
+        var listGoalByOder = cloneData.goalLearningPlans.filter(function (r) {
+          return r.goalLearningPlanOder === goalLearningPlanOder;
+        });
+        listGoalByOder.forEach(function (x) {
+          return cloneData.goalLearningPlans.splice(cloneData.goalLearningPlans.findIndex(function (n) {
+            return n === x;
+          }), 1);
+        });
+      } else {
+        cloneData.goalLearningPlans.splice(index, 1);
+      }
+
       setInitialValues(_extends({}, cloneData));
     };
 
@@ -40703,16 +40729,16 @@ var NewLearningPlan = function NewLearningPlan() {
       className: "" + myStudent["write-and-date-content"]
     }, "Benchmarks or short-term objectives are required only for children with disabilities who take alternate assessments aligned to alternate achievement standards."), values.goalLearningPlans.some(function (i) {
       return i.goalLearningPlanOder;
-    }) ? values.goalLearningPlans.map(function (e, index) {
+    }) || values.goalLearningPlans.length === 0 ? values.goalLearningPlans.map(function (e, index) {
       return React__default.createElement(pickers.MuiPickersUtilsProvider, {
         utils: MomentUtils
       }, React__default.createElement(core.Grid, {
         className: myStudent["input-write-date"] + " " + myStudent[e.type === "ReportingProgress" ? "objectives" : ""]
       }, React__default.createElement(core.Grid, {
         className: "" + myStudent["input-date"]
-      }, !!values.goalLearningPlans[index].startTime ? React__default.createElement("label", {
+      }, !!values.goalLearningPlans[index].startTime && values.goalLearningPlans[index].type == "Annual" && React__default.createElement("label", {
         className: "" + myStudent["input-date-label"]
-      }, "Enter a date range") : "", React__default.createElement(DatePicker, {
+      }, "Enter a date range"), React__default.createElement(DatePicker, {
         selectsRange: true,
         startDate: e.startTime ? new Date(e.startTime) : null,
         endDate: values.goalLearningPlans[index].endTime ? new Date(values.goalLearningPlans[index].endTime) : null,
@@ -40735,9 +40761,9 @@ var NewLearningPlan = function NewLearningPlan() {
         onChange: function onChange(text) {
           return setFieldValue("goalLearningPlans[" + index + "].text", text.target.value);
         }
-      }), e.type === "ReportingProgress" && React__default.createElement("img", {
+      }), React__default.createElement("img", {
         onClick: function onClick() {
-          return handleRemoveGoalItem(index);
+          return handleRemoveGoalItem(index, e.type, e.goalLearningPlanOder);
         },
         src: "/teacher-student/icons/delete.png",
         className: "" + myStudent["icon-remove"]
@@ -40765,9 +40791,9 @@ var NewLearningPlan = function NewLearningPlan() {
         className: "" + myStudent["input-write-date"]
       }, React__default.createElement(core.Grid, {
         className: "" + myStudent["input-date"]
-      }, !!values.goalLearningPlans[index].startTime ? React__default.createElement("label", {
+      }, !!values.goalLearningPlans[index].startTime && values.goalLearningPlans[index].type == "Annual" && React__default.createElement("label", {
         className: "" + myStudent["input-date-label"]
-      }, "Enter a date range") : "", React__default.createElement(DatePicker, {
+      }, "Enter a date range"), React__default.createElement(DatePicker, {
         selectsRange: true,
         startDate: e.startTime ? new Date(e.startTime) : null,
         endDate: values.goalLearningPlans[index].endTime ? new Date(values.goalLearningPlans[index].endTime) : null,
@@ -40840,7 +40866,12 @@ var NewLearningPlan = function NewLearningPlan() {
       })), touched.goalLearningPlans && errors.goalLearningPlans && React__default.createElement(core.Typography, {
         className: "" + myStudent["err-message"]
       }, errors.goalLearningPlans[index] && "Annual goals is a required"));
-    }))), React__default.createElement(core.Grid, {
+    }))), values.goalLearningPlans.length === 0 && React__default.createElement(core.Grid, null, React__default.createElement(core.Typography, {
+      className: "" + myStudent["reporting"],
+      onClick: function onClick() {
+        return handleAddGoalItem(0, "Annual", 1);
+      }
+    }, "Add Goals")), React__default.createElement(core.Grid, {
       className: "" + myStudent["goals-write-and-date"]
     }, React__default.createElement(core.Typography, {
       className: "" + myStudent["write-and-date-title"]
@@ -53621,7 +53652,7 @@ var GoalList = function GoalList() {
       className: "" + styles$8["status-title"]
     }, "Status"), React__default.createElement(core.Typography, {
       className: styles$8["status-item"] + " " + styles$8[i.status === "Completed" ? "completed" : i.status === "NotYetStarted" ? "inactive" : "in-progress"]
-    }, !!(i !== null && i !== void 0 && i.status) && camelCaseToNomal(i.status))), React__default.createElement(CheckPoint, {
+    }, !!(i !== null && i !== void 0 && i.status) && handleShowStatus(i.status))), React__default.createElement(CheckPoint, {
       target: completedCheckpoint(i.checkPoints),
       status: i.status,
       point: completedCheckpoint(i.checkPoints, true)
@@ -54857,7 +54888,7 @@ var GoalDetail = function GoalDetail() {
     className: "" + styles$8["content-title"]
   }, "Status"), React__default.createElement(core.Typography, {
     className: "" + styles$8["content"]
-  }, !!(getOneData !== null && getOneData !== void 0 && getOneData.status) && camelCaseToNomal(getOneData === null || getOneData === void 0 ? void 0 : getOneData.status))), React__default.createElement(core.Grid, {
+  }, !!(getOneData !== null && getOneData !== void 0 && getOneData.status) && handleShowStatus(getOneData === null || getOneData === void 0 ? void 0 : getOneData.status))), React__default.createElement(core.Grid, {
     className: "" + styles$8["box-content"]
   }, React__default.createElement(core.Typography, {
     className: "" + styles$8["content-title"]
@@ -57948,6 +57979,7 @@ var TrainingLink = function TrainingLink() {
   });
   var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant");
   var link = isTeacher ? linkTraining.teacherTraining : linkTraining.studentTraining;
+  document.title = "Training";
   return React__default.createElement(core.Grid, null, React__default.createElement(core.Grid, {
     className: "" + styles$I["header-page"]
   }, React__default.createElement(core.Typography, {