mario-education 2.4.98-beta → 2.4.99-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/components/ReadinessToLearn.d.ts +7 -0
- package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/components/AgGridComponents.d.ts +1 -0
- package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/components/UserForQuestion.d.ts +7 -0
- package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/configs/constants.d.ts +4 -0
- package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionBank/hooks/useQuestionDetail.d.ts +1 -0
- package/dist/index.js +93 -13
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +94 -14
- package/dist/index.modern.js.map +1 -1
- package/package.json +2 -2
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/apiClient/index.d.ts +0 -7
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/components/SelectorTemplate.d.ts +0 -3
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/components/TemplateDialogModal.d.ts +0 -3
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/configs/types.d.ts +0 -12
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/hooks/useTemplateBuilder.d.ts +0 -9
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/hooks/useTemplateDetail.d.ts +0 -20
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/hooks/useTemplateList.d.ts +0 -9
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/hooks/useTemplateStart.d.ts +0 -9
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/views/TemplateBuilderPage.d.ts +0 -3
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/views/TemplateContainer.d.ts +0 -3
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/views/TemplateIEPList.d.ts +0 -3
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/views/TemplateStartBuild.d.ts +0 -3
- package/dist/MarioFramework.Education/ClientApp/src/containers/TemplateSystem/views/TemplateSystemList.d.ts +0 -3
- /package/dist/MarioFramework.Education/ClientApp/src/utils/{serviceType.interface.d.ts → servicetype.interface.d.ts} +0 -0
|
@@ -8,4 +8,5 @@ export declare const renderQuestionText: (params: any) => JSX.Element;
|
|
|
8
8
|
export declare const renderActions: ({ params, edit, remove }: ActionProps) => JSX.Element;
|
|
9
9
|
export declare const renderCategory: (params: any) => JSX.Element;
|
|
10
10
|
export declare const renderType: (params: any) => JSX.Element;
|
|
11
|
+
export declare const renderUserQuestion: (params: any) => JSX.Element;
|
|
11
12
|
export {};
|
|
@@ -24,6 +24,7 @@ declare type QuestionDetail = {
|
|
|
24
24
|
subQuestions: string[];
|
|
25
25
|
isBeforeSession: boolean;
|
|
26
26
|
isDefaultQuestionSurvey: boolean;
|
|
27
|
+
userForQuestion?: string;
|
|
27
28
|
};
|
|
28
29
|
declare const useQuestionDetail: (id?: number | undefined, type?: number | undefined) => {
|
|
29
30
|
questionDetail: QuestionDetail;
|
package/dist/index.js
CHANGED
|
@@ -19,9 +19,9 @@ var masterDetail = require('@ag-grid-enterprise/master-detail');
|
|
|
19
19
|
var clientSideRowModel = require('@ag-grid-community/client-side-row-model');
|
|
20
20
|
var fa = require('react-icons/fa');
|
|
21
21
|
var tinymceReact = require('@tinymce/tinymce-react');
|
|
22
|
+
var fi = require('react-icons/fi');
|
|
22
23
|
var Chart = _interopDefault(require('react-apexcharts'));
|
|
23
24
|
require('react-datepicker/dist/react-datepicker.css');
|
|
24
|
-
var fi = require('react-icons/fi');
|
|
25
25
|
var jsPDF = _interopDefault(require('jspdf'));
|
|
26
26
|
var html2canvas = _interopDefault(require('html2canvas'));
|
|
27
27
|
|
|
@@ -5583,12 +5583,7 @@ var CSVType;
|
|
|
5583
5583
|
CSVType["Others"] = "others";
|
|
5584
5584
|
})(CSVType || (CSVType = {}));
|
|
5585
5585
|
|
|
5586
|
-
var
|
|
5587
|
-
text: "Import students",
|
|
5588
|
-
backgroundColor: "#0abde3",
|
|
5589
|
-
type: CSVType.Students
|
|
5590
|
-
}];
|
|
5591
|
-
var othersButtons = [{
|
|
5586
|
+
var buttons = [{
|
|
5592
5587
|
text: "Import class reflections",
|
|
5593
5588
|
backgroundColor: "#e74c3c",
|
|
5594
5589
|
type: CSVType.ClassReflection
|
|
@@ -5642,7 +5637,6 @@ var useCSVImport = function useCSVImport() {
|
|
|
5642
5637
|
React.useEffect(function () {
|
|
5643
5638
|
document.title = title;
|
|
5644
5639
|
}, []);
|
|
5645
|
-
var buttons = isCheckDomainIBS ? isbButtons : othersButtons;
|
|
5646
5640
|
var upload = React.useCallback(function (file) {
|
|
5647
5641
|
try {
|
|
5648
5642
|
var _temp8 = function _temp8() {
|
|
@@ -11849,6 +11843,17 @@ var TYPE_QUESTION;
|
|
|
11849
11843
|
TYPE_QUESTION[TYPE_QUESTION["Survey"] = 4] = "Survey";
|
|
11850
11844
|
})(TYPE_QUESTION || (TYPE_QUESTION = {}));
|
|
11851
11845
|
|
|
11846
|
+
var userForQuestion = [{
|
|
11847
|
+
value: "TeacherAndStudent",
|
|
11848
|
+
label: "Teacher and student"
|
|
11849
|
+
}, {
|
|
11850
|
+
value: "Teacher",
|
|
11851
|
+
label: "Teacher"
|
|
11852
|
+
}, {
|
|
11853
|
+
value: "Student",
|
|
11854
|
+
label: "Student"
|
|
11855
|
+
}];
|
|
11856
|
+
|
|
11852
11857
|
var subgridStyle = {
|
|
11853
11858
|
overflowY: "auto",
|
|
11854
11859
|
overflowX: "hidden",
|
|
@@ -11978,6 +11983,11 @@ var renderType = function renderType(params) {
|
|
|
11978
11983
|
});
|
|
11979
11984
|
return type ? React__default.createElement("div", null, type.label) : React__default.createElement("div", null);
|
|
11980
11985
|
};
|
|
11986
|
+
var renderUserQuestion = function renderUserQuestion(params) {
|
|
11987
|
+
var _params$data10;
|
|
11988
|
+
|
|
11989
|
+
return 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.userForQuestion);
|
|
11990
|
+
};
|
|
11981
11991
|
|
|
11982
11992
|
var QUESTION_URL$1 = "/admin/question-bank";
|
|
11983
11993
|
var CREATE_QUESTION_URL = "/admin/create-question";
|
|
@@ -12044,6 +12054,12 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
|
|
|
12044
12054
|
dispatch(marioCore.setLoading(true));
|
|
12045
12055
|
|
|
12046
12056
|
var _temp4 = _catch(function () {
|
|
12057
|
+
var filter = filters;
|
|
12058
|
+
|
|
12059
|
+
if (!!isDefaultClassReflection && !isDefaultQuestion) {
|
|
12060
|
+
delete filter.isDefaultQuestion;
|
|
12061
|
+
}
|
|
12062
|
+
|
|
12047
12063
|
return Promise.resolve(get$2(filters)).then(function (res) {
|
|
12048
12064
|
var _res$data = res.data,
|
|
12049
12065
|
items = _res$data.items,
|
|
@@ -12136,7 +12152,7 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
|
|
|
12136
12152
|
|
|
12137
12153
|
if (isDefaultQuestion && !isDefaultClassReflection) {
|
|
12138
12154
|
type = TYPE_QUESTION.OneToOne;
|
|
12139
|
-
} else if (
|
|
12155
|
+
} else if (isDefaultClassReflection) {
|
|
12140
12156
|
type = TYPE_QUESTION.ClassReflection;
|
|
12141
12157
|
} else if (isDefaultConference) {
|
|
12142
12158
|
type = TYPE_QUESTION.Conference;
|
|
@@ -12188,7 +12204,15 @@ var useQuestionList$1 = function useQuestionList(isDefaultQuestion, isDefaultCla
|
|
|
12188
12204
|
}
|
|
12189
12205
|
}];
|
|
12190
12206
|
var gridOptions = {
|
|
12191
|
-
columnDefs: isDefaultQuestion
|
|
12207
|
+
columnDefs: isDefaultQuestion && !isDefaultClassReflection ? [].concat(columnDefs, [{
|
|
12208
|
+
headerName: "Order",
|
|
12209
|
+
rowDrag: true
|
|
12210
|
+
}]) : isDefaultClassReflection ? [].concat(columnDefs, [{
|
|
12211
|
+
headerName: "User for",
|
|
12212
|
+
cellRendererFramework: function cellRendererFramework(params) {
|
|
12213
|
+
return renderUserQuestion(params);
|
|
12214
|
+
}
|
|
12215
|
+
}, {
|
|
12192
12216
|
headerName: "Order",
|
|
12193
12217
|
rowDrag: true
|
|
12194
12218
|
}]) : columnDefs,
|
|
@@ -13952,7 +13976,8 @@ var initValue$g = {
|
|
|
13952
13976
|
subQuestions: [],
|
|
13953
13977
|
isMandatory: false,
|
|
13954
13978
|
isBeforeSession: false,
|
|
13955
|
-
isDefaultQuestionSurvey: false
|
|
13979
|
+
isDefaultQuestionSurvey: false,
|
|
13980
|
+
userForQuestion: "TeacherAndStudent"
|
|
13956
13981
|
};
|
|
13957
13982
|
var TITLE$k = "Question detail";
|
|
13958
13983
|
|
|
@@ -14117,6 +14142,54 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
|
|
|
14117
14142
|
};
|
|
14118
14143
|
};
|
|
14119
14144
|
|
|
14145
|
+
var UserForQuestionSelect = function UserForQuestionSelect(_ref) {
|
|
14146
|
+
var _userForQuestion$find;
|
|
14147
|
+
|
|
14148
|
+
var value = _ref.value,
|
|
14149
|
+
_onChange = _ref.onChange;
|
|
14150
|
+
|
|
14151
|
+
var _useState = React.useState(false),
|
|
14152
|
+
isToggleModel = _useState[0],
|
|
14153
|
+
setIsToggleModel = _useState[1];
|
|
14154
|
+
|
|
14155
|
+
return React__default.createElement("div", null, React__default.createElement("div", {
|
|
14156
|
+
className: styles["block-filter-component"] + " "
|
|
14157
|
+
}, React__default.createElement("button", {
|
|
14158
|
+
onClick: function onClick() {
|
|
14159
|
+
return setIsToggleModel(!isToggleModel);
|
|
14160
|
+
},
|
|
14161
|
+
className: styles["btn-filter"] + " d-flex align-items-center cursor-pointer"
|
|
14162
|
+
}, React__default.createElement("p", {
|
|
14163
|
+
className: " my-0 mx-2"
|
|
14164
|
+
}, ((_userForQuestion$find = userForQuestion.find(function (r) {
|
|
14165
|
+
return r.value == value;
|
|
14166
|
+
})) === 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", {
|
|
14167
|
+
className: styles["select-filter-component"] + " " + (!isToggleModel && "" + styles["hidden"])
|
|
14168
|
+
}, React__default.createElement(reactstrap.Form, {
|
|
14169
|
+
className: "" + styles["box-select"]
|
|
14170
|
+
}, userForQuestion.map(function (item) {
|
|
14171
|
+
return React__default.createElement(reactstrap.FormGroup, {
|
|
14172
|
+
check: true,
|
|
14173
|
+
className: "my-2 px-3",
|
|
14174
|
+
key: item.label
|
|
14175
|
+
}, React__default.createElement(reactstrap.Input, {
|
|
14176
|
+
id: item.label + "userForQuestion",
|
|
14177
|
+
name: "userForQuestion",
|
|
14178
|
+
value: item.value,
|
|
14179
|
+
type: "radio",
|
|
14180
|
+
className: "" + styles["radio-btn"],
|
|
14181
|
+
checked: value === item.value,
|
|
14182
|
+
onChange: function onChange() {
|
|
14183
|
+
return _onChange("userForQuestion", item.value);
|
|
14184
|
+
}
|
|
14185
|
+
}), React__default.createElement(reactstrap.Label, {
|
|
14186
|
+
check: true,
|
|
14187
|
+
"for": item.label + "userForQuestion",
|
|
14188
|
+
className: "" + styles["box-select-label"]
|
|
14189
|
+
}, React__default.createElement("p", null, item.label)));
|
|
14190
|
+
})))));
|
|
14191
|
+
};
|
|
14192
|
+
|
|
14120
14193
|
var CREATE_QUESTION_HEADER = "create_question";
|
|
14121
14194
|
var EDIT_QUESTION_HEADER = "edit_question";
|
|
14122
14195
|
var EMOTIONALS_LENGTH = marioCore.EMOTIONS.length;
|
|
@@ -14221,7 +14294,14 @@ var QuestionDetail = function QuestionDetail() {
|
|
|
14221
14294
|
value: values.categoryId
|
|
14222
14295
|
}), touched.categoryId && errors.categoryId && React__default.createElement(marioCore.ErrorHandler, {
|
|
14223
14296
|
text: errors.categoryId
|
|
14224
|
-
})))
|
|
14297
|
+
}))), parseInt(type) == TYPE_QUESTION.ClassReflection && React__default.createElement(reactstrap.Col, {
|
|
14298
|
+
md: 6
|
|
14299
|
+
}, React__default.createElement(marioCore.RequiredLabel, {
|
|
14300
|
+
text: t("user_for_question")
|
|
14301
|
+
}), React__default.createElement(UserForQuestionSelect, {
|
|
14302
|
+
onChange: setFieldValue,
|
|
14303
|
+
value: values.userForQuestion || ""
|
|
14304
|
+
}))), React__default.createElement(reactstrap.Row, {
|
|
14225
14305
|
className: "mb-2"
|
|
14226
14306
|
}, React__default.createElement(reactstrap.Col, {
|
|
14227
14307
|
md: 12,
|
|
@@ -15846,7 +15926,7 @@ var tabs$3 = [{
|
|
|
15846
15926
|
title: "Class Reflection Question",
|
|
15847
15927
|
component: function component() {
|
|
15848
15928
|
return React__default.createElement(QuestionBankList, {
|
|
15849
|
-
isDefaultQuestion:
|
|
15929
|
+
isDefaultQuestion: false,
|
|
15850
15930
|
isDefaultClassReflection: true
|
|
15851
15931
|
});
|
|
15852
15932
|
}
|