mario-education 2.4.589-feedback → 2.4.591-feedback

package/dist/containers/Dashboard/components/GenerateTrendQuestion.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
 import { IGenerateTrendQuestion } from "../configs/types";
-declare const _default: React.MemoExoticComponent<({ series, avgQuestionLastMonth, icons, className, noAvgText }: IGenerateTrendQuestion) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ series, avgQuestionLastMonth, icons, className, noAvgText, timeOfDay }: IGenerateTrendQuestion) => JSX.Element>;
 export default _default;

package/dist/containers/Dashboard/components/ReadinessToLearnTab.d.ts

@@ -1,3 +1,3 @@
 import { IReadinessToLearnTab } from "../configs/types";
-declare const ReadinessToLearnTab: ({ dataReadinessOfChart, handleHoverTooltip, classFontSize, dataOverallReadyToLearn, dayOfWeekOneToOne, monthsOneToOne, avgQuestionLastMonth, preparednessData, preparednessWeeklyData, weeksOneToOne, setOptionDate, activeColumn, onActiveColumn }: IReadinessToLearnTab) => JSX.Element;
+declare const ReadinessToLearnTab: ({ dataReadinessOfChart, handleHoverTooltip, classFontSize, dataOverallReadyToLearn, dayOfWeekOneToOne, monthsOneToOne, avgQuestionLastMonth, preparednessData, preparednessWeeklyData, weeksOneToOne, setOptionDate, activeColumn, onActiveColumn, timeOfDay }: IReadinessToLearnTab) => JSX.Element;
 export default ReadinessToLearnTab;

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

@@ -640,6 +640,7 @@ export interface IReadinessToLearnTab {
     setOptionDate?: Function;
     onActiveColumn?: any;
     activeColumn?: boolean[];
+    timeOfDay?: string;
 }
 export interface IGenerateTrendQuestion {
     series: ISeries[];
@@ -648,6 +649,7 @@ export interface IGenerateTrendQuestion {
     icons: string[];
     className?: string;
     noAvgText?: boolean;
+    timeOfDay?: string;
 }
 export interface FILTER_STUDENT_WELLBEING {
     startDate?: number;

package/dist/index.js

@@ -1373,6 +1373,10 @@ var useConferenceRubricList = function useConferenceRubricList() {
   };
 };
 
+var domainName = window.location.hostname;
+var listCheckMalvernCollege = ['malverncollege', 'stage', 'localhost'];
+var isMalvernCollege = listCheckMalvernCollege.includes(domainName);
+var isSaisSchool = window.location.hostname.includes('sais');
 var CONFERENCE_RUBRIC_TYPES = {
   Default: "None",
   Balanced: "Balanced",
@@ -1400,8 +1404,7 @@ var FILTER_NAME;
 var defaultDate = '0001-01-01T00:00:00';
 var SMALL_FONT_DEFAULT = 12;
 var LARGE_FONT_DEFAULT = 20;
-var studentGrades = ["All Grades", "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"];
-var isSaisSchool = window.location.hostname.includes('sais');
+var studentGrades = ["All Grades", "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isSaisSchool ? ["PCS"] : [], ["13"], isMalvernCollege ? ["12/13"] : []);
 var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
 var stringOrderIcon = "<svg width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\">\n            <path d=\"M9.00002 19.6153C8.55585 19.6153 8.1756 19.4571 7.85927 19.1408C7.54293 18.8244 7.38477 18.4442 7.38477 18C7.38477 17.5558 7.54293 17.1756 7.85927 16.8593C8.1756 16.5429 8.55585 16.3848 9.00002 16.3848C9.44418 16.3848 9.82443 16.5429 10.1408 16.8593C10.4571 17.1756 10.6153 17.5558 10.6153 18C10.6153 18.4442 10.4571 18.8244 10.1408 19.1408C9.82443 19.4571 9.44418 19.6153 9.00002 19.6153ZM15 19.6153C14.5558 19.6153 14.1756 19.4571 13.8593 19.1408C13.5429 18.8244 13.3848 18.4442 13.3848 18C13.3848 17.5558 13.5429 17.1756 13.8593 16.8593C14.1756 16.5429 14.5558 16.3848 15 16.3848C15.4442 16.3848 15.8244 16.5429 16.1408 16.8593C16.4571 17.1756 16.6153 17.5558 16.6153 18C16.6153 18.4442 16.4571 18.8244 16.1408 19.1408C15.8244 19.4571 15.4442 19.6153 15 19.6153ZM9.00002 13.6153C8.55585 13.6153 8.1756 13.4571 7.85927 13.1408C7.54293 12.8244 7.38477 12.4442 7.38477 12C7.38477 11.5558 7.54293 11.1756 7.85927 10.8593C8.1756 10.5429 8.55585 10.3848 9.00002 10.3848C9.44418 10.3848 9.82443 10.5429 10.1408 10.8593C10.4571 11.1756 10.6153 11.5558 10.6153 12C10.6153 12.4442 10.4571 12.8244 10.1408 13.1408C9.82443 13.4571 9.44418 13.6153 9.00002 13.6153ZM15 13.6153C14.5558 13.6153 14.1756 13.4571 13.8593 13.1408C13.5429 12.8244 13.3848 12.4442 13.3848 12C13.3848 11.5558 13.5429 11.1756 13.8593 10.8593C14.1756 10.5429 14.5558 10.3848 15 10.3848C15.4442 10.3848 15.8244 10.5429 16.1408 10.8593C16.4571 11.1756 16.6153 11.5558 16.6153 12C16.6153 12.4442 16.4571 12.8244 16.1408 13.1408C15.8244 13.4571 15.4442 13.6153 15 13.6153ZM9.00002 7.61526C8.55585 7.61526 8.1756 7.4571 7.85927 7.14077C7.54293 6.82443 7.38477 6.44418 7.38477 6.00002C7.38477 5.55585 7.54293 5.1756 7.85927 4.85927C8.1756 4.54293 8.55585 4.38477 9.00002 4.38477C9.44418 4.38477 9.82443 4.54293 10.1408 4.85927C10.4571 5.1756 10.6153 5.55585 10.6153 6.00002C10.6153 6.44418 10.4571 6.82443 10.1408 7.14077C9.82443 7.4571 9.44418 7.61526 9.00002 7.61526ZM15 7.61526C14.5558 7.61526 14.1756 7.4571 13.8593 7.14077C13.5429 6.82443 13.3848 6.44418 13.3848 6.00002C13.3848 5.55585 13.5429 5.1756 13.8593 4.85927C14.1756 4.54293 14.5558 4.38477 15 4.38477C15.4442 4.38477 15.8244 4.54293 16.1408 4.85927C16.4571 5.1756 16.6153 5.55585 16.6153 6.00002C16.6153 6.44418 16.4571 6.82443 16.1408 7.14077C15.8244 7.4571 15.4442 7.61526 15 7.61526Z\" fill=\"#D3D3D3\" />\n        </svg>";
 
@@ -29155,7 +29158,7 @@ var INITIAL_ACTIVITY_FRIENDS = {
 var LEARNING_STRATEGY_INIT = {
   learningStrategies: []
 };
-var GRAGE_DEFAULT = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"].concat(isSaisSchool ? ["PCS"] : []);
+var GRAGE_DEFAULT = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isMalvernCollege ? ["12/13"] : [], ["13"], isSaisSchool ? ["PCS"] : []);
 var INITIAL_AGE_OF_STUDENT = {
   ageOfFeMaleStudent: {
     nineToTwelve: 0,
@@ -32789,8 +32792,8 @@ var FLAG_TYPES;
   FLAG_TYPES[FLAG_TYPES["GREEN"] = 2] = "GREEN";
 })(FLAG_TYPES || (FLAG_TYPES = {}));
 
-var GRAGE_DEFAULT$1 = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"].concat(isSaisSchool ? ["PCS"] : []);
-var GRADE_DEFAULT_SURVEY = ['All', "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"].concat(isSaisSchool ? ["PCS"] : []);
+var GRAGE_DEFAULT$1 = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isMalvernCollege ? ["12/13"] : [], ["13"], isSaisSchool ? ["PCS"] : []);
+var GRADE_DEFAULT_SURVEY = ['All', "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isMalvernCollege ? ["12/13"] : [], ["13"], isSaisSchool ? ["PCS"] : []);
 var GRADE_SURVEY = [{
   label: "All",
   value: ''
@@ -36318,32 +36321,31 @@ var GenerateTrendQuestion = function GenerateTrendQuestion(_ref) {
       avgQuestionLastMonth = _ref.avgQuestionLastMonth,
       icons = _ref.icons,
       className = _ref.className,
-      noAvgText = _ref.noAvgText;
+      noAvgText = _ref.noAvgText,
+      timeOfDay = _ref.timeOfDay;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
 
   var avgs = React.useMemo(function () {
     return series.map(function (element) {
-      var avgLast = avgQuestionLastMonth.find(function (r) {
-        return r.questionText.toLowerCase().includes(element.name.toLowerCase());
-      });
-
-      if (avgLast) {
-        return avgLast.avgQuestionResponse - avgLast.avgQuestionResponseLastMonth;
-      }
-
       var sum = element.data.reduce(function (acc, val) {
         return acc + val;
       }, 0);
       return sum / element.data.length;
     });
-  }, [series, avgQuestionLastMonth]);
+  }, [series]);
   return React__default.createElement(core$1.Grid, {
     className: "" + styles$3["trend-question-list"]
   }, series.map(function (item, index) {
     var _item$data;
 
+    var avgLast = avgQuestionLastMonth.find(function (r) {
+      var _r$questionText, _r$questionText$toLow, _item$name;
+
+      return (_r$questionText = r.questionText) === null || _r$questionText === void 0 ? void 0 : (_r$questionText$toLow = _r$questionText.toLowerCase()) === null || _r$questionText$toLow === void 0 ? void 0 : _r$questionText$toLow.includes((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name.toLowerCase());
+    });
+    var trendPercent = !avgLast ? 0 : avgLast.avgQuestionResponse - avgLast.avgQuestionResponseLastMonth;
     return React__default.createElement(core$1.Grid, {
       key: item.name,
       className: "" + styles$3["trend-question-item"]
@@ -36357,8 +36359,9 @@ var GenerateTrendQuestion = function GenerateTrendQuestion(_ref) {
       alt: ""
     })), React__default.createElement(GraphTrend, {
       label: getDescriptionFromPercent((item === null || item === void 0 ? void 0 : (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data[0]) || 0, item.description) || "",
-      value: avgs[index] || 0,
-      valueData: avgs[index] || 0
+      value: trendPercent || 0,
+      valueData: avgs[index] || 0,
+      timeOfDay: timeOfDay
     }));
   }));
 };
@@ -36454,7 +36457,8 @@ var ReadinessToLearnTab = function ReadinessToLearnTab(_ref) {
       weeksOneToOne = _ref.weeksOneToOne,
       setOptionDate = _ref.setOptionDate,
       activeColumn = _ref.activeColumn,
-      onActiveColumn = _ref.onActiveColumn;
+      onActiveColumn = _ref.onActiveColumn,
+      timeOfDay = _ref.timeOfDay;
   var preferredOrder = ['Energy', 'Happiness', 'Focus'];
   var sortedData = [].concat(dataReadinessOfChart).sort(function (a, b) {
     return preferredOrder.indexOf(removeHTMLTags(a.questionText)) - preferredOrder.indexOf(removeHTMLTags(b.questionText));
@@ -36472,6 +36476,7 @@ var ReadinessToLearnTab = function ReadinessToLearnTab(_ref) {
   }, React__default.createElement(GenerateTrendQuestion$1, {
     avgQuestionLastMonth: avgQuestionLastMonth,
     series: preparednessData,
+    timeOfDay: timeOfDay,
     icons: ["home/energy.png", "home/focus.png", "home/happiness.png"],
     trendLabels: ["Feeling Okay", "Generally focused", "More positives than negatives"],
     className: "trend-item-icon-large"
@@ -36550,6 +36555,7 @@ var SuccessIndicatorTab = function SuccessIndicatorTab(_ref) {
   }, React__default.createElement(GenerateTrendQuestion$1, {
     avgQuestionLastMonth: avgQuestionLastMonth,
     series: successIndicatorsData,
+    timeOfDay: timeOfDay,
     icons: ["well-being-icon.png", "growth-icon.png", "relationship-icon.png", "personal-icon-quests.svg", "academic-icon.png", "self-efficacy-icon.png"],
     trendLabels: ["Generally okay", "Good growth overall", "All key relationships are positive", "Meeting some deadlines", "On target in most areas", "Lacking some self-belief"],
     noAvgText: true
@@ -38175,7 +38181,8 @@ var Dashboard = function Dashboard() {
         weeksOneToOne: weeksOneToOne,
         setOptionDate: setOptionDate,
         onActiveColumn: handleActiveColumn,
-        activeColumn: activeColumnReadiness
+        activeColumn: activeColumnReadiness,
+        timeOfDay: filter.optionDate
       })
     }, {
       label: "open_field_questions",
@@ -82086,7 +82093,7 @@ var statusCheck = [{
   value: false,
   label: 'Inactive'
 }];
-var gradeLevels = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"];
+var gradeLevels = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"].concat(isMalvernCollege ? ["12/13"] : [], ["13"], isSaisSchool ? ["PCS"] : []);
 var SPECIAL_ROLE = ['Student'];
 
 var schema$n = yup.object({