mario-education 2.4.18-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/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.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;
@@ -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
@@ -20400,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],
@@ -20409,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
             };
           }));
         });
@@ -20427,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;
@@ -20504,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([]),
@@ -20531,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);
             });
           }
@@ -20612,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;
@@ -20624,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
     })
@@ -20783,11 +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("");
     }
   };
 
@@ -20801,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);
@@ -20815,6 +20849,7 @@ var Dashboard = function Dashboard() {
     }
 
     setStudentId(0);
+    setStudentUserId("");
     setStudentDefault(undefined);
     setFilter(_extends({}, filter, {
       gender: [LegalGenderType.Male, LegalGenderType.Female],
@@ -20879,13 +20914,15 @@ var Dashboard = function Dashboard() {
     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-left"]
   }, React__default.createElement(StudentItemSelector, {
     onChange: handleFilterStudent,
     value: studentId,
-    studentDefault: studentDefault
+    studentDefault: studentDefault,
+    teacherUserId: teacherUserId
   })), React__default.createElement("div", {
     className: "" + styles$1["form-filter-left"]
   }, React__default.createElement(InputSelector, {