mario-education 2.2.9 → 2.3.0

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/types.d.ts

@@ -7,6 +7,9 @@ export declare type QuantityReport = {
     teacherPercentage: number;
     studentPercentage: number;
     assistantPercentage: number;
+    numberOfTeachers: number;
+    numberOfStudents: number;
+    numberOfAssistants: number;
 };
 export declare type SkillReportItem = {
     skillName: string;

package/dist/index.js

@@ -5413,7 +5413,7 @@ var SemesterDetailModal = function SemesterDetailModal(props, ref) {
     })), React__default.createElement(reactstrap.Col, {
       md: 6
     }, React__default.createElement(DatePicker, {
-      value: marioCore.utcToLocalTime(values.startTime, "Do MMMM YYYY"),
+      value: !!values.startTime ? marioCore.utcToLocalTime(values.startTime, "Do MMMM YYYY") : "",
       todayButton: "Today",
       peekNextMonth: true,
       showMonthDropdown: true,
@@ -5444,7 +5444,7 @@ var SemesterDetailModal = function SemesterDetailModal(props, ref) {
     })), React__default.createElement(reactstrap.Col, {
       md: 6
     }, React__default.createElement(DatePicker, {
-      value: marioCore.utcToLocalTime(values.endTime, "Do MMMM YYYY"),
+      value: !!values.endTime ? marioCore.utcToLocalTime(values.endTime, "Do MMMM YYYY") : "",
       todayButton: "Today",
       peekNextMonth: true,
       showMonthDropdown: true,
@@ -11732,109 +11732,6 @@ var TutorialScreenContainer = function TutorialScreenContainer() {
   });
 };
 
-var QuestionBankList$1 = function QuestionBankList(_ref) {
-  var isDefaultQuestion = _ref.isDefaultQuestion,
-      isDefaultQuestionGeneral = _ref.isDefaultQuestionGeneral;
-
-  var _useQuestionList = useQuestionList(isDefaultQuestion, isDefaultQuestionGeneral),
-      totalItems = _useQuestionList.totalItems,
-      gridOptions = _useQuestionList.gridOptions,
-      setRef = _useQuestionList.setRef,
-      goToDetail = _useQuestionList.goToDetail,
-      filters = _useQuestionList.filters,
-      changeFilters = _useQuestionList.changeFilters,
-      updateOrderQuestions = _useQuestionList.updateOrderQuestions;
-
-  var onRowDragEnd = function onRowDragEnd(e) {
-    var dataAfterDrag = e.node.parent.childrenAfterFilter.map(function (item, index) {
-      return {
-        id: item.data.id,
-        orderDrag: ++index
-      };
-    });
-    updateOrderQuestions(dataAfterDrag, isDefaultQuestionGeneral);
-  };
-
-  return React__default.createElement("div", {
-    className: "animated fadeIn"
-  }, React__default.createElement(reactstrap.Row, {
-    className: "my-2"
-  }, React__default.createElement(reactstrap.Col, {
-    md: 8
-  }, React__default.createElement(marioCore.SearchBoxContainer, {
-    text: "Create question",
-    onClick: function onClick() {
-      return goToDetail();
-    },
-    initValue: filters.searchString,
-    onSearch: function onSearch(searchString) {
-      return changeFilters({
-        searchString: searchString
-      });
-    },
-    placeholder: "Type something to Search question"
-  })), isDefaultQuestion && React__default.createElement(reactstrap.Col, {
-    md: 2
-  }, React__default.createElement(DefaultQuestionStudentTeacherFilter, {
-    isDefaultQuestionTeacher: filters.isDefaultQuestionTeacher,
-    onChange: function onChange(e) {
-      return changeFilters({
-        isDefaultQuestionTeacher: e ? e.value : null
-      });
-    }
-  })), isDefaultQuestionGeneral && React__default.createElement(reactstrap.Col, {
-    md: 2
-  }, React__default.createElement(DefaultQuestionStudentTeacherFilter, {
-    isDefaultQuestionTeacher: filters.isDefaultQuestionGeneralClassTeacher,
-    onChange: function onChange(e) {
-      return changeFilters({
-        isDefaultQuestionGeneralClassTeacher: e ? e.value : null
-      });
-    },
-    isDefaultGeneralClass: true
-  })), React__default.createElement(reactstrap.Col, {
-    md: isDefaultQuestion || isDefaultQuestionGeneral ? 2 : 4,
-    className: "d-flex align-items-center justify-content-end"
-  }, "Total of questions: ", totalItems)), React__default.createElement(reactstrap.Row, {
-    className: "mb-2"
-  }, React__default.createElement(reactstrap.Col, {
-    md: 12,
-    className: "mb-2"
-  }, React__default.createElement("div", {
-    className: "ag-theme-balham w-100"
-  }, React__default.createElement(react.AgGridReact, {
-    domLayout: "autoHeight",
-    gridOptions: gridOptions,
-    masterDetail: true,
-    onGridReady: function onGridReady(params) {
-      setRef(params.api);
-    },
-    rowDragManaged: true,
-    animateRows: true,
-    modules: [masterDetail.MasterDetailModule, clientSideRowModel.ClientSideRowModelModule],
-    onRowDragEnd: onRowDragEnd
-  }))), React__default.createElement(reactstrap.Col, {
-    md: 12
-  }, React__default.createElement(marioCore.CustomPagination, {
-    filters: filters,
-    totalRecordCount: totalItems,
-    changePageSize: function changePageSize(pageSize) {
-      return changeFilters({
-        pageSize: pageSize
-      });
-    },
-    changePage: function changePage(currentPage) {
-      return changeFilters({
-        currentPage: currentPage
-      });
-    }
-  }))));
-};
-
-QuestionBankList$1.defaultProps = {
-  isDefaultQuestion: false
-};
-
 var schema$c = yup.object({
   name: yup.string().required("Name is required")
 });
@@ -12263,25 +12160,7 @@ var QuestionCateList = function QuestionCateList() {
 var tabs$3 = [{
   path: "/admin/question/question-list",
   title: "Question list",
-  component: QuestionBankList$1
-}, {
-  path: "/admin/question/default-question-list",
-  title: "Default question list",
-  component: function component() {
-    return React__default.createElement(QuestionBankList$1, {
-      isDefaultQuestion: true,
-      isDefaultQuestionGeneral: false
-    });
-  }
-}, {
-  path: "/admin/question/default-question-general-list",
-  title: "Default question general class list",
-  component: function component() {
-    return React__default.createElement(QuestionBankList$1, {
-      isDefaultQuestion: false,
-      isDefaultQuestionGeneral: true
-    });
-  }
+  component: QuestionBankList
 }, {
   path: "/admin/question/question-category",
   title: "Question category",
@@ -17331,6 +17210,7 @@ var HighImpact = function HighImpact(_ref) {
   }, [data]);
   if (!data) return React__default.createElement(Loading, null);
   var series = [{
+    name: "",
     data: ratings
   }];
   var options = {
@@ -17524,7 +17404,10 @@ var Quantity = function Quantity(_ref) {
   if (!data) return React__default.createElement(Loading, null);
   var teacherPercentage = data.teacherPercentage,
       studentPercentage = data.studentPercentage,
-      assistantPercentage = data.assistantPercentage;
+      assistantPercentage = data.assistantPercentage,
+      numberOfTeachers = data.numberOfTeachers,
+      numberOfStudents = data.numberOfStudents,
+      numberOfAssistants = data.numberOfAssistants;
   var series = [teacherPercentage, studentPercentage, assistantPercentage].map(function (number) {
     return Number(number.toFixed(2));
   });
@@ -17550,15 +17433,15 @@ var Quantity = function Quantity(_ref) {
   var details = [{
     label: "Teachers",
     color: colors$3[0],
-    value: teacherPercentage
+    value: numberOfTeachers
   }, {
     label: "Students",
     color: colors$3[1],
-    value: studentPercentage
+    value: numberOfStudents
   }, {
     label: "Assistants",
     color: colors$3[2],
-    value: assistantPercentage
+    value: numberOfAssistants
   }];
   return React__default.createElement("div", {
     className: "d-flex h-100"
@@ -17572,8 +17455,6 @@ var Quantity = function Quantity(_ref) {
     bordered: true,
     size: "sm"
   }, React__default.createElement("tbody", null, details.map(function (item) {
-    var _item$value;
-
     return React__default.createElement("tr", {
       key: item.label
     }, React__default.createElement("td", null, item.label), React__default.createElement("td", {
@@ -17583,8 +17464,8 @@ var Quantity = function Quantity(_ref) {
       style: {
         backgroundColor: item.color
       }
-    })), React__default.createElement("td", null, Number(((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.toFixed(2)) || "0"), "%"));
-  }))))), React__default.createElement("div", {
+    })), React__default.createElement("td", null, item.value));
+  }))), React__default.createElement("p", null, "The number of user for each role"))), React__default.createElement("div", {
     className: "d-flex align-items-end"
   }, React__default.createElement(ReactApexChart, {
     options: options,