mario-education 2.4.315-release → 2.4.317-release

package/dist/containers/TemplateSurvey/hooks/useTemplateCateList.d.ts

@@ -5,7 +5,7 @@ declare const useTemplateCateList: () => {
     changeFilters: (updatedFilters: any) => void;
     getData: () => Promise<void>;
     removeData: (id: number) => void;
-    handleSort: () => void;
+    handleSort: (colId: string) => void;
     updateOrderTemplateSurvey: (data: any) => Promise<void>;
     setRef: (node: any) => any;
 };

package/dist/index.js

@@ -13221,13 +13221,11 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
         try {
           var _temp10 = _catch(function () {
             return Promise.resolve(remove$2(id)).then(function () {
+              getData();
               dispatch(marioCore.setAlert({
                 type: "success",
                 message: "Remove question successfully"
               }));
-              changeFilters({
-                currentPage: 1
-              });
             });
           }, function (err) {
             var _err$response3, _err$response3$data;
@@ -13491,6 +13489,7 @@ var QuestionBankList = function QuestionBankList(_ref) {
   }, React__default.createElement("div", {
     className: "ag-theme-balham w-100"
   }, React__default.createElement(react.AgGridReact, {
+    key: JSON.stringify(filters),
     defaultColDef: defaultColDef,
     sortingOrder: ['desc', 'asc'],
     domLayout: "autoHeight",
@@ -18493,9 +18492,7 @@ var useTemplateCateList = function useTemplateCateList() {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getSurvey(_extends({}, filters, {
-          sortBy: "OrderDefaultSurvey"
-        }))).then(function (res) {
+        return Promise.resolve(getSurvey(filters)).then(function (res) {
           var _res$data = res.data,
               items = _res$data.items,
               totalItems = _res$data.totalItems;
@@ -18548,11 +18545,12 @@ var useTemplateCateList = function useTemplateCateList() {
     }
   }, [dispatch, filters]);
 
-  var handleSort = function handleSort() {
-    filters.sortOrder == "ASC" ? changeFilters({
-      sortOrder: "ASC"
-    }) : changeFilters({
-      sortOrder: "DESC"
+  var handleSort = function handleSort(colId) {
+    changeFilters(filters.sortBy == colId ? {
+      sortOrder: filters.sortOrder != "ASC" ? "ASC" : "DESC"
+    } : {
+      sortOrder: "ASC",
+      sortBy: colId
     });
   };
 
@@ -18728,13 +18726,16 @@ var TemplateSurveyList = function TemplateSurveyList() {
   };
 
   var columnDefs = [{
+    field: 'name',
     headerName: t('name'),
+    sortingOrder: ['asc', 'desc'],
     cellRendererFramework: function cellRendererFramework(params) {
       return renderName(params, openModal);
     }
   }, {
-    field: 'number_of_questions',
+    field: 'numberOfQuestions',
     headerName: t('number_of_questions'),
+    sortingOrder: ['asc', 'desc'],
     cellRendererFramework: function cellRendererFramework(params) {
       return renderNumberOfQuestion(params);
     }
@@ -18825,7 +18826,12 @@ var TemplateSurveyList = function TemplateSurveyList() {
     animateRows: true,
     modules: [masterDetail.MasterDetailModule, clientSideRowModel.ClientSideRowModelModule],
     onRowDragEnd: onRowDragEnd,
-    onSortChanged: handleSort
+    onSortChanged: function onSortChanged(event) {
+      var _event$api$getSortMod = event.api.getSortModel(),
+          sortModel = _event$api$getSortMod[0];
+
+      handleSort(sortModel.colId);
+    }
   }))), React__default.createElement(reactstrap.Col, {
     md: 12
   }, React__default.createElement(marioCore.CustomPagination, {
@@ -69567,9 +69573,9 @@ var StudentWellness = function StudentWellness(_ref) {
     percent: safetyPercent,
     diffPercent: safetyDiffPercent,
     numberOfStudent: (studentSkillQuestion === null || studentSkillQuestion === void 0 ? void 0 : studentSkillQuestion.studentSafetyQuestionCount) || 0,
-    numberOfStudentText: t("of_students_are_not_feeling_safe"),
+    numberOfStudentText: t("marked_themselves_as_unsafe"),
     percentOfStudent: (studentSkillQuestion === null || studentSkillQuestion === void 0 ? void 0 : studentSkillQuestion.studentPercentageUnsafe) || 0,
-    percentOfStudentText: t("marked_themselves_as_unsafe"),
+    percentOfStudentText: t("of_students_are_not_feeling_safe"),
     onSeeMore: function onSeeMore() {
       return handleClickSeeMore(studentSkillQuestion.responseStudentSafety, "safety");
     },
@@ -69585,9 +69591,9 @@ var StudentWellness = function StudentWellness(_ref) {
     percent: stressPercent,
     diffPercent: stressDiffPercent,
     numberOfStudent: (studentSkillQuestion === null || studentSkillQuestion === void 0 ? void 0 : studentSkillQuestion.studentStressQuestionCount) || 0,
-    numberOfStudentText: t("of_students_are_highly_stressed"),
+    numberOfStudentText: t("flagged_with_high_stress"),
     percentOfStudent: (studentSkillQuestion === null || studentSkillQuestion === void 0 ? void 0 : studentSkillQuestion.studentPercentageStress) || 0,
-    percentOfStudentText: t("flagged_with_high_stress"),
+    percentOfStudentText: t("of_students_are_highly_stressed"),
     onSeeMore: function onSeeMore() {
       return handleClickSeeMore(studentSkillQuestion.responseStudentStress, "stress");
     },