mario-teacher-student-client 3.0.3-admin → 3.0.6-admin

package/dist/containers/ActionPoint/components/DashBoardView/hooks/useActionPointsDB.d.ts

@@ -6,5 +6,6 @@ declare const useActionPointsDB: () => {
     onReloading: () => void;
     classFontSize: string;
     getData: () => Promise<void>;
+    setListData: import("react").Dispatch<any>;
 };
 export default useActionPointsDB;

package/dist/containers/ActionPoint/constants/function.d.ts

@@ -0,0 +1,2 @@
+import { IActionPoint } from "./types";
+export declare const groupBy: (xs: IActionPoint[]) => {};

package/dist/containers/ActionPoint/constants/types.d.ts

@@ -21,3 +21,14 @@ export interface FORM_REQUEST {
     notiDuration?: string;
     isDone?: boolean;
 }
+export interface IActionPoint {
+    deadline: number;
+    deadlineDate: string;
+    id: number;
+    isDone: boolean;
+    notiCount: number;
+    notiDuration: string;
+    reflectionId: number;
+    title: string;
+    class: any;
+}

package/dist/index.css

@@ -15748,7 +15748,7 @@ h4._3lNz0 {
     font-size: 35px; }
 
 ._vaSYb {
-  color: #680000;
+  color: #C54140;
   font-family: 'Montserrat-Bold' !important;
   font-size: 90px;
   margin-bottom: 18px; }
@@ -15770,14 +15770,14 @@ h4._3lNz0 {
   font-family: 'Poppins-Regular' !important;
   padding: 10px 60px;
   color: white;
-  background-color: #680000;
+  background-color: #C54140;
   border-radius: 20px;
   border: none;
   box-shadow: #b96666 0px 5px 10px, #b96666 0px 3px 12px; }
 
 ._YOepY {
   padding: 25px;
-  background-color: #1B4DA2; }
+  background-color: #336DDA; }
 
 ._1jZkl {
   color: #8ab0ff; }

package/dist/index.js

@@ -3284,7 +3284,7 @@ var Card = function Card(props) {
     handleGetNewActionPoint: handleGetNewActionPoint
   }), React__default.createElement(core.Typography, {
     className: "" + styles$1["date"]
-  }, marioCore.utcToLocalTime(date, "Do MMMM yyyy")), !!actionPointsList && actionPointsList.map(function (i, _index) {
+  }, date), !!actionPointsList && actionPointsList.map(function (i) {
     return React__default.createElement("div", {
       className: "" + styles$1["card-content"]
     }, React__default.createElement("div", {
@@ -3305,7 +3305,7 @@ var Card = function Card(props) {
       } : {
         root: classes.title
       }
-    }, marioCore.utcToLocalTime(i.deadlineDate, "hh:mm A")), !!i["class"] && React__default.createElement(core.Typography, {
+    }, marioCore.utcToLocalTime(new Date(i.deadline).toString(), "hh:mm A")), !!i["class"] && React__default.createElement(core.Typography, {
       className: "" + styles$1["class"],
       classes: i.isDone ? {
         root: classes.titleOverLine
@@ -3333,6 +3333,8 @@ var Card = function Card(props) {
 };
 
 var ActionPointsDashboard = function ActionPointsDashboard(_ref) {
+  var _listData$actionPoint;
+
   var handleGetNewActionPoint = _ref.handleGetNewActionPoint,
       listData = _ref.listData,
       openDialog = _ref.openDialog,
@@ -3375,7 +3377,7 @@ var ActionPointsDashboard = function ActionPointsDashboard(_ref) {
     className: "" + styles$1["body-header-link"]
   }, t("see_all_action_points"))), React__default.createElement("div", {
     className: "" + styles$1["body-content"]
-  }, !!listData && (listData === null || listData === void 0 ? void 0 : listData.actionPointList.map(function (item) {
+  }, !!listData && (listData === null || listData === void 0 ? void 0 : (_listData$actionPoint = listData.actionPointList) === null || _listData$actionPoint === void 0 ? void 0 : _listData$actionPoint.map(function (item) {
     return React__default.createElement(Card, {
       date: item.date,
       actionPointsList: item.actionPoints,
@@ -3416,6 +3418,13 @@ var getDataActionPoint = function getDataActionPoint(dispatch, filter) {
   }
 };
 
+var groupBy = function groupBy(xs) {
+  return xs.reduce(function (rv, x) {
+    (rv[x.deadlineDate] = rv[x.deadlineDate] || []).push(x);
+    return rv;
+  }, {});
+};
+
 var defaultFontLarge$4 = 20;
 var defaultFontSmall$4 = 12;
 
@@ -3467,7 +3476,21 @@ var useActionPointsDB = function useActionPointsDB() {
   var getData = function getData() {
     try {
       return Promise.resolve(getDataActionPoint(dispatch, queryRequest)).then(function (data) {
-        setListData(data);
+        var dataGroup = groupBy(data.map(function (r) {
+          return _extends({}, r, {
+            deadlineDate: marioCore.utcToLocalTime(r.deadlineDate, "Do MMMM yyyy")
+          });
+        }));
+        var listKeyData = Object.keys(dataGroup);
+        var result = {
+          actionPointList: listKeyData.map(function (r) {
+            return {
+              date: r,
+              actionPoints: dataGroup[r]
+            };
+          })
+        };
+        setListData(result);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -3483,7 +3506,8 @@ var useActionPointsDB = function useActionPointsDB() {
     clickOpenModal: clickOpenModal,
     onReloading: onReloading,
     classFontSize: classFontSize,
-    getData: getData
+    getData: getData,
+    setListData: setListData
   };
 };
 
@@ -56998,7 +57022,7 @@ var CardItem$1 = function CardItem(props) {
     reloadRef: reloadRef
   }), React__default.createElement(core.Typography, {
     className: "" + styles$D["milestones"]
-  }, marioCore.utcToLocalTime(date, "Do MMMM yyyy")), !!copyData && copyData.map(function (i) {
+  }, date), !!copyData && copyData.map(function (i) {
     return React__default.createElement("div", {
       className: "" + styles$D["card-content"]
     }, React__default.createElement("div", {
@@ -57022,7 +57046,7 @@ var CardItem$1 = function CardItem(props) {
       } : {
         root: classes.title
       }
-    }, marioCore.utcToLocalTime(i.deadlineDate, "hh:mm A")), !!i["class"] && React__default.createElement(core.Typography, {
+    }, marioCore.utcToLocalTime(new Date(i.deadline).toString(), "hh:mm A")), !!i["class"] && React__default.createElement(core.Typography, {
       className: "" + styles$D["grade"],
       classes: i.isDone ? {
         root: classes.titleOverLine
@@ -57036,7 +57060,7 @@ var CardItem$1 = function CardItem(props) {
       classes: {
         root: classes.title
       }
-    }, marioCore.utcToLocalTime(i.deadlineDate, "hh:mm A")), !!i["class"] && React__default.createElement(core.Typography, {
+    }, marioCore.utcToLocalTime(new Date(i.deadline).toString(), "hh:mm A")), !!i["class"] && React__default.createElement(core.Typography, {
       className: "" + styles$D["grade"],
       classes: {
         root: classes.title
@@ -57275,7 +57299,21 @@ var useTodoList = function useTodoList() {
   var getActionPointList = function getActionPointList() {
     try {
       return Promise.resolve(getDataActionPoints(dispatch, filters)).then(function (data) {
-        setDataActionPoint(data);
+        var dataGroup = groupBy(data.map(function (r) {
+          return _extends({}, r, {
+            deadlineDate: marioCore.utcToLocalTime(r.deadlineDate, "Do MMMM yyyy")
+          });
+        }));
+        var listKeyData = Object.keys(dataGroup);
+        var result = {
+          actionPointList: listKeyData.map(function (r) {
+            return {
+              date: r,
+              actionPoints: dataGroup[r]
+            };
+          })
+        };
+        setDataActionPoint(result);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -57574,7 +57612,21 @@ var useDoneList = function useDoneList() {
   var getListActionPoint = function getListActionPoint() {
     try {
       return Promise.resolve(getDataDoneList(dispatch, filters)).then(function (data) {
-        setDataDoneList(data);
+        var dataGroup = groupBy(data.map(function (r) {
+          return _extends({}, r, {
+            deadlineDate: marioCore.utcToLocalTime(r.deadlineDate, "Do MMMM yyyy")
+          });
+        }));
+        var listKeyData = Object.keys(dataGroup);
+        var result = {
+          actionPointList: listKeyData.map(function (r) {
+            return {
+              date: r,
+              actionPoints: dataGroup[r]
+            };
+          })
+        };
+        setDataDoneList(result);
       });
     } catch (e) {
       return Promise.reject(e);
@@ -64465,7 +64517,7 @@ var ThankYouCard = function ThankYouCard() {
     className: styles$M["box-image"]
   }, React__default.createElement("img", {
     className: styles$M["logo-card"],
-    src: "/images/logoR.png",
+    src: "/images/main-logo-blue.png",
     alt: ""
   })), React__default.createElement("div", {
     className: styles$M["content-card"]
@@ -69625,7 +69677,7 @@ var ThankYouError = function ThankYouError() {
     className: styles$M["box-image"]
   }, React__default.createElement("img", {
     className: styles$M["logo-card"],
-    src: "/images/logoR.png",
+    src: "/images/main-logo-blue.png",
     alt: ""
   })), React__default.createElement("div", {
     className: styles$M["content-card"]