mario-teacher-student-client 2.1.94-admin → 2.1.95-admin

package/dist/index.js

@@ -18733,7 +18733,7 @@ var useChartOneToOne = function useChartOneToOne(studentId) {
     legend: {
       position: "top",
       horizontalAlign: "center",
-      fontSize: '13px',
+      fontSize: "13px",
       offsetY: 5,
       markers: {
         height: 16,
@@ -18771,7 +18771,7 @@ var useChartOneToOne = function useChartOneToOne(studentId) {
       max: 100
     }
   };
-  var questionOneToOne = ["Wellbeing", "Growth", "Relations", "Productivity", "Academic", "Self-Efficacy", "Focus", "Energy", "Happiness"];
+  var questionOneToOne = ["Well-being", "Growth", "Relations", "Productivity", "Academic", "Self-efficacy", "Focus", "Energy", "Happiness"];
 
   var _useState7 = React.useState([]),
       seriesOneToOne = _useState7[0],
@@ -18801,27 +18801,29 @@ var useChartOneToOne = function useChartOneToOne(studentId) {
           };
         }) || [];
         var listMonth = [];
-        !!res && res.map(function (element) {
-          listMonth.push(element.month);
-          element.resultQuestion.map(function (data) {
-            if (data.questionText == "") {
-              currentData.map(function (r) {
-                r.data.push(null);
-              });
-            } else {
-              var _data$avgOfStudentCho;
+        var afterData = !!currentData && currentData.length > 0 && currentData.map(function (record) {
+          var dataItem = !!res && res.map(function (item) {
+            listMonth.push(item.month);
+            var objectItem = item.resultQuestion.find(function (i) {
+              var _i$questionText, _i$questionText$repla;
 
-              var result = (_data$avgOfStudentCho = data.avgOfStudentChoice) === null || _data$avgOfStudentCho === void 0 ? void 0 : _data$avgOfStudentCho.toFixed(2);
-              currentData.map(function (r, index) {
-                var _data$questionText, _data$questionText$re;
+              return (_i$questionText = i.questionText) === null || _i$questionText === void 0 ? void 0 : (_i$questionText$repla = _i$questionText.replace("-", "")) === null || _i$questionText$repla === void 0 ? void 0 : _i$questionText$repla.toLocaleLowerCase().includes(record.name.replace("-", "").toLocaleLowerCase());
+            });
 
-                var isCheckContain = (_data$questionText = data.questionText) === null || _data$questionText === void 0 ? void 0 : (_data$questionText$re = _data$questionText.replace("-", "")) === null || _data$questionText$re === void 0 ? void 0 : _data$questionText$re.toLocaleLowerCase().includes(r.name.replace("-", "").toLocaleLowerCase());
-                if (isCheckContain) currentData[index].data.push(result);
-              });
+            if (objectItem != null) {
+              var _objectItem$avgOfStud;
+
+              return objectItem === null || objectItem === void 0 ? void 0 : (_objectItem$avgOfStud = objectItem.avgOfStudentChoice) === null || _objectItem$avgOfStud === void 0 ? void 0 : _objectItem$avgOfStud.toFixed(2);
+            } else {
+              return null;
             }
           });
+          return {
+            name: record.name,
+            data: dataItem
+          };
         });
-        setSeriesOneToOne(currentData);
+        setSeriesOneToOne(afterData);
         setChartMonthOneToOne([].concat(listMonth));
       });
     } catch (e) {
@@ -19229,25 +19231,29 @@ var useChartConference = function useChartConference(studentId) {
           };
         }) || [];
         var listMonth = [];
-        !!res && res.map(function (element) {
-          listMonth.push(element.month);
-          element.resultQuestion.map(function (data) {
-            if (data.questionText == "") {
-              currentData.map(function (r) {
-                r.data.push(null);
-              });
-            } else {
-              var result = (data.avgOfStudentChoice * 100).toFixed(2);
-              currentData.map(function (r, index) {
-                var _data$questionText, _data$questionText$re;
+        var afterData = !!currentData && currentData.length > 0 && currentData.map(function (record) {
+          var dataItem = !!res && res.map(function (item) {
+            listMonth.push(item.month);
+            var objectItem = item.resultQuestion.find(function (i) {
+              var _i$questionText, _i$questionText$repla;
 
-                var isCheckContain = (_data$questionText = data.questionText) === null || _data$questionText === void 0 ? void 0 : (_data$questionText$re = _data$questionText.replace("-", "")) === null || _data$questionText$re === void 0 ? void 0 : _data$questionText$re.toLocaleLowerCase().includes(r.name.replace("-", "").toLocaleLowerCase());
-                if (isCheckContain) currentData[index].data.push(result);
-              });
+              return (_i$questionText = i.questionText) === null || _i$questionText === void 0 ? void 0 : (_i$questionText$repla = _i$questionText.replace("-", "")) === null || _i$questionText$repla === void 0 ? void 0 : _i$questionText$repla.toLocaleLowerCase().includes(record.name.replace("-", "").toLocaleLowerCase());
+            });
+
+            if (objectItem != null) {
+              var _objectItem$avgOfStud;
+
+              return objectItem === null || objectItem === void 0 ? void 0 : (_objectItem$avgOfStud = objectItem.avgOfStudentChoice) === null || _objectItem$avgOfStud === void 0 ? void 0 : _objectItem$avgOfStud.toFixed(2);
+            } else {
+              return null;
             }
           });
+          return {
+            name: record.name,
+            data: dataItem
+          };
         });
-        setSeries(currentData);
+        setSeries(afterData);
         setChartMonthConference([].concat(listMonth));
       });
     } catch (e) {
@@ -58113,7 +58119,7 @@ var AddClassReflection = function AddClassReflection() {
   }, "Send to Teacher"), isTeacher && React__default.createElement(StyledTableCell, {
     align: "center",
     className: styles$E["header-title"]
-  }, "Send"))), React__default.createElement(TableBody, null, rowClassReflection.map(function (row) {
+  }, "Send Now"))), React__default.createElement(TableBody, null, rowClassReflection.map(function (row) {
     return React__default.createElement(StyledTableRow, {
       key: row.id
     }, React__default.createElement(StyledTableCell, {