mario-teacher-student-client 2.2.30-beta → 2.2.31-beta

package/dist/containers/GoalPage/hook/useGoals.d.ts

@@ -1,7 +1,7 @@
 import { IGoal } from "../types/types";
 declare const useGoals: () => {
     activeStep: number;
-    handleChangeStep: (isBackStep?: boolean | undefined) => void;
+    handleChangeStep: (isBackStep?: boolean | undefined, isTarget?: boolean | undefined) => void;
     handleBackPage: () => void;
     openModelCreate: boolean;
     handleToggleModelCreate: () => void;

package/dist/index.js

@@ -53479,7 +53479,7 @@ function SettingPage() {
     className: "" + styles$A["title-activity"]
   }, "In-App Notifications"), React__default.createElement(SwitchComponent, {
     name: "isTurnOnAllNotification",
-    title: "Turn " + (!dataSwitchNotification.isTurnOnAllNotification ? "on" : "off") + " all notifications",
+    title: "Turn on all notifications",
     value: dataSwitchNotification.isTurnOnAllNotification,
     onChange: function onChange(event) {
       return handleToggleAllNotification(event.target.checked, true);
@@ -53510,7 +53510,7 @@ function SettingPage() {
     className: "" + styles$A["title-activity"]
   }, "Email Notifications"), React__default.createElement(SwitchComponent, {
     name: "isTurnOnAllEmail",
-    title: "Turn " + (!dataSwitchNotification.isTurnOnAllEmail ? "on" : "off") + " all emails",
+    title: "Turn on all emails",
     value: dataSwitchNotification.isTurnOnAllEmail,
     onChange: function onChange(event) {
       return handleToggleAllNotification(event.target.checked);
@@ -72039,10 +72039,13 @@ var useGoals$1 = function useGoals() {
     history.push("/personal-learning-plan/" + studentId);
   };
 
-  var handleChangeStep = function handleChangeStep(isBackStep) {
+  var handleChangeStep = function handleChangeStep(isBackStep, isTarget) {
     if (!isBackStep) {
       setActiveStep(activeStep + 1);
-      !!goalFormCreate.id && update(goalFormCreate.id, goalFormCreate);
+
+      if (!!goalFormCreate.id) {
+        !isTarget ? update(goalFormCreate.id, goalFormCreate) : createCheckPoint(goalFormCreate.id, goalFormCreate.checkPoints);
+      }
     } else {
       setActiveStep(activeStep - 1);
     }
@@ -72171,8 +72174,10 @@ var useGoals$1 = function useGoals() {
 
       var _temp12 = _catch(function () {
         return Promise.resolve(createCheckpoint$1(goalId, parseInt(studentId), targets.map(function (r) {
+          var _r$text;
+
           return _extends({}, r, {
-            text: r.text.trim()
+            text: r === null || r === void 0 ? void 0 : (_r$text = r.text) === null || _r$text === void 0 ? void 0 : _r$text.trim()
           });
         }).filter(function (r) {
           return r.text && r.endTime && r.time && r.status;
@@ -72195,12 +72200,14 @@ var useGoals$1 = function useGoals() {
   var update = React.useCallback(function (goalId, data) {
     try {
       var _temp14 = _catch(function () {
+        var _data$baseLineChecked, _data$category, _data$detail, _data$name;
+
         return Promise.resolve(updateItem$2(goalId, parseInt(studentId), _extends({}, data, {
           studentId: parseInt(studentId),
-          baseLineChecked: data.baseLineChecked.trim(),
-          category: data.category.trim(),
-          detail: data.detail.trim(),
-          name: data.name.trim()
+          baseLineChecked: data === null || data === void 0 ? void 0 : (_data$baseLineChecked = data.baseLineChecked) === null || _data$baseLineChecked === void 0 ? void 0 : _data$baseLineChecked.trim(),
+          category: data === null || data === void 0 ? void 0 : (_data$category = data.category) === null || _data$category === void 0 ? void 0 : _data$category.trim(),
+          detail: data === null || data === void 0 ? void 0 : (_data$detail = data.detail) === null || _data$detail === void 0 ? void 0 : _data$detail.trim(),
+          name: data === null || data === void 0 ? void 0 : (_data$name = data.name) === null || _data$name === void 0 ? void 0 : _data$name.trim()
         }))).then(function () {});
       }, function (err) {
         var _err$response4, _err$response4$data;
@@ -72235,12 +72242,14 @@ var useGoals$1 = function useGoals() {
 
         var _temp16 = function () {
           if (!goalFormCreate.id) {
+            var _goalFormCreate$baseL, _goalFormCreate$categ, _goalFormCreate$detai, _goalFormCreate$name;
+
             return Promise.resolve(createItem$2(_extends({}, goalFormCreate, {
               studentId: parseInt(studentId),
-              baseLineChecked: goalFormCreate.baseLineChecked.trim(),
-              category: goalFormCreate.category.trim(),
-              detail: goalFormCreate.detail.trim(),
-              name: goalFormCreate.name.trim()
+              baseLineChecked: goalFormCreate === null || goalFormCreate === void 0 ? void 0 : (_goalFormCreate$baseL = goalFormCreate.baseLineChecked) === null || _goalFormCreate$baseL === void 0 ? void 0 : _goalFormCreate$baseL.trim(),
+              category: goalFormCreate === null || goalFormCreate === void 0 ? void 0 : (_goalFormCreate$categ = goalFormCreate.category) === null || _goalFormCreate$categ === void 0 ? void 0 : _goalFormCreate$categ.trim(),
+              detail: goalFormCreate === null || goalFormCreate === void 0 ? void 0 : (_goalFormCreate$detai = goalFormCreate.detail) === null || _goalFormCreate$detai === void 0 ? void 0 : _goalFormCreate$detai.trim(),
+              name: goalFormCreate === null || goalFormCreate === void 0 ? void 0 : (_goalFormCreate$name = goalFormCreate.name) === null || _goalFormCreate$name === void 0 ? void 0 : _goalFormCreate$name.trim()
             }))).then(function (res) {
               var _temp15 = function () {
                 if (!!res.data) {
@@ -72278,11 +72287,9 @@ var useGoals$1 = function useGoals() {
         checkPoints: [initialTarget, initialTarget, initialTarget, initialTarget]
       }));
       setActiveStep(1);
+      getAll();
     }
   }, [openModelCreate]);
-  React.useEffect(function () {
-    getAll();
-  }, []);
   return {
     activeStep: activeStep,
     handleChangeStep: handleChangeStep,
@@ -72665,7 +72672,7 @@ var ModelPickTarget = function ModelPickTarget(_ref) {
   }, React__default.createElement(core.Grid, null), React__default.createElement(core.Button, {
     className: "" + goalPage["button-action"],
     onClick: function onClick() {
-      return onChangeStep();
+      return onChangeStep(false, true);
     }
   }, "Keep going!"), React__default.createElement(core.Button, {
     className: "" + goalPage["button-add-grey"],