mario-teacher-student-client 2.2.20-beta → 2.2.21-beta

package/dist/containers/ConductSurvey/hooks/useConductSurvey.d.ts

@@ -25,5 +25,6 @@ declare const useConductSurvey: () => {
     setQuestionIBLearner: import("react").Dispatch<import("react").SetStateAction<string>>;
     isSchedule: boolean;
     isDone: boolean;
+    currentPage: import("react").ReactText;
 };
 export default useConductSurvey;

package/dist/containers/Surveys/constants/constant.d.ts

@@ -1,6 +1,7 @@
 export declare const STEP_MODEL: string[];
 export declare const lableStep: (activeStep: number) => "" | "NEXT" | "REVIEW" | "Publish survey";
 export declare const convertTime: (time: string) => string;
+export declare const initTabSurvey: string[];
 export declare const initialValues: {
     title: string;
     additionalQuestions: never[];

package/dist/index.css

@@ -27,10 +27,11 @@
   background-color: #ffffff !important;
   border-radius: 12px !important;
   padding: 10px 21px !important;
-  border: 1px solid #0A4DA2 !important;
-  margin-right: 15px !important; }
+  border: 1px solid #336DDA !important;
+  margin-right: 15px !important;
+  box-shadow: none; }
   ._11N79 > span {
-    color: #0A4DA2 !important;
+    color: #336DDA !important;
     font-weight: 600 !important;
     font-size: 13px !important; }
 
@@ -4256,9 +4257,9 @@ h2._2HVLw {
 
 ._2ZiJ5 ._3a_fi {
   padding: 5px 10px;
-  background: #308252; }
+  background: #5A7F05; }
   ._2ZiJ5 ._3a_fi:hover {
-    background: #308252; }
+    background: #5A7F05; }
   ._2ZiJ5 ._3a_fi span {
     font-size: 15px;
     color: #fff;
@@ -4379,10 +4380,10 @@ h2._2HVLw {
         padding: 8px;
         margin: 8px;
         margin-left: 14px !important;
-        color: #153e75;
-        background-color: #e7f6fd;
+        color: #336DDA;
+        background-color: #fff;
         border-left: 3px solid;
-        border-color: #0ea5e9;
+        border-color: #316CD9;
         border-radius: 4px; }
         ._BsjjF ._2Vtyk ._188XK ._jEewf ._329tN {
           text-align: center;
@@ -4405,7 +4406,7 @@ h2._2HVLw {
 ._1J4Xk {
   padding: 0 15px; }
   ._1J4Xk ._zz5G4 {
-    background-color: #308252;
+    background-color: #5A7F05;
     border-radius: 12px;
     margin: 15px 0 30px;
     width: 100%;
@@ -4474,12 +4475,12 @@ h2._2HVLw {
   align-items: center; }
 
 ._1cjDe {
-  background: #edf2f7;
+  background: #DFE0DF;
   padding: 16px;
   border-radius: 10px; }
   ._1cjDe ._17pRN {
     font-size: 16px;
-    color: #2d3748;
+    color: #242424;
     line-height: 24px;
     margin-bottom: 0px; }
 
@@ -4511,16 +4512,16 @@ h2._2HVLw {
   color: #F44336; }
 
 ._ymo8r ._3dIQu {
-  background-color: #308252;
+  background-color: #5A7F05;
   color: #ffff;
   border-radius: 12px;
   padding: 10px 15px; }
 
 ._ymo8r ._3dIQu:hover {
-  background-color: #154729; }
+  background-color: #5A7F05; }
 
 ._ymo8r ._3dIQu:disabled {
-  background-color: #69af86; }
+  background-color: #5A7F05; }
   ._ymo8r ._3dIQu:disabled > span {
     color: #ffffff; }
 
@@ -4539,7 +4540,7 @@ h2._2HVLw {
   width: 100%; }
 
 ._3AIlB {
-  background: #308252 !important;
+  background: #5A7F05 !important;
   color: white !important; }
 
 ._3KML_ {
@@ -15244,9 +15245,9 @@ h4._3lNz0 {
 ._3tbAL ._1Vgmy {
   color: #fff;
   border-radius: 12px;
-  background-color: #308252; }
+  background-color: #5A7F05; }
   ._3tbAL ._1Vgmy:hover {
-    background-color: #308252; }
+    background-color: #5A7F05; }
 
 ._3tbAL ._1m1n9 {
   color: rgba(0, 0, 0, 0.54); }

package/dist/index.js

@@ -8808,8 +8808,7 @@ var ChipButton = function ChipButton(_ref) {
   var StyleChip = styles$R.withStyles({
     root: {
       backgroundColor: !!backgroundColor ? backgroundColor : BACKGROUND_COLOR,
-      color: color,
-      fontWeight: "bold"
+      color: color
     }
   })(core.Chip);
   return React__default.createElement(StyleChip, {
@@ -8881,34 +8880,34 @@ var ConductTop = function ConductTop(_ref) {
   }, [lengthSession]);
   var listConduct = [{
     label: "" + (!!gradeLevel ? "Grade: " + gradeLevel : ""),
-    color: "#1E4E8C",
-    backgroundColor: "#CEEDFF"
+    color: "#242424",
+    backgroundColor: "#B3D4FF"
   }, {
     label: !!startTime && marioCore.utcToLocalTime(startTime, "Do MMMM YYYY - hh:mm A") || "",
-    color: "#153E75",
-    backgroundColor: "#BAD5F8"
+    color: "#242424",
+    backgroundColor: "#B3D4FF"
   }, {
     label: isConference ? "Conference" : "",
-    color: "#702459",
+    color: "#242424",
     backgroundColor: "#FFB0A6"
   }];
   var sessionResultTitle = [{
     label: !!sessionType ? "" + sessionType : "",
-    color: "#702459",
+    color: "#242424",
     backgroundColor: "#FFB0A6"
   }, {
     label: "" + timeSession,
-    color: "#702459",
+    color: "#242424",
     backgroundColor: "#FFB0A6"
   }];
   var teacherRequest = {
     label: isConference ? "" : "Teacher request",
-    color: "#702459",
+    color: "#242424",
     backgroundColor: "#FFB0A6"
   };
   var studentRequest = {
     label: isConference ? "" : "Student request",
-    color: "#702459",
+    color: "#242424",
     backgroundColor: "#FFB0A6"
   };
   var objectRequest = createdByTeacher ? teacherRequest : studentRequest;
@@ -13403,17 +13402,17 @@ var SurveyTop = function SurveyTop(_ref) {
       dayLeft = _ref.dayLeft;
   var listConduct = [{
     label: "" + (!!gradeLevel ? "Grade: " + gradeLevel : ""),
-    color: "#1E4E8C",
-    backgroundColor: "#CEEDFF"
+    color: "#242424",
+    backgroundColor: "#B3D4FF"
   }, {
     label: !!startTime && marioCore.utcToLocalTime(startTime, "Do MMMM YYYY - hh:mm A") || "",
-    color: "#153E75",
-    backgroundColor: "#BAD5F8"
+    color: "#242424",
+    backgroundColor: "#B3D4FF"
   }];
   var objectRequest = {
     label: dayLeft + " Day left",
-    color: "#702459",
-    backgroundColor: "#FED7E2"
+    color: "#242424",
+    backgroundColor: "#FFB0A6"
   };
   return React__default.createElement("div", {
     className: styles$8["title-conduct"] + " " + styles$8[classFontSize]
@@ -13507,6 +13506,8 @@ var defaultFontLarge$9 = 20;
 
 var useConductSurvey = function useConductSurvey() {
   var apiTimeouts = React.useRef({});
+  var params = new URLSearchParams(location.search);
+  var currentPage = params.get('currentPage') || 0;
   var pusherCluster = reactRedux.useSelector(function (state) {
     return state.common.user.pusherCluster;
   });
@@ -13615,13 +13616,13 @@ var useConductSurvey = function useConductSurvey() {
           var _res$data, _res$data$studentResu, _res$data2, _res$data2$teacherRes, _res$data$teacherResu, _res$data$teacherResu2, _res$data$studentResu2, _res$data$studentResu3, _res$data$teacherResu3, _res$data$studentResu4, _res$data$teacherResu4, _res$data3, _res$data3$teacherRes, _res$data4, _res$data4$teacherRes;
 
           if (isStudent && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$studentResu = _res$data.studentResult) !== null && _res$data$studentResu !== void 0 && _res$data$studentResu.isDone) {
-            history.push("/result-survey/" + surveyId + "/" + studentId);
+            history.push("/result-survey/" + surveyId + "/" + studentId + "?currentPage=" + currentPage);
           }
 
           setIsStudentChangeAfter(res.data.isChangeAfterSession);
 
           if (isTeacher && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && (_res$data2$teacherRes = _res$data2.teacherResult) !== null && _res$data2$teacherRes !== void 0 && _res$data2$teacherRes.isDone) {
-            history.push("/result-survey/" + surveyId + "/" + studentId);
+            history.push("/result-survey/" + surveyId + "/" + studentId + "?currentPage=" + currentPage);
           }
 
           setListQuestionTeacherAnswer((_res$data$teacherResu = res.data.teacherResult) === null || _res$data$teacherResu === void 0 ? void 0 : (_res$data$teacherResu2 = _res$data$teacherResu.questions) === null || _res$data$teacherResu2 === void 0 ? void 0 : _res$data$teacherResu2[0]);
@@ -13867,7 +13868,8 @@ var useConductSurvey = function useConductSurvey() {
     questionIBLearner: questionIBLearner,
     setQuestionIBLearner: setQuestionIBLearner,
     isSchedule: isSchedule,
-    isDone: isDone
+    isDone: isDone,
+    currentPage: currentPage
   };
 };
 
@@ -13993,8 +13995,8 @@ var IBLearnerComponent = function IBLearnerComponent(_ref) {
         return !isResultPage && isUserChangeConference && onChangeLearingStategory("" + item.text);
       }
     }, React__default.createElement(ChipButton, {
-      color: answerLearningStrategy.includes("" + item.text) ? "#FFF" : "#000",
-      backgroundColor: answerLearningStrategy.includes("" + item.text) ? "#1E4E8C" : "#EDF2F7",
+      color: answerLearningStrategy.includes("" + item.text) ? "#FFFFFF" : "#242424",
+      backgroundColor: answerLearningStrategy.includes("" + item.text) ? "#336DDA" : "#EDF2F7",
       label: item.text
     }));
   }));
@@ -14023,7 +14025,8 @@ var SurveyIndex = function SurveyIndex() {
       updateAnswerIBLearner = _useConductSurvey.updateAnswerIBLearner,
       questionIBLearner = _useConductSurvey.questionIBLearner,
       setQuestionIBLearner = _useConductSurvey.setQuestionIBLearner,
-      isSchedule = _useConductSurvey.isSchedule;
+      isSchedule = _useConductSurvey.isSchedule,
+      currentPage = _useConductSurvey.currentPage;
 
   var history = reactRouterDom.useHistory();
   var checkQuestionAnswer = React.useMemo(function () {
@@ -14076,12 +14079,12 @@ var SurveyIndex = function SurveyIndex() {
 
   var handleFinished = function handleFinished() {
     fnfinishSurvey(function () {
-      history.push("/result-survey/" + surveyId + "/" + studentId);
+      history.push("/result-survey/" + surveyId + "/" + studentId + "?currentPage=" + currentPage);
     });
   };
 
   var goBack = function goBack() {
-    !isTeacher ? history.push("/my-surveys/pending") : history.push("/survey-detail/" + surveyId);
+    !isTeacher ? history.push("/my-surveys/pending") : history.push("/survey-detail/" + surveyId + "?currentPage=" + currentPage);
   };
 
   var onChangeIBLearnerAnswer = function onChangeIBLearnerAnswer(_questionId, answerText) {
@@ -14127,14 +14130,14 @@ var SurveyIndex = function SurveyIndex() {
   }, React__default.createElement("div", {
     className: styles$8["item-question"] + " mr-3"
   }, React__default.createElement(ChipButton, {
-    color: "#153E75",
-    backgroundColor: "#CEEDFF",
+    color: "#242424",
+    backgroundColor: "#B3D4FF",
     label: numberQuestions + " Questions"
   })), React__default.createElement("div", {
     className: "item-question mr-3"
   }, React__default.createElement(ChipButton, {
-    color: "#153E75",
-    backgroundColor: "#CEEDFF",
+    color: "#242424",
+    backgroundColor: "#B3D4FF",
     label: "Deadline " + marioCore.utcToLocalTime(informationUser === null || informationUser === void 0 ? void 0 : informationUser.deadline, "Do MMMM yyyy - hh:mm A")
   }))))), !!questionSummarize && React__default.createElement("div", {
     className: styles$8["talk-conduct"]
@@ -14288,12 +14291,13 @@ var SurveyResult = function SurveyResult() {
       studentId = _useConductSurvey.studentId,
       questionIBLearner = _useConductSurvey.questionIBLearner,
       isSchedule = _useConductSurvey.isSchedule,
-      isDone = _useConductSurvey.isDone;
+      isDone = _useConductSurvey.isDone,
+      currentPage = _useConductSurvey.currentPage;
 
   var history = reactRouterDom.useHistory();
 
   var goBack = function goBack() {
-    !isTeacher ? history.push("/my-surveys/pending") : history.push("/survey-detail/" + surveyId);
+    !isTeacher ? history.push("/my-surveys/pending") : history.push("/survey-detail/" + surveyId + "?currentPage=" + currentPage);
   };
 
   var resultIBLearnerProfile = React.useMemo(function () {
@@ -14349,14 +14353,14 @@ var SurveyResult = function SurveyResult() {
   }, React__default.createElement("div", {
     className: styles$8["item-question"] + " mr-3"
   }, React__default.createElement(ChipButton, {
-    color: "#153E75",
-    backgroundColor: "#CEEDFF",
+    color: "#242424",
+    backgroundColor: "#B3D4FF",
     label: numberQuestions + " Questions"
   })), React__default.createElement("div", {
     className: "item-question mr-3"
   }, React__default.createElement(ChipButton, {
-    color: "#153E75",
-    backgroundColor: "#CEEDFF",
+    color: "#242424",
+    backgroundColor: "#B3D4FF",
     label: "Deadline " + marioCore.utcToLocalTime(informationUser === null || informationUser === void 0 ? void 0 : informationUser.deadline, "Do MMMM yyyy - hh:mm A")
   }))))), !!questionSummarize && React__default.createElement("div", {
     className: styles$8["talk-conduct"]
@@ -14947,14 +14951,14 @@ var useStyles$a = core.makeStyles(function (theme) {
     tabs: {
       "& > div > div": {
         padding: "15px 20px 0 20px",
-        borderBottom: "2px solid #156DA1"
+        borderBottom: "2px solid #336DDA"
       }
     },
     tabLabel: (_tabLabel = {
       height: "59px",
       opacity: 1,
-      background: "#156DA1",
-      border: "2px solid #156DA1",
+      background: "#336DDA",
+      border: "2px solid #336DDA",
       borderRadius: "12px 12px 0px 0px",
       bottom: "-3px",
       width: 200,
@@ -14973,7 +14977,7 @@ var useStyles$a = core.makeStyles(function (theme) {
       borderBottom: "2px solid #ffffff",
       background: "#ffffff",
       "& span": {
-        color: "#156DA1"
+        color: "#336DDA"
       }
     },
     tabLabelActive: {
@@ -14981,7 +14985,7 @@ var useStyles$a = core.makeStyles(function (theme) {
       borderBottom: "2px solid #efefef",
       background: "#efefef",
       "& span": {
-        color: "#156DA1"
+        color: "#242424"
       }
     }
   };
@@ -45964,7 +45968,7 @@ var ConfirmDelete = function ConfirmDelete(props) {
   }, React__default.createElement(core.Button, {
     onClick: handleCloseConfirmDeleteDialog,
     style: {
-      color: "red"
+      color: "#c94645"
     }
   }, "CANCEL"), React__default.createElement(core.Button, {
     onClick: function onClick() {
@@ -45973,8 +45977,8 @@ var ConfirmDelete = function ConfirmDelete(props) {
     },
     variant: "contained",
     style: {
-      color: "white",
-      backgroundColor: "red"
+      color: "#fff",
+      backgroundColor: "#c94645"
     }
   }, "YES, DELETE ", React__default.createElement(DeleteIcon, null)))));
 };
@@ -60424,7 +60428,7 @@ var useStyleItem = styles$R.makeStyles(function (theme) {
     },
     button: {
       margin: theme.spacing(1),
-      backgroundColor: "#a10630 !important",
+      backgroundColor: "#c94645 !important",
       color: "#fff"
     }
   };
@@ -64393,6 +64397,7 @@ var lableStep = function lableStep(activeStep) {
 var convertTime = function convertTime(time) {
   return marioCore.utcToLocalTime(time, "Do MMM yyyy - hh:mm A").toString();
 };
+var initTabSurvey = ["ALL", "PENDING", "COMPLETED", "ACTION NEEDED", "EXTERNAL"];
 var initialValues = {
   title: "",
   additionalQuestions: [],
@@ -64480,8 +64485,8 @@ var TYPECHART$1;
   TYPECHART[TYPECHART["BOTH"] = 3] = "BOTH";
 })(TYPECHART$1 || (TYPECHART$1 = {}));
 
-var COLOR_CHART_AND_PIE = ["#336DDA", "#F9F871", "#C94645"];
-var COLOR_LABEL_PIE = ["#5A7F05", "#C94645", "#994700"];
+var COLOR_CHART_AND_PIE = ["#5A7F05", "#C94645", "#FFB04F"];
+var COLOR_LABEL_PIE = ["#006E60", "#FF7670", "#994700"];
 var COLOR_NAME = ["Green", "Red", "Yellow"];
 var optionTotalSurvey = ["Total survey done", "Total survey not done"];
 var LABEL_NAME_PIE_CHART = ["Green", "Red", "Yellow"];
@@ -65580,14 +65585,14 @@ var useStyles$m = styles$R.makeStyles(function (theme) {
       },
       "& > div > div": {
         padding: "0 20px",
-        borderBottom: "2px solid #156DA1"
+        borderBottom: "2px solid #336DDA"
       }
     },
     tabLabel: (_tabLabel = {
       height: "59px",
       opacity: 1,
-      background: "#156DA1",
-      border: "2px solid #156DA1",
+      background: "#336DDA",
+      border: "2px solid #336DDA",
       borderRadius: "12px 12px 0px 0px",
       bottom: "-3px",
       width: 200,
@@ -65606,7 +65611,7 @@ var useStyles$m = styles$R.makeStyles(function (theme) {
       borderBottom: "2px solid #ffffff",
       background: "#FFFFFF",
       "& span": {
-        color: "#156DA1"
+        color: "#336DDA"
       }
     }
   };
@@ -65736,7 +65741,7 @@ var useListSurveyDetail = function useListSurveyDetail(_ref) {
   };
 
   var handleStartSurvey = function handleStartSurvey(surveyId, studentId) {
-    history.push("/start-survey/" + surveyId + "/" + studentId);
+    history.push("/start-survey/" + surveyId + "/" + studentId + "?currentPage=" + (filters.type ? filters.type : 0));
   };
 
   var goToBookSession = function goToBookSession(studentId, surveyId) {
@@ -66098,7 +66103,7 @@ var RepliedSurvey = function RepliedSurvey() {
       scope: "row",
       height: 80,
       className: "" + styles$N["table-class-type"]
-    }, React__default.createElement(core.Typography, {
+    }, !!row.flag && React__default.createElement(core.Typography, {
       className: styles$N["row-status"] + " " + styles$N[flagCellBgColor(row.flag)]
     }, React__default.createElement(core.Typography, {
       className: styles$N["session"] + " " + styles$N[sessionBackground(row.actionScore)]
@@ -66450,6 +66455,8 @@ var ListSurveyDetail = function ListSurveyDetail(props) {
 var useSurveyDetail = function useSurveyDetail() {
   var dispatch = reactRedux.useDispatch();
   var history = reactRouterDom.useHistory();
+  var params = new URLSearchParams(location.search);
+  var currentPage = params.get('currentPage') || 0;
 
   var _useParams = reactRouterDom.useParams(),
       id = _useParams.id;
@@ -66462,7 +66469,7 @@ var useSurveyDetail = function useSurveyDetail() {
       detailSurvey = _useState2[0],
       setDetailSurvey = _useState2[1];
 
-  var _useState3 = React.useState("ALL"),
+  var _useState3 = React.useState(initTabSurvey[Number(currentPage) || 0]),
       activeTab = _useState3[0],
       setActiveTab = _useState3[1];
 
@@ -70896,6 +70903,7 @@ var optionColumnChartAndPercents$1 = function optionColumnChartAndPercents(month
       decimalsInFloat: 0
     },
     tooltip: {
+      shared: false,
       y: {
         formatter: function formatter(value) {
           return "" + (!percentData ? value : value.toFixed(2) + "%");
@@ -70994,6 +71002,7 @@ var optionBarChartAndArea$1 = function optionBarChartAndArea(months, activeData,
       decimalsInFloat: 0
     },
     tooltip: {
+      shared: false,
       enabledOnSeries: handleViewSeriesActive$1(activeData),
       y: {
         formatter: function formatter(value) {