mario-education 2.4.317-release → 2.4.319-release

package/dist/containers/Dashboard/configs/types.d.ts

@@ -12,6 +12,10 @@ export declare type QuantityReport = {
     numberOfStudents: number;
     numberOfAssistants: number;
 };
+export interface IQuestionTranslate {
+    questionName: string;
+    questionTranslationName: string;
+}
 export declare type SkillReportItem = {
     skillName: string;
     ratings: SkillRating[];
@@ -140,6 +144,7 @@ export interface IStudentByGrade {
 export interface ISeries {
     name: string;
     data: number[];
+    questionTranslation: string;
 }
 export interface ILearningItem {
     learningStrategyName: string;
@@ -175,6 +180,7 @@ export interface IResultQuestion {
     avgOfStudentChoice: number;
     questionId: number;
     questionText: string;
+    questionTranslation: string;
 }
 export interface IOverviewQuestionChoice {
     month: string;

package/dist/containers/Dashboard/configs/utils.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { ApexOptions } from "apexcharts";
 import { IOptionSelector } from "../../../components/Select/InputSelector";
-import { FILTER_YEAR, IActivityCircle, IOverviewQuestionChoice, IReadinessToLearning, ISeries, IseriesChart, IStudentByAge, IStudentByGrade, IsyntheticFriendCircle, LegalGenderType, MtssType } from "./types";
+import { FILTER_YEAR, IActivityCircle, IOverviewQuestionChoice, IQuestionTranslate, IReadinessToLearning, ISeries, IseriesChart, IStudentByAge, IStudentByGrade, IsyntheticFriendCircle, LegalGenderType, MtssType } from "./types";
 export declare const getColors: (length: number) => string[];
 export declare const friendCircleItems: ({ bestFriends, friends, couldBeFriends, supportive }: IsyntheticFriendCircle) => {
     id: number;
@@ -106,9 +106,10 @@ export declare const optionColumnChartAndPercents: (min: number, months: string[
 export declare const optionLineChart: (months: string[], activeData: boolean[], colors: string[], dayOfWeek: string[]) => ApexOptions;
 export declare const optionBarChartAndArea: (months: string[], activeData: boolean[], dayOfWeek: string[], newseries?: any) => ApexOptions;
 export declare const overallDonutCHartOptions: (labelNames: string[], colors: string[], isCountSeries?: boolean | undefined, textColors?: string[] | undefined) => ApexOptions;
-export declare const convertDataToDataChart: (data: IOverviewQuestionChoice[]) => string[];
-export declare const convertToSeriesColumnChartAndPercent: (dataCharts: string[], data: IOverviewQuestionChoice[]) => {
+export declare const convertDataToDataChart: (data: IOverviewQuestionChoice[]) => IQuestionTranslate[];
+export declare const convertToSeriesColumnChartAndPercent: (dataCharts: IQuestionTranslate[], data: IOverviewQuestionChoice[], isHardQuestion?: boolean | undefined) => {
     name: string;
+    questionTranslation: string;
     data: number[];
 }[];
 export declare const convertToSeriesColumnChartAndPercentProgress: (data: IOverviewQuestionChoice[]) => {
@@ -121,6 +122,7 @@ export declare const mergeBarChartAndArea: (series: ISeries[], isHasLineChart: b
     type: string;
     name: string;
     data: number[];
+    questionTranslation: string;
 }[];
 export declare const getLastQuarterRange: () => {
     start: number;

package/dist/containers/Dashboard/hooks/useChartDatas.d.ts

@@ -36,7 +36,6 @@ declare const useChartDatas: () => {
     stressData: import("../../../utils/type").ISeries[];
     seriesConference: import("../../../utils/type").ISeries[];
     avgConferenceLastMonth: import("../configs/types").IQuestionResponseLastMonth[];
-    dataConvertedConference: string[];
     monthsConference: string[];
     dayOfWeekConference: string[];
     handleActiveColumnConference: (index: number) => void;

package/dist/containers/Dashboard/hooks/useDashboard.d.ts

@@ -26,7 +26,6 @@ declare const useDashboard: () => {
     handleFilterTeacher: (option: any) => void;
     onChangeFilters: (filterSelect: IFilter) => void;
     handleActiveColumnOneToOne: (index: number, name: string) => void;
-    dataConvertedOneToOne: string[];
     monthsOneToOne: string[];
     dayOfWeekOneToOne: string[];
     stressData: ISeries[];
@@ -41,7 +40,6 @@ declare const useDashboard: () => {
     dataOverallReadyToLearn: IOverallReadinessToLearn;
     seriesConference: ISeries[];
     avgConferenceLastMonth: IQuestionResponseLastMonth[];
-    dataConvertedConference: string[];
     monthsConference: string[];
     dayOfWeekConference: string[];
     handleActiveColumnConference: (index: number) => void;

package/dist/index.js

@@ -30414,22 +30414,38 @@ var overallDonutCHartOptions = function overallDonutCHartOptions(labelNames, col
   };
 };
 var convertDataToDataChart = function convertDataToDataChart(data) {
+  var uniqueQuestions = new Set();
+
+  if (data.length === 0) {
+    return [];
+  }
+
   return data.reduce(function (acc, cur) {
-    return [].concat(acc, cur.resultQuestion.map(function (i) {
-      var quests = i.questionText.split("</p>");
-      return quests[0].replace("<p>", "").trim();
-    }).filter(function (i) {
-      return !!i && !acc.includes(i);
-    }));
+    cur.resultQuestion.forEach(function (i) {
+      var _i$questionText, _i$questionTranslatio;
+
+      var questionText = ((_i$questionText = i.questionText) === null || _i$questionText === void 0 ? void 0 : _i$questionText.split("</p>")[0].replace("<p>", "").trim()) || "";
+      var questionTranslation = ((_i$questionTranslatio = i.questionTranslation) === null || _i$questionTranslatio === void 0 ? void 0 : _i$questionTranslatio.split("</p>")[0].replace("<p>", "").trim()) || "";
+
+      if (questionText && !uniqueQuestions.has(questionText)) {
+        uniqueQuestions.add(questionText);
+        acc.push({
+          questionName: questionText,
+          questionTranslationName: questionTranslation
+        });
+      }
+    });
+    return acc;
   }, []);
 };
-var convertToSeriesColumnChartAndPercent = function convertToSeriesColumnChartAndPercent(dataCharts, data) {
+var convertToSeriesColumnChartAndPercent = function convertToSeriesColumnChartAndPercent(dataCharts, data, isHardQuestion) {
   return dataCharts.map(function (dataName) {
     return {
-      name: dataName,
+      name: dataName.questionName,
+      questionTranslation: dataName.questionTranslationName,
       data: data.map(function (i) {
         var questionItem = i.resultQuestion.find(function (question) {
-          return question.questionText.includes(dataName);
+          return !isHardQuestion ? question.questionText.includes(dataName.questionName) : question.questionText == dataName.questionName;
         });
         return !!questionItem ? questionItem.avgOfStudentChoice : 0;
       })
@@ -30685,6 +30701,9 @@ var useDashboard = function useDashboard() {
   var user = reactRedux.useSelector(function (state) {
     return state.common.user;
   });
+  var language = reactRedux.useSelector(function (state) {
+    return state.common.language;
+  });
 
   var _useState14 = React.useState(undefined),
       studentDefault = _useState14[0],
@@ -30733,16 +30752,12 @@ var useDashboard = function useDashboard() {
       setActiveColumnPreparedness = _useState23[1];
 
   var _useState24 = React.useState([]),
-      dataConvertedOneToOne = _useState24[0],
-      setDataConvertedOneToOne = _useState24[1];
+      monthsOneToOne = _useState24[0],
+      setMonthsOneToOne = _useState24[1];
 
   var _useState25 = React.useState([]),
-      monthsOneToOne = _useState25[0],
-      setMonthsOneToOne = _useState25[1];
-
-  var _useState26 = React.useState([]),
-      dayOfWeekOneToOne = _useState26[0],
-      setDayOfWeekOneToOne = _useState26[1];
+      dayOfWeekOneToOne = _useState25[0],
+      setDayOfWeekOneToOne = _useState25[1];
 
   var handleSetDataChartOneToOne = function handleSetDataChartOneToOne(data) {
     var _data$overviewQuestio;
@@ -30790,10 +30805,10 @@ var useDashboard = function useDashboard() {
         name: r.name,
         data: r.data.map(function (i) {
           return i / 2 + 50;
-        })
+        }),
+        questionTranslation: r.questionTranslation
       };
     });
-    setDataConvertedOneToOne(questions);
     setDayOfWeekOneToOne(dayOfWeeks);
     setMonthsOneToOne(months);
     setStressData(stressDataConvert);
@@ -30820,37 +30835,33 @@ var useDashboard = function useDashboard() {
     }
   };
 
-  var _useState27 = React.useState(initStudentPressure),
-      studentPressure = _useState27[0],
-      setStudentPressure = _useState27[1];
+  var _useState26 = React.useState(initStudentPressure),
+      studentPressure = _useState26[0],
+      setStudentPressure = _useState26[1];
+
+  var _useState27 = React.useState(INITIAL_OVERALL_READY_TO_LEARN),
+      dataOverallReadyToLearn = _useState27[0],
+      setDataOverallReadyToLearn = _useState27[1];
 
-  var _useState28 = React.useState(INITIAL_OVERALL_READY_TO_LEARN),
-      dataOverallReadyToLearn = _useState28[0],
-      setDataOverallReadyToLearn = _useState28[1];
+  var _useState28 = React.useState([]),
+      seriesConference = _useState28[0],
+      setSeriesConference = _useState28[1];
 
   var _useState29 = React.useState([]),
-      seriesConference = _useState29[0],
-      setSeriesConference = _useState29[1];
+      activeColumnConference = _useState29[0],
+      setActiveColumnConference = _useState29[1];
 
   var _useState30 = React.useState([]),
-      activeColumnConference = _useState30[0],
-      setActiveColumnConference = _useState30[1];
+      avgConferenceLastMonth = _useState30[0],
+      setAvgConferenceLastMonth = _useState30[1];
 
   var _useState31 = React.useState([]),
-      avgConferenceLastMonth = _useState31[0],
-      setAvgConferenceLastMonth = _useState31[1];
+      monthsConference = _useState31[0],
+      setMonthsConference = _useState31[1];
 
   var _useState32 = React.useState([]),
-      dataConvertedConference = _useState32[0],
-      setDataConvertedConference = _useState32[1];
-
-  var _useState33 = React.useState([]),
-      monthsConference = _useState33[0],
-      setMonthsConference = _useState33[1];
-
-  var _useState34 = React.useState([]),
-      dayOfWeekConference = _useState34[0],
-      setDayOfWeekConference = _useState34[1];
+      dayOfWeekConference = _useState32[0],
+      setDayOfWeekConference = _useState32[1];
 
   var handleSetDataChartConference = function handleSetDataChartConference(data) {
     var _data$overviewQuestio2;
@@ -30874,7 +30885,6 @@ var useDashboard = function useDashboard() {
       }
     }
 
-    setDataConvertedConference(questions);
     setDayOfWeekConference(dayOfWeeks);
     setMonthsConference(months);
     setSeriesConference(newSeriesConference);
@@ -30891,8 +30901,11 @@ var useDashboard = function useDashboard() {
     try {
       var _temp2 = _catch(function () {
         return Promise.resolve(type ? apiCaller(_extends({}, filter, {
-          type: type
-        })) : apiCaller(filter)).then(function (res) {
+          type: type,
+          language: language
+        })) : apiCaller(_extends({}, filter, {
+          language: language
+        }))).then(function (res) {
           if (type == "academicyear") {
             !!(res !== null && res !== void 0 && res.data) && setData(res.data.items);
           } else {
@@ -30913,7 +30926,7 @@ var useDashboard = function useDashboard() {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [filter]);
+  }, [filter, language]);
 
   var handleFilterTeacher = function handleFilterTeacher(option) {
     if (option != null) {
@@ -31016,7 +31029,7 @@ var useDashboard = function useDashboard() {
       var _temp8 = function () {
         if (!!academicYear && academicYear.length > 0) {
           dispatch(marioCore.setLoading(true));
-          return Promise.resolve(Promise.any([callApi(getAllTotalTime, setListTotalTime, []), callApi(getReadinessToLearning, setReadinessToLearning, []), callApi(getTopLearningStrategies, setTopLearningStrategies, []), callApi(getStudentByGrade, setStudentByGrade, []), callApi(getOverviewQuestionChart, handleSetDataChartOneToOne, [], "OneToOne"), callApi(getOverviewQuestionChart, handleSetDataChartConference, [], "Conference"), callApi(getFriendCircleItems, setFriendCircles, INITIAL_BEST_FRIENDS), callApi(getActivityCircleItems, setActivityCircles, INITIAL_ACTIVITY_FRIENDS), callApi(getStudentBySpecialNeed, setStudentBySpecialNeed, []), callApi(getStudentByAge, setStudentByAge, INITIAL_AGE_OF_STUDENT), callApi(getStudentByGender, setStudentByGender, []), callApi(getStudentPressure, setStudentPressure, initStudentPressure), callApi(getOverallReadinessToLearn, setDataOverallReadyToLearn, INITIAL_OVERALL_READY_TO_LEARN)])).then(function () {
+          return Promise.resolve(Promise.any([callApi(getAllTotalTime, setListTotalTime, []), callApi(getReadinessToLearning, setReadinessToLearning, []), callApi(getTopLearningStrategies, setTopLearningStrategies, []), callApi(getStudentByGrade, setStudentByGrade, []), callApi(getFriendCircleItems, setFriendCircles, INITIAL_BEST_FRIENDS), callApi(getActivityCircleItems, setActivityCircles, INITIAL_ACTIVITY_FRIENDS), callApi(getStudentBySpecialNeed, setStudentBySpecialNeed, []), callApi(getStudentByAge, setStudentByAge, INITIAL_AGE_OF_STUDENT), callApi(getStudentByGender, setStudentByGender, []), callApi(getStudentPressure, setStudentPressure, initStudentPressure)])).then(function () {
             dispatch(marioCore.setLoading(false));
           });
         }
@@ -31027,9 +31040,28 @@ var useDashboard = function useDashboard() {
       return Promise.reject(e);
     }
   }, [filter]);
+  var getChartDataLanguage = React.useCallback(function () {
+    try {
+      var _temp10 = function () {
+        if (!!academicYear && academicYear.length > 0) {
+          dispatch(marioCore.setLoading(true));
+          return Promise.resolve(Promise.any([callApi(getOverviewQuestionChart, handleSetDataChartOneToOne, [], "OneToOne"), callApi(getOverviewQuestionChart, handleSetDataChartConference, [], "Conference"), callApi(getOverallReadinessToLearn, setDataOverallReadyToLearn, INITIAL_OVERALL_READY_TO_LEARN)])).then(function () {
+            dispatch(marioCore.setLoading(false));
+          });
+        }
+      }();
+
+      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, [filter, language]);
   React.useEffect(function () {
     getData();
   }, [filter]);
+  React.useEffect(function () {
+    getChartDataLanguage();
+  }, [filter, language]);
   React.useEffect(function () {
     !!filter.studentUserId && callApiByStudentUserId(getGrades, setGradeList, filter.studentUserId, []);
     callApi(getBandScore, setBandScore, []);
@@ -31062,7 +31094,6 @@ var useDashboard = function useDashboard() {
     handleFilterTeacher: handleFilterTeacher,
     onChangeFilters: onChangeFilters,
     handleActiveColumnOneToOne: handleActiveColumnOneToOne,
-    dataConvertedOneToOne: dataConvertedOneToOne,
     monthsOneToOne: monthsOneToOne,
     dayOfWeekOneToOne: dayOfWeekOneToOne,
     stressData: stressData,
@@ -31077,7 +31108,6 @@ var useDashboard = function useDashboard() {
     dataOverallReadyToLearn: dataOverallReadyToLearn,
     seriesConference: seriesConference,
     avgConferenceLastMonth: avgConferenceLastMonth,
-    dataConvertedConference: dataConvertedConference,
     monthsConference: monthsConference,
     dayOfWeekConference: dayOfWeekConference,
     handleActiveColumnConference: handleActiveColumnConference,
@@ -31118,7 +31148,6 @@ var useChartDatas = function useChartDatas() {
       gradeList = _useDashboard.gradeList,
       seriesConference = _useDashboard.seriesConference,
       avgConferenceLastMonth = _useDashboard.avgConferenceLastMonth,
-      dataConvertedConference = _useDashboard.dataConvertedConference,
       monthsConference = _useDashboard.monthsConference,
       dayOfWeekConference = _useDashboard.dayOfWeekConference,
       handleActiveColumnConference = _useDashboard.handleActiveColumnConference,
@@ -31294,7 +31323,6 @@ var useChartDatas = function useChartDatas() {
     stressData: stressData,
     seriesConference: seriesConference,
     avgConferenceLastMonth: avgConferenceLastMonth,
-    dataConvertedConference: dataConvertedConference,
     monthsConference: monthsConference,
     dayOfWeekConference: dayOfWeekConference,
     handleActiveColumnConference: handleActiveColumnConference,
@@ -32303,9 +32331,15 @@ var GenerateChartData = function GenerateChartData(_ref) {
     _loop(i);
   }
 
-  var newSeries = series.filter(function (_r, index) {
-    return activeColumn[index] == true;
-  }) || [];
+  var newSeries = series.filter(function (_, index) {
+    return activeColumn[index];
+  }).map(function (r) {
+    return {
+      data: r.data,
+      name: r.questionTranslation,
+      questionTranslation: r.questionTranslation
+    };
+  });
   var seriesDonut = series.map(function (r) {
     return r.data[0] || 0;
   }) || [];
@@ -32357,7 +32391,7 @@ var GenerateChartData = function GenerateChartData(_ref) {
       }
     }), React__default.createElement("label", {
       className: "" + styles$1["label-chart"]
-    }, item.name)), React__default.createElement("p", {
+    }, item.questionTranslation)), React__default.createElement("p", {
       className: "" + styles$1["avr-question"]
     }, "" + ((_handleGenerateAvgQue = handleGenerateAvgQuestion(item.data, min == -100, avgContent)) != null ? _handleGenerateAvgQue : 0)), React__default.createElement("div", {
       hidden: avgs.length == 0 || !timeOfDay,
@@ -44818,11 +44852,13 @@ var useSandbox = function useSandbox() {
   var redirectLogin = function redirectLogin(isSandboxMode) {
     alert("Sandbox mode is " + (isSandboxMode ? "on" : "off") + " now but cannot switch to your sandbox account! You need to login manually");
     localStorage.removeItem(marioCore.ACCESS_TOKEN);
+    sessionStorage.removeItem(marioCore.ACCESS_TOKEN);
     dispatch(marioCore.reset());
     history.push("/login");
   };
 
   var changeUser = function changeUser(data, isSandboxMode) {
+    var isSessionUserBrowser = sessionStorage.getItem("IS_USER_SESSION_BROWSER");
     var token = data.token,
         id = data.id,
         firstName = data.firstName,
@@ -44830,7 +44866,13 @@ var useSandbox = function useSandbox() {
         roles = data.roles,
         email = data.email,
         profileImageFileName = data.profileImageFileName;
-    localStorage.setItem(marioCore.ACCESS_TOKEN, token);
+
+    if (!isSessionUserBrowser) {
+      localStorage.setItem(marioCore.ACCESS_TOKEN, token);
+    } else {
+      sessionStorage.setItem(marioCore.ACCESS_TOKEN, token);
+    }
+
     localStorage.removeItem(marioCore.NOTIFICATION_ALERT_KEY);
     localStorage.removeItem("SESSION_TIME");
     dispatch(marioCore.setUser({