mario-education 2.4.161-level → 2.4.162-level

package/dist/MarioFramework.Education/ClientApp/src/containers/Classes/components/StudentItemSelector.d.ts

@@ -6,6 +6,7 @@ interface Props {
     studentDefault?: Student;
     teacherUserId?: string;
     placeholder?: string;
+    isDeleted?: boolean;
 }
 export interface Student {
     studentId: number;
@@ -16,6 +17,7 @@ export interface Student {
     value?: string;
     gender?: string;
     mtss?: string;
+    deletedAt?: string;
 }
 declare const StudentItemSelector: FC<Props>;
 export default StudentItemSelector;

package/dist/MarioFramework.Education/ClientApp/src/containers/UserRevert/hooks/useRevertUser.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { Student } from "../../Classes/components/StudentItemSelector";
+declare const useRevertUser: () => {
+    user: Student | null;
+    setUser: import("react").Dispatch<import("react").SetStateAction<Student | null>>;
+    handelRevertUser: (id: string) => Promise<void>;
+    userFrom: Student | null;
+    setUserFrom: import("react").Dispatch<import("react").SetStateAction<Student | null>>;
+    userTo: Student | null;
+    setUserTo: import("react").Dispatch<import("react").SetStateAction<Student | null>>;
+    handelMergeDataUser: () => Promise<void>;
+};
+export default useRevertUser;

package/dist/MarioFramework.Education/ClientApp/src/containers/UserRevert/views/RevertUser.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const RevertUser: () => JSX.Element;
+export default RevertUser;

package/dist/MarioFramework.Education/ClientApp/src/index.d.ts

@@ -36,4 +36,5 @@ import TemplateStartBuild from "./containers/TemplateSystem/views/TemplateStartB
 import LoadLanguage from "./components/Loading/LoadLanguage";
 import AdminTraining from "./containers/AdminTraining/views/AdminTraining";
 import SurveyDashboard from "./containers/SurveyDashboard/views/SurveyDashboard";
-export { ClassList, ConferenceRubricList, ConferenceRubricDetail, SuggestionList, LearningStrategyList, SetupContainer, QuestionBankList, ReflectionFormList, ReflectionContainer, QuestionDetail, SubjectList, LearningSupportCategoryList, BadgeList, GoalExampleList, TutorialScreenContainer, FeedbackList, AssessmentList, QuestionBankContainer, SurveyQuestionContainer, QuestionCategoryList, AssignmentList, AssessmentAssignmentContainer, SessionTemplateContainer, SessionTemplateDetail, SessionTemplateGeneralClassDetail, CustomAlertList, CertificateContainer, CompareTeacher, AssetLog, SessionTemplateList, SessionTemplateGeneralClassList, Dashboard, LoadLanguage, AdminTraining, TemplateContainer, TemplateBuilderPage, TemplateStartBuild, SurveyDashboard };
+import RevertUser from "./containers/UserRevert/views/RevertUser";
+export { ClassList, ConferenceRubricList, ConferenceRubricDetail, SuggestionList, LearningStrategyList, SetupContainer, QuestionBankList, ReflectionFormList, ReflectionContainer, QuestionDetail, SubjectList, LearningSupportCategoryList, BadgeList, GoalExampleList, TutorialScreenContainer, FeedbackList, AssessmentList, QuestionBankContainer, SurveyQuestionContainer, QuestionCategoryList, AssignmentList, AssessmentAssignmentContainer, SessionTemplateContainer, SessionTemplateDetail, SessionTemplateGeneralClassDetail, CustomAlertList, CertificateContainer, CompareTeacher, AssetLog, SessionTemplateList, SessionTemplateGeneralClassList, Dashboard, LoadLanguage, AdminTraining, TemplateContainer, TemplateBuilderPage, TemplateStartBuild, SurveyDashboard, RevertUser };

package/dist/MarioFramework.Education/ClientApp/src/services/revertUserService.d.ts

@@ -0,0 +1,2 @@
+export declare const revertUser: (id: string) => Promise<import("axios").AxiosResponse<any>>;
+export declare const mergeData: (fromId: string, toId: string) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.js

@@ -29876,7 +29876,8 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
       studentDefault = _ref.studentDefault,
       teacherUserId = _ref.teacherUserId,
       _ref$placeholder = _ref.placeholder,
-      placeholder = _ref$placeholder === void 0 ? "Search student" : _ref$placeholder;
+      placeholder = _ref$placeholder === void 0 ? "Search student" : _ref$placeholder,
+      isDeleted = _ref.isDeleted;
   var dispatch = reactRedux.useDispatch();
 
   var _useState = React.useState([]),
@@ -29894,22 +29895,39 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
   var timeout = React.useRef();
   var loadData = React.useCallback(function () {
     try {
-      var _temp4 = function _temp4() {
+      var _temp5 = function _temp5() {
         setLoading(false);
       };
 
       setLoading(true);
 
-      var _temp5 = _catch(function () {
-        var _temp = function () {
+      var _temp6 = _catch(function () {
+        var _temp2 = function () {
           if (!value) {
-            return Promise.resolve(getAllStudents(searchString, teacherUserId)).then(function (res) {
-              setStudents(res.data);
-            });
+            var _temp7 = function () {
+              if (!isDeleted) {
+                return Promise.resolve(getAllStudents(searchString, teacherUserId)).then(function (res) {
+                  setStudents(res.data);
+                });
+              } else {
+                var filters = {
+                  currentPage: 1,
+                  pageSize: 100,
+                  searchString: searchString
+                };
+                return Promise.resolve(get$d(filters)).then(function (res) {
+                  var _res$data;
+
+                  setStudents(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.items) || []);
+                });
+              }
+            }();
+
+            if (_temp7 && _temp7.then) return _temp7.then(function () {});
           }
         }();
 
-        if (_temp && _temp.then) return _temp.then(function () {});
+        if (_temp2 && _temp2.then) return _temp2.then(function () {});
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -29919,7 +29937,7 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
         }));
       });
 
-      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp4) : _temp4(_temp5));
+      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(_temp5) : _temp5(_temp6));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -35295,6 +35313,146 @@ var SurveyDashboard = function SurveyDashboard() {
   }))));
 };
 
+var USER_URL$4 = marioCore.BASE_URL + "/api/User";
+var revertUser = function revertUser(id) {
+  return marioCore.api.put(USER_URL$4 + "/revert-user/" + id);
+};
+var mergeData = function mergeData(fromId, toId) {
+  return marioCore.api.put(USER_URL$4 + "/merge-data/" + fromId + "/" + toId);
+};
+
+var useRevertUser = function useRevertUser() {
+  var dispatch = reactRedux.useDispatch();
+
+  var _useState = React.useState(null),
+      user = _useState[0],
+      setUser = _useState[1];
+
+  var _useState2 = React.useState(null),
+      userFrom = _useState2[0],
+      setUserFrom = _useState2[1];
+
+  var _useState3 = React.useState(null),
+      userTo = _useState3[0],
+      setUserTo = _useState3[1];
+
+  var handelRevertUser = function handelRevertUser(id) {
+    try {
+      var _temp2 = _catch(function () {
+        return Promise.resolve(revertUser(id)).then(function () {
+          dispatch(marioCore.setAlert({
+            type: "success",
+            message: "Success"
+          }));
+        });
+      }, function (err) {
+        var _err$response, _err$response$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  var handelMergeDataUser = function handelMergeDataUser() {
+    try {
+      return Promise.resolve(_catch(function () {
+        var _temp3 = function () {
+          if (!!userFrom && !!userTo) {
+            return Promise.resolve(mergeData(userFrom === null || userFrom === void 0 ? void 0 : userFrom.id, userTo === null || userTo === void 0 ? void 0 : userTo.id)).then(function () {
+              dispatch(marioCore.setAlert({
+                type: "success",
+                message: "Success"
+              }));
+            });
+          }
+        }();
+
+        if (_temp3 && _temp3.then) return _temp3.then(function () {});
+      }, function (err) {
+        var _err$response2, _err$response2$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
+        }));
+      }));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  return {
+    user: user,
+    setUser: setUser,
+    handelRevertUser: handelRevertUser,
+    userFrom: userFrom,
+    setUserFrom: setUserFrom,
+    userTo: userTo,
+    setUserTo: setUserTo,
+    handelMergeDataUser: handelMergeDataUser
+  };
+};
+
+var RevertUser = function RevertUser() {
+  var _useRevertUser = useRevertUser(),
+      user = _useRevertUser.user,
+      setUser = _useRevertUser.setUser,
+      handelRevertUser = _useRevertUser.handelRevertUser,
+      userFrom = _useRevertUser.userFrom,
+      setUserFrom = _useRevertUser.setUserFrom,
+      userTo = _useRevertUser.userTo,
+      setUserTo = _useRevertUser.setUserTo,
+      handelMergeDataUser = _useRevertUser.handelMergeDataUser;
+
+  return React__default.createElement(reactstrap.Row, {
+    className: "my-2"
+  }, React__default.createElement(reactstrap.Col, {
+    md: 4
+  }, React__default.createElement("p", null, "Revert User"), !!user && React__default.createElement("div", null, React__default.createElement("p", null, "Id: ", user.id), React__default.createElement("p", null, "Name: ", user.fullName), React__default.createElement("p", null, "Email: ", user.email), React__default.createElement("p", null, "Delete at:", " ", (user === null || user === void 0 ? void 0 : user.deletedAt) && marioCore.utcToLocalTime(user === null || user === void 0 ? void 0 : user.deletedAt, "yyyy-MM-DD"))), React__default.createElement(StudentItemSelector, {
+    isDeleted: true,
+    placeholder: "Type 2 characters to search",
+    onChange: function onChange(e) {
+      setUser(e);
+    }
+  }), React__default.createElement(reactstrap.Button, {
+    disabled: !user,
+    className: "my-2 w-100",
+    onClick: function onClick() {
+      return !!user && handelRevertUser(user === null || user === void 0 ? void 0 : user.id);
+    }
+  }, "Revert")), React__default.createElement(reactstrap.Col, {
+    md: 8
+  }, React__default.createElement("p", null, "Merge Data User"), React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+    md: 6
+  }, "From", !!userFrom && React__default.createElement("div", null, React__default.createElement("p", null, "Id: ", userFrom.id), React__default.createElement("p", null, "Name: ", userFrom.fullName), React__default.createElement("p", null, "Email: ", userFrom.email), React__default.createElement("p", null, "Delete at:", " ", (userFrom === null || userFrom === void 0 ? void 0 : userFrom.deletedAt) && marioCore.utcToLocalTime(userFrom === null || userFrom === void 0 ? void 0 : userFrom.deletedAt, "yyyy-MM-DD"))), React__default.createElement(StudentItemSelector, {
+    isDeleted: true,
+    placeholder: "Type 2 characters to search",
+    onChange: function onChange(e) {
+      setUserFrom(e);
+    }
+  })), React__default.createElement(reactstrap.Col, {
+    md: 6
+  }, "To", !!userTo && React__default.createElement("div", null, React__default.createElement("p", null, "Id: ", userTo.id), React__default.createElement("p", null, "Name: ", userTo.fullName), React__default.createElement("p", null, "Email: ", userTo.email), React__default.createElement("p", null, "Delete at:", " ", (userTo === null || userTo === void 0 ? void 0 : userTo.deletedAt) && marioCore.utcToLocalTime(userTo === null || userTo === void 0 ? void 0 : userTo.deletedAt, "yyyy-MM-DD"))), React__default.createElement(StudentItemSelector, {
+    placeholder: "Type 2 characters to search",
+    onChange: function onChange(e) {
+      setUserTo(e);
+    }
+  })), React__default.createElement(reactstrap.Button, {
+    disabled: !userTo || !userFrom,
+    className: "m-2 w-100",
+    onClick: function onClick() {
+      return handelMergeDataUser();
+    }
+  }, "Merge Session, Conference"))));
+};
+
 core.LicenseManager.setLicenseKey(marioCore.LICENSE_AGGRID);
 
 exports.AdminTraining = AdminTraining;
@@ -35321,6 +35479,7 @@ exports.QuestionCategoryList = QuestionCateList;
 exports.QuestionDetail = QuestionDetail;
 exports.ReflectionContainer = ReflectionContainer;
 exports.ReflectionFormList = ReflectionFormList;
+exports.RevertUser = RevertUser;
 exports.SessionTemplateContainer = SessionTemplateContainer;
 exports.SessionTemplateDetail = SessionTemplateDetail;
 exports.SessionTemplateGeneralClassDetail = SessionTemplateGeneralClassDetail;