mario-education 2.4.108-beta → 2.4.112-beta

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/components/AgGridComponents.d.ts

@@ -8,4 +8,5 @@ export declare const renderQuestionText: (params: any) => JSX.Element;
 export declare const renderActions: ({ params, edit, remove }: ActionProps) => JSX.Element;
 export declare const renderCategory: (params: any) => JSX.Element;
 export declare const renderType: (params: any) => JSX.Element;
+export declare const renderUserQuestion: (params: any) => JSX.Element;
 export {};

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/configs/constants.d.ts

@@ -5,3 +5,7 @@ export declare enum TYPE_QUESTION {
     Conference = 3,
     Survey = 4
 }
+export declare const userForQuestion: {
+    value: string;
+    label: string;
+}[];

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/hooks/useQuestionDetail.d.ts

@@ -24,6 +24,7 @@ declare type QuestionDetail = {
     subQuestions: string[];
     isBeforeSession: boolean;
     isDefaultQuestionSurvey: boolean;
+    userForQuestion?: string;
 };
 declare const useQuestionDetail: (id?: number | undefined, type?: number | undefined) => {
     questionDetail: QuestionDetail;

package/dist/index.js

@@ -19,9 +19,9 @@ var masterDetail = require('@ag-grid-enterprise/master-detail');
 var clientSideRowModel = require('@ag-grid-community/client-side-row-model');
 var fa = require('react-icons/fa');
 var tinymceReact = require('@tinymce/tinymce-react');
+var fi = require('react-icons/fi');
 var Chart = _interopDefault(require('react-apexcharts'));
 require('react-datepicker/dist/react-datepicker.css');
-var fi = require('react-icons/fi');
 var jsPDF = _interopDefault(require('jspdf'));
 var html2canvas = _interopDefault(require('html2canvas'));
 
@@ -8333,7 +8333,7 @@ var UserDeletedModal = function UserDeletedModal(props, ref) {
     onClick: function onClick() {
       return removeData(userChoiced.id);
     }
-  }, t("delete_user")))), userChoiced.roles.includes("Parent") && React__default.createElement("div", null, React__default.createElement(reactstrap.Alert, {
+  }, t("delete_user")))), (userChoiced.roles.includes("Parent") || userChoiced.roles.includes("Counselor") || userChoiced.roles.includes("SecondaryTeacher")) && React__default.createElement("div", null, React__default.createElement(reactstrap.Alert, {
     color: "danger"
   }, t("alert_delete_user")), React__default.createElement(reactstrap.Button, {
     color: "danger",
@@ -12708,6 +12708,14 @@ var TYPE_QUESTION;
   TYPE_QUESTION[TYPE_QUESTION["Survey"] = 4] = "Survey";
 })(TYPE_QUESTION || (TYPE_QUESTION = {}));
 
+var userForQuestion = [{
+  value: "Teacher",
+  label: "Teacher"
+}, {
+  value: "Student",
+  label: "Student"
+}];
+
 var subgridStyle = {
   overflowY: "auto",
   overflowX: "hidden",
@@ -12830,12 +12838,19 @@ var renderCategory = function renderCategory(params) {
   return React__default.createElement("div", null, params === null || params === void 0 ? void 0 : (_params$data8 = params.data) === null || _params$data8 === void 0 ? void 0 : (_params$data8$categor = _params$data8.category) === null || _params$data8$categor === void 0 ? void 0 : _params$data8$categor.name);
 };
 var renderType = function renderType(params) {
+  var _params$data10;
+
   var type = marioCore.QUESTION_TYPES_OPTIONS.find(function (option) {
     var _params$data9;
 
     return option.value === (params === null || params === void 0 ? void 0 : (_params$data9 = params.data) === null || _params$data9 === void 0 ? void 0 : _params$data9.type);
   });
-  return type ? React__default.createElement("div", null, type.label) : React__default.createElement("div", null);
+  return type ? React__default.createElement("div", null, type.label) : React__default.createElement("div", null, params === null || params === void 0 ? void 0 : (_params$data10 = params.data) === null || _params$data10 === void 0 ? void 0 : _params$data10.type);
+};
+var renderUserQuestion = function renderUserQuestion(params) {
+  var _params$data11;
+
+  return React__default.createElement("div", null, params === null || params === void 0 ? void 0 : (_params$data11 = params.data) === null || _params$data11 === void 0 ? void 0 : _params$data11.userForQuestion);
 };
 
 var QUESTION_URL$1 = "/admin/question-bank";
@@ -12903,6 +12918,12 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
+        var filter = filters;
+
+        if (!!isDefaultClassReflection && !isDefaultQuestion) {
+          delete filter.isDefaultQuestion;
+        }
+
         return Promise.resolve(get$2(filters)).then(function (res) {
           var _res$data = res.data,
               items = _res$data.items,
@@ -12995,7 +13016,7 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
 
     if (isDefaultQuestion && !isDefaultClassReflection) {
       type = TYPE_QUESTION.OneToOne;
-    } else if (isDefaultQuestion && isDefaultClassReflection) {
+    } else if (isDefaultClassReflection) {
       type = TYPE_QUESTION.ClassReflection;
     } else if (isDefaultConference) {
       type = TYPE_QUESTION.Conference;
@@ -13030,24 +13051,47 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
     cellRendererFramework: function cellRendererFramework(params) {
       return renderCategory(params);
     }
-  }, {
-    width: 80,
-    headerComponentParams: {
-      template: "<div class=\"text-center w-100\">Actions</div>"
-    },
-    cellStyle: {
-      textAlign: "center"
-    },
-    cellRendererFramework: function cellRendererFramework(params) {
-      return renderActions({
-        params: params,
-        edit: goToDetail,
-        remove: removeData
-      });
-    }
   }];
   var gridOptions = {
-    columnDefs: isDefaultQuestion || isDefaultClassReflection ? [].concat(columnDefs, [{
+    columnDefs: isDefaultQuestion && !isDefaultClassReflection ? [].concat(columnDefs, [{
+      width: 80,
+      headerComponentParams: {
+        template: "<div class=\"text-center w-100\">Actions</div>"
+      },
+      cellStyle: {
+        textAlign: "center"
+      },
+      cellRendererFramework: function cellRendererFramework(params) {
+        return renderActions({
+          params: params,
+          edit: goToDetail,
+          remove: removeData
+        });
+      }
+    }, {
+      headerName: "Order",
+      rowDrag: true
+    }]) : isDefaultClassReflection ? [].concat(columnDefs, [{
+      headerName: "User for",
+      cellRendererFramework: function cellRendererFramework(params) {
+        return renderUserQuestion(params);
+      }
+    }, {
+      width: 80,
+      headerComponentParams: {
+        template: "<div class=\"text-center w-100\">Actions</div>"
+      },
+      cellStyle: {
+        textAlign: "center"
+      },
+      cellRendererFramework: function cellRendererFramework(params) {
+        return renderActions({
+          params: params,
+          edit: goToDetail,
+          remove: removeData
+        });
+      }
+    }, {
       headerName: "Order",
       rowDrag: true
     }]) : columnDefs,
@@ -14652,7 +14696,7 @@ var AdditionalComponent = function AdditionalComponent(_ref) {
     numberOfStars: numberOfStars,
     setFieldValue: setFieldValue
   });
-  if ([marioCore.QUESTION_TYPES.SINGLE_CHOICE, marioCore.QUESTION_TYPES.MULTIPLE_CHOICE, marioCore.QUESTION_TYPES.EMOTIONAL].includes(type)) return React__default.createElement(AnswerList, {
+  if ([marioCore.QUESTION_TYPES.SINGLE_CHOICE, marioCore.QUESTION_TYPES.MULTIPLE_CHOICE, marioCore.QUESTION_TYPES.EMOTIONAL, marioCore.QUESTION_TYPES.DROPDOWN].includes(type)) return React__default.createElement(AnswerList, {
     type: type,
     answers: answers,
     isSurvey: isSurvey,
@@ -14811,7 +14855,8 @@ var initValue$g = {
   subQuestions: [],
   isMandatory: false,
   isBeforeSession: false,
-  isDefaultQuestionSurvey: false
+  isDefaultQuestionSurvey: false,
+  userForQuestion: "Student"
 };
 var TITLE$m = "Question detail";
 
@@ -14976,6 +15021,54 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
   };
 };
 
+var UserForQuestionSelect = function UserForQuestionSelect(_ref) {
+  var _userForQuestion$find;
+
+  var value = _ref.value,
+      _onChange = _ref.onChange;
+
+  var _useState = React.useState(false),
+      isToggleModel = _useState[0],
+      setIsToggleModel = _useState[1];
+
+  return React__default.createElement("div", null, React__default.createElement("div", {
+    className: styles["block-filter-component"] + " "
+  }, React__default.createElement("button", {
+    onClick: function onClick() {
+      return setIsToggleModel(!isToggleModel);
+    },
+    className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
+  }, React__default.createElement("p", {
+    className: " my-0 mx-2"
+  }, ((_userForQuestion$find = userForQuestion.find(function (r) {
+    return r.value == value;
+  })) === null || _userForQuestion$find === void 0 ? void 0 : _userForQuestion$find.label) || "Teacher and student"), !isToggleModel ? React__default.createElement(fi.FiChevronDown, null) : React__default.createElement(fi.FiChevronUp, null)), React__default.createElement("div", {
+    className: styles["select-filter-component"] + " " + (!isToggleModel && "" + styles["hidden"])
+  }, React__default.createElement(reactstrap.Form, {
+    className: "" + styles["box-select"]
+  }, userForQuestion.map(function (item) {
+    return React__default.createElement(reactstrap.FormGroup, {
+      check: true,
+      className: "my-2 px-3",
+      key: item.label
+    }, React__default.createElement(reactstrap.Input, {
+      id: item.label + "userForQuestion",
+      name: "userForQuestion",
+      value: item.value,
+      type: "radio",
+      className: "" + styles["radio-btn"],
+      checked: value === item.value,
+      onChange: function onChange() {
+        return _onChange("userForQuestion", item.value);
+      }
+    }), React__default.createElement(reactstrap.Label, {
+      check: true,
+      "for": item.label + "userForQuestion",
+      className: "" + styles["box-select-label"]
+    }, React__default.createElement("p", null, item.label)));
+  })))));
+};
+
 var CREATE_QUESTION_HEADER = "create_question";
 var EDIT_QUESTION_HEADER = "edit_question";
 var EMOTIONALS_LENGTH = marioCore.EMOTIONS.length;
@@ -15027,7 +15120,7 @@ var QuestionDetail = function QuestionDetail() {
         handleSubmit = formikProps.handleSubmit;
 
     var onChangeQuestionType = function onChangeQuestionType(e) {
-      if (![marioCore.QUESTION_TYPES.EMOTIONAL, marioCore.QUESTION_TYPES.LEARNING_STRATEGY, marioCore.QUESTION_TYPES.RATING, marioCore.QUESTION_TYPES.SUMMARIZE, marioCore.QUESTION_TYPES.TEXT_INPUT].includes(e.value)) {
+      if (![marioCore.QUESTION_TYPES.EMOTIONAL, marioCore.QUESTION_TYPES.LEARNING_STRATEGY, marioCore.QUESTION_TYPES.RATING, marioCore.QUESTION_TYPES.SUMMARIZE, marioCore.QUESTION_TYPES.TEXT_INPUT, marioCore.QUESTION_TYPES.DROPDOWN].includes(e.value)) {
         setFieldValue("isDefaultQuestion", false);
       }
 
@@ -15080,7 +15173,14 @@ var QuestionDetail = function QuestionDetail() {
       value: values.categoryId
     }), touched.categoryId && errors.categoryId && React__default.createElement(marioCore.ErrorHandler, {
       text: errors.categoryId
-    })))), React__default.createElement(reactstrap.Row, {
+    }))), parseInt(type) == TYPE_QUESTION.ClassReflection && React__default.createElement(reactstrap.Col, {
+      md: 6
+    }, React__default.createElement(marioCore.RequiredLabel, {
+      text: t("user_for_question")
+    }), React__default.createElement(UserForQuestionSelect, {
+      onChange: setFieldValue,
+      value: values.userForQuestion || ""
+    }))), React__default.createElement(reactstrap.Row, {
       className: "mb-2"
     }, React__default.createElement(reactstrap.Col, {
       md: 12,