mario-education 2.4.530-feedback → 2.4.531-feedback

package/dist/containers/ConferenceRubric/components/ConferenceRubricItem.d.ts

@@ -10,6 +10,7 @@ interface Props {
     newRowTexts: any;
     changeNewRowText: Function;
     changeConferenceRubricItemRowGrades: Function;
+    column?: number;
 }
 declare const ConferenceRubricItem: FC<Props>;
 export default ConferenceRubricItem;

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

@@ -0,0 +1,4 @@
+export declare const columnOptions: {
+    label: string;
+    value: number;
+}[];

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

@@ -15,6 +15,8 @@ export declare type ConferenceRubric = {
     conferenceRubricItems: ConferenceRubricItem[];
     questions: ConferenceRubricQuestion[];
     lang: string;
+    column: number;
+    isChangeColumn?: boolean;
 };
 export declare type ConferenceRubricItem = {
     id?: number | null;

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

@@ -36,5 +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>;
 };
 export default useConferenceRubricDetail;

package/dist/index.js

@@ -1554,6 +1554,15 @@ var columns = [{
 }, {
   text: ""
 }];
+var threeColumns = [{
+  text: "(3)"
+}, {
+  text: "(2)"
+}, {
+  text: "(1)"
+}, {
+  text: ""
+}];
 var backgroundColor = "#1c77ac";
 
 var ConferenceRubricItem = function ConferenceRubricItem(_ref) {
@@ -1567,7 +1576,9 @@ var ConferenceRubricItem = function ConferenceRubricItem(_ref) {
       changeNewRowText = _ref.changeNewRowText,
       addConferenceRubricItemRow = _ref.addConferenceRubricItemRow,
       removeConferenceRubricItemRow = _ref.removeConferenceRubricItemRow,
-      changeConferenceRubricItemRowGrades = _ref.changeConferenceRubricItemRowGrades;
+      changeConferenceRubricItemRowGrades = _ref.changeConferenceRubricItemRowGrades,
+      _ref$column = _ref.column,
+      column = _ref$column === void 0 ? 6 : _ref$column;
 
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -1588,6 +1599,7 @@ var ConferenceRubricItem = function ConferenceRubricItem(_ref) {
       value: r
     };
   }) || [];
+  var renderColumns = column === 4 ? threeColumns : columns;
   return React__default.createElement("div", {
     className: "mb-4",
     style: {
@@ -1602,7 +1614,7 @@ var ConferenceRubricItem = function ConferenceRubricItem(_ref) {
     style: {
       backgroundColor: backgroundColor
     }
-  }, (_conferenceRubricItem2 = conferenceRubricItem.skill) === null || _conferenceRubricItem2 === void 0 ? void 0 : _conferenceRubricItem2.name), columns.map(function (column, index) {
+  }, (_conferenceRubricItem2 = conferenceRubricItem.skill) === null || _conferenceRubricItem2 === void 0 ? void 0 : _conferenceRubricItem2.name), renderColumns.map(function (column, index) {
     var _conferenceRubricItem3;
 
     return React__default.createElement("th", {
@@ -1636,7 +1648,7 @@ var ConferenceRubricItem = function ConferenceRubricItem(_ref) {
         return changeConferenceRubricItemRowText(conferenceRubricItem.skillId, index, value);
       },
       noMb: true
-    })), columns.map(function (column) {
+    })), renderColumns.map(function (column) {
       return React__default.createElement("td", {
         key: column.text
       });
@@ -1676,7 +1688,7 @@ var ConferenceRubricItem = function ConferenceRubricItem(_ref) {
       return _onKeyUp(e)(conferenceRubricItem.skillId);
     }
   })), React__default.createElement("td", {
-    colSpan: columns.length + 1
+    colSpan: renderColumns.length + 1
   }), React__default.createElement("td", null)))));
 };
 
@@ -2010,7 +2022,8 @@ var initValue$1 = {
   instruction: "",
   conferenceRubricItems: [],
   questions: [],
-  lang: marioCore.DEFAULT_LANGUAGE_CODE
+  lang: marioCore.DEFAULT_LANGUAGE_CODE,
+  column: 6
 };
 var conferenceRubricItemColumns = [{
   order: RubricItemColumnOrder.Order1,
@@ -2178,7 +2191,9 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
           var _res$data;
 
           var newData = checkAndAddMissingColumns(res.data);
-          setConferenceRubricDetail(newData);
+          setConferenceRubricDetail(_extends({}, newData, {
+            title: newData.title || "Default"
+          }));
 
           if ((_res$data = res.data) !== null && _res$data !== void 0 && _res$data.name) {
             var _res$data2;
@@ -2234,12 +2249,16 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
 
   React.useEffect(function () {
     var timeoutId = setTimeout(function () {
-      confirmData(true);
+      if (conferenceRubricDetail.id) {
+        confirmData(!conferenceRubricDetail.isChangeColumn);
+      }
     }, 2000);
     return function () {
       return clearTimeout(timeoutId);
     };
-  }, [JSON.stringify(conferenceRubricDetail)]);
+  }, [JSON.stringify(_extends({}, conferenceRubricDetail, {
+    isChangeColumn: null
+  }))]);
   var confirmData = React.useCallback(function (isLoading) {
     try {
       var title = conferenceRubricDetail.title,
@@ -2272,6 +2291,10 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
               setEdited(false);
               if (!!localStorage.getItem(window.location.href)) localStorage.removeItem(window.location.href);
             }
+
+            changeConferenceRubricDetail({
+              isChangeColumn: null
+            });
           });
         }, function (err) {
           var _err$response3, _err$response3$data;
@@ -2282,7 +2305,7 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
           }));
         });
       }, function (_wasThrown, _result) {
-        !isLoading && dispatch(marioCore.setLoading(false));
+        dispatch(marioCore.setLoading(false));
         if (_wasThrown) throw _result;
         return _result;
       }));
@@ -2501,7 +2524,8 @@ var useConferenceRubricDetail = function useConferenceRubricDetail(id) {
     listLanguage: listLanguage,
     activeLanguage: activeLanguage,
     onChangeLanguage: onChangeLanguage,
-    changeConferenceRubricItemRowGrades: changeConferenceRubricItemRowGrades
+    changeConferenceRubricItemRowGrades: changeConferenceRubricItemRowGrades,
+    dispatch: dispatch
   };
 };
 
@@ -2517,6 +2541,14 @@ var style = {
   zIndex: 1
 };
 
+var columnOptions = [{
+  label: "3 column",
+  value: 4
+}, {
+  label: "5 column",
+  value: 6
+}];
+
 var ConferenceRubricDetail = function ConferenceRubricDetail() {
   var _useParams = reactRouterDom.useParams(),
       id = _useParams.id;
@@ -2549,7 +2581,8 @@ var ConferenceRubricDetail = function ConferenceRubricDetail() {
       listLanguage = _useConferenceRubricD.listLanguage,
       activeLanguage = _useConferenceRubricD.activeLanguage,
       onChangeLanguage = _useConferenceRubricD.onChangeLanguage,
-      changeConferenceRubricItemRowGrades = _useConferenceRubricD.changeConferenceRubricItemRowGrades;
+      changeConferenceRubricItemRowGrades = _useConferenceRubricD.changeConferenceRubricItemRowGrades,
+      dispatch = _useConferenceRubricD.dispatch;
 
   var confirmText = !!id ? t("update") : t("create");
   var instruction = conferenceRubricDetail.instruction,
@@ -2657,7 +2690,29 @@ var ConferenceRubricDetail = function ConferenceRubricDetail() {
     className: "h-100",
     color: "success",
     onClick: addItem
-  }, t("add_item"))), checked && (!conferenceRubricItems || !conferenceRubricItems.length) && React__default.createElement(reactstrap.Col, {
+  }, t("add_item"))), conferenceRubricDetail.column == 6 && React__default.createElement(reactstrap.Col, {
+    className: "d-flex justify-content-end"
+  }, React__default.createElement("div", {
+    className: "w-25"
+  }, React__default.createElement(marioCore.CustomSelector, {
+    options: columnOptions,
+    value: columnOptions.find(function (r) {
+      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.");
+
+      if (confirmed) {
+        changeConferenceRubricDetail({
+          column: e.value,
+          isChangeColumn: true
+        });
+        setEditedTrue();
+        dispatch(marioCore.setLoading(true));
+      }
+    },
+    placeholder: "Select column"
+  }))), checked && (!conferenceRubricItems || !conferenceRubricItems.length) && React__default.createElement(reactstrap.Col, {
     md: 12
   }, React__default.createElement(marioCore.ErrorHandler, {
     text: t("conference_rubric_items_is_empty")
@@ -2666,6 +2721,7 @@ var ConferenceRubricDetail = function ConferenceRubricDetail() {
 
     return React__default.createElement(ConferenceRubricItem, {
       key: (_item$skill = item.skill) === null || _item$skill === void 0 ? void 0 : _item$skill.id,
+      column: conferenceRubricDetail.column,
       conferenceRubricItem: item,
       changeConferenceRubricItemColumnText: changeConferenceRubricItemColumnText,
       changeConferenceRubricItemRowText: changeConferenceRubricItemRowText,