mario-teacher-student-client 1.7.4 → 1.7.5

package/dist/index.js

@@ -6895,7 +6895,7 @@ var useStyles$3 = styles$b.makeStyles(function () {
 });
 
 var CustomTabNote = function CustomTabNote(props) {
-  var _props$teacherNoteDat, _props$teacherNoteDat2, _props$teacherNoteDat3, _props$teacherNoteDat4, _props$studentNoteDat, _props$studentNoteDat2, _props$studentNoteDat3, _props$studentNoteDat4, _props$teacherNoteDat5, _props$studentNoteDat5;
+  var _props$teacherNoteDat, _props$studentNoteDat;
 
   var classes = useStyles$3();
 
@@ -6996,6 +6996,22 @@ var CustomTabNote = function CustomTabNote(props) {
     return shortDate;
   };
 
+  var handleCounter = function handleCounter(data) {
+    var count = 0;
+
+    for (var _iterator = _createForOfIteratorHelperLoose(data), _step; !(_step = _iterator()).done;) {
+      var element = _step.value;
+
+      if (element.notes) {
+        var _element$notes;
+
+        count += (_element$notes = element.notes) === null || _element$notes === void 0 ? void 0 : _element$notes.length;
+      }
+    }
+
+    return count;
+  };
+
   return React__default.createElement(core.Grid, {
     container: true,
     direction: "column",
@@ -7015,14 +7031,14 @@ var CustomTabNote = function CustomTabNote(props) {
     "aria-label": "simple tabs example",
     indicatorColor: "primary"
   }, React__default.createElement(core.Tab, Object.assign({
-    label: (!isTeacher ? "TEACHER" : "ME") + " (" + (!!props.teacherNoteData && ((_props$teacherNoteDat = props.teacherNoteData[0]) === null || _props$teacherNoteDat === void 0 ? void 0 : (_props$teacherNoteDat2 = _props$teacherNoteDat.notes) === null || _props$teacherNoteDat2 === void 0 ? void 0 : _props$teacherNoteDat2.length) > 0 ? (_props$teacherNoteDat3 = props.teacherNoteData[0]) === null || _props$teacherNoteDat3 === void 0 ? void 0 : (_props$teacherNoteDat4 = _props$teacherNoteDat3.notes) === null || _props$teacherNoteDat4 === void 0 ? void 0 : _props$teacherNoteDat4.length : 0) + ")",
+    label: (!isTeacher ? "TEACHER" : "ME") + " (" + (!!props.teacherNoteData ? handleCounter(props.teacherNoteData) : 0) + ")",
     className: classes.tabLabel + " " + (value === 0 ? classes.tabLabelActive : "")
   }, a11yProps$1(0), {
     onClick: function onClick() {
       handleIndexTab(0);
     }
   })), React__default.createElement(core.Tab, Object.assign({
-    label: " " + (!isTeacher ? "ME" : "STUDENT") + " (" + (!!props.studentNoteData && ((_props$studentNoteDat = props.studentNoteData[0]) === null || _props$studentNoteDat === void 0 ? void 0 : (_props$studentNoteDat2 = _props$studentNoteDat.notes) === null || _props$studentNoteDat2 === void 0 ? void 0 : _props$studentNoteDat2.length) > 0 ? (_props$studentNoteDat3 = props.studentNoteData[0]) === null || _props$studentNoteDat3 === void 0 ? void 0 : (_props$studentNoteDat4 = _props$studentNoteDat3.notes) === null || _props$studentNoteDat4 === void 0 ? void 0 : _props$studentNoteDat4.length : 0) + ")",
+    label: " " + (!isTeacher ? "ME" : "STUDENT") + " (" + (!!props.studentNoteData ? handleCounter(props.studentNoteData) : 0) + ")",
     className: classes.tabLabel + " " + (value === 1 ? classes.tabLabelActive : "")
   }, a11yProps$1(1), {
     onClick: function onClick() {
@@ -7044,7 +7060,7 @@ var CustomTabNote = function CustomTabNote(props) {
     style: {
       height: "" + heightScrollTab
     }
-  }, !!(props !== null && props !== void 0 && props.teacherNoteData) && (props === null || props === void 0 ? void 0 : (_props$teacherNoteDat5 = props.teacherNoteData) === null || _props$teacherNoteDat5 === void 0 ? void 0 : _props$teacherNoteDat5.map(function (item) {
+  }, !!(props !== null && props !== void 0 && props.teacherNoteData) && (props === null || props === void 0 ? void 0 : (_props$teacherNoteDat = props.teacherNoteData) === null || _props$teacherNoteDat === void 0 ? void 0 : _props$teacherNoteDat.map(function (item) {
     var _item$notes;
 
     return React__default.createElement(core.Box, {
@@ -7093,7 +7109,7 @@ var CustomTabNote = function CustomTabNote(props) {
     style: {
       height: "" + heightScrollTab
     }
-  }, !!(props !== null && props !== void 0 && props.studentNoteData) && (props === null || props === void 0 ? void 0 : (_props$studentNoteDat5 = props.studentNoteData) === null || _props$studentNoteDat5 === void 0 ? void 0 : _props$studentNoteDat5.map(function (item) {
+  }, !!(props !== null && props !== void 0 && props.studentNoteData) && (props === null || props === void 0 ? void 0 : (_props$studentNoteDat = props.studentNoteData) === null || _props$studentNoteDat === void 0 ? void 0 : _props$studentNoteDat.map(function (item) {
     var _item$notes2;
 
     return React__default.createElement(core.Box, {
@@ -12200,6 +12216,10 @@ var Overview = function Overview(props) {
       disableDate = _useState[0],
       setDisableDate = _useState[1];
 
+  var _useState2 = React.useState(true),
+      isFirstTimeEnter = _useState2[0],
+      setIsFirstTimeEnter = _useState2[1];
+
   var overviewTotal = React.useMemo(function () {
     var currentYear = moment().format("YYYY");
     return overviewCollap.map(function (item) {
@@ -12229,17 +12249,15 @@ var Overview = function Overview(props) {
     });
   }, [overviewCollap, informationWellbeing]);
   React.useEffect(function () {
-    var firstChildId = !!overviewTotal && overviewTotal.length > 0 ? overviewTotal[0].id : 0;
-    var openPanel = "panel" + firstChildId;
-    setExpanded(openPanel);
+    var firstChildId = !!overviewTotal && overviewTotal.length > 0 ? overviewTotal[0].id : -1;
+    var targetOpenPanel = "panel" + firstChildId;
 
-    if (expanded != openPanel) {
+    if (expanded != targetOpenPanel && firstChildId >= 0 && isFirstTimeEnter) {
+      setExpanded(targetOpenPanel);
       getInformationWellbeing(firstChildId, moment().startOf("month").valueOf(), Date.now());
+      setIsFirstTimeEnter(false);
     }
-  }, [overviewTotal, overviewCollap, informationWellbeing]);
-  console.log({
-    overviewTotal: overviewTotal
-  });
+  }, [overviewTotal, informationWellbeing]);
 
   var handleChangeStartDate = function handleChangeStartDate(type, date) {
     if (!date) return;