mario-education 2.4.581-feedback → 2.4.582-release

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

@@ -69,7 +69,7 @@ export declare const INITIAL_OVERALL_READY_TO_LEARN: {
 export declare const heightChartDefault = 250;
 export declare const PREPAREDNESS_QUESTION: string[];
 export declare const SUCCESS_INDICATORS_QUESTION: string[];
-export declare const SAFETY_QUESTION = "safety";
+export declare const SAFETY_QUESTION: string[];
 export declare const STRESS_QUESTION = "stress";
 export declare const readinessToLearnName = "readiness_to_learn";
 export declare const preparednessChartName = "readiness_to_learn";

package/dist/containers/Homepage/common/constant.d.ts

@@ -23,7 +23,7 @@ export declare const INITIAl_SCHOOL_INFO: {
     logo: string;
     name: string;
 };
-export declare const SAFETY_QUESTION = "safety";
+export declare const SAFETY_QUESTION: string[];
 export declare const STRESS_QUESTION = "stress";
 export declare const PREPAREDNESS_QUESTION: string[];
 export declare const SUCCESS_INDICATORS_QUESTION: string[];

package/dist/containers/Homepage/common/interface.d.ts

@@ -135,6 +135,7 @@ export interface IOneToOneParams {
     gradeFilter?: string[];
     roles?: string[];
     academicYearId?: number;
+    includeMonthAndWeekView?: boolean;
 }
 export interface IStudentQuestionSkillParams {
     studentId: any;

package/dist/index.js

@@ -29230,7 +29230,7 @@ var INITIAL_OVERALL_READY_TO_LEARN = {
 var heightChartDefault = 250;
 var PREPAREDNESS_QUESTION = ["energy", "focus", "happiness"];
 var SUCCESS_INDICATORS_QUESTION = ["growth", "relationships", "productivity", "academics", "self-efficacy", "well-being"];
-var SAFETY_QUESTION = "safety";
+var SAFETY_QUESTION = ["safety", "resilience"];
 var STRESS_QUESTION = "stress";
 var preparednessChartName = "readiness_to_learn";
 var averageStudentStressName = "average_student_stress";
@@ -30696,7 +30696,7 @@ var useDashboard = function useDashboard() {
     setWeeksOneToOne(weeks);
     setStressData(stressDataQuestion);
     var safetyDataQuestion = newSeriesOneToOne.filter(function (r) {
-      return r.name.toLocaleLowerCase() == SAFETY_QUESTION;
+      return SAFETY_QUESTION.includes(r.name.toLocaleLowerCase());
     });
     setSafetyValue(safetyDataQuestion === null || safetyDataQuestion === void 0 ? void 0 : (_safetyDataQuestion$ = safetyDataQuestion[0]) === null || _safetyDataQuestion$ === void 0 ? void 0 : _safetyDataQuestion$.data);
     setSafetyData(safetyDataQuestion);
@@ -34318,7 +34318,7 @@ var getColorAnswer = function getColorAnswer(value, isStress) {
 };
 
 var GraphTrend = function GraphTrend(_ref) {
-  var _Math$abs;
+  var _ref2;
 
   var value = _ref.value,
       label = _ref.label,
@@ -34326,6 +34326,7 @@ var GraphTrend = function GraphTrend(_ref) {
       timeOfDay = _ref.timeOfDay,
       valueData = _ref.valueData;
   var bgColor = darkenColor(getColorAnswer(valueData || 0, isStress));
+  var labelText = label ? label + " |" : "";
   return React__default.createElement(core$1.Grid, {
     className: "" + styles$3["graph-trend"]
   }, React__default.createElement(core$1.Typography, {
@@ -34333,7 +34334,7 @@ var GraphTrend = function GraphTrend(_ref) {
       backgroundColor: bgColor
     },
     className: "" + styles$3["graph-label"]
-  }, label + " | " + ((_Math$abs = Math.abs(valueData || 0)) === null || _Math$abs === void 0 ? void 0 : _Math$abs.toFixed(2)) + "%"), timeOfDay && React__default.createElement("img", {
+  }, labelText + " " + ((_ref2 = valueData || 0) === null || _ref2 === void 0 ? void 0 : _ref2.toFixed(2)) + "%"), timeOfDay && React__default.createElement("img", {
     src: "/images/" + (value < 0 ? "trend-down.png" : "trend-up.png"),
     alt: "Graph Trend Icon"
   }));
@@ -35998,7 +35999,7 @@ var GeneratePlpChart = function GeneratePlpChart(_ref) {
   var lgListItem = (name === t(readinessTrendName) || name === t(successIndicatorsName) || name === t(overallReadinessToLearnName) || name === t(learningProcessName)) && "auto";
 
   var avgValue = function avgValue(arr) {
-    return arr.reduce(function (a, b) {
+    return arr.length === 0 ? 0 : arr.reduce(function (a, b) {
       return a + b;
     }) / arr.length;
   };
@@ -73285,7 +73286,7 @@ var INITIAl_SCHOOL_INFO = {
   logo: '',
   name: ''
 };
-var SAFETY_QUESTION$1 = "safety";
+var SAFETY_QUESTION$1 = ["safety", "resilience"];
 var STRESS_QUESTION$1 = "stress";
 var PREPAREDNESS_QUESTION$1 = ["energy", "focus", "happiness"];
 var SUCCESS_INDICATORS_QUESTION$1 = ["well-being", "growth", "relationships", "productivity", "self-efficacy", "academics"];
@@ -73392,7 +73393,7 @@ var useSchoolUsage = function useSchoolUsage() {
 };
 
 var getOneToOneApi = function getOneToOneApi(filter) {
-  return marioCore.api.get(marioCore.BASE_URL + "/api/Student/overview-chart", {
+  return marioCore.api.get(marioCore.BASE_URL + "/api/report/overview-chart", {
     params: {
       studentId: filter.studentId,
       startDate: filter.timeSearch.startDate,
@@ -73401,7 +73402,8 @@ var getOneToOneApi = function getOneToOneApi(filter) {
       type: "OneToOne",
       grade: filter.gradeFilter,
       roles: filter.roles,
-      academicYearId: filter.academicYearId
+      academicYearId: filter.academicYearId,
+      includeMonthAndWeekView: filter.includeMonthAndWeekView
     }
   });
 };
@@ -73519,7 +73521,8 @@ var useStudentWellness = function useStudentWellness(studentId, filterDateChart,
         timeSearch: timeSearch,
         gradeFilter: gradeFilter,
         roles: roles,
-        academicYearId: academicYearId
+        academicYearId: academicYearId,
+        includeMonthAndWeekView: true
       };
       return Promise.resolve(getDataOneToOneServices(dispatch, filterParams)).then(function (res) {
         var _data$overviewQuestio;
@@ -73585,9 +73588,7 @@ var useStudentWellness = function useStudentWellness(studentId, filterDateChart,
         var stressDataConvert = stressDataQuestion.map(function (r) {
           return {
             name: r.name,
-            data: r.data.map(function (i) {
-              return i / 2 + 50;
-            })
+            data: r.data
           };
         });
         setDataConvertedOneToOne(questions);
@@ -73595,7 +73596,7 @@ var useStudentWellness = function useStudentWellness(studentId, filterDateChart,
         setMonthsOneToOne(months);
         setStressData(stressDataConvert);
         setSafetyData(newSeriesOneToOne.filter(function (r) {
-          return r.name.toLocaleLowerCase() == SAFETY_QUESTION$1;
+          return SAFETY_QUESTION$1.includes(r.name.toLocaleLowerCase());
         }));
         setPreparednessData(preparednessQuestionData);
         setSuccessIndicatorsData(successIndicatorsQuestionData);
@@ -74696,7 +74697,7 @@ var StudentWellness = function StudentWellness(_ref) {
     return calculatePercent(safetyData === null || safetyData === void 0 ? void 0 : safetyData[0]);
   }, [safetyData]);
   var stressPercent = React.useMemo(function () {
-    return calculatePercent(stressData === null || stressData === void 0 ? void 0 : stressData[0], true);
+    return calculatePercent(stressData === null || stressData === void 0 ? void 0 : stressData[0]);
   }, [stressData]);
   var safetyDiffPercent = React.useMemo(function () {
     return calculateDiffPercent(safetyData === null || safetyData === void 0 ? void 0 : safetyData[0]);