mario-education 2.4.552-feedback → 2.4.554-feedback

package/dist/containers/Classes/components/StudentItemSelector.d.ts

@@ -8,6 +8,7 @@ interface Props {
     placeholder?: string;
     isDeleted?: boolean;
     connectionString?: string;
+    pageSize?: number;
 }
 export interface Student {
     studentId: number;

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

@@ -1395,7 +1395,7 @@ var FILTER_NAME;
 
 var SMALL_FONT_DEFAULT = 12;
 var LARGE_FONT_DEFAULT = 20;
-var studentGrades = ["All Grades", "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"];
+var studentGrades = ["All Grades", "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"];
 var isSaisSchool = window.location.hostname.includes('sais');
 var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
 var stringOrderIcon = "<svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n            <path d=\"M9.00002 19.6153C8.55585 19.6153 8.1756 19.4571 7.85927 19.1408C7.54293 18.8244 7.38477 18.4442 7.38477 18C7.38477 17.5558 7.54293 17.1756 7.85927 16.8593C8.1756 16.5429 8.55585 16.3848 9.00002 16.3848C9.44418 16.3848 9.82443 16.5429 10.1408 16.8593C10.4571 17.1756 10.6153 17.5558 10.6153 18C10.6153 18.4442 10.4571 18.8244 10.1408 19.1408C9.82443 19.4571 9.44418 19.6153 9.00002 19.6153ZM15 19.6153C14.5558 19.6153 14.1756 19.4571 13.8593 19.1408C13.5429 18.8244 13.3848 18.4442 13.3848 18C13.3848 17.5558 13.5429 17.1756 13.8593 16.8593C14.1756 16.5429 14.5558 16.3848 15 16.3848C15.4442 16.3848 15.8244 16.5429 16.1408 16.8593C16.4571 17.1756 16.6153 17.5558 16.6153 18C16.6153 18.4442 16.4571 18.8244 16.1408 19.1408C15.8244 19.4571 15.4442 19.6153 15 19.6153ZM9.00002 13.6153C8.55585 13.6153 8.1756 13.4571 7.85927 13.1408C7.54293 12.8244 7.38477 12.4442 7.38477 12C7.38477 11.5558 7.54293 11.1756 7.85927 10.8593C8.1756 10.5429 8.55585 10.3848 9.00002 10.3848C9.44418 10.3848 9.82443 10.5429 10.1408 10.8593C10.4571 11.1756 10.6153 11.5558 10.6153 12C10.6153 12.4442 10.4571 12.8244 10.1408 13.1408C9.82443 13.4571 9.44418 13.6153 9.00002 13.6153ZM15 13.6153C14.5558 13.6153 14.1756 13.4571 13.8593 13.1408C13.5429 12.8244 13.3848 12.4442 13.3848 12C13.3848 11.5558 13.5429 11.1756 13.8593 10.8593C14.1756 10.5429 14.5558 10.3848 15 10.3848C15.4442 10.3848 15.8244 10.5429 16.1408 10.8593C16.4571 11.1756 16.6153 11.5558 16.6153 12C16.6153 12.4442 16.4571 12.8244 16.1408 13.1408C15.8244 13.4571 15.4442 13.6153 15 13.6153ZM9.00002 7.61526C8.55585 7.61526 8.1756 7.4571 7.85927 7.14077C7.54293 6.82443 7.38477 6.44418 7.38477 6.00002C7.38477 5.55585 7.54293 5.1756 7.85927 4.85927C8.1756 4.54293 8.55585 4.38477 9.00002 4.38477C9.44418 4.38477 9.82443 4.54293 10.1408 4.85927C10.4571 5.1756 10.6153 5.55585 10.6153 6.00002C10.6153 6.44418 10.4571 6.82443 10.1408 7.14077C9.82443 7.4571 9.44418 7.61526 9.00002 7.61526ZM15 7.61526C14.5558 7.61526 14.1756 7.4571 13.8593 7.14077C13.5429 6.82443 13.3848 6.44418 13.3848 6.00002C13.3848 5.55585 13.5429 5.1756 13.8593 4.85927C14.1756 4.54293 14.5558 4.38477 15 4.38477C15.4442 4.38477 15.8244 4.54293 16.1408 4.85927C16.4571 5.1756 16.6153 5.55585 16.6153 6.00002C16.6153 6.44418 16.4571 6.82443 16.1408 7.14077C15.8244 7.4571 15.4442 7.61526 15 7.61526Z\" fill=\"#D3D3D3\" />\n        </svg>";
@@ -29150,7 +29150,7 @@ var INITIAL_ACTIVITY_FRIENDS = {
 var LEARNING_STRATEGY_INIT = {
   learningStrategies: []
 };
-var GRAGE_DEFAULT = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isSaisSchool ? ["PCS"] : []);
+var GRAGE_DEFAULT = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"].concat(isSaisSchool ? ["PCS"] : []);
 var INITIAL_AGE_OF_STUDENT = {
   ageOfFeMaleStudent: {
     nineToTwelve: 0,
@@ -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);
   };
 
@@ -32289,8 +32295,8 @@ var FLAG_TYPES;
   FLAG_TYPES[FLAG_TYPES["GREEN"] = 2] = "GREEN";
 })(FLAG_TYPES || (FLAG_TYPES = {}));
 
-var GRAGE_DEFAULT$1 = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isSaisSchool ? ["PCS"] : []);
-var GRADE_DEFAULT_SURVEY = ['All', "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isSaisSchool ? ["PCS"] : []);
+var GRAGE_DEFAULT$1 = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"].concat(isSaisSchool ? ["PCS"] : []);
+var GRADE_DEFAULT_SURVEY = ['All', "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"].concat(isSaisSchool ? ["PCS"] : []);
 var GRADE_SURVEY = [{
   label: "All",
   value: ''
@@ -48057,7 +48063,8 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
       _ref$placeholder = _ref.placeholder,
       placeholder = _ref$placeholder === void 0 ? "Search student" : _ref$placeholder,
       isDeleted = _ref.isDeleted,
-      connectionString = _ref.connectionString;
+      connectionString = _ref.connectionString,
+      pageSize = _ref.pageSize;
   var dispatch = reactRedux.useDispatch();
 
   var _useState = React.useState([]),
@@ -48093,7 +48100,7 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
               } else {
                 var filters = {
                   currentPage: 1,
-                  pageSize: 100
+                  pageSize: pageSize != null ? pageSize : 100
                 };
                 return Promise.resolve(get$u(filters)).then(function (res) {
                   var _res$data2;
@@ -48121,10 +48128,10 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [teacherUserId, connectionString]);
+  }, [teacherUserId, connectionString, pageSize]);
   React.useEffect(function () {
     loadData();
-  }, [teacherUserId, connectionString]);
+  }, [teacherUserId, connectionString, pageSize]);
   var options = value && studentDefault ? [studentDefault] : students.filter(function (student) {
     return !externalStudentIds || externalStudentIds && !externalStudentIds.includes(student.studentId);
   }).map(function (student) {
@@ -75534,6 +75541,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 +75632,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 +75681,8 @@ var useSyncData = function useSyncData() {
     setFromUser: setFromUser,
     toUser: toUser,
     setToUser: setToUser,
-    handleMergeData: handleMergeData
+    handleMergeData: handleMergeData,
+    handleTransferData: handleTransferData
   };
 };
 
@@ -75649,7 +75698,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",
@@ -75686,7 +75736,8 @@ var SyncData = function SyncData() {
     placeholder: t("type_2_characters_to_search"),
     onChange: function onChange(e) {
       setFromUser(e);
-    }
+    },
+    pageSize: 10000
   })), React__default.createElement(core$1.Grid, {
     item: true,
     xs: 6,
@@ -75698,13 +75749,19 @@ var SyncData = function SyncData() {
     placeholder: t("type_2_characters_to_search"),
     onChange: function onChange(e) {
       setToUser(e);
-    }
+    },
+    pageSize: 10000
   }))), React__default.createElement(reactstrap.Button, {
     hidden: !fromUser || !toUser || !schoolSelected,
     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() {