mario-education 2.4.525-feedback → 2.4.527-feedback

package/dist/components/selector/CustomFilterComponent.d.ts

@@ -1,12 +1,4 @@
 import { SURVEY_LIST } from "../../containers/SurveyDashboard/configs/types";
-interface FILTER {
-    startDate?: number | null;
-    endDate?: number | null;
-    isFavorite?: boolean;
-    studentId?: number;
-    flag?: string;
-    optionDate?: string;
-}
 interface STUDENT {
     email: string;
     gradeLevel: string;
@@ -15,7 +7,7 @@ interface STUDENT {
     actionScore: number;
 }
 interface PROPS_FILTER {
-    filters?: FILTER;
+    filters?: any;
     handleChangeStartDate?: Function;
     handleChangeEndDate?: Function;
     handleChangeInputSearch?: Function;
@@ -41,7 +33,6 @@ interface PROPS_FILTER {
     onChangeOptionDate?: Function;
     renderOption?: string;
     isSelectMulti?: boolean;
-    isDetailSurvey?: boolean;
 }
-declare const CustomFilterComponent: ({ filters, handleChangeStartDate, handleChangeEndDate, handleChangeInputSearch, inputSearch, isShowSelectRight, handleChangeStatus, placeholderSearch, handleSelectFavorite, studentList, onSelectStudent, toggleKeyCustom, handleToggleCustom, toggleContentCustom, optionCustomSelect, handleChangeCustomSelect, surveyOptions, handleChangeSurveyOption, academicOption, handleChangeAcademicYear, valueAcademicYear, handleDownloadCsv, onChangeGrade, onChangeOptionDate, renderOption, isSelectMulti, isDetailSurvey }: PROPS_FILTER) => JSX.Element;
+declare const CustomFilterComponent: ({ filters, handleChangeStartDate, handleChangeEndDate, handleChangeInputSearch, inputSearch, isShowSelectRight, handleChangeStatus, placeholderSearch, handleSelectFavorite, studentList, onSelectStudent, toggleKeyCustom, handleToggleCustom, toggleContentCustom, optionCustomSelect, handleChangeCustomSelect, surveyOptions, handleChangeSurveyOption, academicOption, handleChangeAcademicYear, valueAcademicYear, handleDownloadCsv, onChangeGrade, onChangeOptionDate, renderOption, isSelectMulti, }: PROPS_FILTER) => JSX.Element;
 export default CustomFilterComponent;

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

@@ -81,6 +81,6 @@ export declare const topLearningStrategyName = "learning_strategies";
 export declare const topMostUsedStrategiesName = "top_5_most_used_strategies";
 export declare const overallReadinessToLearn = "overall_readiness_to_learn";
 export declare const studentStressByZone = "student_stress_by_zone";
-export declare const studentAverageScore = "students_average_score";
+export declare const studentAverageScore = "student_distribution";
 export declare const chartNames: string[];
 export declare const CSV_PREFIX = "data:text/csv;charset=utf-8,";

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

@@ -340,8 +340,9 @@ export interface FILTER_SURVEY_DETAIL {
     searchString?: string;
     startDate?: number | null;
     endDate?: number | null;
-    grade?: string;
+    grade?: string[];
     optionDate?: string;
+    studentId?: number;
 }
 export interface SURVEY_RESPONSE {
     currentPage: number;

package/dist/containers/SurveyDashboard/hooks/useListSurvey.d.ts

@@ -50,7 +50,7 @@ declare const useListSurvey: (pageSize?: number | undefined) => {
     handleChangeGrade: (grade: string[]) => void;
     onChangeOptionDate: (option: string) => void;
     dataStudents: never[];
-    handleChangeStudent: (studentId: any) => void;
+    handleChangeStudent: (studentId?: number | undefined) => void;
     onEditSurvey: (id: number) => void;
     handlePublishSurvey: (surveyId: any) => Promise<void>;
 };

package/dist/containers/SurveyDashboard/hooks/useSurveyDetail.d.ts

@@ -64,7 +64,7 @@ declare const useSurveyDetail: () => {
     onChangeOptionDate: (option: string) => void;
     handleChangeInputSearch: (event: React.ChangeEvent<HTMLInputElement>) => void;
     inputSearch: import("react").MutableRefObject<any>;
-    handleChangeStudent: (student: any) => void;
+    handleChangeStudent: (studentId?: number | undefined) => void;
     dataStudentSurvey: never[];
     isShowFilter: boolean;
     handleShowFilter: () => void;

package/dist/index.js

@@ -33539,7 +33539,7 @@ var topLearningStrategyName = "learning_strategies";
 var topMostUsedStrategiesName = "top_5_most_used_strategies";
 var overallReadinessToLearn = "overall_readiness_to_learn";
 var studentStressByZone = "student_stress_by_zone";
-var studentAverageScore = "students_average_score";
+var studentAverageScore = "student_distribution";
 var chartNames = [averageStudentSafetyName, averageStudentStressName, preparednessChartName, overallReadinessToLearn, successIndicatorsName, learningProcessName, topLearningStrategyName, studentStressByZone, studentAverageScore];
 var CSV_PREFIX = "data:text/csv;charset=utf-8,";
 
@@ -51454,7 +51454,7 @@ var useListSurvey = function useListSurvey(pageSize) {
     isFavorite: false,
     isSchedule: false,
     flag: "",
-    grade: [],
+    grade: ['All'],
     optionDate: "",
     studentId: 0
   }),
@@ -51579,7 +51579,7 @@ var useListSurvey = function useListSurvey(pageSize) {
   var handleChangeStudent = function handleChangeStudent(studentId) {
     changeFilters({
       currentPage: 1,
-      studentId: studentId.id
+      studentId: studentId
     });
   };
 
@@ -51716,7 +51716,11 @@ var useListSurvey = function useListSurvey(pageSize) {
       dispatch(marioCore.setLoading(true));
 
       var _temp6 = _catch(function () {
-        return Promise.resolve(getAllSurvey(_extends({}, filters))).then(function (res) {
+        var _filters$grade;
+
+        return Promise.resolve(getAllSurvey(_extends({}, filters, {
+          grade: (_filters$grade = filters.grade) !== null && _filters$grade !== void 0 && _filters$grade.includes('All') ? [] : filters.grade
+        }))).then(function (res) {
           setListSurvey(res.data);
         });
       }, function (err) {
@@ -51844,9 +51848,13 @@ var useListSurvey = function useListSurvey(pageSize) {
 
       var _temp16 = _catch(function () {
         return Promise.resolve(deleteSurvey(surveyId)).then(function () {
+          var _filters$grade2;
+
           setShowModalDeleteSurvey(false);
           setAnchorEl(null);
-          return Promise.resolve(getAllSurvey(_extends({}, filters))).then(function (res) {
+          return Promise.resolve(getAllSurvey(_extends({}, filters, {
+            grade: (_filters$grade2 = filters.grade) !== null && _filters$grade2 !== void 0 && _filters$grade2.includes('All') ? [] : filters.grade
+          }))).then(function (res) {
             setListSurvey(res.data);
           });
         });
@@ -51875,9 +51883,13 @@ var useListSurvey = function useListSurvey(pageSize) {
 
       var _temp20 = _catch(function () {
         return Promise.resolve(publishSurvey(surveyId)).then(function () {
+          var _filters$grade3;
+
           setShowModalDeleteSurvey(false);
           setAnchorEl(null);
-          return Promise.resolve(getAllSurvey(_extends({}, filters))).then(function (res) {
+          return Promise.resolve(getAllSurvey(_extends({}, filters, {
+            grade: (_filters$grade3 = filters.grade) !== null && _filters$grade3 !== void 0 && _filters$grade3.includes('All') ? [] : filters.grade
+          }))).then(function (res) {
             setListSurvey(res.data);
           });
         });
@@ -52101,8 +52113,7 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
       onChangeGrade = _ref.onChangeGrade,
       onChangeOptionDate = _ref.onChangeOptionDate,
       _renderOption = _ref.renderOption,
-      isSelectMulti = _ref.isSelectMulti,
-      isDetailSurvey = _ref.isDetailSurvey;
+      isSelectMulti = _ref.isSelectMulti;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -52243,33 +52254,59 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
   }), !!onChangeGrade && (isSelectMulti ? React__default.createElement(Autocomplete, {
     multiple: true,
     fullWidth: true,
-    options: isDetailSurvey ? GRAGE_DEFAULT$1 : GRADE_DEFAULT_SURVEY,
+    options: GRADE_DEFAULT_SURVEY,
     getOptionLabel: function getOptionLabel(option) {
       return option;
     },
-    renderOption: function renderOption(option, _ref2) {
-      var selected = _ref2.selected;
+    renderOption: function renderOption(option) {
+      var _filters$grade;
+
       return React__default.createElement("div", null, React__default.createElement(core$1.Checkbox, {
         icon: icon,
         checkedIcon: checkedIcon,
         style: {
           marginRight: 8
         },
-        checked: selected
+        checked: filters === null || filters === void 0 ? void 0 : (_filters$grade = filters.grade) === null || _filters$grade === void 0 ? void 0 : _filters$grade.includes(option),
+        onChange: function onChange() {
+          var _filters$grade2, _filters$grade3;
+
+          var isSelected = filters === null || filters === void 0 ? void 0 : (_filters$grade2 = filters.grade) === null || _filters$grade2 === void 0 ? void 0 : _filters$grade2.includes(option);
+          var isAllSelected = filters === null || filters === void 0 ? void 0 : (_filters$grade3 = filters.grade) === null || _filters$grade3 === void 0 ? void 0 : _filters$grade3.includes('All');
+
+          if (option === 'All') {
+            if (!isAllSelected) {
+              onChangeGrade === null || onChangeGrade === void 0 ? void 0 : onChangeGrade(['All']);
+            }
+          } else {
+            if (isAllSelected) {
+              onChangeGrade === null || onChangeGrade === void 0 ? void 0 : onChangeGrade([option]);
+            } else {
+              if (isSelected) {
+                onChangeGrade === null || onChangeGrade === void 0 ? void 0 : onChangeGrade(filters === null || filters === void 0 ? void 0 : filters.grade.filter(function (item) {
+                  return item !== option;
+                }));
+              } else {
+                onChangeGrade === null || onChangeGrade === void 0 ? void 0 : onChangeGrade([].concat(filters === null || filters === void 0 ? void 0 : filters.grade, [option]));
+              }
+            }
+          }
+        }
       }), option);
     },
-    onChange: function onChange(__e, val) {
-      if (val.includes('All')) {
-        onChangeGrade === null || onChangeGrade === void 0 ? void 0 : onChangeGrade([]);
-        return;
+    renderTags: function renderTags() {
+      if (filters !== null && filters !== void 0 && filters.grade.includes('All')) {
+        return React__default.createElement(core$1.Typography, {
+          variant: "body2",
+          style: {
+            padding: '0 2px 0 8px'
+          }
+        }, "All");
       }
 
-      onChangeGrade === null || onChangeGrade === void 0 ? void 0 : onChangeGrade(val || []);
-    },
-    renderTags: function renderTags(value) {
       var maxDisplay = 3;
-      var visible = value === null || value === void 0 ? void 0 : value.slice(0, maxDisplay).join(', ');
-      var hiddenCount = (value === null || value === void 0 ? void 0 : value.length) - maxDisplay;
+      var visible = filters === null || filters === void 0 ? void 0 : filters.grade.slice(0, maxDisplay).join(', ');
+      var hiddenCount = (filters === null || filters === void 0 ? void 0 : filters.grade.length) - maxDisplay;
       return React__default.createElement(core$1.Typography, {
         variant: "body2",
         style: {
@@ -52286,7 +52323,8 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
     className: styles["filter-item"],
     classes: {
       popper: classes.popper
-    }
+    },
+    disableCloseOnSelect: true
   }) : React__default.createElement(Autocomplete, {
     fullWidth: true,
     classes: {
@@ -52403,7 +52441,9 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
       return r.id == (filters === null || filters === void 0 ? void 0 : filters.studentId);
     }) || null,
     onChange: function onChange(_event, value) {
-      return onSelectStudent === null || onSelectStudent === void 0 ? void 0 : onSelectStudent(value ? value : 0);
+      var _value$id;
+
+      return onSelectStudent === null || onSelectStudent === void 0 ? void 0 : onSelectStudent((_value$id = value === null || value === void 0 ? void 0 : value.id) != null ? _value$id : undefined);
     },
     renderInput: function renderInput(params) {
       return React__default.createElement(core$1.TextField, Object.assign({}, params, {
@@ -53620,8 +53660,8 @@ var useSurveyDetail = function useSurveyDetail() {
     searchString: "",
     startDate: null,
     endDate: null,
-    grade: "",
-    optionDate: ""
+    optionDate: "",
+    grade: ['All']
   }),
       filters = _useState29[0],
       setFilters = _useState29[1];
@@ -53967,7 +54007,11 @@ var useSurveyDetail = function useSurveyDetail() {
       dispatch(marioCore.setLoading(true));
 
       var _temp12 = _catch(function () {
-        return Promise.resolve(getRatingsOfQuestions(parseInt(id), filters)).then(function (res) {
+        var _filters$grade;
+
+        return Promise.resolve(getRatingsOfQuestions(parseInt(id), _extends({}, filters, {
+          grade: (_filters$grade = filters.grade) !== null && _filters$grade !== void 0 && _filters$grade.includes('All') ? [] : filters.grade
+        }))).then(function (res) {
           var ratingQuestions = res.data || [];
           var questionRemoveTags = ratingQuestions.questions.map(function (r) {
             return {
@@ -54039,8 +54083,11 @@ var useSurveyDetail = function useSurveyDetail() {
       dispatch(marioCore.setLoading(true));
 
       var _temp16 = _catch(function () {
+        var _filters$grade2;
+
         return Promise.resolve(getTotalByQuestion(parseInt(id), _extends({}, filters, {
-          questionId: questionId
+          questionId: questionId,
+          grade: (_filters$grade2 = filters.grade) !== null && _filters$grade2 !== void 0 && _filters$grade2.includes('All') ? [] : filters.grade
         }))).then(function (res) {
           var data = res.data;
           var dataOverall = [data.totalSent, data.numberOfResponses];
@@ -54076,7 +54123,11 @@ var useSurveyDetail = function useSurveyDetail() {
       dispatch(marioCore.setLoading(true));
 
       var _temp20 = _catch(function () {
-        return Promise.resolve(getResponsesDistribution(parseInt(id), filters)).then(function (res) {
+        var _filters$grade3;
+
+        return Promise.resolve(getResponsesDistribution(parseInt(id), _extends({}, filters, {
+          grade: (_filters$grade3 = filters.grade) !== null && _filters$grade3 !== void 0 && _filters$grade3.includes('All') ? [] : filters.grade
+        }))).then(function (res) {
           var data = (res === null || res === void 0 ? void 0 : res.data) || [];
           setDistributionQuestions(data.map(function (_r, index) {
             return "Q # " + (index + 1);
@@ -54136,8 +54187,11 @@ var useSurveyDetail = function useSurveyDetail() {
       dispatch(marioCore.setLoading(true));
 
       var _temp24 = _catch(function () {
+        var _filters$grade4;
+
         return Promise.resolve(getAnswerChart(parseInt(id), _extends({}, filters, {
-          isQuestionDropDown: true
+          isQuestionDropDown: true,
+          grade: (_filters$grade4 = filters.grade) !== null && _filters$grade4 !== void 0 && _filters$grade4.includes('All') ? [] : filters.grade
         }))).then(function (res) {
           var _res$data2;
 
@@ -54167,8 +54221,11 @@ var useSurveyDetail = function useSurveyDetail() {
       dispatch(marioCore.setLoading(true));
 
       var _temp28 = _catch(function () {
+        var _filters$grade5;
+
         return Promise.resolve(getAnswerChart(parseInt(id), _extends({}, filters, {
-          isQuestionDropDown: false
+          isQuestionDropDown: false,
+          grade: (_filters$grade5 = filters.grade) !== null && _filters$grade5 !== void 0 && _filters$grade5.includes('All') ? [] : filters.grade
         }))).then(function (res) {
           var _res$data3;
 
@@ -54234,10 +54291,10 @@ var useSurveyDetail = function useSurveyDetail() {
     getAllStudentsData();
   }, []);
 
-  var handleChangeStudent = function handleChangeStudent(student) {
+  var handleChangeStudent = function handleChangeStudent(studentId) {
     changeFilters({
       currentPage: 1,
-      searchString: student.studentName
+      studentId: studentId
     });
   };
 
@@ -55146,7 +55203,7 @@ var BubbleChartCustom$2 = function BubbleChartCustom(_ref) {
     className: "" + styles$7["block-header-chart"]
   }, React__default.createElement("p", {
     className: styles$7["title-chart"] + " " + styles$7["ml-10"]
-  }, t("students_average_score"))), React__default.createElement("div", {
+  }, t("student_distribution"))), React__default.createElement("div", {
     className: "" + styles$7["bubble-chart-custom"]
   }, React__default.createElement("div", {
     className: styles$7["chart-custom"]
@@ -56041,7 +56098,6 @@ var SurveyDetailAdmin = function SurveyDetailAdmin() {
     onChangeGrade: handleChangeGrade,
     onChangeOptionDate: onChangeOptionDate,
     isSelectMulti: true,
-    isDetailSurvey: true,
     studentList: dataStudentSurvey,
     onSelectStudent: handleChangeStudent
   })), React__default.createElement(core$1.Grid, {
@@ -68926,7 +68982,7 @@ var useListFavoriteSurvey = function useListFavoriteSurvey(_ref) {
           setIsContinue(true);
 
           if (!!res.data) {
-            var _res$data, _res$data$sharedStaff, _res$data$additionalQ, _res$data2, _res$data3, _res$data4, _res$data5;
+            var _res$data, _res$data$sharedStaff, _res$data$additionalQ, _res$data2, _res$data3;
 
             setDataFormCreateSurvey(_extends({}, res.data, {
               activeStep: 0,
@@ -68941,7 +68997,7 @@ var useListFavoriteSurvey = function useListFavoriteSurvey(_ref) {
                 });
               }),
               deadline: !((_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.isDraft) ? null : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.deadline,
-              id: !((_res$data4 = res.data) !== null && _res$data4 !== void 0 && _res$data4.isDraft) ? 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.id
+              id: favoriteId || 0
             }));
             handleresetFilterStudent === null || handleresetFilterStudent === void 0 ? void 0 : handleresetFilterStudent();
             handleresetFilterStaff === null || handleresetFilterStaff === void 0 ? void 0 : handleresetFilterStaff();
@@ -68971,7 +69027,9 @@ var useListFavoriteSurvey = function useListFavoriteSurvey(_ref) {
       dispatch(marioCore.setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(getAllSurvey(_extends({}, filterFavorite))).then(function (res) {
+        return Promise.resolve(getAllSurvey(_extends({}, filterFavorite, {
+          excludeSurveyId: favoriteId
+        }))).then(function (res) {
           setFavoriteItem(res.data);
         });
       }, function (err) {
@@ -68987,10 +69045,10 @@ var useListFavoriteSurvey = function useListFavoriteSurvey(_ref) {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [filterFavorite]);
+  }, [filterFavorite, favoriteId]);
   React.useEffect(function () {
     getListSurvey();
-  }, [filterFavorite]);
+  }, [filterFavorite, favoriteId]);
   React.useEffect(function () {
     var _students$items2;