mario-education 2.4.552-feedback → 2.4.553-feedback

package/dist/containers/SyncData/hooks/useSyncData.d.ts

@@ -10,5 +10,6 @@ declare const useSyncData: () => {
     toUser: Student | null;
     setToUser: import("react").Dispatch<import("react").SetStateAction<Student | null>>;
     handleMergeData: () => Promise<void>;
+    handleTransferData: () => Promise<void>;
 };
 export default useSyncData;

package/dist/index.js

@@ -29224,7 +29224,7 @@ var INITIAL_OVERALL_READY_TO_LEARN = {
 };
 var heightChartDefault = 250;
 var PREPAREDNESS_QUESTION = ["energy", "focus", "happiness"];
-var SUCCESS_INDICATORS_QUESTION = ["well-being", "growth", "relationships", "productivity", "self-efficacy", "academics"];
+var SUCCESS_INDICATORS_QUESTION = ["growth", "relationships", "productivity", "academics", "self-efficacy", "well-being"];
 var SAFETY_QUESTION = "safety";
 var STRESS_QUESTION = "stress";
 var preparednessChartName = "readiness_to_learn";
@@ -30653,14 +30653,20 @@ var useDashboard = function useDashboard() {
       return preferredOrderReadline.indexOf(a.name) - preferredOrderReadline.indexOf(b.name);
     });
     setPreparednessData(sortedDataReadline);
-    var reOrdered = [].concat(successIndicatorsQuestionData.filter(function (item) {
-      return item.name !== 'Well-being';
-    }), successIndicatorsQuestionData.filter(function (item) {
-      return item.name === 'Well-being';
-    }));
-    setSuccessIndicatorsData(reOrdered);
-    setSuccessIndicatorWeeklyData(successIndicatorsWeeklyQuestionData);
-    setPreparednessWeeklyData(preparednessWeeklyQuestionData);
+    var preferredOrderSuccessIndicators = ['Growth', 'Relationships', 'Productivity', 'Academics', 'Self-efficacy', 'Well-being'];
+    var sortedSuccessIndicatorsData = [].concat(successIndicatorsQuestionData).sort(function (a, b) {
+      return preferredOrderSuccessIndicators.indexOf(a.name) - preferredOrderSuccessIndicators.indexOf(b.name);
+    });
+    setSuccessIndicatorsData(sortedSuccessIndicatorsData);
+    var sortedSuccessIndicatorsWeeklyData = [].concat(successIndicatorsWeeklyQuestionData).sort(function (a, b) {
+      return preferredOrderSuccessIndicators.indexOf(a.name) - preferredOrderSuccessIndicators.indexOf(b.name);
+    });
+    console.log(sortedSuccessIndicatorsData, "sortedSuccessIndicatorsData");
+    setSuccessIndicatorWeeklyData(sortedSuccessIndicatorsWeeklyData);
+    var sortedPreparednessWeeklyQuestionData = [].concat(preparednessWeeklyQuestionData).sort(function (a, b) {
+      return preferredOrderReadline.indexOf(a.name) - preferredOrderReadline.indexOf(b.name);
+    });
+    setPreparednessWeeklyData(sortedPreparednessWeeklyQuestionData);
     setAvgQuestionLastMonth(data.overViewQuestionLastMonth);
   };
 
@@ -75534,6 +75540,9 @@ var getAllSchool = function getAllSchool() {
 var mergeData$1 = function mergeData(fromId, toId, connectionString) {
   return marioCore.api.put(USER_URL$4 + "/merge-data-school/" + fromId + "/" + toId + "/" + connectionString);
 };
+var transferData = function transferData(fromId, schoolId) {
+  return marioCore.api.put(USER_URL$4 + "/transfer-data-school/" + fromId + "/" + schoolId);
+};
 
 var useSyncData = function useSyncData() {
   var dispatch = reactRedux.useDispatch();
@@ -75622,6 +75631,44 @@ var useSyncData = function useSyncData() {
       return Promise.reject(e);
     }
   }, [schoolSelected, toUser, fromUser]);
+  var handleTransferData = React.useCallback(function () {
+    try {
+      var _exit4 = false;
+
+      var _temp11 = function _temp11(_result2) {
+        if (_exit4) return _result2;
+        dispatch(marioCore.setLoading(false));
+      };
+
+      dispatch(marioCore.setLoading(true));
+
+      var _temp12 = _catch(function () {
+        if (!(fromUser !== null && fromUser !== void 0 && fromUser.id) || !(schoolSelected !== null && schoolSelected !== void 0 && schoolSelected.connectString)) {
+          throw new Error("err");
+        }
+
+        return Promise.resolve(transferData(fromUser === null || fromUser === void 0 ? void 0 : fromUser.id, schoolSelected === null || schoolSelected === void 0 ? void 0 : schoolSelected.id)).then(function (res) {
+          if (res.data) {
+            dispatch(marioCore.setAlert({
+              type: "success",
+              message: "transfer data success"
+            }));
+          }
+        });
+      }, function (err) {
+        var _err$response3, _err$response3$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [schoolSelected, toUser, fromUser]);
   React.useEffect(function () {
     getData();
   }, []);
@@ -75633,7 +75680,8 @@ var useSyncData = function useSyncData() {
     setFromUser: setFromUser,
     toUser: toUser,
     setToUser: setToUser,
-    handleMergeData: handleMergeData
+    handleMergeData: handleMergeData,
+    handleTransferData: handleTransferData
   };
 };
 
@@ -75649,7 +75697,8 @@ var SyncData = function SyncData() {
       setFromUser = _useSyncData.setFromUser,
       toUser = _useSyncData.toUser,
       setToUser = _useSyncData.setToUser,
-      handleMergeData = _useSyncData.handleMergeData;
+      handleMergeData = _useSyncData.handleMergeData,
+      handleTransferData = _useSyncData.handleTransferData;
 
   return React__default.createElement(core$1.Grid, null, React__default.createElement(core$1.Typography, null, schoolSelected === null || schoolSelected === void 0 ? void 0 : schoolSelected.schoolName), React__default.createElement(lab.Autocomplete, {
     id: "combo-box-demo",
@@ -75704,7 +75753,12 @@ var SyncData = function SyncData() {
     onClick: function onClick() {
       return handleMergeData();
     }
-  }, "Merge data"));
+  }, "Merge data"), React__default.createElement(reactstrap.Button, {
+    hidden: !fromUser || !schoolSelected,
+    onClick: function onClick() {
+      return handleTransferData();
+    }
+  }, "Transfer data"));
 };
 
 var useSummarizeQuestion = function useSummarizeQuestion() {