mario-education 2.4.60-admin → 2.4.62-admin

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/components/LearningStrategiesTable.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { DashboardFilter } from "../configs/types";
 interface PropsType {
     isOpen: boolean;
     onClosed: () => void;
@@ -6,6 +7,7 @@ interface PropsType {
     data: any;
     getData: () => void;
     changeFilter: (updatedFilter: any) => void;
+    filterDashboard: DashboardFilter;
 }
-declare const LearningStrategiesTable: ({ isOpen, onClosed, filter, data, getData, changeFilter }: PropsType) => JSX.Element;
+declare const LearningStrategiesTable: ({ isOpen, onClosed, filter, data, getData, changeFilter, filterDashboard }: PropsType) => JSX.Element;
 export default LearningStrategiesTable;

package/dist/index.css

@@ -188,6 +188,7 @@ tbody._b-AXV tr {
 ._3xuSa {
     display: flex;
     align-items: center;
+    justify-content: flex-end;
 }
 
 ._15ep6 {

package/dist/index.js

@@ -26774,23 +26774,27 @@ var ColumnChartAndPercent = function ColumnChartAndPercent(_ref) {
   })), !isPDF && React__default.createElement("div", {
     className: "w-100 d-flex gap-2 flex-wrap  " + styles$1["listItem"]
   }, data.map(function (month, index) {
-    return React__default.createElement("div", {
-      className: "" + styles$1["item-legend"],
-      key: index
-    }, React__default.createElement("div", {
-      className: "" + styles$1["item"]
-    }, React__default.createElement("div", {
-      className: "" + styles$1["mark-custom"],
-      style: {
-        backgroundColor: COLOR_CHART_AND_PERCENTS[index]
-      }
-    }), React__default.createElement("label", {
-      className: "" + styles$1["label-legend-custom"]
-    }, month)), React__default.createElement("div", {
-      className: "" + styles$1["percent"]
-    }, React__default.createElement("label", {
-      className: "m-0"
-    }, avg[index] ? avg[index] + "%" : "0.00%")));
+    if (!!avg && avg[index] > 0) {
+      return React__default.createElement("div", {
+        className: "" + styles$1["item-legend"],
+        key: index
+      }, React__default.createElement("div", {
+        className: "" + styles$1["item"]
+      }, React__default.createElement("div", {
+        className: "" + styles$1["mark-custom"],
+        style: {
+          backgroundColor: COLOR_CHART_AND_PERCENTS[index]
+        }
+      }), React__default.createElement("label", {
+        className: "" + styles$1["label-legend-custom"]
+      }, month)), React__default.createElement("div", {
+        className: "" + styles$1["percent"]
+      }, React__default.createElement("label", {
+        className: "m-0"
+      }, avg[index] ? avg[index].toFixed(2) + "%" : "0.00%")));
+    }
+
+    return null;
   })));
 };
 
@@ -27125,9 +27129,7 @@ var useDashboard = function useDashboard() {
     currentPage: 1,
     pageSize: 10,
     sortBy: "Strategies",
-    sortOrder: "ASC",
-    startDate: DEFAULT_START_DATE,
-    endDate: DEFAULT_END_DATE
+    sortOrder: "ASC"
   }),
       filterLearningStrategiesTable = _useState4[0],
       setFilterLearningStrategiesTable = _useState4[1];
@@ -27136,7 +27138,7 @@ var useDashboard = function useDashboard() {
     setFilterLearningStrategiesTable(_extends({}, filterLearningStrategiesTable, updatedFilter));
   };
 
-  var getLearningStrategiesTableData = function getLearningStrategiesTableData() {
+  var getLearningStrategiesTableData = React.useCallback(function () {
     try {
       var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
@@ -27145,7 +27147,7 @@ var useDashboard = function useDashboard() {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getLearningStrategiesTableApi(filterLearningStrategiesTable)).then(function (res) {
+        return Promise.resolve(getLearningStrategiesTableApi(_extends({}, filter, filterLearningStrategiesTable))).then(function (res) {
           !!res.data && setLearningStrategiesData(res.data);
         });
       }, function (err) {
@@ -27161,7 +27163,7 @@ var useDashboard = function useDashboard() {
     } catch (e) {
       return Promise.reject(e);
     }
-  };
+  }, [filter, filterLearningStrategiesTable]);
 
   var _useState5 = React.useState(INITIAl_STUDENT_DASHBOARD),
       listTotalTime = _useState5[0],
@@ -29417,8 +29419,6 @@ var DashboardToPDF = function DashboardToPDF(props) {
   }, "Export"));
 };
 
-var ICON_CALENDAR = "/images/calendar.svg";
-
 var LearningStrategiesTable = function LearningStrategiesTable(_ref) {
   var _data$items;
 
@@ -29427,60 +29427,11 @@ var LearningStrategiesTable = function LearningStrategiesTable(_ref) {
       filter = _ref.filter,
       data = _ref.data,
       getData = _ref.getData,
-      changeFilter = _ref.changeFilter;
-  var refStartDate = React.useRef(null);
-  var refEndDate = React.useRef(null);
-
-  var _useState = React.useState(false),
-      isOpenCollapseStartDate = _useState[0],
-      setIsOpenCollapseStartDate = _useState[1];
-
-  var _useState2 = React.useState(false),
-      isOpenCollapseEndDate = _useState2[0],
-      setIsOpenCollapseEndDate = _useState2[1];
-
-  var handleToggleCollapseStartDate = function handleToggleCollapseStartDate() {
-    setIsOpenCollapseStartDate(!isOpenCollapseStartDate);
-  };
-
-  var handleToggleCollapseEndDate = function handleToggleCollapseEndDate() {
-    setIsOpenCollapseEndDate(!isOpenCollapseEndDate);
-  };
-
-  var handleClickOutSideStartDate = function handleClickOutSideStartDate(event) {
-    var _refStartDate$current;
-
-    if (refStartDate.current && !(refStartDate !== null && refStartDate !== void 0 && (_refStartDate$current = refStartDate.current) !== null && _refStartDate$current !== void 0 && _refStartDate$current.contains(event.target))) setIsOpenCollapseStartDate(false);
-  };
-
-  var handleClickOutSideEndDate = function handleClickOutSideEndDate(event) {
-    var _refEndDate$current;
-
-    if (refEndDate.current && !(refEndDate !== null && refEndDate !== void 0 && (_refEndDate$current = refEndDate.current) !== null && _refEndDate$current !== void 0 && _refEndDate$current.contains(event.target))) setIsOpenCollapseEndDate(false);
-  };
-
-  React.useEffect(function () {
-    document.addEventListener("click", handleClickOutSideStartDate, true);
-    document.addEventListener("click", handleClickOutSideEndDate, true);
-  }, []);
-
-  var handleChangeStartDate = function handleChangeStartDate(date) {
-    !!changeFilter && changeFilter({
-      startDate: moment(date).startOf("day").valueOf()
-    });
-    setIsOpenCollapseStartDate(false);
-  };
-
-  var handleChangeEndDate = function handleChangeEndDate(date) {
-    !!changeFilter && changeFilter({
-      endDate: moment(date).endOf("day").valueOf()
-    });
-    setIsOpenCollapseEndDate(false);
-  };
-
+      changeFilter = _ref.changeFilter,
+      filterDashboard = _ref.filterDashboard;
   React.useEffect(function () {
     getData === null || getData === void 0 ? void 0 : getData();
-  }, [filter]);
+  }, [filter, filterDashboard]);
   return React__default.createElement(reactstrap.Modal, {
     isOpen: isOpen,
     toggle: onClosed,
@@ -29488,45 +29439,6 @@ var LearningStrategiesTable = function LearningStrategiesTable(_ref) {
   }, React__default.createElement(reactstrap.ModalHeader, null, "Learning Strategies"), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement("div", {
     className: "" + styles["filter-box-learning"]
   }, React__default.createElement("div", {
-    className: "" + styles["block-filter-component"],
-    ref: refStartDate
-  }, React__default.createElement("button", {
-    onClick: handleToggleCollapseStartDate,
-    className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
-  }, React__default.createElement("img", {
-    src: "" + ICON_CALENDAR
-  }), React__default.createElement("p", {
-    className: styles["color-filter"] + " my-0 mx-2"
-  }, "Start Date", !!(filter !== null && filter !== void 0 && filter.startDate) && ": " + moment(filter === null || filter === void 0 ? void 0 : filter.startDate).format("DD/MM/YYYY"))), isOpenCollapseStartDate && React__default.createElement("div", {
-    className: "" + styles["date-picker"]
-  }, React__default.createElement(DatePicker, {
-    selected: moment(filter === null || filter === void 0 ? void 0 : filter.startDate).toDate(),
-    onChange: function onChange(date) {
-      return handleChangeStartDate(date);
-    },
-    inline: true,
-    maxDate: moment(filter === null || filter === void 0 ? void 0 : filter.endDate).toDate()
-  }))), React__default.createElement("div", {
-    className: "" + styles["block-filter-component"],
-    ref: refEndDate
-  }, React__default.createElement("button", {
-    onClick: handleToggleCollapseEndDate,
-    className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
-  }, React__default.createElement("img", {
-    src: "" + ICON_CALENDAR
-  }), React__default.createElement("p", {
-    className: styles["color-filter"] + " my-0 mx-2"
-  }, "End Date", !!(filter !== null && filter !== void 0 && filter.endDate) && ": " + moment(filter === null || filter === void 0 ? void 0 : filter.endDate).format("DD/MM/YYYY"))), isOpenCollapseEndDate && React__default.createElement("div", {
-    className: "" + styles["date-picker"]
-  }, React__default.createElement(DatePicker, {
-    selected: moment(filter === null || filter === void 0 ? void 0 : filter.endDate).toDate(),
-    onChange: function onChange(date) {
-      return handleChangeEndDate(date);
-    },
-    inline: true,
-    maxDate: moment(filter === null || filter === void 0 ? void 0 : filter.startDate).add(3, "months").toDate(),
-    minDate: moment(filter === null || filter === void 0 ? void 0 : filter.startDate).toDate()
-  }))), React__default.createElement("div", {
     className: "" + styles["search-box-learning"]
   }, React__default.createElement(marioCore.SearchBox, {
     initValue: filter.searchString,
@@ -29555,16 +29467,14 @@ var LearningStrategiesTable = function LearningStrategiesTable(_ref) {
       position: "sticky",
       backgroundColor: "#fff"
     }
-  }, React__default.createElement("th", null, "Strategies"), React__default.createElement("th", null, "Number Of Used"), React__default.createElement("th", null, "Session Type"))), React__default.createElement("tbody", null, data === null || data === void 0 ? void 0 : (_data$items = data.items) === null || _data$items === void 0 ? void 0 : _data$items.map(function (item, index) {
+  }, React__default.createElement("th", null, "Strategies"), React__default.createElement("th", null, "Number Of Used"))), React__default.createElement("tbody", null, data === null || data === void 0 ? void 0 : (_data$items = data.items) === null || _data$items === void 0 ? void 0 : _data$items.map(function (item, index) {
     return React__default.createElement("tr", {
       key: index
     }, React__default.createElement("td", {
       className: "align-middle"
     }, item === null || item === void 0 ? void 0 : item.strategiesName), React__default.createElement("td", {
       className: "align-middle"
-    }, item === null || item === void 0 ? void 0 : item.numberOfUsed), React__default.createElement("td", {
-      className: "align-middle"
-    }, item === null || item === void 0 ? void 0 : item.sessionType));
+    }, item === null || item === void 0 ? void 0 : item.numberOfUsed));
   })))), React__default.createElement(marioCore.CustomPagination, {
     filters: filter,
     totalRecordCount: data === null || data === void 0 ? void 0 : data.totalItems,
@@ -29777,6 +29687,7 @@ var Dashboard = function Dashboard() {
     isOpen: openLearningStrategiesTable,
     onClosed: handleOpenCloseLearningStrategiesTable,
     filter: filterLearningStrategiesTable,
+    filterDashboard: filter,
     data: learningStrategiesData,
     getData: getLearningStrategiesTableData,
     changeFilter: changeFiltersLearningStrategiesTable