mario-education 2.4.531-feedback → 2.4.533-feedback

package/dist/containers/ConferenceRubric/hooks/useConferenceRubricDetail.d.ts

@@ -36,6 +36,6 @@ declare const useConferenceRubricDetail: (id?: number | null | undefined) => {
     activeLanguage: string;
     onChangeLanguage: (code: string) => void;
     changeConferenceRubricItemRowGrades: (skillId: number, rowIndex: number, value: string) => void;
-    dispatch: import("redux").Dispatch<any>;
+    handleChangeColumn: (value: number) => void;
 };
 export default useConferenceRubricDetail;

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

@@ -3,6 +3,7 @@ export interface IPermission {
     conferences: string[];
     classReflections: string[];
     surveys: string[];
+    students: string[];
 }
 export interface IAccessToken {
     permission: IPermission;

package/dist/index.js

@@ -1555,11 +1555,11 @@ var columns = [{
   text: ""
 }];
 var threeColumns = [{
-  text: "(3)"
+  text: "(67 - 100)"
 }, {
-  text: "(2)"
+  text: "(34 - 66)"
 }, {
-  text: "(1)"
+  text: "(0 - 33)"
 }, {
   text: ""
 }];
@@ -2130,6 +2130,20 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
     setActiveLanguage(code);
   };
 
+  var handleChangeColumn = function handleChangeColumn(value) {
+    changeConferenceRubricDetail({
+      column: value,
+      isChangeColumn: true,
+      conferenceRubricItems: conferenceRubricDetail.conferenceRubricItems.map(function (item) {
+        item.columns[2].text = "Rarely";
+        item.columns[3].text = "Not Applicable";
+        return item;
+      })
+    });
+    setEditedTrue();
+    dispatch(marioCore.setLoading(true));
+  };
+
   var checkAndAddMissingColumns = function checkAndAddMissingColumns(conferenceRubric) {
     var _conferenceRubric$con;
 
@@ -2525,7 +2539,7 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
     activeLanguage: activeLanguage,
     onChangeLanguage: onChangeLanguage,
     changeConferenceRubricItemRowGrades: changeConferenceRubricItemRowGrades,
-    dispatch: dispatch
+    handleChangeColumn: handleChangeColumn
   };
 };
 
@@ -2582,7 +2596,7 @@ var ConferenceRubricDetail = function ConferenceRubricDetail() {
       activeLanguage = _useConferenceRubricD.activeLanguage,
       onChangeLanguage = _useConferenceRubricD.onChangeLanguage,
       changeConferenceRubricItemRowGrades = _useConferenceRubricD.changeConferenceRubricItemRowGrades,
-      dispatch = _useConferenceRubricD.dispatch;
+      handleChangeColumn = _useConferenceRubricD.handleChangeColumn;
 
   var confirmText = !!id ? t("update") : t("create");
   var instruction = conferenceRubricDetail.instruction,
@@ -2700,15 +2714,10 @@ var ConferenceRubricDetail = function ConferenceRubricDetail() {
       return r.value == conferenceRubricDetail.column;
     }) || null,
     onChange: function onChange(e) {
-      var confirmed = window.confirm("Are you sure you want to change the number of columns?\n\n" + "This action will modify existing data and cannot be undone.");
+      var confirmed = window.confirm("Are you sure you want to change from 5 columns to 3 columns? \n\n Data will be mapped to the corresponding columns, but this action is irreversible and the previous data cannot be restored.");
 
       if (confirmed) {
-        changeConferenceRubricDetail({
-          column: e.value,
-          isChangeColumn: true
-        });
-        setEditedTrue();
-        dispatch(marioCore.setLoading(true));
+        handleChangeColumn(e.value);
       }
     },
     placeholder: "Select column"
@@ -72722,11 +72731,14 @@ var useExternalApi = function useExternalApi() {
 
           var items = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.items) || [];
           setTokens(items.map(function (r) {
+            var permission = JSON.parse(r.permission);
             return {
               id: r.id,
               createDate: r.createDate,
               token: r.token,
-              permission: JSON.parse(r.permission)
+              permission: _extends({}, permission, {
+                students: permission.students || []
+              })
             };
           }));
         });
@@ -72890,11 +72902,19 @@ var PermissionSelected = function PermissionSelected(_ref) {
     onClick: function onClick() {
       return onChange(name, "GET");
     }
-  }), "GET"));
+  }), "GET"), React__default.createElement("div", {
+    className: "d-flex align-items-center mr-4"
+  }, React__default.createElement(CheckboxCustom, {
+    isActive: permission.includes("POST"),
+    className: "mr-2",
+    onClick: function onClick() {
+      return onChange(name, "POST");
+    }
+  }), "POST"));
 };
 
 var ExternalApi = function ExternalApi() {
-  var _tokenDetail$permissi, _tokenDetail$permissi2, _tokenDetail$permissi3, _tokenDetail$permissi4;
+  var _tokenDetail$permissi, _tokenDetail$permissi2, _tokenDetail$permissi3, _tokenDetail$permissi4, _tokenDetail$permissi5;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -72940,10 +72960,12 @@ var ExternalApi = function ExternalApi() {
     className: "align-top"
   }, t("survey")), React__default.createElement("th", {
     className: "align-top"
+  }, t("students")), React__default.createElement("th", {
+    className: "align-top"
   }, t("created_date")), React__default.createElement("th", {
     className: "text-center"
   }, t("action")))), React__default.createElement("tbody", null, tokens.map(function (record) {
-    var _record$permission, _record$permission$ch, _record$permission2, _record$permission2$c, _record$permission3, _record$permission3$c, _record$permission4, _record$permission4$s;
+    var _record$permission, _record$permission$ch, _record$permission2, _record$permission2$c, _record$permission3, _record$permission3$c, _record$permission4, _record$permission4$s, _record$permission5, _record$permission5$s;
 
     return React__default.createElement("tr", {
       key: record.id
@@ -72964,6 +72986,8 @@ var ExternalApi = function ExternalApi() {
       className: "align-middle"
     }, (_record$permission4 = record.permission) === null || _record$permission4 === void 0 ? void 0 : (_record$permission4$s = _record$permission4.surveys) === null || _record$permission4$s === void 0 ? void 0 : _record$permission4$s.toString()), React__default.createElement("td", {
       className: "align-middle"
+    }, (_record$permission5 = record.permission) === null || _record$permission5 === void 0 ? void 0 : (_record$permission5$s = _record$permission5.students) === null || _record$permission5$s === void 0 ? void 0 : _record$permission5$s.toString()), React__default.createElement("td", {
+      className: "align-middle"
     }, dateFns.format(new Date(record.createDate), DATE_RESULT)), React__default.createElement("td", {
       className: "text-center align-middle"
     }, React__default.createElement(marioCore.DeleteButtonIcon, {
@@ -73035,6 +73059,14 @@ var ExternalApi = function ExternalApi() {
     name: "surveys",
     onChange: handleChangePermission,
     permission: (tokenDetail === null || tokenDetail === void 0 ? void 0 : (_tokenDetail$permissi4 = tokenDetail.permission) === null || _tokenDetail$permissi4 === void 0 ? void 0 : _tokenDetail$permissi4.surveys) || []
+  })), React__default.createElement("div", {
+    className: "d-flex align-items-center mt-4"
+  }, React__default.createElement("h6", {
+    className: "mr-5 mb-0"
+  }, "Students:"), React__default.createElement(PermissionSelected, {
+    name: "students",
+    onChange: handleChangePermission,
+    permission: (tokenDetail === null || tokenDetail === void 0 ? void 0 : (_tokenDetail$permissi5 = tokenDetail.permission) === null || _tokenDetail$permissi5 === void 0 ? void 0 : _tokenDetail$permissi5.students) || []
   })))));
 };