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

package/dist/containers/ActionPoint/constants/function.d.ts

@@ -0,0 +1,2 @@
+import { IActionPoint } from "./types";
+export declare const groupBy: (xs: IActionPoint[]) => {};

package/dist/containers/GoalPage/components/CreateGoalModel.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { IPropModelCreate } from "../types/types";
-declare const CreateGoalModel: ({ open, onToggleModel, activeStep, handleChangeStep, goalFormCreate, handleChangeValueForm, handleReturnCategoryOptions, handleReturnNameOptions, handleReturnDetailOptions, handleReturnTargetOptions, handleRemoveTarget, handleCreateGoal }: IPropModelCreate) => JSX.Element;
+declare const CreateGoalModel: ({ open, onToggleModel, activeStep, handleChangeStep, goalFormCreate, handleChangeValueForm, handleReturnCategoryOptions, handleReturnNameOptions, handleReturnDetailOptions, handleReturnTargetOptions, handleRemoveTarget, handleCreateGoal, handleAddTargetItem }: IPropModelCreate) => JSX.Element;
 export default CreateGoalModel;

package/dist/containers/GoalPage/components/Steps/ModelPickTarget.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { IPickTarget } from "../../types/types";
-declare const ModelPickTarget: ({ onChangeStep, onReturnTargetOptions, valueTargetOptions, onChangeValueForm, onRemoveTarget }: IPickTarget) => JSX.Element;
+declare const ModelPickTarget: ({ onChangeStep, onReturnTargetOptions, valueTargetOptions, onChangeValueForm, onRemoveTarget, onAddTargetItem }: IPickTarget) => JSX.Element;
 export default ModelPickTarget;

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;
@@ -15,5 +15,6 @@ declare const useGoals: () => {
     handleCreateGoal: () => Promise<void>;
     goalList: IGoal[];
     getById: (goalId: number) => Promise<void>;
+    handleAddTargetItem: () => void;
 };
 export default useGoals;

package/dist/containers/GoalPage/types/types.d.ts

@@ -50,6 +50,7 @@ export interface IPropModelCreate {
     handleReturnTargetOptions: Function;
     handleRemoveTarget: Function;
     handleCreateGoal: Function;
+    handleAddTargetItem: Function;
 }
 export interface ISelectCategory {
     onChangeStep: Function;
@@ -75,6 +76,7 @@ export interface IPickTarget {
     valueTargetOptions: ITarget[];
     onChangeValueForm: Function;
     onRemoveTarget: Function;
+    onAddTargetItem: Function;
 }
 export interface IBaseLineModel {
     onCreateGoal: Function;

package/dist/index.css

@@ -17599,7 +17599,8 @@ h2._1hrCT {
 ._z3uxc ._2fKtp {
   width: 100%;
   display: flex;
-  justify-content: center; }
+  justify-content: center;
+  justify-content: space-around; }
   ._z3uxc ._2fKtp ._1V9_B {
     background: #336dda;
     color: #ffffff;
@@ -17610,10 +17611,19 @@ h2._1hrCT {
     background: #517fd5; }
   ._z3uxc ._2fKtp ._1V9_B:disabled {
     background: #517fd5; }
+  ._z3uxc ._2fKtp ._1MjbD {
+    background: rgba(102, 112, 128, 0.1);
+    color: #667080;
+    border-radius: 12px;
+    margin-top: 20px;
+    padding: 10px 15px; }
 
 ._3cjdO {
   min-width: 250px; }
 
+._16r__ {
+  min-width: 150px; }
+
 ._2eP1A {
   background-color: white;
   border: solid 1px #cbd4c9;

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,8 +72039,16 @@ var useGoals$1 = function useGoals() {
     history.push("/personal-learning-plan/" + studentId);
   };
 
-  var handleChangeStep = function handleChangeStep(isBackStep) {
-    !isBackStep ? setActiveStep(activeStep + 1) : setActiveStep(activeStep - 1);
+  var handleChangeStep = function handleChangeStep(isBackStep, isTarget) {
+    if (!isBackStep) {
+      setActiveStep(activeStep + 1);
+
+      if (!!goalFormCreate.id) {
+        !isTarget ? update(goalFormCreate.id, goalFormCreate) : createCheckPoint(goalFormCreate.id, goalFormCreate.checkPoints);
+      }
+    } else {
+      setActiveStep(activeStep - 1);
+    }
   };
 
   var handleToggleModelCreate = function handleToggleModelCreate() {
@@ -72071,6 +72079,14 @@ var useGoals$1 = function useGoals() {
     }));
   };
 
+  var handleAddTargetItem = function handleAddTargetItem() {
+    var targets = goalFormCreate.checkPoints;
+    targets.push(initialTarget);
+    setGoalFormCreate(_extends({}, goalFormCreate, {
+      checkPoints: targets
+    }));
+  };
+
   var handleReturnCategoryOptions = function handleReturnCategoryOptions() {
     return Object.keys(optionSelect) || [];
   };
@@ -72157,7 +72173,15 @@ var useGoals$1 = function useGoals() {
       dispatch(marioCore.setLoading(true));
 
       var _temp12 = _catch(function () {
-        return Promise.resolve(createCheckpoint$1(goalId, parseInt(studentId), targets)).then(function () {});
+        return Promise.resolve(createCheckpoint$1(goalId, parseInt(studentId), targets.map(function (r) {
+          var _r$text;
+
+          return _extends({}, r, {
+            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;
+        }))).then(function () {});
       }, function (err) {
         var _err$response3, _err$response3$data;
 
@@ -72176,7 +72200,15 @@ var useGoals$1 = function useGoals() {
   var update = React.useCallback(function (goalId, data) {
     try {
       var _temp14 = _catch(function () {
-        return Promise.resolve(updateItem$2(goalId, parseInt(studentId), data)).then(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 === 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;
 
@@ -72210,8 +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)
+              studentId: parseInt(studentId),
+              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) {
@@ -72245,13 +72283,13 @@ var useGoals$1 = function useGoals() {
   }, [goalFormCreate]);
   React.useEffect(function () {
     if (!openModelCreate) {
-      setGoalFormCreate(initialGoalModel);
+      setGoalFormCreate(_extends({}, initialGoalModel, {
+        checkPoints: [initialTarget, initialTarget, initialTarget, initialTarget]
+      }));
       setActiveStep(1);
+      getAll();
     }
   }, [openModelCreate]);
-  React.useEffect(function () {
-    getAll();
-  }, []);
   return {
     activeStep: activeStep,
     handleChangeStep: handleChangeStep,
@@ -72267,11 +72305,12 @@ var useGoals$1 = function useGoals() {
     handleRemoveTarget: handleRemoveTarget,
     handleCreateGoal: handleCreateGoal,
     goalList: goalList,
-    getById: getById
+    getById: getById,
+    handleAddTargetItem: handleAddTargetItem
   };
 };
 
-var goalPage = {"icon-header":"_YAtNC","cancel-button":"_3bYIU","item-between":"_3huiX","ml-10":"_1Y18n","block-goal":"_1ShQw","container-goal-page":"_jw03r","pointer":"_ZK47B","block-filter":"_3xa3T","select-filter":"_1SlBm","box-goal-item":"_2fvMj","header-item":"_2bu5G","header-item-title":"_3xEHS","title":"_FnPu2","header-button":"_2xAED","header-button-title":"_pOjtL","header-button-icon":"_3Gyut","baseline-item":"_1uv1z","baseline-title":"_1T5lR","box-target":"_93zyw","target-item":"_ogLm4","target-item-title":"_2d5aK","target-item-description":"_3VgfO","target-item-time":"_1y0M2","target-item-box-status":"_3a_lC","target-item-note":"_2qlsz","model-create-goal":"_38RlV","box-content-model":"_1USJi","box-target-content":"_2CG2W","date-range":"_ECsZO","target-count":"_1cgKE","box-step":"_z3uxc","title-step":"_Hz1Wh","title-detail":"_dUniv","description-step":"_3qnsc","box-action":"_2fKtp","button-action":"_1V9_B","select-option":"_3cjdO","input-date-icon":"_2eP1A","date-placeholder":"_2bO1b","box-status-target":"_17V8C","status":"_3U6IZ","completed":"_3D2OE","inprogress":"_1LPjK","notyetstarted":"_2r1u0","ontrack":"_2_vqN"};
+var goalPage = {"icon-header":"_YAtNC","cancel-button":"_3bYIU","item-between":"_3huiX","ml-10":"_1Y18n","block-goal":"_1ShQw","container-goal-page":"_jw03r","pointer":"_ZK47B","block-filter":"_3xa3T","select-filter":"_1SlBm","box-goal-item":"_2fvMj","header-item":"_2bu5G","header-item-title":"_3xEHS","title":"_FnPu2","header-button":"_2xAED","header-button-title":"_pOjtL","header-button-icon":"_3Gyut","baseline-item":"_1uv1z","baseline-title":"_1T5lR","box-target":"_93zyw","target-item":"_ogLm4","target-item-title":"_2d5aK","target-item-description":"_3VgfO","target-item-time":"_1y0M2","target-item-box-status":"_3a_lC","target-item-note":"_2qlsz","model-create-goal":"_38RlV","box-content-model":"_1USJi","box-target-content":"_2CG2W","date-range":"_ECsZO","target-count":"_1cgKE","box-step":"_z3uxc","title-step":"_Hz1Wh","title-detail":"_dUniv","description-step":"_3qnsc","box-action":"_2fKtp","button-action":"_1V9_B","button-add-grey":"_1MjbD","select-option":"_3cjdO","select-status":"_16r__","input-date-icon":"_2eP1A","date-placeholder":"_2bO1b","box-status-target":"_17V8C","status":"_3U6IZ","completed":"_3D2OE","inprogress":"_1LPjK","notyetstarted":"_2r1u0","ontrack":"_2_vqN"};
 
 var FilterGoalPage = function FilterGoalPage() {
   return React__default.createElement(core.Grid, {
@@ -72470,6 +72509,7 @@ var ChooseArea = function ChooseArea(_ref) {
   })), React__default.createElement(core.Grid, {
     className: "" + goalPage["box-action"]
   }, React__default.createElement(core.Button, {
+    disabled: !valueName,
     className: "" + goalPage["button-action"],
     onClick: function onClick() {
       return onChangeStep();
@@ -72517,6 +72557,7 @@ var DetailFormCreate = function DetailFormCreate(_ref) {
   })), React__default.createElement(core.Grid, {
     className: "" + goalPage["box-action"]
   }, React__default.createElement(core.Button, {
+    disabled: !valueDetail,
     className: "" + goalPage["button-action"],
     onClick: function onClick() {
       return onChangeStep();
@@ -72552,7 +72593,8 @@ var ModelPickTarget = function ModelPickTarget(_ref) {
       onReturnTargetOptions = _ref.onReturnTargetOptions,
       valueTargetOptions = _ref.valueTargetOptions,
       onChangeValueForm = _ref.onChangeValueForm,
-      onRemoveTarget = _ref.onRemoveTarget;
+      onRemoveTarget = _ref.onRemoveTarget,
+      onAddTargetItem = _ref.onAddTargetItem;
   return React__default.createElement(core.Grid, {
     className: "" + goalPage["box-step"]
   }, React__default.createElement(core.Typography, {
@@ -72604,14 +72646,13 @@ var ModelPickTarget = function ModelPickTarget(_ref) {
       customInput: React__default.createElement(CustomInputDatePicker, null),
       placeholderText: "day-month-year"
     })), React__default.createElement(lab.Autocomplete, {
-      freeSolo: true,
       id: "combo-box-demo",
       value: target.status,
       options: optionStatusTarget,
       getOptionLabel: function getOptionLabel(option) {
         return option;
       },
-      className: goalPage["select-option"] + " " + goalPage["ml-10"],
+      className: goalPage["select-status"] + " " + goalPage["ml-10"],
       onChange: function onChange(_e, value) {
         return onChangeValueForm(value, "checkPoints", index, "status");
       },
@@ -72628,12 +72669,17 @@ var ModelPickTarget = function ModelPickTarget(_ref) {
     }));
   })), React__default.createElement(core.Grid, {
     className: "" + goalPage["box-action"]
-  }, React__default.createElement(core.Button, {
+  }, 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!")));
+  }, "Keep going!"), React__default.createElement(core.Button, {
+    className: "" + goalPage["button-add-grey"],
+    onClick: function onClick() {
+      return onAddTargetItem();
+    }
+  }, React__default.createElement(AddIcon, null), "Add target")));
 };
 
 var BaseLine = function BaseLine(_ref) {
@@ -72678,7 +72724,8 @@ var CreateGoalModel = function CreateGoalModel(_ref) {
       handleReturnDetailOptions = _ref.handleReturnDetailOptions,
       handleReturnTargetOptions = _ref.handleReturnTargetOptions,
       handleRemoveTarget = _ref.handleRemoveTarget,
-      handleCreateGoal = _ref.handleCreateGoal;
+      handleCreateGoal = _ref.handleCreateGoal,
+      handleAddTargetItem = _ref.handleAddTargetItem;
   return React__default.createElement(core.Dialog, {
     open: open,
     maxWidth: "xl"
@@ -72726,7 +72773,8 @@ var CreateGoalModel = function CreateGoalModel(_ref) {
     valueTargetOptions: goalFormCreate.checkPoints,
     onReturnTargetOptions: handleReturnTargetOptions,
     onChangeValueForm: handleChangeValueForm,
-    onRemoveTarget: handleRemoveTarget
+    onRemoveTarget: handleRemoveTarget,
+    onAddTargetItem: handleAddTargetItem
   })), React__default.createElement(core.Grid, {
     hidden: activeStep !== 5
   }, React__default.createElement(BaseLine, {
@@ -72751,6 +72799,7 @@ var MyGoals = function MyGoals() {
       handleReturnTargetOptions = _useGoals.handleReturnTargetOptions,
       handleRemoveTarget = _useGoals.handleRemoveTarget,
       handleCreateGoal = _useGoals.handleCreateGoal,
+      handleAddTargetItem = _useGoals.handleAddTargetItem,
       goalList = _useGoals.goalList,
       getById = _useGoals.getById;
 
@@ -72777,7 +72826,8 @@ var MyGoals = function MyGoals() {
     handleReturnDetailOptions: handleReturnDetailOptions,
     handleReturnTargetOptions: handleReturnTargetOptions,
     handleRemoveTarget: handleRemoveTarget,
-    handleCreateGoal: handleCreateGoal
+    handleCreateGoal: handleCreateGoal,
+    handleAddTargetItem: handleAddTargetItem
   }), React__default.createElement(core.Grid, {
     className: "" + goalPage["container-goal-page"]
   }, React__default.createElement(FilterGoalPage, null), goalList.map(function (goal) {