mario-teacher-student-client 2.1.67-beta → 2.1.68-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,5 +3,6 @@ declare const getEventFullCalendar: (userId: string, year: number, month: number
3
3
  classFontSize: string;
4
4
  fontSizeHeader: number;
5
5
  getDataEvent: () => Promise<void>;
6
+ dataCardTotal: any;
6
7
  };
7
8
  export default getEventFullCalendar;
package/dist/index.css CHANGED
@@ -14092,3 +14092,6 @@ h4._3lNz0 {
14092
14092
  ._2r6Xx {
14093
14093
  padding: 10px 24px;
14094
14094
  border-bottom: 1px solid #ebebeb; }
14095
+
14096
+ ._3u2Hp {
14097
+ padding: 30px; }
package/dist/index.js CHANGED
@@ -1458,6 +1458,7 @@ var MainLayout = function MainLayout(_ref) {
1458
1458
  var home = {"title-home":"_28pc4","to-do-today":"_1UG9Q","show-calendar":"_2W0R7","today-schedule":"_34JC1","box-schedule":"_UlvOc","action-point":"_1rK_Q","show-arrange-today":"_2pCuD","box":"_ppOfL","title-box":"_3DN3c","content-box":"_2X2qR","title-today-schedule":"_-NEIR","time-line-item":"_po9t4","time":"_1ickv","time-line":"_2y9cV","event":"_2slF0","event-text":"_anBzU","event-red":"_3Tk6m","full-calendar":"_26M4Q","current-time":"_23CKo","current-date":"_1ehp6","current-weekday":"_3Zq5B","action-points":"_10JrS","schedule-item":"_1XZWI","item-time":"_1dn2z","right-content":"_1XobX","font-large":"_1gBbm","font-small":"_3gyKR"};
1459
1459
 
1460
1460
  var EVENT_CALENDAR = marioCore.BASE_URL + "/api/GoogleCalendar/eventCalendarDashboard";
1461
+ var TOTAL_CARD = marioCore.BASE_URL + "/api/GoogleCalendar/eventTotalCardDashboard";
1461
1462
  var getEventCalendar = function getEventCalendar(userId, year, month) {
1462
1463
  return marioCore.api.get("" + EVENT_CALENDAR, {
1463
1464
  params: {
@@ -1475,6 +1476,11 @@ var getEventToDayCalendar = function getEventToDayCalendar(startDate, teacherUse
1475
1476
  }
1476
1477
  });
1477
1478
  };
1479
+ var getEventCard = function getEventCard(params) {
1480
+ return marioCore.api.get("" + TOTAL_CARD, {
1481
+ params: params
1482
+ });
1483
+ };
1478
1484
 
1479
1485
  var defaultFontLarge$1 = 20;
1480
1486
  var defaultFontSmall$1 = 12;
@@ -1787,6 +1793,10 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
1787
1793
  dataEvent = _useState[0],
1788
1794
  setDataEvent = _useState[1];
1789
1795
 
1796
+ var _useState2 = React.useState(),
1797
+ dataCardTotal = _useState2[0],
1798
+ setDataCardTotal = _useState2[1];
1799
+
1790
1800
  var defaultFont = reactRedux.useSelector(function (state) {
1791
1801
  var _state$common;
1792
1802
 
@@ -1824,15 +1834,39 @@ var getEventFullCalendar = function getEventFullCalendar(userId, year, month) {
1824
1834
  return Promise.reject(e);
1825
1835
  }
1826
1836
  }, [month, year]);
1837
+
1838
+ var getDataCardEvent = function getDataCardEvent() {
1839
+ try {
1840
+ var _temp4 = _catch(function () {
1841
+ var params = {
1842
+ startDate: moment().startOf("day").valueOf(),
1843
+ endDate: moment().endOf("day").valueOf(),
1844
+ userId: userId
1845
+ };
1846
+ return Promise.resolve(getEventCard(params)).then(function (res) {
1847
+ setDataCardTotal(res.data);
1848
+ });
1849
+ }, function () {});
1850
+
1851
+ return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
1852
+ } catch (e) {
1853
+ return Promise.reject(e);
1854
+ }
1855
+ };
1856
+
1827
1857
  React.useEffect(function () {
1828
1858
  document.title = "Home";
1829
1859
  getDataEvent();
1830
1860
  }, [month, year]);
1861
+ React.useEffect(function () {
1862
+ getDataCardEvent();
1863
+ }, []);
1831
1864
  return {
1832
1865
  dataEvent: dataEvent,
1833
1866
  classFontSize: classFontSize,
1834
1867
  fontSizeHeader: fontSizeHeader,
1835
- getDataEvent: getDataEvent
1868
+ getDataEvent: getDataEvent,
1869
+ dataCardTotal: dataCardTotal
1836
1870
  };
1837
1871
  };
1838
1872
 
@@ -3178,7 +3212,8 @@ var Dashboard = function Dashboard() {
3178
3212
  var _getEventFullCalendar = getEventFullCalendar(user.id, currentYear, currentMonth),
3179
3213
  dataEvent = _getEventFullCalendar.dataEvent,
3180
3214
  classFontSize = _getEventFullCalendar.classFontSize,
3181
- getDataEvent = _getEventFullCalendar.getDataEvent;
3215
+ getDataEvent = _getEventFullCalendar.getDataEvent,
3216
+ dataCardTotal = _getEventFullCalendar.dataCardTotal;
3182
3217
 
3183
3218
  var handleGetNewActionPoint = function handleGetNewActionPoint() {
3184
3219
  getDataEvent();
@@ -3213,25 +3248,25 @@ var Dashboard = function Dashboard() {
3213
3248
  className: "" + home["title-box"]
3214
3249
  }, "Today\u2019s 1-1"), React__default.createElement("p", {
3215
3250
  className: "" + home["content-box"]
3216
- }, dataEvent === null || dataEvent === void 0 ? void 0 : dataEvent.todayOneToOne)), React__default.createElement("div", {
3251
+ }, dataCardTotal === null || dataCardTotal === void 0 ? void 0 : dataCardTotal.todayOneToOne)), React__default.createElement("div", {
3217
3252
  className: "" + home["box"]
3218
3253
  }, React__default.createElement("p", {
3219
3254
  className: "" + home["title-box"]
3220
3255
  }, "Today\u2019s Conferences"), React__default.createElement("p", {
3221
3256
  className: "" + home["content-box"]
3222
- }, dataEvent === null || dataEvent === void 0 ? void 0 : dataEvent.todayConferences)), React__default.createElement("div", {
3257
+ }, dataCardTotal === null || dataCardTotal === void 0 ? void 0 : dataCardTotal.todayConferences)), React__default.createElement("div", {
3223
3258
  className: "" + home["box"]
3224
3259
  }, React__default.createElement("p", {
3225
3260
  className: "" + home["title-box"]
3226
3261
  }, "Next Meeting"), React__default.createElement("p", {
3227
3262
  className: "" + home["content-box"]
3228
- }, !!dataEvent && (marioCore.utcToLocalTime(dataEvent.nextMeeting, "hh:mm A") || "00:00 AM"))), React__default.createElement("div", {
3263
+ }, !!dataCardTotal && (marioCore.utcToLocalTime(dataCardTotal.nextMeeting, "hh:mm A") || "00:00 AM"))), React__default.createElement("div", {
3229
3264
  className: "" + home["box"]
3230
3265
  }, React__default.createElement("p", {
3231
3266
  className: "" + home["title-box"]
3232
3267
  }, "Next Conference"), React__default.createElement("p", {
3233
3268
  className: "" + home["content-box"]
3234
- }, !!dataEvent && (marioCore.utcToLocalTime(dataEvent.nextClass, "hh:mm A") || "00:00 AM")))), React__default.createElement("div", {
3269
+ }, !!dataCardTotal && (marioCore.utcToLocalTime(dataCardTotal.nextClass, "hh:mm A") || "00:00 AM")))), React__default.createElement("div", {
3235
3270
  className: home["full-calendar"] + " full-calender-view"
3236
3271
  }, React__default.createElement("div", {
3237
3272
  className: "" + home["current-time"]
@@ -17795,7 +17830,7 @@ var OverviewLeft = function OverviewLeft(props) {
17795
17830
  }, "No Schedule"))))))))), React__default.createElement(GoalProgress, {
17796
17831
  studentId: studentId,
17797
17832
  classFontSize: classFontSize
17798
- }), React__default.createElement(MyNote, {
17833
+ }), !isEduTeacher && React__default.createElement(MyNote, {
17799
17834
  studentId: studentId,
17800
17835
  classFontSize: classFontSize
17801
17836
  })) : React__default.createElement(core.Box, {
@@ -17981,7 +18016,7 @@ var OverviewLeft = function OverviewLeft(props) {
17981
18016
  }, "No Schedule"))))))))), React__default.createElement(GoalProgress, {
17982
18017
  studentId: studentId,
17983
18018
  classFontSize: classFontSize
17984
- }), React__default.createElement(MyNote, {
18019
+ }), !isEduTeacher && React__default.createElement(MyNote, {
17985
18020
  studentId: studentId,
17986
18021
  classFontSize: classFontSize
17987
18022
  })));
@@ -39802,16 +39837,17 @@ var NewLearningPlan = function NewLearningPlan() {
39802
39837
  setFieldValue = formikProps.setFieldValue,
39803
39838
  handleSubmit = formikProps.handleSubmit,
39804
39839
  touched = formikProps.touched,
39805
- errors = formikProps.errors;
39840
+ errors = formikProps.errors,
39841
+ dirty = formikProps.dirty;
39806
39842
  React.useEffect(function () {
39807
- if (toggleAlert && Object.keys(errors).length > 0) {
39843
+ if (toggleAlert && !dirty && Object.keys(errors).length > 0) {
39808
39844
  dispatch(marioCore.setAlert({
39809
39845
  type: "danger",
39810
39846
  message: "Please fill in all required information"
39811
39847
  }));
39812
39848
  setToggleAlert(false);
39813
39849
  }
39814
- }, [toggleAlert, errors]);
39850
+ }, [toggleAlert, errors, dirty]);
39815
39851
  React.useMemo(function () {
39816
39852
  values != initialValues && localStorage.setItem("learning-plan", JSON.stringify(values));
39817
39853
  }, [values]);
@@ -40869,7 +40905,9 @@ var useUpdateProfile = function useUpdateProfile(studentId) {
40869
40905
 
40870
40906
  var _temp34 = _catch(function () {
40871
40907
  return Promise.resolve(checkEmailApi(email)).then(function (res) {
40872
- if (!!res.data && (values.secondaryEmail.toUpperCase() !== email.toUpperCase() && openAddEditParentModal1 || values.thirdEmail.toUpperCase() !== email.toUpperCase() && openAddEditParentModal2)) {
40908
+ var _values$secondaryEmai, _values$thirdEmail;
40909
+
40910
+ if (!!res.data && (((_values$secondaryEmai = values.secondaryEmail) === null || _values$secondaryEmai === void 0 ? void 0 : _values$secondaryEmai.toUpperCase()) !== (email === null || email === void 0 ? void 0 : email.toUpperCase()) && openAddEditParentModal1 || ((_values$thirdEmail = values.thirdEmail) === null || _values$thirdEmail === void 0 ? void 0 : _values$thirdEmail.toUpperCase()) !== (email === null || email === void 0 ? void 0 : email.toUpperCase()) && openAddEditParentModal2)) {
40873
40911
  setExistEmailData(res.data);
40874
40912
  handleOpenConfirmModal();
40875
40913
  } else {
@@ -42100,7 +42138,9 @@ var useCreateStudent = function useCreateStudent() {
42100
42138
 
42101
42139
  var _temp4 = _catch(function () {
42102
42140
  return Promise.resolve(checkEmailApi(email)).then(function (res) {
42103
- if (!!res.data && (values.secondaryEmail.toUpperCase() !== email.toUpperCase() && openAddEditParentModal1 || values.thirdEmail.toUpperCase() !== email.toUpperCase() && openAddEditParentModal2)) {
42141
+ var _values$secondaryEmai, _values$thirdEmail;
42142
+
42143
+ if (!!res.data && (((_values$secondaryEmai = values.secondaryEmail) === null || _values$secondaryEmai === void 0 ? void 0 : _values$secondaryEmai.toUpperCase()) !== (email === null || email === void 0 ? void 0 : email.toUpperCase()) && openAddEditParentModal1 || ((_values$thirdEmail = values.thirdEmail) === null || _values$thirdEmail === void 0 ? void 0 : _values$thirdEmail.toUpperCase()) !== (email === null || email === void 0 ? void 0 : email.toUpperCase()) && openAddEditParentModal2)) {
42104
42144
  setExistEmailData(res.data);
42105
42145
  handleOpenConfirmModal();
42106
42146
  } else {
@@ -58590,7 +58630,7 @@ var ThankYouCard = function ThankYouCard() {
58590
58630
  var history = reactRouterDom.useHistory();
58591
58631
 
58592
58632
  var onGoHome = function onGoHome() {
58593
- history.push("/");
58633
+ history.push("/login");
58594
58634
  };
58595
58635
 
58596
58636
  return React__default.createElement("div", {
@@ -58623,7 +58663,7 @@ var ThankYouError = function ThankYouError() {
58623
58663
  var history = reactRouterDom.useHistory();
58624
58664
 
58625
58665
  var onGoHome = function onGoHome() {
58626
- history.push("/");
58666
+ history.push("/login");
58627
58667
  };
58628
58668
 
58629
58669
  return React__default.createElement("div", {
@@ -58726,7 +58766,7 @@ var useStudentList$2 = function useStudentList() {
58726
58766
  };
58727
58767
  };
58728
58768
 
58729
- var styles$M = {"search-input":"_mB4S_","search-input-icon":"_2dOCb","inputInput":"_3LZHP","block-search":"_3ETqf","block-header":"_28w_g","header-content":"_MM65j","table-border":"_2l3wP","table-row":"_NhhUt","row_type":"_rp-5t","duration":"_3I1fi","request":"_2-rzs","avatar_user":"_1FxvF","table-cell":"_3flzL","list-student-desktop":"_2hSN6","list-student-mobile":"_1Uabb","item-right":"_3AfFZ","item":"_3pZDy","box-info":"_3osaq","item-name":"_cuqGm","box-edu":"_2r6Xx"};
58769
+ var styles$M = {"search-input":"_mB4S_","search-input-icon":"_2dOCb","inputInput":"_3LZHP","block-search":"_3ETqf","block-header":"_28w_g","header-content":"_MM65j","table-border":"_2l3wP","table-row":"_NhhUt","row_type":"_rp-5t","duration":"_3I1fi","request":"_2-rzs","avatar_user":"_1FxvF","table-cell":"_3flzL","list-student-desktop":"_2hSN6","list-student-mobile":"_1Uabb","item-right":"_3AfFZ","item":"_3pZDy","box-info":"_3osaq","item-name":"_cuqGm","box-edu":"_2r6Xx","box-container":"_3u2Hp"};
58730
58770
 
58731
58771
  var DEFAULT_USER_AVATAR$r = "/images/image-default.png";
58732
58772
  var ListStudent = function ListStudent() {
@@ -58778,7 +58818,12 @@ var ListStudent = function ListStudent() {
58778
58818
  });
58779
58819
  };
58780
58820
 
58781
- return React__default.createElement(core.Grid, null, React__default.createElement(core.Grid, {
58821
+ var location = reactRouterDom.useLocation();
58822
+ var pathname = location.pathname;
58823
+ var dashboard = pathname === "/" ? "box-container" : "";
58824
+ return React__default.createElement(core.Grid, {
58825
+ className: "" + styles$M["" + dashboard]
58826
+ }, React__default.createElement(core.Grid, {
58782
58827
  className: "" + styles$M["block-header"]
58783
58828
  }, React__default.createElement(core.Typography, {
58784
58829
  className: "" + styles$M["header-content"]