mario-education 2.4.151-level → 2.4.153-level

package/dist/index.js

@@ -96,6 +96,35 @@ function _isSettledPact(thenable) {
 	return thenable instanceof _Pact && thenable.s & 1;
 }
 
+// Asynchronously iterate through an object that has a length property, passing the index as the first argument to the callback (even as the length property changes)
+function _forTo(array, body, check) {
+	var i = -1, pact, reject;
+	function _cycle(result) {
+		try {
+			while (++i < array.length && (!check || !check())) {
+				result = body(i);
+				if (result && result.then) {
+					if (_isSettledPact(result)) {
+						result = result.v;
+					} else {
+						result.then(_cycle, reject || (reject = _settle.bind(null, pact = new _Pact(), 2)));
+						return;
+					}
+				}
+			}
+			if (pact) {
+				_settle(pact, 1, result);
+			} else {
+				pact = result;
+			}
+		} catch (e) {
+			_settle(pact || (pact = new _Pact()), 2, e);
+		}
+	}
+	_cycle();
+	return pact;
+}
+
 const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";
 
 const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
@@ -5715,7 +5744,7 @@ var useCSVImport = function useCSVImport() {
 
   var upload = React.useCallback(function (file) {
     try {
-      var _temp12 = function _temp12() {
+      var _temp11 = function _temp11() {
         dispatch(marioCore.setLoading(false));
         var inputId = document.getElementById(id);
         var input = document.getElementById('import-student');
@@ -5728,8 +5757,8 @@ var useCSVImport = function useCSVImport() {
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp13 = _catch(function () {
-        function _temp9() {
+      var _temp12 = _catch(function () {
+        function _temp8() {
           dispatch(marioCore.setAlert({
             type: "success",
             message: "Import CSV successfully"
@@ -5739,31 +5768,29 @@ var useCSVImport = function useCSVImport() {
         var formData = new FormData();
         formData.append("file", file, file.name);
 
-        var _temp8 = function () {
-          if (isCheckDomainIBS) {
-            var _temp14 = function _temp14() {
-              var _temp5 = function () {
-                if (type == CSVType.ClassReflection) {
-                  return Promise.resolve(importClassReflectionCSV(formData)).then(function () {});
-                }
-              }();
-
-              if (_temp5 && _temp5.then) return _temp5.then(function () {});
-            };
+        var _temp7 = function () {
+          if (type == CSVType.Students) {
+            return Promise.resolve(importStudentCSV(formData)).then(function () {});
+          } else {
+            var _temp13 = function () {
+              if (isCheckDomainIBS) {
+                var _temp14 = function () {
+                  if (type == CSVType.ClassReflection) {
+                    return Promise.resolve(importClassReflectionCSV(formData)).then(function () {});
+                  }
+                }();
 
-            var _temp15 = function () {
-              if (type == CSVType.Students) {
-                return Promise.resolve(importStudentCSV(formData)).then(function () {});
+                if (_temp14 && _temp14.then) return _temp14.then(function () {});
+              } else {
+                return Promise.resolve(importCSV(formData, type.toString())).then(function () {});
               }
             }();
 
-            return _temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15);
-          } else {
-            return Promise.resolve(importCSV(formData, type.toString())).then(function () {});
+            if (_temp13 && _temp13.then) return _temp13.then(function () {});
           }
         }();
 
-        return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
+        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -5773,7 +5800,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(_temp12) : _temp12(_temp13));
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5781,7 +5808,7 @@ var useCSVImport = function useCSVImport() {
 
   var uploadByTeacherId = function uploadByTeacherId(file) {
     try {
-      var _temp18 = function _temp18() {
+      var _temp17 = function _temp17() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById('teacherSelector');
         input && (input.value = "");
@@ -5798,7 +5825,7 @@ var useCSVImport = function useCSVImport() {
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp19 = _catch(function () {
+      var _temp18 = _catch(function () {
         var formData = new FormData();
         formData.append("file", file, file.name);
         return Promise.resolve(importStudentByTeacher(defaultTeacher, formData)).then(function () {
@@ -5816,7 +5843,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19));
+      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp17) : _temp17(_temp18));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5824,7 +5851,7 @@ var useCSVImport = function useCSVImport() {
 
   var onConfirm = function onConfirm(values) {
     try {
-      var _temp22 = function _temp22() {
+      var _temp21 = function _temp21() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById(id);
         input && (input.value = "");
@@ -5833,7 +5860,7 @@ var useCSVImport = function useCSVImport() {
       if (!dataFile || !dataFile) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp23 = _catch(function () {
+      var _temp22 = _catch(function () {
         var formData = new FormData();
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
@@ -5857,7 +5884,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp23 && _temp23.then ? _temp23.then(_temp22) : _temp22(_temp23));
+      return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(_temp21) : _temp21(_temp22));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -5945,11 +5972,6 @@ var CSVImport = function CSVImport() {
       buttons = _useCSVImport.buttons,
       upload = _useCSVImport.upload,
       isCheckDomainIBS = _useCSVImport.isCheckDomainIBS,
-      onChangeTeacher = _useCSVImport.onChangeTeacher,
-      setDataFileImportStudent = _useCSVImport.setDataFileImportStudent,
-      defaultTeacher = _useCSVImport.defaultTeacher,
-      fileName = _useCSVImport.fileName,
-      onStudentSubmit = _useCSVImport.onStudentSubmit,
       downloadTemplateStudentISB = _useCSVImport.downloadTemplateStudentISB;
 
   var _useTranslation = marioCore.useTranslation(),
@@ -6066,40 +6088,43 @@ var CSVImport = function CSVImport() {
       });
     })))));
   }))) : React__default.createElement(React__default.Fragment, null, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
-    md: 3,
-    className: "mb-3"
-  }, React__default.createElement(TeacherSelector, {
-    defaultValue: defaultTeacher,
-    onChange: onChangeTeacher
-  }), React__default.createElement("div", {
-    className: "mt-3"
-  }, fileName ? React__default.createElement("span", {
-    className: "font-italic mb-1 font-lg"
-  }, fileName) : null, React__default.createElement(reactstrap.Input, {
+    md: 12,
+    className: "mb-2 text-left"
+  }, React__default.createElement(reactstrap.Button, {
+    role: "button",
+    color: "primary",
+    onClick: function onClick() {
+      return downloadTemplateStudentISB();
+    }
+  }, React__default.createElement("p", {
+    className: "d-flex align-items-center mb-0"
+  }, t("download_template"), " ", React__default.createElement(ai.AiOutlineDownload, {
+    size: 20,
+    className: "ml-2"
+  })))), React__default.createElement(reactstrap.Col, {
+    md: 6,
+    className: "mb-2"
+  }, React__default.createElement(reactstrap.Input, {
+    id: "import-student",
     className: "d-none",
     type: "file",
-    id: "teacherSelector",
     onChange: function onChange(e) {
-      return setDataFileImportStudent(e.target.files[0]);
+      return upload(e.target.files[0]);
     },
     accept: "text/csv"
+  }), React__default.createElement(marioCore.RequiredLabel, {
+    text: "Import student"
   }), React__default.createElement(UploadCSVButton, {
-    key: "Import student",
-    htmlFor: "teacherSelector",
-    text: "Select CSV",
+    key: "import-students",
+    htmlFor: 'import-student',
+    text: "Import students",
     isDisabled: isLoading,
-    backgroundColor: "#e74c3c",
+    backgroundColor: "#0abde3",
     onClick: function onClick() {
-      return setType(CSVType.Students);
+      setType(CSVType.Students);
     }
-  })), React__default.createElement(reactstrap.Button, {
-    color: "success",
-    onClick: onStudentSubmit,
-    className: "w-100 mt-3"
-  }, "Import")), React__default.createElement(reactstrap.Col, {
-    md: 3
-  }), React__default.createElement(reactstrap.Col, {
-    md: 3,
+  })), React__default.createElement(reactstrap.Col, {
+    md: 6,
     className: "mb-3"
   }, React__default.createElement(reactstrap.Input, {
     className: "d-none",
@@ -6110,7 +6135,9 @@ var CSVImport = function CSVImport() {
     },
     accept: "text/csv"
   }), buttons.map(function (button) {
-    return React__default.createElement(UploadCSVButton, {
+    return React__default.createElement(React__default.Fragment, null, React__default.createElement(marioCore.RequiredLabel, {
+      text: button.text
+    }), React__default.createElement(UploadCSVButton, {
       key: button.text,
       htmlFor: id,
       text: button.text,
@@ -6119,7 +6146,7 @@ var CSVImport = function CSVImport() {
       onClick: function onClick() {
         return setType(button.type);
       }
-    });
+    }));
   })))));
 };
 
@@ -11127,7 +11154,7 @@ var INITIAL_CHOSEN_USER$1 = {
   studentName: ""
 };
 
-var TITLE$h = "Assign secondary teacher list";
+var TITLE$h = "Assign support teacher list";
 
 var useAssignSecondaryTeacher = function useAssignSecondaryTeacher() {
   var modal = React.useRef();
@@ -11260,7 +11287,7 @@ var useAssignSecondaryTeacher = function useAssignSecondaryTeacher() {
       if (!secondaryTeacherChangeId) {
         dispatch(marioCore.setAlert({
           type: "danger",
-          message: "Secondary Teacher have not been selected!"
+          message: "Support Teacher have not been selected!"
         }));
         return Promise.resolve();
       }
@@ -11268,7 +11295,7 @@ var useAssignSecondaryTeacher = function useAssignSecondaryTeacher() {
       dispatch(marioCore.setModal({
         isOpen: true,
         type: "warning",
-        message: "Do you want to assign this Secondary Teacher to student " + chosenUser.studentName + "?",
+        message: "Do you want to assign this Support Teacher to student " + chosenUser.studentName + "?",
         onConfirm: function () {
           try {
             var _temp9 = function _temp9() {
@@ -11281,7 +11308,7 @@ var useAssignSecondaryTeacher = function useAssignSecondaryTeacher() {
               return Promise.resolve(assignSecondaryTeacherOfStudent(chosenUser.id, chosenUser.teacherId, secondaryTeacherChangeId)).then(function () {
                 dispatch(marioCore.setAlert({
                   type: "success",
-                  message: "Assign Secondary Teacher successfully"
+                  message: "Assign Support Teacher successfully"
                 }));
                 openModal();
                 resetData();
@@ -11368,13 +11395,13 @@ var AssignSecondaryTeacherModal = function AssignSecondaryTeacherModal(_ref, ref
   }, t("student_email")), React__default.createElement("p", null, chosenUser.emailStudent), !!chosenUser && React__default.createElement(marioCore.CustomSelector, {
     options: options,
     value: valueDefault,
-    placeholder: t("select_secondary_teacher"),
+    placeholder: t("select_support_teacher"),
     onChange: function onChange(e) {
       return setSecondaryTeacherChangeId((e === null || e === void 0 ? void 0 : e.value) || 0);
     },
     isClearable: true
   }), !!isChecked && !secondaryTeacherChangeId && React__default.createElement(marioCore.ErrorHandler, {
-    text: "Secondary Teacher is required"
+    text: "Support Teacher is required"
   }))));
 };
 
@@ -11449,7 +11476,7 @@ var AssignSecondaryTeacherList = function AssignSecondaryTeacherList() {
       onClick: function onClick() {
         return choiceUser(record);
       }
-    }, t("assign_secondary_teacher"))));
+    }, t("assign_support_teacher"))));
   })))) : React__default.createElement(marioCore.EmptyDataAlert, {
     label: "user"
   })), React__default.createElement(reactstrap.Col, {
@@ -11469,7 +11496,7 @@ var AssignSecondaryTeacherList = function AssignSecondaryTeacherList() {
     }
   }))), React__default.createElement(AssignSecondaryTeacherModal$1, {
     ref: modal,
-    header: t("assign_secondary_teacher"),
+    header: t("assign_support_teacher"),
     chosenUser: chosenUser,
     onAssign: handleAssign,
     options: options,
@@ -11905,12 +11932,12 @@ var SwitchSecondaryTeacherModal = function SwitchSecondaryTeacherModal(_ref, ref
     className: "font-weight-bold"
   }, t("student_email")), React__default.createElement("p", null, userChoiced.emailStudent), React__default.createElement("p", {
     className: "font-weight-bold"
-  }, t("current_secondary_teacher_name")), React__default.createElement("p", null, userChoiced.secondaryTeacherName), React__default.createElement("p", {
+  }, t("current_support_teacher_name")), React__default.createElement("p", null, userChoiced.secondaryTeacherName), React__default.createElement("p", {
     className: "font-weight-bold"
-  }, t("current_secondary_teacher_email")), React__default.createElement("p", null, userChoiced.emailSecondaryTeacher), !!userChoiced && React__default.createElement(marioCore.CustomSelector, {
+  }, t("current_support_teacher_email")), React__default.createElement("p", null, userChoiced.emailSecondaryTeacher), !!userChoiced && React__default.createElement(marioCore.CustomSelector, {
     options: options,
     value: valueDefault,
-    placeholder: t("select_secondary_teacher_change"),
+    placeholder: t("select_support_teacher_change"),
     onChange: function onChange(e) {
       return setSecondaryTeacherChangeId(e.value);
     }
@@ -11928,7 +11955,7 @@ var INITIAL_USER_CHOICE$3 = {
   assistantName: ""
 };
 
-var TITLE$j = "Switch counselor list";
+var TITLE$j = "Switch support list";
 
 var useSwitchSecondaryTeacher = function useSwitchSecondaryTeacher() {
   var modal = React.useRef();
@@ -12043,7 +12070,7 @@ var useSwitchSecondaryTeacher = function useSwitchSecondaryTeacher() {
       dispatch(marioCore.setModal({
         isOpen: true,
         type: "warning",
-        message: "Do you want to change secondary teacher?",
+        message: "Do you want to change support teacher?",
         onConfirm: function () {
           try {
             var _temp9 = function _temp9() {
@@ -12056,7 +12083,7 @@ var useSwitchSecondaryTeacher = function useSwitchSecondaryTeacher() {
               return Promise.resolve(changeSecondaryTeacherOfStudent(studentId, secondaryTeacherId)).then(function () {
                 dispatch(marioCore.setAlert({
                   type: "success",
-                  message: "Change secondary teacher successfully"
+                  message: "Change support teacher successfully"
                 }));
                 openModal();
                 resetData();
@@ -12091,7 +12118,7 @@ var useSwitchSecondaryTeacher = function useSwitchSecondaryTeacher() {
       dispatch(marioCore.setModal({
         isOpen: true,
         type: "warning",
-        message: "Do you want to remove this Secondary teacher?",
+        message: "Do you want to remove this support teacher?",
         onConfirm: function () {
           try {
             var _temp12 = _catch(function () {
@@ -12099,7 +12126,7 @@ var useSwitchSecondaryTeacher = function useSwitchSecondaryTeacher() {
                 getStudentSecondaryTeacherData();
                 dispatch(marioCore.setAlert({
                   type: "success",
-                  message: "Remove secondary teacher successfully"
+                  message: "Remove support teacher successfully"
                 }));
               });
             }, function (err) {
@@ -12153,20 +12180,20 @@ var useSwitchSecondaryTeacher = function useSwitchSecondaryTeacher() {
 var header$a = "list_students";
 
 var SwitchSecondaryTeacherList = function SwitchSecondaryTeacherList() {
-  var _useSwitchCounselor = useSwitchSecondaryTeacher(),
-      userList = _useSwitchCounselor.userList,
-      totalItems = _useSwitchCounselor.totalItems,
-      filters = _useSwitchCounselor.filters,
-      changeFilters = _useSwitchCounselor.changeFilters,
-      modal = _useSwitchCounselor.modal,
-      userChoiced = _useSwitchCounselor.userChoiced,
-      options = _useSwitchCounselor.options,
-      setSecondaryTeacherChangeId = _useSwitchCounselor.setSecondaryTeacherChangeId,
-      secondaryTeacherChangeId = _useSwitchCounselor.secondaryTeacherChangeId,
-      removeData = _useSwitchCounselor.removeData,
-      resetData = _useSwitchCounselor.resetData,
-      choiceUser = _useSwitchCounselor.choiceUser,
-      onDeleteSecondaryTeacher = _useSwitchCounselor.onDeleteSecondaryTeacher;
+  var _uuseSwitchSecondaryT = useSwitchSecondaryTeacher(),
+      userList = _uuseSwitchSecondaryT.userList,
+      totalItems = _uuseSwitchSecondaryT.totalItems,
+      filters = _uuseSwitchSecondaryT.filters,
+      changeFilters = _uuseSwitchSecondaryT.changeFilters,
+      modal = _uuseSwitchSecondaryT.modal,
+      userChoiced = _uuseSwitchSecondaryT.userChoiced,
+      options = _uuseSwitchSecondaryT.options,
+      setSecondaryTeacherChangeId = _uuseSwitchSecondaryT.setSecondaryTeacherChangeId,
+      secondaryTeacherChangeId = _uuseSwitchSecondaryT.secondaryTeacherChangeId,
+      removeData = _uuseSwitchSecondaryT.removeData,
+      resetData = _uuseSwitchSecondaryT.resetData,
+      choiceUser = _uuseSwitchSecondaryT.choiceUser,
+      onDeleteSecondaryTeacher = _uuseSwitchSecondaryT.onDeleteSecondaryTeacher;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -12206,11 +12233,11 @@ var SwitchSecondaryTeacherList = function SwitchSecondaryTeacherList() {
     className: "align-top"
   }, t("student_email")), React__default.createElement("th", {
     className: "align-top"
-  }, t("current_secondary_teacher_name")), React__default.createElement("th", {
+  }, t("current_support_teacher_name")), React__default.createElement("th", {
     className: "align-top"
-  }, t("current_secondary_teacher_email")), React__default.createElement("th", {
+  }, t("current_support_teacher_email")), React__default.createElement("th", {
     className: "align-top"
-  }, t("remove_secondary_teacher")))), React__default.createElement("tbody", null, !!userList && userList.length > 0 && userList.map(function (record) {
+  }, t("remove_support_teacher")))), React__default.createElement("tbody", null, !!userList && userList.length > 0 && userList.map(function (record) {
     return React__default.createElement("tr", {
       key: record.id
     }, React__default.createElement("td", {
@@ -12252,7 +12279,7 @@ var SwitchSecondaryTeacherList = function SwitchSecondaryTeacherList() {
     }
   }))), React__default.createElement(SwitchSecondaryTeacherModal$1, {
     ref: modal,
-    header: t("switch_counselor"),
+    header: t("switch_support_teacher"),
     userChoiced: userChoiced,
     removeData: removeData,
     options: options,
@@ -12332,11 +12359,11 @@ var tabs = [{
   component: SwitchCounselorList
 }, {
   path: "/admin/set-up/assign-secondary-teacher",
-  title: "Assign secondary teacher",
+  title: "Assign support teacher",
   component: AssignSecondaryTeacherList
 }, {
   path: "/admin/set-up/switch-secondary-teacher",
-  title: "Switch secondary teacher",
+  title: "Switch support teacher",
   component: SwitchSecondaryTeacherList
 }, {
   path: "/admin/set-up/welcome-email-re-send",
@@ -28570,7 +28597,7 @@ var learningStrategyChartOptions = function learningStrategyChartOptions(labelNa
 var average = function average(arr) {
   return arr.reduce(function (a, b) {
     return a + b;
-  }, 0) / arr.length;
+  }, 0) / arr.length || 0;
 };
 var getConvertMinuteToHour = function getConvertMinuteToHour(timeSecond) {
   var hTime = "";
@@ -30781,12 +30808,6 @@ var GenerateChartData = function GenerateChartData(_ref) {
   })));
 };
 
-var chartPropsAreEqual = function chartPropsAreEqual(prevMovie, nextMovie) {
-  return prevMovie === nextMovie;
-};
-
-var GenerateChartData$1 = React__default.memo(GenerateChartData, chartPropsAreEqual);
-
 var Loading = function Loading() {
   return React__default.createElement("div", {
     className: "d-flex align-items-center justify-content-center"
@@ -31039,23 +31060,23 @@ var DashboardToPDF = function DashboardToPDF(props) {
 
   var generatePDF = function generatePDF() {
     try {
-      var _temp27 = function _temp27() {
+      var _temp30 = function _temp30() {
         dispatch(marioCore.setLoading(false));
       };
 
       dispatch(marioCore.setLoading(true));
 
-      var _temp28 = _catch(function () {
-        function _temp24() {
-          function _temp22() {
-            function _temp20() {
-              function _temp18() {
-                function _temp16() {
-                  function _temp14() {
+      var _temp31 = _catch(function () {
+        function _temp27() {
+          function _temp25() {
+            function _temp23() {
+              function _temp21() {
+                function _temp19() {
+                  function _temp17() {
                     doc.save("DashBoard.pdf");
                   }
 
-                  var _temp13 = function () {
+                  var _temp16 = function () {
                     if (selectedToPDF.includes(topLearningStrategyName)) {
                       var chart = document.getElementById("learning_strategy");
                       return Promise.resolve(html2canvas(chart)).then(function (canvas) {
@@ -31067,10 +31088,10 @@ var DashboardToPDF = function DashboardToPDF(props) {
                     }
                   }();
 
-                  return _temp13 && _temp13.then ? _temp13.then(_temp14) : _temp14(_temp13);
+                  return _temp16 && _temp16.then ? _temp16.then(_temp17) : _temp17(_temp16);
                 }
 
-                var _temp15 = function () {
+                var _temp18 = function () {
                   if (selectedToPDF.includes(learningProcessName)) {
                     return Promise.resolve(createImageHeader()).then(function () {
                       doc.setFontSize(14);
@@ -31079,20 +31100,82 @@ var DashboardToPDF = function DashboardToPDF(props) {
                       line += 20;
                       var chart = document.getElementById("learning_progress");
                       return Promise.resolve(html2canvas(chart)).then(function (canvas) {
+                        function _temp15() {
+                          left = 20;
+                          doc.addImage(canvas.toDataURL("image/png"), 10, line + 70, 420, heightChart);
+                          doc.setFontSize(8);
+                          doc.addPage();
+                          line = 80;
+                          left = 20;
+                        }
+
+                        var lineOptionPrecess = line;
                         doc.setFontSize(8);
-                        left = 20;
-                        doc.addImage(canvas.toDataURL("image/png"), 10, line + 20, 420, heightChart);
-                        doc.setFontSize(8);
-                        line += heightChart;
+                        var questions = seriesConference.map(function (r) {
+                          return r.name;
+                        });
+
+                        var _temp14 = _forTo(monthsConference, function (index) {
+                          var _line = line;
+                          doc.setFontSize(12);
+                          doc.setFont("Helvetica", "normal", "bold");
+                          doc.text(monthsConference[index], left, _line);
+                          doc.setFontSize(8);
+
+                          for (var indexResult = 0; indexResult < (seriesConference === null || seriesConference === void 0 ? void 0 : seriesConference.length); indexResult++) {
+                            var avg = seriesConference[indexResult].data[index];
+
+                            if (avg != 0) {
+                              var questionText = questions[indexResult];
+
+                              if (questionText != "") {
+                                doc.setDrawColor(0);
+                                doc.setFillColor(COLOR_CHART_AND_PERCENTS[indexResult]);
+                                doc.roundedRect(left, _line + 5, 5, 5, 1, 1, "F");
+                                doc.setFont("Helvetica", "normal", "bold");
+                                doc.text(questionText + ":", left + 8, _line + 10);
+                                doc.setFont("Helvetica", "normal", "normal");
+                                doc.text((avg === null || avg === void 0 ? void 0 : avg.toFixed(2)) + "%", left + (questionText === null || questionText === void 0 ? void 0 : questionText.length) * 2.5 + 20.5, _line + 10);
+                              }
+
+                              _line += 10;
+
+                              if (_line > lineOptionPrecess) {
+                                lineOptionPrecess = _line;
+                              }
+                            }
+                          }
+
+                          left += 100;
+
+                          if (left + 105 > WIDTH_PAPER) {
+                            left = 20;
+                            line = lineOptionPrecess + 25;
+                          }
+
+                          var _temp13 = function () {
+                            if (line + 150 > HEIGHT_PAPER) {
+                              doc.addPage();
+                              return Promise.resolve(createImageHeader()).then(function () {
+                                line = 80;
+                                left = 20;
+                              });
+                            }
+                          }();
+
+                          if (_temp13 && _temp13.then) return _temp13.then(function () {});
+                        });
+
+                        return _temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14);
                       });
                     });
                   }
                 }();
 
-                return _temp15 && _temp15.then ? _temp15.then(_temp16) : _temp16(_temp15);
+                return _temp18 && _temp18.then ? _temp18.then(_temp19) : _temp19(_temp18);
               }
 
-              var _temp17 = function () {
+              var _temp20 = function () {
                 if (selectedToPDF.includes(successIndicatorsName)) {
                   return Promise.resolve(createImageHeader()).then(function () {
                     doc.setFontSize(14);
@@ -31179,15 +31262,15 @@ var DashboardToPDF = function DashboardToPDF(props) {
                 }
               }();
 
-              return _temp17 && _temp17.then ? _temp17.then(_temp18) : _temp18(_temp17);
+              return _temp20 && _temp20.then ? _temp20.then(_temp21) : _temp21(_temp20);
             }
 
-            var _temp19 = function () {
+            var _temp22 = function () {
               if (selectedToPDF.includes(preparednessChartName)) {
                 return Promise.resolve(createImageHeader()).then(function () {
                   doc.setFontSize(14);
                   doc.setFont("Helvetica", "normal", "bold");
-                  doc.text(t(preparednessChartName), left, line);
+                  doc.text("Readiness To Learn", left, line);
                   line += 20;
                   var chart = document.getElementById("preparedness");
                   return Promise.resolve(html2canvas(chart)).then(function (canvas) {
@@ -31269,10 +31352,10 @@ var DashboardToPDF = function DashboardToPDF(props) {
               }
             }();
 
-            return _temp19 && _temp19.then ? _temp19.then(_temp20) : _temp20(_temp19);
+            return _temp22 && _temp22.then ? _temp22.then(_temp23) : _temp23(_temp22);
           }
 
-          var _temp21 = function () {
+          var _temp24 = function () {
             if (selectedToPDF.includes(averageStudentStressName)) {
               return Promise.resolve(createImageHeader()).then(function () {
                 doc.setFontSize(14);
@@ -31358,7 +31441,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
             }
           }();
 
-          return _temp21 && _temp21.then ? _temp21.then(_temp22) : _temp22(_temp21);
+          return _temp24 && _temp24.then ? _temp24.then(_temp25) : _temp25(_temp24);
         }
 
         var doc = new jsPDF({
@@ -31391,7 +31474,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
         var line = 85;
         var left = 20;
 
-        var _temp23 = function () {
+        var _temp26 = function () {
           if (selectedToPDF.includes(averageStudentSafetyName)) {
             return Promise.resolve(createImageHeader()).then(function () {
               doc.setFontSize(14);
@@ -31479,7 +31562,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
           }
         }();
 
-        return _temp23 && _temp23.then ? _temp23.then(_temp24) : _temp24(_temp23);
+        return _temp26 && _temp26.then ? _temp26.then(_temp27) : _temp27(_temp26);
       }, function (err) {
         console.log(err);
         dispatch(marioCore.setAlert({
@@ -31488,7 +31571,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
         }));
       });
 
-      return Promise.resolve(_temp28 && _temp28.then ? _temp28.then(_temp27) : _temp27(_temp28));
+      return Promise.resolve(_temp31 && _temp31.then ? _temp31.then(_temp30) : _temp30(_temp31));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -31502,7 +31585,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
       display: "block",
       width: "45%"
     }
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#0F9655"],
     typeChart: TYPECHART.AREA,
     activeColumn: [true],
@@ -31517,7 +31600,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
       display: "block",
       width: "45%"
     }
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#C44140"],
     typeChart: TYPECHART.LINE,
     activeColumn: [true],
@@ -31532,7 +31615,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
       display: "block",
       width: "45%"
     }
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#169490", "#316CD9", "#FFB04F"],
     typeChart: TYPECHART.LINE,
     activeColumn: activeColumnPreparedness,
@@ -31547,7 +31630,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
       display: "block",
       width: "45%"
     }
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     typeChart: TYPECHART.AREA,
     activeColumn: activeColumnSuccessIndicators,
     series: successIndicatorsData,
@@ -31555,16 +31638,15 @@ var DashboardToPDF = function DashboardToPDF(props) {
     months: monthsOneToOne,
     dayOfWeek: dayOfWeekOneToOne,
     timeOfDay: timeOfDay,
-    colors: ["#73C8E5", "#F9F871", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"]
+    colors: ["#73C8E5", "#FFB04F", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"]
   })), React__default.createElement("div", {
     id: "learning_progress",
     style: {
       display: "block",
       width: "45%"
     }
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#73C8E5", "#F9F871", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"],
-    name: "Learning Process",
     typeChart: TYPECHART.AREA,
     activeColumn: activeColumnConference,
     series: seriesConference,
@@ -32128,7 +32210,7 @@ var Dashboard = function Dashboard() {
     className: "d-flex"
   }, React__default.createElement(reactstrap.Col, {
     md: !isExpandChart && chartIsOpened[0] ? 6 : 12
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     isShowExpandIcon: true,
     colors: ["#0F9655"],
     name: t(averageStudentSafetyName),
@@ -32141,9 +32223,9 @@ var Dashboard = function Dashboard() {
     onExpand: handleToggleChartWidth,
     timeOfDay: filter.optionDate
   })), React__default.createElement(reactstrap.Col, {
-    md: !isExpandChart ? 6 : 12,
+    md: !isExpandChart && chartIsOpened[0] ? 6 : 12,
     className: ""
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     isShowExpandIcon: true,
     colors: ["#C44140"],
     name: t(averageStudentStressName),
@@ -32158,10 +32240,10 @@ var Dashboard = function Dashboard() {
   }))), React__default.createElement(reactstrap.Row, {
     className: "d-flex"
   }, React__default.createElement(reactstrap.Col, {
-    md: 7
-  }, React__default.createElement(GenerateChartData$1, {
+    md: chartIsOpened[0] ? 7 : 12
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#169490", "#316CD9", "#FFB04F"],
-    name: t(preparednessChartName),
+    name: "Readiness To Learn",
     typeChart: TYPECHART.AREA,
     onActiveColumn: handleActiveColumnOneToOne,
     activeColumn: activeColumnPreparedness,
@@ -32172,7 +32254,7 @@ var Dashboard = function Dashboard() {
     timeOfDay: filter.optionDate
   })), React__default.createElement(reactstrap.Col, {
     md: 5
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#D9EEE4", "#FAF0F0"],
     name: t(overallReadinessToLearn),
     typeChart: TYPECHART.DONUT,
@@ -32182,7 +32264,9 @@ var Dashboard = function Dashboard() {
     series: dataOverallReadyToLearn.resultQuestion,
     timeOfDay: filter.optionDate,
     dayOfWeek: []
-  }))), React__default.createElement(GenerateChartData$1, {
+  }))), React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+    md: !chartIsOpened[0] ? 6 : 12
+  }, React__default.createElement(GenerateChartData, {
     name: t(successIndicatorsName),
     typeChart: TYPECHART.AREA,
     onActiveColumn: handleActiveColumnOneToOne,
@@ -32192,8 +32276,8 @@ var Dashboard = function Dashboard() {
     months: monthsOneToOne,
     dayOfWeek: dayOfWeekOneToOne,
     timeOfDay: filter.optionDate,
-    colors: ["#73C8E5", "#F9F871", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"]
-  }), React__default.createElement(BubbleChartCustom$1, {
+    colors: ["#73C8E5", "#FFB04F", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"]
+  }))), React__default.createElement(BubbleChartCustom$1, {
     data: readinessToLearning
   }), React__default.createElement("div", {
     className: "" + styles$1["mt-15"]
@@ -32214,7 +32298,9 @@ var Dashboard = function Dashboard() {
     index: 1
   }), React__default.createElement(reactstrap.Collapse, {
     isOpen: chartIsOpened[1]
-  }, React__default.createElement(GenerateChartData$1, {
+  }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
+    md: !chartIsOpened[1] ? 6 : 12
+  }, React__default.createElement(GenerateChartData, {
     colors: ["#73C8E5", "#F9F871", "#D7B0DE", "#E56362", "#5A7F05", "#D3D3D3"],
     name: t(learningProcessName),
     typeChart: TYPECHART.AREA,
@@ -32225,7 +32311,7 @@ var Dashboard = function Dashboard() {
     dayOfWeek: dayOfWeekConference,
     avgQuestionLastMonth: avgConferenceLastMonth,
     timeOfDay: filter.optionDate
-  }), React__default.createElement(TopLearningStrategy$1, {
+  }))), React__default.createElement(TopLearningStrategy$1, {
     data: topLearningStrategies
   }))));
 };