mario-education 2.4.16-beta → 2.4.19-beta

package/dist/MarioFramework.Education/ClientApp/src/containers/Classes/components/StudentItemSelector.d.ts

@@ -4,6 +4,7 @@ interface Props {
     onChange: any;
     externalStudentIds?: number[];
     studentDefault?: Student;
+    teacherUserId?: string;
 }
 export interface Student {
     studentId: number;

package/dist/MarioFramework.Education/ClientApp/src/containers/Classes/components/TeacherItemSelector.d.ts

@@ -2,10 +2,12 @@ import { FC } from "react";
 interface Props {
     defaultValue: number | null | undefined;
     onChange: Function;
+    studentUserId: string;
 }
 export interface Option {
     label: string;
     value: number;
+    teacherUserId: string;
 }
 declare const TeacherItemSelector: FC<Props>;
 export default TeacherItemSelector;

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/constants.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const colors: string[];
 export declare const INITIAL_BEST_FRIENDS: {
     friends: number;
@@ -16,4 +15,4 @@ export declare const LEARNING_STRATEGY_CHART_COLORS: string[];
 export declare const LEARNING_STRATEGY_INIT: {
     learningStrategies: never[];
 };
-export declare const GRAGE_DEFAULT: import("react").ReactText[];
+export declare const GRAGE_DEFAULT: string[];

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/utils.d.ts

@@ -30,8 +30,9 @@ export declare const mtssOptions: {
 export declare const learningStrategyChartOptions: (labelNames: string[], usageCountList: number[]) => ApexOptions;
 export declare const ReadinessToLearnOptions: (questionTexts: string[]) => ApexOptions;
 export declare const optionsChartGrade: (maxDatas: number, colorCharts: string[]) => ApexOptions;
-export declare const studentBySpecialNeedOptions: (seriesValue: IseriesChart) => ApexOptions;
+export declare const studentBySpecialNeedOptions: (seriesValue: IseriesChart, colors: string[]) => ApexOptions;
 export declare const seriesConvert: (gradeAndQuantity: IStudentByGrade[]) => ISeries[];
 export declare const maxSeries: (series: ISeries[]) => number;
 export declare const average: (arr: number[]) => number;
 export declare const colorCharts: (series: ISeries[]) => string[];
+export declare const colorChartsSpecialNeedOptions: (series: IseriesChart[]) => string[];

package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/hooks/useDashboard.d.ts

@@ -25,5 +25,9 @@ declare const useDashboard: () => {
     studentId: number;
     setStudentId: import("react").Dispatch<import("react").SetStateAction<number>>;
     onFilter: () => void;
+    studentUserId: string;
+    setStudentUserId: import("react").Dispatch<import("react").SetStateAction<string>>;
+    teacherUserId: string;
+    setTeacherUserId: import("react").Dispatch<import("react").SetStateAction<string>>;
 };
 export default useDashboard;

package/dist/MarioFramework.Education/ClientApp/src/services/classService.d.ts

@@ -5,5 +5,5 @@ export declare const create: (data: any) => Promise<import("axios").AxiosRespons
 export declare const update: (data: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const remove: (id: number) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getStudents: (classId: number) => Promise<import("axios").AxiosResponse<any>>;
-export declare const getAllStudents: (searchString: string) => Promise<import("axios").AxiosResponse<any>>;
-export declare const getAllTeachers: () => Promise<import("axios").AxiosResponse<any>>;
+export declare const getAllStudents: (searchString?: string | undefined, userId?: string | undefined) => Promise<import("axios").AxiosResponse<any>>;
+export declare const getAllTeachers: (studentUserId?: string | undefined) => Promise<import("axios").AxiosResponse<any>>;

package/dist/MarioFramework.Education/ClientApp/src/services/dashboardService.d.ts

@@ -16,4 +16,4 @@ export declare const getActivityCircleItems: (filter: any) => Promise<import("ax
 export declare const getStudentBySpecialNeed: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getStudentByAge: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getStudentByGender: (filter: any) => Promise<import("axios").AxiosResponse<any>>;
-export declare const getGrades: () => Promise<import("axios").AxiosResponse<any>>;
+export declare const getGrades: (studentUserId: string) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.css

@@ -229,7 +229,6 @@ h6._3zOGW {
 
 ._6yLxd {
   min-width: 200px;
-  margin-left: 20px;
   margin-bottom: 10px;
   height: 100%;
   background-color: hsl(0, 0%, 100%);
@@ -245,6 +244,7 @@ h6._3zOGW {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
+    padding: 0px 16px;
 }
 
 ._3e2pi {
@@ -261,7 +261,7 @@ h6._3zOGW {
     height: 38px;
 }
 ._1DlZ4{
-  min-width: 180px;
+  width: 220px;
   margin-right: 20px;
   margin-bottom: 10px;
   height: 38px;
@@ -294,6 +294,7 @@ h6._3zOGW {
 ._2PMoX {
     height: auto;
     width: auto;
+    max-width: 315px;
 }
 
 ._2asi- ._muT01 ._35BzZ {

package/dist/index.js

@@ -77,15 +77,20 @@ var remove = function remove(id) {
 var getStudents = function getStudents(classId) {
   return marioCore.api.get(CLASS_URL + "/" + classId + "/students");
 };
-var getAllStudents = function getAllStudents(searchString) {
+var getAllStudents = function getAllStudents(searchString, userId) {
   return marioCore.api.get(STUDENT_URL + "/allstudents", {
     params: {
-      searchString: searchString
+      searchString: searchString,
+      userId: userId
     }
   });
 };
-var getAllTeachers = function getAllTeachers() {
-  return marioCore.api.get(TEACHER_URL);
+var getAllTeachers = function getAllTeachers(studentUserId) {
+  return marioCore.api.get(TEACHER_URL, {
+    params: {
+      studentUserId: studentUserId
+    }
+  });
 };
 
 var StudentSelector = function StudentSelector(_ref) {
@@ -19061,8 +19066,12 @@ var getStudentByGender = function getStudentByGender(filter) {
     params: filter
   });
 };
-var getGrades = function getGrades() {
-  return marioCore.api.get(REPORT_URL + "/grade-levels");
+var getGrades = function getGrades(studentUserId) {
+  return marioCore.api.get(REPORT_URL + "/grade-levels", {
+    params: {
+      studentUserId: studentUserId
+    }
+  });
 };
 
 var LegalGenderType;
@@ -19095,7 +19104,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];
+var GRAGE_DEFAULT = ["K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"];
 
 var TITLE$s = "Dashboard";
 
@@ -19187,6 +19196,14 @@ var useDashboard = function useDashboard() {
       topSkill = _useState19[0],
       setTopSkill = _useState19[1];
 
+  var _useState20 = React.useState(""),
+      teacherUserId = _useState20[0],
+      setTeacherUserId = _useState20[1];
+
+  var _useState21 = React.useState(""),
+      studentUserId = _useState21[0],
+      setStudentUserId = _useState21[1];
+
   var callApi = React.useCallback(function (apiCaller, setData, defaultData, type) {
     try {
       var _temp2 = _catch(function () {
@@ -19237,7 +19254,7 @@ var useDashboard = function useDashboard() {
     return hTime;
   };
 
-  var callApiNoFilter = function callApiNoFilter(apiCaller, setData, defaultData) {
+  var callApiByStudentUserId = function callApiByStudentUserId(apiCaller, setData, studentUserId, defaultData) {
     try {
       var _temp5 = function _temp5() {
         dispatch(marioCore.setLoading(false));
@@ -19246,7 +19263,7 @@ var useDashboard = function useDashboard() {
       dispatch(marioCore.setLoading(true));
 
       var _temp6 = _catch(function () {
-        return Promise.resolve(apiCaller()).then(function (res) {
+        return Promise.resolve(apiCaller(studentUserId)).then(function (res) {
           res && setData(res.data);
         });
       }, function (err) {
@@ -19285,8 +19302,8 @@ var useDashboard = function useDashboard() {
     getData();
   }, []);
   React.useEffect(function () {
-    callApiNoFilter(getGrades, setGrades, []);
-  }, []);
+    callApiByStudentUserId(getGrades, setGrades, studentUserId, []);
+  }, [studentUserId]);
   return {
     setFilter: setFilter,
     filter: filter,
@@ -19311,7 +19328,11 @@ var useDashboard = function useDashboard() {
     setTeacherId: setTeacherId,
     studentId: studentId,
     setStudentId: setStudentId,
-    onFilter: onFilter
+    onFilter: onFilter,
+    studentUserId: studentUserId,
+    setStudentUserId: setStudentUserId,
+    teacherUserId: teacherUserId,
+    setTeacherUserId: setTeacherUserId
   };
 };
 
@@ -19410,7 +19431,10 @@ var activityCircleItems = function activityCircleItems(_ref2) {
   }];
 };
 var gradeOptions = function gradeOptions(grades) {
-  return grades.map(function (grade, index) {
+  var result = GRAGE_DEFAULT.filter(function (val) {
+    return grades.indexOf(val) != -1;
+  });
+  return result.map(function (grade, index) {
     return {
       label: grade,
       value: index
@@ -19673,6 +19697,26 @@ var optionsChartGrade = function optionsChartGrade(maxDatas, colorCharts) {
         colors: ["#4B92CE"]
       }
     },
+    states: {
+      normal: {
+        filter: {
+          type: "none",
+          value: 0
+        }
+      },
+      hover: {
+        filter: {
+          type: "none",
+          value: 0
+        }
+      },
+      active: {
+        filter: {
+          type: "none",
+          value: 0
+        }
+      }
+    },
     legend: {
       show: false
     },
@@ -19697,20 +19741,22 @@ var optionsChartGrade = function optionsChartGrade(maxDatas, colorCharts) {
       axisTicks: {
         show: false
       }
+    },
+    tooltip: {
+      x: {
+        formatter: function formatter(value) {
+          return "Grade " + value;
+        }
+      },
+      y: {
+        formatter: function formatter(value) {
+          return value.toFixed(0);
+        }
+      }
     }
   };
 };
-var colorRandoms = new Array(1000).fill("").map(function () {
-  var letters = '0123456789ABCDEF'.split('');
-  var color = '#';
-
-  for (var i = 0; i < 6; i++) {
-    color += letters[Math.floor(Math.random() * 16)];
-  }
-
-  return color;
-});
-var studentBySpecialNeedOptions = function studentBySpecialNeedOptions(seriesValue) {
+var studentBySpecialNeedOptions = function studentBySpecialNeedOptions(seriesValue, colors) {
   return {
     legend: {
       show: false
@@ -19740,7 +19786,7 @@ var studentBySpecialNeedOptions = function studentBySpecialNeedOptions(seriesVal
         }
       }
     },
-    colors: colorRandoms,
+    colors: colors,
     dataLabels: {
       enabled: false
     },
@@ -19829,6 +19875,35 @@ var colorCharts = function colorCharts(series) {
     }
   });
 };
+var colorChartsSpecialNeedOptions = function colorChartsSpecialNeedOptions(series) {
+  return series[0].data.map(function (i) {
+    switch (i) {
+      case 1:
+        return "#40D2CC";
+
+      case 2:
+        return "#0D9994";
+
+      case 3:
+        return "#78B6E2";
+
+      case 4:
+        return "#1D74C5";
+
+      case 5:
+        return "#FFB04F";
+
+      case 6:
+        return "#DD7B00";
+
+      case 7:
+        return "#CE4A49";
+
+      default:
+        return "#850000";
+    }
+  });
+};
 
 var ReadinessToLearn = function ReadinessToLearn(_ref) {
   var data = _ref.data;
@@ -19965,7 +20040,7 @@ var CustomBarChart = function CustomBarChart(_ref) {
       offsetX: 20,
       markers: {
         width: 12,
-        radius: 0
+        radius: 3
       }
     },
     stroke: {
@@ -19974,7 +20049,7 @@ var CustomBarChart = function CustomBarChart(_ref) {
     markers: {
       size: 5
     },
-    colors: ["#40D2CC", "#78B6E2", "#FFB04F", "#78B6E2", "#0D9994", "#1C77AC", "#4992BD", "#77ADCD", "#3DCBCB", "#1DBAB4", "#61CBCB"],
+    colors: ["#40D2CC", "#78B6E2", "#FFB04F", "#CE4A49", "#1CB7B1", "#4B92CE", "#F09422", "#A23333", "#0D9994", "#1D74C5", "#DD7B00"],
     xaxis: {
       categories: chatMonth
     },
@@ -19986,7 +20061,7 @@ var CustomBarChart = function CustomBarChart(_ref) {
         offsetX: -20,
         show: true,
         formatter: function formatter(val) {
-          return chartName === "Safety" ? val + "%" : "" + (val === null || val === void 0 ? void 0 : val.toFixed(0));
+          return chartName === "Safety" ? val + "%" : "" + (val === null || val === void 0 ? void 0 : val.toFixed(2));
         }
       }
     }
@@ -20075,7 +20150,7 @@ var StudentByGrade = function StudentByGrade(_ref) {
   var data = _ref.data;
   var newData = GRAGE_DEFAULT.map(function (i) {
     return data.find(function (j) {
-      return i === parseInt(j.grade) || i === j.grade;
+      return i === j.grade.toString();
     }) || {
       grade: i.toString(),
       quantity: 0
@@ -20090,10 +20165,12 @@ var StudentByGrade = function StudentByGrade(_ref) {
     type: "bar",
     width: "100%",
     height: 450
-  }) : React__default.createElement("img", {
+  }) : React__default.createElement("div", {
+    className: "d-flex justify-content-center align-items-center"
+  }, React__default.createElement("img", {
     className: "" + styles$1["image-no-data"],
     src: "images/grade.png"
-  }));
+  })));
 };
 
 var labelNames = ["Male", "Female"];
@@ -20169,7 +20246,7 @@ var StudentWithSpecialNeeds = function StudentWithSpecialNeeds(_ref) {
   }, series[0].data.some(function (i) {
     return i;
   }) ? React__default.createElement(ReactApexChart, {
-    options: studentBySpecialNeedOptions(series[0]),
+    options: studentBySpecialNeedOptions(series[0], colorChartsSpecialNeedOptions(series)),
     series: series,
     type: "bar",
     width: "100%",
@@ -20347,7 +20424,8 @@ var CircleChart = function CircleChart(_ref) {
 
 var TeacherItemSelector = function TeacherItemSelector(_ref) {
   var defaultValue = _ref.defaultValue,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      studentUserId = _ref.studentUserId;
 
   var _useState = React.useState([]),
       options = _useState[0],
@@ -20356,11 +20434,12 @@ var TeacherItemSelector = function TeacherItemSelector(_ref) {
   var getData = React.useCallback(function () {
     try {
       var _temp2 = _catch(function () {
-        return Promise.resolve(getAllTeachers()).then(function (res) {
+        return Promise.resolve(getAllTeachers(studentUserId)).then(function (res) {
           setOptions(res.data.map(function (item) {
             return {
               value: item.teacherId,
-              label: item.name + " (" + item.email + ")"
+              label: item.name + " (" + item.email + ")",
+              teacherUserId: item.userId
             };
           }));
         });
@@ -20374,10 +20453,10 @@ var TeacherItemSelector = function TeacherItemSelector(_ref) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, []);
+  }, [studentUserId]);
   React.useEffect(function () {
     getData();
-  }, []);
+  }, [studentUserId]);
   var value = defaultValue && options.filter(function (option) {
     return option.value === defaultValue;
   }) || null;
@@ -20451,7 +20530,8 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
   var value = _ref.value,
       onChange = _ref.onChange,
       externalStudentIds = _ref.externalStudentIds,
-      studentDefault = _ref.studentDefault;
+      studentDefault = _ref.studentDefault,
+      teacherUserId = _ref.teacherUserId;
   var dispatch = reactRedux.useDispatch();
 
   var _useState = React.useState([]),
@@ -20478,7 +20558,7 @@ var StudentItemSelector = function StudentItemSelector(_ref) {
       var _temp5 = _catch(function () {
         var _temp = function () {
           if (!value) {
-            return Promise.resolve(getAllStudents(searchString)).then(function (res) {
+            return Promise.resolve(getAllStudents(searchString, teacherUserId)).then(function (res) {
               setStudents(res.data);
             });
           }
@@ -20559,7 +20639,11 @@ var Dashboard = function Dashboard() {
       setTeacherId = _useDashboard.setTeacherId,
       studentId = _useDashboard.studentId,
       setStudentId = _useDashboard.setStudentId,
-      onFilter = _useDashboard.onFilter;
+      onFilter = _useDashboard.onFilter,
+      studentUserId = _useDashboard.studentUserId,
+      setStudentUserId = _useDashboard.setStudentUserId,
+      teacherUserId = _useDashboard.teacherUserId,
+      setTeacherUserId = _useDashboard.setTeacherUserId;
 
   var user = reactRedux.useSelector(function (state) {
     return state.common.user;
@@ -20571,9 +20655,9 @@ var Dashboard = function Dashboard() {
 
   var questionOneToOne = ["Well-being", "Growth", "Relations", "Productivity", "Academic", "Self-Efficacy", "Happiness", "Energy", "Focus"];
   var questionClassReflection = ["Focus", "Energy", "Happiness", "Stress", "Productivity"];
-  var questionConferences = ["Organization", "Self-Awareness", "Self-Directed Learning", "Self-Management", "Self-Management", "Self-Advocacy"];
+  var questionConferences = ["Organization", "Self-Awareness", "Self-Directed Learning", "Self-Management", "Self-Advocacy", "Goal Progress"];
   var listChartLeft = [{
-    label: "Top learning strategies",
+    label: "Learning strategies",
     children: React__default.createElement(TopLearningStrategy, {
       data: topLearningStrategies
     })
@@ -20730,8 +20814,13 @@ var Dashboard = function Dashboard() {
       setFilter(_extends({}, filter, {
         teacherId: option ? option.value : undefined
       }));
+      setTeacherUserId(option.teacherUserId);
     } else {
       setTeacherId(0);
+      setFilter(_extends({}, filter, {
+        teacherId: undefined
+      }));
+      setTeacherUserId("");
     }
   };
 
@@ -20745,6 +20834,7 @@ var Dashboard = function Dashboard() {
 
   var handleFilterStudent = function handleFilterStudent(option) {
     if (option != null) {
+      setStudentUserId(option.id);
       setTeacherId(0);
       setStudentId(option.value);
       setStudentDefault(option);
@@ -20759,6 +20849,7 @@ var Dashboard = function Dashboard() {
     }
 
     setStudentId(0);
+    setStudentUserId("");
     setStudentDefault(undefined);
     setFilter(_extends({}, filter, {
       gender: [LegalGenderType.Male, LegalGenderType.Female],
@@ -20819,42 +20910,40 @@ var Dashboard = function Dashboard() {
     },
     value: handleFormatDate(filter.endDate),
     min: handleFormatDate(filter.startDate)
-  }))), React__default.createElement("div", {
-    className: "" + styles$1["bock-filter-right"]
-  }, React__default.createElement("div", {
-    className: "" + styles$1["bock-filter-wrap"]
-  }, React__default.createElement("div", {
-    className: "" + styles$1["form-filter-right"]
+  })), React__default.createElement("div", {
+    className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(TeacherItemSelector, {
     onChange: handleFilterTeacher,
-    defaultValue: teacherId
+    defaultValue: teacherId,
+    studentUserId: studentUserId
   })), React__default.createElement("div", {
-    className: "" + styles$1["form-filter-right"]
+    className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(StudentItemSelector, {
     onChange: handleFilterStudent,
     value: studentId,
-    studentDefault: studentDefault
+    studentDefault: studentDefault,
+    teacherUserId: teacherUserId
   })), React__default.createElement("div", {
-    className: "" + styles$1["form-filter-right"]
+    className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(InputSelector, {
     options: genderOptions,
     onChange: handleFilterGender,
     placeholder: "Select Gender"
   })), React__default.createElement("div", {
-    className: "" + styles$1["form-filter-right"]
+    className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(InputSelector, {
     options: gradeOptions(grades),
     onChange: handleFilterGrades,
     placeholder: "Select Grade",
     isMultiSelect: true
   })), React__default.createElement("div", {
-    className: "" + styles$1["form-filter-right"]
+    className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(InputSelector, {
     options: mtssOptions,
     onChange: handleFilterMtss,
     placeholder: "Select MTSS"
-  }))), React__default.createElement("div", {
-    className: "" + styles$1["form-filter-right"]
+  })), React__default.createElement("div", {
+    className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(SubmitButton, {
     text: "Filter",
     onClick: onFilter,