mario-teacher-student-client 2.1.126-admin → 2.1.128-admin
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/containers/MyStudent/components/NewOverview/TopLearningStrategies/hooks/useLearningStrategies.d.ts +3 -3
- package/dist/containers/MyStudent/hooks/useOverview.d.ts +2 -2
- package/dist/containers/PLP/hooks/usePlpPage.d.ts +2 -2
- package/dist/index.css +21 -13
- package/dist/index.js +81 -88
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +81 -88
- package/dist/index.modern.js.map +1 -1
- package/dist/services/MyStudent.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
declare const useLearningStrategies: (studentId: any) => {
|
|
1
|
+
declare const useLearningStrategies: (studentId: any, filterDateChart: any) => {
|
|
2
2
|
filtersLearningStrategiesData: {
|
|
3
3
|
searchString: string;
|
|
4
4
|
currentPage: number;
|
|
5
5
|
pageSize: number;
|
|
6
6
|
sortBy: string;
|
|
7
7
|
sortOrder: string;
|
|
8
|
-
startDate:
|
|
9
|
-
endDate:
|
|
8
|
+
startDate: any;
|
|
9
|
+
endDate: any;
|
|
10
10
|
};
|
|
11
11
|
changeFiltersLearningStrategiesData: (updatedFilters: any) => void;
|
|
12
12
|
learningStrategiesData: any;
|
|
@@ -26,8 +26,8 @@ declare const useOverview: (studentId: number) => {
|
|
|
26
26
|
pageSize: number;
|
|
27
27
|
sortBy: string;
|
|
28
28
|
sortOrder: string;
|
|
29
|
-
startDate:
|
|
30
|
-
endDate:
|
|
29
|
+
startDate: any;
|
|
30
|
+
endDate: any;
|
|
31
31
|
};
|
|
32
32
|
changeFiltersLearningStrategiesData: (updatedFilters: any) => void;
|
|
33
33
|
handleActiveColumnOneToOne: (index: any) => void;
|
|
@@ -25,8 +25,8 @@ declare const usePlpPage: () => {
|
|
|
25
25
|
pageSize: number;
|
|
26
26
|
sortBy: string;
|
|
27
27
|
sortOrder: string;
|
|
28
|
-
startDate:
|
|
29
|
-
endDate:
|
|
28
|
+
startDate: any;
|
|
29
|
+
endDate: any;
|
|
30
30
|
};
|
|
31
31
|
changeFiltersLearningStrategiesData: (updatedFilters: any) => void;
|
|
32
32
|
handleActiveColumnOneToOne: (index: any) => void;
|
package/dist/index.css
CHANGED
|
@@ -5120,9 +5120,9 @@ h2._1OAmb {
|
|
|
5120
5120
|
|
|
5121
5121
|
._2qL5J {
|
|
5122
5122
|
display: flex;
|
|
5123
|
-
padding-bottom:
|
|
5123
|
+
padding-bottom: 26px;
|
|
5124
5124
|
padding-right: 20px;
|
|
5125
|
-
justify-content:
|
|
5125
|
+
justify-content: space-between; }
|
|
5126
5126
|
|
|
5127
5127
|
._3d2hF ._zL0pN {
|
|
5128
5128
|
display: flex;
|
|
@@ -5133,7 +5133,7 @@ h2._1OAmb {
|
|
|
5133
5133
|
margin-right: 20px; }
|
|
5134
5134
|
._3d2hF ._zL0pN ._1kI5l ._30FUT, ._3d2hF ._zL0pN ._3keyG ._30FUT {
|
|
5135
5135
|
margin-bottom: 0 !important;
|
|
5136
|
-
font-size:
|
|
5136
|
+
font-size: 15px;
|
|
5137
5137
|
margin-right: 10px;
|
|
5138
5138
|
color: #242424; }
|
|
5139
5139
|
|
|
@@ -6136,7 +6136,6 @@ h2._1OAmb {
|
|
|
6136
6136
|
._2Q5K5 {
|
|
6137
6137
|
display: flex;
|
|
6138
6138
|
justify-content: flex-end;
|
|
6139
|
-
width: 100%;
|
|
6140
6139
|
padding: 0 15px; }
|
|
6141
6140
|
|
|
6142
6141
|
@font-face {
|
|
@@ -6286,15 +6285,16 @@ h2._1OAmb {
|
|
|
6286
6285
|
padding-right: 20px;
|
|
6287
6286
|
width: 336px; } }
|
|
6288
6287
|
|
|
6289
|
-
._3Saaw
|
|
6290
|
-
|
|
6291
|
-
|
|
6292
|
-
|
|
6293
|
-
._3Saaw
|
|
6294
|
-
|
|
6295
|
-
|
|
6296
|
-
|
|
6297
|
-
|
|
6288
|
+
._3Saaw {
|
|
6289
|
+
width: 700px !important; }
|
|
6290
|
+
._3Saaw thead {
|
|
6291
|
+
border-top: 1px solid #e8e8e8; }
|
|
6292
|
+
._3Saaw td,
|
|
6293
|
+
._3Saaw th {
|
|
6294
|
+
border-right: 1px solid #e8e8e8; }
|
|
6295
|
+
._3Saaw td:last-child,
|
|
6296
|
+
._3Saaw th:last-child {
|
|
6297
|
+
border-right: none; }
|
|
6298
6298
|
|
|
6299
6299
|
._i-ZXZ {
|
|
6300
6300
|
font-size: 14px !important;
|
|
@@ -14402,6 +14402,14 @@ h4._3lNz0 {
|
|
|
14402
14402
|
._3u2Hp {
|
|
14403
14403
|
padding: 30px; }
|
|
14404
14404
|
|
|
14405
|
+
._3yRVo {
|
|
14406
|
+
font-size: 16px !important;
|
|
14407
|
+
font-weight: bold; }
|
|
14408
|
+
|
|
14409
|
+
._3M1fw {
|
|
14410
|
+
display: flex;
|
|
14411
|
+
align-items: center; }
|
|
14412
|
+
|
|
14405
14413
|
@font-face {
|
|
14406
14414
|
font-family: "Lato-Regular";
|
|
14407
14415
|
src: url("/fonts/Lato-Regular.ttf");
|
package/dist/index.js
CHANGED
|
@@ -4132,10 +4132,10 @@ var checkIsStartedSession = function checkIsStartedSession(sessionId) {
|
|
|
4132
4132
|
}
|
|
4133
4133
|
});
|
|
4134
4134
|
};
|
|
4135
|
-
var checkIsConferenceStarted = function checkIsConferenceStarted(
|
|
4135
|
+
var checkIsConferenceStarted = function checkIsConferenceStarted(conferenceId) {
|
|
4136
4136
|
return marioCore.api.get(TEACHER_URL$1 + "/current/check-session-conference", {
|
|
4137
4137
|
params: {
|
|
4138
|
-
|
|
4138
|
+
conferenceId: conferenceId
|
|
4139
4139
|
}
|
|
4140
4140
|
});
|
|
4141
4141
|
};
|
|
@@ -18407,7 +18407,7 @@ var OverviewLeft = function OverviewLeft(props) {
|
|
|
18407
18407
|
|
|
18408
18408
|
var openEdit = function openEdit() {
|
|
18409
18409
|
var url = "/student-detail/profile/" + studentId + "/update";
|
|
18410
|
-
!isAdmin && history.push(url);
|
|
18410
|
+
!isEduTeacher && !isAdmin && history.push(url);
|
|
18411
18411
|
};
|
|
18412
18412
|
|
|
18413
18413
|
return React__default.createElement("div", {
|
|
@@ -19372,7 +19372,7 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(months,
|
|
|
19372
19372
|
xaxis: {
|
|
19373
19373
|
categories: months,
|
|
19374
19374
|
labels: {
|
|
19375
|
-
show: true,
|
|
19375
|
+
show: months.length > 0 ? true : false,
|
|
19376
19376
|
style: {
|
|
19377
19377
|
colors: ["#808080"],
|
|
19378
19378
|
fontSize: "16px",
|
|
@@ -19380,6 +19380,9 @@ var optionColumnChartAndPercents = function optionColumnChartAndPercents(months,
|
|
|
19380
19380
|
fontWeight: 400,
|
|
19381
19381
|
cssClass: "apexcharts-yaxis-label"
|
|
19382
19382
|
}
|
|
19383
|
+
},
|
|
19384
|
+
axisTicks: {
|
|
19385
|
+
show: months.length > 0 ? true : false
|
|
19383
19386
|
}
|
|
19384
19387
|
},
|
|
19385
19388
|
yaxis: {
|
|
@@ -19462,14 +19465,14 @@ var convertToSeriesColumnChartAndPercentConference = function convertToSeriesCol
|
|
|
19462
19465
|
};
|
|
19463
19466
|
var convertToAvg = function convertToAvg(dataCharts, data, months) {
|
|
19464
19467
|
var result = dataCharts.map(function (dataName) {
|
|
19465
|
-
return Number(
|
|
19468
|
+
return Number(data.map(function (i) {
|
|
19466
19469
|
var questionItem = i.resultQuestion.find(function (question) {
|
|
19467
19470
|
return question.questionText.includes(dataName);
|
|
19468
19471
|
});
|
|
19469
19472
|
return !!questionItem ? questionItem.avgOfStudentChoice : 0;
|
|
19470
19473
|
}).reduce(function (acc, curr) {
|
|
19471
19474
|
return acc + curr;
|
|
19472
|
-
}, 0) / (months === null || months === void 0 ? void 0 : months.length))
|
|
19475
|
+
}, 0) / (months === null || months === void 0 ? void 0 : months.length));
|
|
19473
19476
|
});
|
|
19474
19477
|
return result;
|
|
19475
19478
|
};
|
|
@@ -20109,7 +20112,7 @@ var useTopLearningStrategies = function useTopLearningStrategies(studentId, filt
|
|
|
20109
20112
|
};
|
|
20110
20113
|
};
|
|
20111
20114
|
|
|
20112
|
-
var useLearningStrategies = function useLearningStrategies(studentId) {
|
|
20115
|
+
var useLearningStrategies = function useLearningStrategies(studentId, filterDateChart) {
|
|
20113
20116
|
var dispatch = reactRedux.useDispatch();
|
|
20114
20117
|
|
|
20115
20118
|
var _useState = React.useState(),
|
|
@@ -20122,8 +20125,8 @@ var useLearningStrategies = function useLearningStrategies(studentId) {
|
|
|
20122
20125
|
pageSize: 10,
|
|
20123
20126
|
sortBy: "Strategies",
|
|
20124
20127
|
sortOrder: "ASC",
|
|
20125
|
-
startDate: null,
|
|
20126
|
-
endDate: null
|
|
20128
|
+
startDate: filterDateChart === null || filterDateChart === void 0 ? void 0 : filterDateChart.startDate,
|
|
20129
|
+
endDate: filterDateChart === null || filterDateChart === void 0 ? void 0 : filterDateChart.endDate
|
|
20127
20130
|
}),
|
|
20128
20131
|
filtersLearningStrategiesData = _useState2[0],
|
|
20129
20132
|
setFilters = _useState2[1];
|
|
@@ -20403,7 +20406,7 @@ var useOverview = function useOverview(studentId) {
|
|
|
20403
20406
|
labelName = _useTopLearningStrate.labelName,
|
|
20404
20407
|
usageCountList = _useTopLearningStrate.usageCountList;
|
|
20405
20408
|
|
|
20406
|
-
var _useLearningStrategie = useLearningStrategies(studentId),
|
|
20409
|
+
var _useLearningStrategie = useLearningStrategies(studentId, filterDateChart),
|
|
20407
20410
|
learningStrategiesData = _useLearningStrategie.learningStrategiesData,
|
|
20408
20411
|
filtersLearningStrategiesData = _useLearningStrategie.filtersLearningStrategiesData,
|
|
20409
20412
|
changeFiltersLearningStrategiesData = _useLearningStrategie.changeFiltersLearningStrategiesData,
|
|
@@ -28932,27 +28935,10 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
|
|
|
28932
28935
|
getLearningStrategiesData = props.getLearningStrategiesData,
|
|
28933
28936
|
changeFilters = props.changeFilters,
|
|
28934
28937
|
learningStrategiesData = props.learningStrategiesData,
|
|
28935
|
-
filters = props.filters
|
|
28936
|
-
isPlp = props.isPlp;
|
|
28938
|
+
filters = props.filters;
|
|
28937
28939
|
var inputSearch = React.useRef(null);
|
|
28938
28940
|
var classes = useStyles$b();
|
|
28939
28941
|
|
|
28940
|
-
var handleChangeStartDate = function handleChangeStartDate(date) {
|
|
28941
|
-
if (!date) return;
|
|
28942
|
-
changeFilters({
|
|
28943
|
-
startDate: date.valueOf(),
|
|
28944
|
-
currentPage: 1
|
|
28945
|
-
});
|
|
28946
|
-
};
|
|
28947
|
-
|
|
28948
|
-
var handleChangeEndDate = function handleChangeEndDate(date) {
|
|
28949
|
-
if (!date) return;
|
|
28950
|
-
changeFilters({
|
|
28951
|
-
endDate: date.valueOf(),
|
|
28952
|
-
currentPage: 1
|
|
28953
|
-
});
|
|
28954
|
-
};
|
|
28955
|
-
|
|
28956
28942
|
var handleSort = function handleSort(e) {
|
|
28957
28943
|
changeFilters({
|
|
28958
28944
|
sortOrder: (filters === null || filters === void 0 ? void 0 : filters.sortOrder) === "DESC" ? "ASC" : "DESC",
|
|
@@ -28988,7 +28974,7 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
|
|
|
28988
28974
|
};
|
|
28989
28975
|
|
|
28990
28976
|
React.useEffect(function () {
|
|
28991
|
-
|
|
28977
|
+
getLearningStrategiesData === null || getLearningStrategiesData === void 0 ? void 0 : getLearningStrategiesData();
|
|
28992
28978
|
}, [filters]);
|
|
28993
28979
|
return React__default.createElement(core.Dialog, {
|
|
28994
28980
|
onClose: function onClose() {
|
|
@@ -29014,38 +29000,6 @@ var LearningStrategyDialog = function LearningStrategyDialog(props) {
|
|
|
29014
29000
|
item: true,
|
|
29015
29001
|
className: "" + styles$a["gr-action"]
|
|
29016
29002
|
}, React__default.createElement(core.Grid, {
|
|
29017
|
-
className: "" + styles$a["gr-date-time"]
|
|
29018
|
-
}, React__default.createElement(pickers.MuiPickersUtilsProvider, {
|
|
29019
|
-
utils: MomentUtils
|
|
29020
|
-
}, React__default.createElement(pickers.KeyboardDatePicker, {
|
|
29021
|
-
inputVariant: "outlined",
|
|
29022
|
-
format: "Do MMM YYYY",
|
|
29023
|
-
id: "date-picker-inline",
|
|
29024
|
-
label: "From",
|
|
29025
|
-
className: "" + styles$a["date-time"],
|
|
29026
|
-
value: filters === null || filters === void 0 ? void 0 : filters.startDate,
|
|
29027
|
-
onChange: function onChange(e) {
|
|
29028
|
-
return handleChangeStartDate(e);
|
|
29029
|
-
},
|
|
29030
|
-
KeyboardButtonProps: {
|
|
29031
|
-
"aria-label": "change date"
|
|
29032
|
-
},
|
|
29033
|
-
maxDate: (filters === null || filters === void 0 ? void 0 : filters.endDate) || ""
|
|
29034
|
-
}), React__default.createElement(pickers.KeyboardDatePicker, {
|
|
29035
|
-
minDate: (filters === null || filters === void 0 ? void 0 : filters.startDate) || "",
|
|
29036
|
-
inputVariant: "outlined",
|
|
29037
|
-
format: "Do MMM YYYY",
|
|
29038
|
-
id: "time-picker",
|
|
29039
|
-
label: "To",
|
|
29040
|
-
className: "" + styles$a["date-time"],
|
|
29041
|
-
value: filters === null || filters === void 0 ? void 0 : filters.endDate,
|
|
29042
|
-
onChange: function onChange(e) {
|
|
29043
|
-
return handleChangeEndDate(e);
|
|
29044
|
-
},
|
|
29045
|
-
KeyboardButtonProps: {
|
|
29046
|
-
"aria-label": "change date"
|
|
29047
|
-
}
|
|
29048
|
-
}))), React__default.createElement(core.Grid, {
|
|
29049
29003
|
className: "" + styles$a["search-input"]
|
|
29050
29004
|
}, React__default.createElement(core.Grid, {
|
|
29051
29005
|
className: "" + styles$a["search-input-icon"]
|
|
@@ -29147,6 +29101,14 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
|
|
|
29147
29101
|
open = _useState[0],
|
|
29148
29102
|
setOpen = _useState[1];
|
|
29149
29103
|
|
|
29104
|
+
var _useState2 = React.useState(false),
|
|
29105
|
+
expanded = _useState2[0],
|
|
29106
|
+
setExpanded = _useState2[1];
|
|
29107
|
+
|
|
29108
|
+
var handleChange = function handleChange() {
|
|
29109
|
+
setExpanded(!expanded);
|
|
29110
|
+
};
|
|
29111
|
+
|
|
29150
29112
|
var handleToggleDialog = function handleToggleDialog() {
|
|
29151
29113
|
setOpen(!open);
|
|
29152
29114
|
};
|
|
@@ -29188,8 +29150,12 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
|
|
|
29188
29150
|
changeFilters: changeFiltersLearningStrategiesData,
|
|
29189
29151
|
getLearningStrategiesData: getLearningStrategiesData,
|
|
29190
29152
|
isPlp: isPlp
|
|
29191
|
-
}), React__default.createElement(core.Accordion,
|
|
29192
|
-
|
|
29153
|
+
}), React__default.createElement(core.Accordion, {
|
|
29154
|
+
expanded: expanded
|
|
29155
|
+
}, React__default.createElement(core.AccordionSummary, {
|
|
29156
|
+
expandIcon: React__default.createElement(ExpandMoreIcon, {
|
|
29157
|
+
onClick: handleChange
|
|
29158
|
+
}),
|
|
29193
29159
|
"aria-controls": "panel1a-content",
|
|
29194
29160
|
id: "panel1a-header"
|
|
29195
29161
|
}, React__default.createElement("div", {
|
|
@@ -29198,7 +29164,7 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
|
|
|
29198
29164
|
className: "" + styles$9["block-header-name"]
|
|
29199
29165
|
}, React__default.createElement("p", {
|
|
29200
29166
|
className: "" + styles$9["title-chart"]
|
|
29201
|
-
}, "Top Learning Strategies"),
|
|
29167
|
+
}, "Top Learning Strategies"), React__default.createElement("div", {
|
|
29202
29168
|
className: "" + styles$9["expand-option"]
|
|
29203
29169
|
}, React__default.createElement(core.IconButton, {
|
|
29204
29170
|
onClick: handleClick,
|
|
@@ -29233,6 +29199,15 @@ var TopLearningStrategy = function TopLearningStrategy(_ref) {
|
|
|
29233
29199
|
var BubbleChartCustom = function BubbleChartCustom(_ref) {
|
|
29234
29200
|
var data = _ref.data,
|
|
29235
29201
|
isPlp = _ref.isPlp;
|
|
29202
|
+
|
|
29203
|
+
var _React$useState = React__default.useState(true),
|
|
29204
|
+
expanded = _React$useState[0],
|
|
29205
|
+
setExpanded = _React$useState[1];
|
|
29206
|
+
|
|
29207
|
+
var handleChange = function handleChange() {
|
|
29208
|
+
setExpanded(!expanded);
|
|
29209
|
+
};
|
|
29210
|
+
|
|
29236
29211
|
var history = reactRouterDom.useHistory();
|
|
29237
29212
|
|
|
29238
29213
|
var redirectStudentOverview = function redirectStudentOverview(studentId) {
|
|
@@ -29249,9 +29224,11 @@ var BubbleChartCustom = function BubbleChartCustom(_ref) {
|
|
|
29249
29224
|
return React__default.createElement("div", {
|
|
29250
29225
|
className: "" + styles$9["size-100"]
|
|
29251
29226
|
}, React__default.createElement(core.Accordion, {
|
|
29252
|
-
|
|
29227
|
+
expanded: expanded
|
|
29253
29228
|
}, React__default.createElement(core.AccordionSummary, {
|
|
29254
|
-
expandIcon: React__default.createElement(ExpandMoreIcon,
|
|
29229
|
+
expandIcon: React__default.createElement(ExpandMoreIcon, {
|
|
29230
|
+
onClick: handleChange
|
|
29231
|
+
}),
|
|
29255
29232
|
"aria-controls": "panel1a-content",
|
|
29256
29233
|
id: "panel1a-header"
|
|
29257
29234
|
}, React__default.createElement("div", {
|
|
@@ -29418,7 +29395,7 @@ var ChoiceChartType = function ChoiceChartType(_ref) {
|
|
|
29418
29395
|
typeChart = _ref$typeChart === void 0 ? [TYPECHART.BAR] : _ref$typeChart,
|
|
29419
29396
|
options = _ref.options;
|
|
29420
29397
|
return React__default.createElement("div", {
|
|
29421
|
-
className: "d-flex align-items-center d-inline-block
|
|
29398
|
+
className: "d-flex align-items-center d-inline-block"
|
|
29422
29399
|
}, React__default.createElement("div", {
|
|
29423
29400
|
className: "d-flex align-items-center px-2 " + styles$9["checkbox-chart"]
|
|
29424
29401
|
}, React__default.createElement("div", {
|
|
@@ -29442,7 +29419,7 @@ var ChoiceChartType = function ChoiceChartType(_ref) {
|
|
|
29442
29419
|
cursor: "pointer"
|
|
29443
29420
|
}
|
|
29444
29421
|
}, "Ridge charts"))), React__default.createElement("div", {
|
|
29445
|
-
className: "d-inline-block
|
|
29422
|
+
className: "d-inline-block " + styles$9["checkbox-chart"]
|
|
29446
29423
|
}, React__default.createElement("div", {
|
|
29447
29424
|
className: "pr-4 d-flex align-items-center",
|
|
29448
29425
|
onClick: function onClick() {
|
|
@@ -29482,6 +29459,15 @@ var ColumnChartAndPercent = function ColumnChartAndPercent(_ref) {
|
|
|
29482
29459
|
isHiddenLabel = _ref.isHiddenLabel,
|
|
29483
29460
|
_ref$isClassReflectio = _ref.isClassReflectionChart,
|
|
29484
29461
|
isClassReflectionChart = _ref$isClassReflectio === void 0 ? false : _ref$isClassReflectio;
|
|
29462
|
+
|
|
29463
|
+
var _React$useState = React__default.useState(false),
|
|
29464
|
+
expanded = _React$useState[0],
|
|
29465
|
+
setExpanded = _React$useState[1];
|
|
29466
|
+
|
|
29467
|
+
var handleChange = function handleChange() {
|
|
29468
|
+
setExpanded(!expanded);
|
|
29469
|
+
};
|
|
29470
|
+
|
|
29485
29471
|
if (!data) return React__default.createElement("div", {
|
|
29486
29472
|
className: "flex justify-content-center align-items-center",
|
|
29487
29473
|
style: {
|
|
@@ -29491,8 +29477,12 @@ var ColumnChartAndPercent = function ColumnChartAndPercent(_ref) {
|
|
|
29491
29477
|
return React__default.createElement("div", {
|
|
29492
29478
|
key: name,
|
|
29493
29479
|
className: " " + styles$9["size-100"]
|
|
29494
|
-
}, React__default.createElement(core.Accordion,
|
|
29495
|
-
|
|
29480
|
+
}, React__default.createElement(core.Accordion, {
|
|
29481
|
+
expanded: expanded
|
|
29482
|
+
}, React__default.createElement(core.AccordionSummary, {
|
|
29483
|
+
expandIcon: React__default.createElement(ExpandMoreIcon, {
|
|
29484
|
+
onClick: handleChange
|
|
29485
|
+
}),
|
|
29496
29486
|
"aria-controls": "panel1a-content",
|
|
29497
29487
|
id: "panel1a-header",
|
|
29498
29488
|
style: {
|
|
@@ -29502,15 +29492,13 @@ var ColumnChartAndPercent = function ColumnChartAndPercent(_ref) {
|
|
|
29502
29492
|
className: "" + styles$9["block-header-chart"]
|
|
29503
29493
|
}, React__default.createElement("p", {
|
|
29504
29494
|
className: "" + styles$9["title-chart"]
|
|
29505
|
-
}, name)
|
|
29506
|
-
className: "" + styles$9["column-chart-percent"]
|
|
29507
|
-
}, React__default.createElement("div", {
|
|
29508
|
-
className: "" + styles$9["filter-date"]
|
|
29509
|
-
}, React__default.createElement(ChoiceChartType, {
|
|
29495
|
+
}, name), expanded && React__default.createElement(ChoiceChartType, {
|
|
29510
29496
|
onChangeChart: onChangeChart,
|
|
29511
29497
|
options: optionType,
|
|
29512
29498
|
typeChart: typeChart
|
|
29513
|
-
})),
|
|
29499
|
+
}))), React__default.createElement(core.AccordionDetails, null, React__default.createElement("div", {
|
|
29500
|
+
className: "" + styles$9["column-chart-percent"]
|
|
29501
|
+
}, !isHiddenLabel && React__default.createElement("div", {
|
|
29514
29502
|
className: "" + styles$9["listItem"]
|
|
29515
29503
|
}, data.map(function (month, index) {
|
|
29516
29504
|
return React__default.createElement("div", {
|
|
@@ -29916,7 +29904,7 @@ var Overview = function Overview(props) {
|
|
|
29916
29904
|
}, React__default.createElement("div", {
|
|
29917
29905
|
className: "" + styles$7["date-time-box"]
|
|
29918
29906
|
}, React__default.createElement("div", {
|
|
29919
|
-
className:
|
|
29907
|
+
className: styles$7["date-time-start"] + " date-picker-overview"
|
|
29920
29908
|
}, React__default.createElement("p", {
|
|
29921
29909
|
className: "" + styles$7["text"]
|
|
29922
29910
|
}, "From"), React__default.createElement(pickers.KeyboardDatePicker, {
|
|
@@ -29931,14 +29919,15 @@ var Overview = function Overview(props) {
|
|
|
29931
29919
|
KeyboardButtonProps: {
|
|
29932
29920
|
"aria-label": "change date"
|
|
29933
29921
|
},
|
|
29934
|
-
minDate: filterDateChart.
|
|
29922
|
+
minDate: moment(filterDateChart.endDate).subtract(4, 'months').valueOf(),
|
|
29935
29923
|
maxDate: filterDateChart.endDate
|
|
29936
29924
|
})), React__default.createElement("div", {
|
|
29937
|
-
className:
|
|
29925
|
+
className: styles$7["date-time-end"] + " date-picker-overview"
|
|
29938
29926
|
}, React__default.createElement("p", {
|
|
29939
29927
|
className: "" + styles$7["text"]
|
|
29940
29928
|
}, "To"), React__default.createElement(pickers.KeyboardDatePicker, {
|
|
29941
29929
|
minDate: filterDateChart.startDate || null,
|
|
29930
|
+
maxDate: moment(filterDateChart.startDate).add(4, 'months').valueOf(),
|
|
29942
29931
|
inputVariant: "outlined",
|
|
29943
29932
|
format: "Do MMM YYYY",
|
|
29944
29933
|
id: "time-picker",
|
|
@@ -31231,7 +31220,7 @@ var Conferences = function Conferences() {
|
|
|
31231
31220
|
var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
|
|
31232
31221
|
var open = React.useCallback(function (row) {
|
|
31233
31222
|
var studentId = row.studentId;
|
|
31234
|
-
var url = !row.
|
|
31223
|
+
var url = !row.isTeacherDone ? "/start-conference/" + studentId + "/" + row.id + "/conferenceRubric" : "/result-conference/" + studentId + "/" + row.id + "/conferenceRubric";
|
|
31235
31224
|
history.push(url);
|
|
31236
31225
|
}, [isTeacher]);
|
|
31237
31226
|
return React__default.createElement(core.Grid, {
|
|
@@ -31421,7 +31410,7 @@ var Conferences = function Conferences() {
|
|
|
31421
31410
|
}, !!row.gradeLevel && (row === null || row === void 0 ? void 0 : row.gradeLevel)), React__default.createElement(core.TableCell, {
|
|
31422
31411
|
align: "left",
|
|
31423
31412
|
className: "" + styles$c["row_grade"]
|
|
31424
|
-
}, row !== null && row !== void 0 && row.
|
|
31413
|
+
}, row !== null && row !== void 0 && row.isTeacherDone ? React__default.createElement("div", {
|
|
31425
31414
|
className: styles$c["done"] + " " + styles$c["request"]
|
|
31426
31415
|
}, "Done") : React__default.createElement("div", {
|
|
31427
31416
|
className: styles$c["missed"] + " " + styles$c["request"]
|
|
@@ -31430,7 +31419,7 @@ var Conferences = function Conferences() {
|
|
|
31430
31419
|
className: "" + styles$c["row_type"]
|
|
31431
31420
|
}, React__default.createElement("div", {
|
|
31432
31421
|
className: styles$c["duration"] + " " + styles$c["request"]
|
|
31433
|
-
}, !!row.finalScore ? row === null || row === void 0 ? void 0 : row.finalScore : ""), !row.isEditConference && !row.
|
|
31422
|
+
}, !!row.finalScore ? row === null || row === void 0 ? void 0 : row.finalScore : ""), !row.isEditConference && !row.isTeacherDone && React__default.createElement(core.Button, {
|
|
31434
31423
|
variant: "contained",
|
|
31435
31424
|
color: "primary",
|
|
31436
31425
|
disableElevation: true,
|
|
@@ -40383,7 +40372,7 @@ var BookSessionConferences = function BookSessionConferences() {
|
|
|
40383
40372
|
};
|
|
40384
40373
|
|
|
40385
40374
|
React.useEffect(function () {
|
|
40386
|
-
document.title = "Book
|
|
40375
|
+
document.title = "Book conference";
|
|
40387
40376
|
});
|
|
40388
40377
|
var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
|
|
40389
40378
|
return React__default.createElement(core.Grid, null, screenWidth > 600 ? React__default.createElement(core.Grid, {
|
|
@@ -40471,7 +40460,7 @@ var BookSessionConferences = function BookSessionConferences() {
|
|
|
40471
40460
|
fontSize: "18px",
|
|
40472
40461
|
fontWeight: 500
|
|
40473
40462
|
}
|
|
40474
|
-
}, "Book
|
|
40463
|
+
}, "Book Conference"), React__default.createElement(InsertInvitationIcon, null)))))), React__default.createElement(core.Grid, {
|
|
40475
40464
|
item: true,
|
|
40476
40465
|
xs: 1,
|
|
40477
40466
|
style: {
|
|
@@ -40653,7 +40642,7 @@ var BookSessionConferences = function BookSessionConferences() {
|
|
|
40653
40642
|
fontSize: "18px",
|
|
40654
40643
|
fontWeight: 500
|
|
40655
40644
|
}
|
|
40656
|
-
}, "BOOK
|
|
40645
|
+
}, "BOOK CONFERENCE"), React__default.createElement("i", {
|
|
40657
40646
|
className: "fas fa-calendar-day",
|
|
40658
40647
|
style: {
|
|
40659
40648
|
fontSize: 18
|
|
@@ -59668,7 +59657,7 @@ var usePlpPage = function usePlpPage() {
|
|
|
59668
59657
|
labelName = _useTopLearningStrate.labelName,
|
|
59669
59658
|
usageCountList = _useTopLearningStrate.usageCountList;
|
|
59670
59659
|
|
|
59671
|
-
var _useLearningStrategie = useLearningStrategies(student === null || student === void 0 ? void 0 : student.studentId),
|
|
59660
|
+
var _useLearningStrategie = useLearningStrategies(student === null || student === void 0 ? void 0 : student.studentId, filterDate),
|
|
59672
59661
|
learningStrategiesData = _useLearningStrategie.learningStrategiesData,
|
|
59673
59662
|
filtersLearningStrategiesData = _useLearningStrategie.filtersLearningStrategiesData,
|
|
59674
59663
|
changeFiltersLearningStrategiesData = _useLearningStrategie.changeFiltersLearningStrategiesData,
|
|
@@ -61816,7 +61805,7 @@ var useStudentList$2 = function useStudentList() {
|
|
|
61816
61805
|
};
|
|
61817
61806
|
};
|
|
61818
61807
|
|
|
61819
|
-
var styles$L = {"search-input":"_mB4S_","search-input-icon":"_2dOCb","inputInput":"_3LZHP","block-search":"_3ETqf","block-header":"_28w_g","header-content":"_MM65j","table-border":"_2l3wP","table-row":"_NhhUt","row_type":"_rp-5t","duration":"_3I1fi","request":"_2-rzs","avatar_user":"_1FxvF","table-cell":"_3flzL","list-student-desktop":"_2hSN6","list-student-mobile":"_1Uabb","item-right":"_3AfFZ","item":"_3pZDy","box-info":"_3osaq","item-name":"_cuqGm","box-edu":"_2r6Xx","box-container":"_3u2Hp"};
|
|
61808
|
+
var styles$L = {"search-input":"_mB4S_","search-input-icon":"_2dOCb","inputInput":"_3LZHP","block-search":"_3ETqf","block-header":"_28w_g","header-content":"_MM65j","table-border":"_2l3wP","table-row":"_NhhUt","row_type":"_rp-5t","duration":"_3I1fi","request":"_2-rzs","avatar_user":"_1FxvF","table-cell":"_3flzL","list-student-desktop":"_2hSN6","list-student-mobile":"_1Uabb","item-right":"_3AfFZ","item":"_3pZDy","box-info":"_3osaq","item-name":"_cuqGm","box-edu":"_2r6Xx","box-container":"_3u2Hp","student_name":"_3yRVo","box_name":"_3M1fw"};
|
|
61820
61809
|
|
|
61821
61810
|
var DEFAULT_USER_AVATAR$t = "/images/image-default.png";
|
|
61822
61811
|
var ListStudent = function ListStudent() {
|
|
@@ -61946,11 +61935,15 @@ var ListStudent = function ListStudent() {
|
|
|
61946
61935
|
scope: "row",
|
|
61947
61936
|
height: 80,
|
|
61948
61937
|
className: "" + styles$L["row_name"]
|
|
61938
|
+
}, React__default.createElement("div", {
|
|
61939
|
+
className: "" + styles$L["box_name"]
|
|
61949
61940
|
}, React__default.createElement("img", {
|
|
61950
61941
|
src: !!(row !== null && row !== void 0 && row.profileImageFileName) ? marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.profileImageFileName) : DEFAULT_USER_AVATAR$t,
|
|
61951
61942
|
alt: "",
|
|
61952
61943
|
className: "" + styles$L["avatar_user"]
|
|
61953
|
-
}),
|
|
61944
|
+
}), React__default.createElement(core.Typography, {
|
|
61945
|
+
className: "" + styles$L["student_name"]
|
|
61946
|
+
}, row.fullName))), React__default.createElement(core.TableCell, {
|
|
61954
61947
|
component: "th",
|
|
61955
61948
|
scope: "row",
|
|
61956
61949
|
height: 80,
|