mario-education 2.4.29-admin → 2.4.31-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/MarioFramework.Education/ClientApp/src/containers/Dashboard/configs/types.d.ts +3 -2
- package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/hooks/useChartDatas.d.ts +10 -1
- package/dist/MarioFramework.Education/ClientApp/src/containers/Dashboard/hooks/useDashboard.d.ts +0 -5
- package/dist/index.js +95 -86
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +95 -86
- package/dist/index.modern.js.map +1 -1
- package/package.json +2 -2
package/dist/index.modern.js
CHANGED
|
@@ -19685,8 +19685,9 @@ var CompareTeacher = function CompareTeacher() {
|
|
|
19685
19685
|
var LegalGenderType;
|
|
19686
19686
|
|
|
19687
19687
|
(function (LegalGenderType) {
|
|
19688
|
-
LegalGenderType[LegalGenderType["
|
|
19689
|
-
LegalGenderType[LegalGenderType["
|
|
19688
|
+
LegalGenderType[LegalGenderType["None"] = 0] = "None";
|
|
19689
|
+
LegalGenderType[LegalGenderType["Male"] = 1] = "Male";
|
|
19690
|
+
LegalGenderType[LegalGenderType["Female"] = 2] = "Female";
|
|
19690
19691
|
})(LegalGenderType || (LegalGenderType = {}));
|
|
19691
19692
|
|
|
19692
19693
|
var MtssType;
|
|
@@ -20016,13 +20017,13 @@ var COLOR_CHART_AND_PERCENTS = ["#40D2CC", "#78B6E2", "#FFB04F", "#CE4A49", "#1C
|
|
|
20016
20017
|
var COLOR_CHART_BUBBLE = ["#53ACF5", "#9DD889", "#FFB04F", "#E15454", "#9747FF"];
|
|
20017
20018
|
var PERCENT = [100, 80, 60, 40, 20, 0, -20, -40, -60, -80, -100];
|
|
20018
20019
|
var GENDER_OPTION = [{
|
|
20019
|
-
value:
|
|
20020
|
+
value: -1,
|
|
20020
20021
|
label: "All"
|
|
20021
20022
|
}, {
|
|
20022
|
-
value:
|
|
20023
|
+
value: LegalGenderType.Male,
|
|
20023
20024
|
label: "Male"
|
|
20024
20025
|
}, {
|
|
20025
|
-
value:
|
|
20026
|
+
value: LegalGenderType.Female,
|
|
20026
20027
|
label: "Female"
|
|
20027
20028
|
}];
|
|
20028
20029
|
|
|
@@ -27292,52 +27293,6 @@ var useDashboard = function useDashboard() {
|
|
|
27292
27293
|
return newAvgSafety[idx];
|
|
27293
27294
|
}));
|
|
27294
27295
|
}, [safety === null || safety === void 0 ? void 0 : safety.overviewQuestionChoice]);
|
|
27295
|
-
|
|
27296
|
-
var _useState32 = useState([]),
|
|
27297
|
-
selectedToPrint = _useState32[0],
|
|
27298
|
-
setSelectedToPrint = _useState32[1];
|
|
27299
|
-
|
|
27300
|
-
var handleSelectToPrint = function handleSelectToPrint(checked, data, chartType) {
|
|
27301
|
-
var updateSelectToPrint = [].concat(selectedToPrint);
|
|
27302
|
-
var foundItem = updateSelectToPrint === null || updateSelectToPrint === void 0 ? void 0 : updateSelectToPrint.find(function (e) {
|
|
27303
|
-
return e.identification == data.id;
|
|
27304
|
-
});
|
|
27305
|
-
|
|
27306
|
-
if (checked) {
|
|
27307
|
-
if (!!data.id && !foundItem) {
|
|
27308
|
-
updateSelectToPrint.push({
|
|
27309
|
-
id: data.id,
|
|
27310
|
-
identification: data.id,
|
|
27311
|
-
label: data.label,
|
|
27312
|
-
children: data.children,
|
|
27313
|
-
chartType: chartType
|
|
27314
|
-
});
|
|
27315
|
-
}
|
|
27316
|
-
|
|
27317
|
-
if (!!data && foundItem && foundItem.id == null) {
|
|
27318
|
-
var itemIndex = updateSelectToPrint.indexOf(foundItem);
|
|
27319
|
-
updateSelectToPrint[itemIndex].id = data.id;
|
|
27320
|
-
updateSelectToPrint[itemIndex].children = data.children;
|
|
27321
|
-
}
|
|
27322
|
-
} else {
|
|
27323
|
-
var _itemIndex = updateSelectToPrint.indexOf(foundItem);
|
|
27324
|
-
|
|
27325
|
-
updateSelectToPrint[_itemIndex].id = null;
|
|
27326
|
-
updateSelectToPrint[_itemIndex].children = null;
|
|
27327
|
-
}
|
|
27328
|
-
|
|
27329
|
-
setSelectedToPrint(updateSelectToPrint);
|
|
27330
|
-
};
|
|
27331
|
-
|
|
27332
|
-
var checkSelectedItem = function checkSelectedItem(id) {
|
|
27333
|
-
for (var _iterator = _createForOfIteratorHelperLoose(selectedToPrint), _step; !(_step = _iterator()).done;) {
|
|
27334
|
-
var item = _step.value;
|
|
27335
|
-
if (item.id === id) return true;
|
|
27336
|
-
}
|
|
27337
|
-
|
|
27338
|
-
return false;
|
|
27339
|
-
};
|
|
27340
|
-
|
|
27341
27296
|
var callApi = useCallback(function (apiCaller, setData, defaultData, type) {
|
|
27342
27297
|
try {
|
|
27343
27298
|
var _temp2 = _catch(function () {
|
|
@@ -27381,7 +27336,7 @@ var useDashboard = function useDashboard() {
|
|
|
27381
27336
|
setGenderOfStudent(option === null || option === void 0 ? void 0 : option.gender);
|
|
27382
27337
|
setStudentDefault(option);
|
|
27383
27338
|
setFilter(_extends({}, filter, {
|
|
27384
|
-
gender: [LegalGenderType.Male, LegalGenderType.Female],
|
|
27339
|
+
gender: [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female],
|
|
27385
27340
|
teacherId: undefined,
|
|
27386
27341
|
studentId: option ? option === null || option === void 0 ? void 0 : option.studentId : undefined,
|
|
27387
27342
|
studentUserId: option === null || option === void 0 ? void 0 : option.id
|
|
@@ -27392,7 +27347,7 @@ var useDashboard = function useDashboard() {
|
|
|
27392
27347
|
setGenderOfStudent("");
|
|
27393
27348
|
setStudentDefault(undefined);
|
|
27394
27349
|
setFilter(_extends({}, filter, {
|
|
27395
|
-
gender: [LegalGenderType.Male, LegalGenderType.Female],
|
|
27350
|
+
gender: [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female],
|
|
27396
27351
|
teacherId: undefined,
|
|
27397
27352
|
grade: [],
|
|
27398
27353
|
studentId: undefined,
|
|
@@ -27450,11 +27405,6 @@ var useDashboard = function useDashboard() {
|
|
|
27450
27405
|
return Promise.reject(e);
|
|
27451
27406
|
}
|
|
27452
27407
|
}, [filter]);
|
|
27453
|
-
|
|
27454
|
-
var onFilter = function onFilter() {
|
|
27455
|
-
getData();
|
|
27456
|
-
};
|
|
27457
|
-
|
|
27458
27408
|
useEffect(function () {
|
|
27459
27409
|
getData();
|
|
27460
27410
|
}, [filter]);
|
|
@@ -27480,7 +27430,6 @@ var useDashboard = function useDashboard() {
|
|
|
27480
27430
|
studentByGender: studentByGender,
|
|
27481
27431
|
safety: safety,
|
|
27482
27432
|
topSkill: topSkill,
|
|
27483
|
-
onFilter: onFilter,
|
|
27484
27433
|
handleChangeFilters: handleChangeFilters,
|
|
27485
27434
|
bandScore: bandScore,
|
|
27486
27435
|
user: user,
|
|
@@ -27490,10 +27439,6 @@ var useDashboard = function useDashboard() {
|
|
|
27490
27439
|
setGenderOfStudent: setGenderOfStudent,
|
|
27491
27440
|
handleFilterStudent: handleFilterStudent,
|
|
27492
27441
|
handleFilterTeacher: handleFilterTeacher,
|
|
27493
|
-
handleSelectToPrint: handleSelectToPrint,
|
|
27494
|
-
checkSelectedItem: checkSelectedItem,
|
|
27495
|
-
selectedToPrint: selectedToPrint,
|
|
27496
|
-
setSelectedToPrint: setSelectedToPrint,
|
|
27497
27442
|
onChangeFilters: onChangeFilters,
|
|
27498
27443
|
handleActiveColumnOneToOne: handleActiveColumnOneToOne,
|
|
27499
27444
|
seriesOneToOne: seriesOneToOne,
|
|
@@ -27561,7 +27506,56 @@ var useChartDatas = function useChartDatas() {
|
|
|
27561
27506
|
avgSafety = _useDashboard.avgSafety,
|
|
27562
27507
|
monthsSafety = _useDashboard.monthsSafety,
|
|
27563
27508
|
dataConvertedSafety = _useDashboard.dataConvertedSafety,
|
|
27564
|
-
activeColumnSafety = _useDashboard.activeColumnSafety
|
|
27509
|
+
activeColumnSafety = _useDashboard.activeColumnSafety,
|
|
27510
|
+
chartOneToOneData = _useDashboard.chartOneToOneData,
|
|
27511
|
+
chartClassReflection = _useDashboard.chartClassReflection,
|
|
27512
|
+
chartConference = _useDashboard.chartConference,
|
|
27513
|
+
safety = _useDashboard.safety;
|
|
27514
|
+
|
|
27515
|
+
var _useState = useState([]),
|
|
27516
|
+
selectedToPrint = _useState[0],
|
|
27517
|
+
setSelectedToPrint = _useState[1];
|
|
27518
|
+
|
|
27519
|
+
var handleSelectToPrint = function handleSelectToPrint(checked, data, chartType) {
|
|
27520
|
+
var updateSelectToPrint = [].concat(selectedToPrint);
|
|
27521
|
+
var foundItem = updateSelectToPrint === null || updateSelectToPrint === void 0 ? void 0 : updateSelectToPrint.find(function (e) {
|
|
27522
|
+
return e.identification == data.id;
|
|
27523
|
+
});
|
|
27524
|
+
|
|
27525
|
+
if (checked) {
|
|
27526
|
+
if (!!data.id && !foundItem) {
|
|
27527
|
+
updateSelectToPrint.push({
|
|
27528
|
+
id: data.id,
|
|
27529
|
+
identification: data.id,
|
|
27530
|
+
label: data.label,
|
|
27531
|
+
children: data.children,
|
|
27532
|
+
chartType: chartType
|
|
27533
|
+
});
|
|
27534
|
+
}
|
|
27535
|
+
|
|
27536
|
+
if (!!data && foundItem && foundItem.id == null) {
|
|
27537
|
+
var itemIndex = updateSelectToPrint.indexOf(foundItem);
|
|
27538
|
+
updateSelectToPrint[itemIndex].id = data.id;
|
|
27539
|
+
updateSelectToPrint[itemIndex].children = data.children;
|
|
27540
|
+
}
|
|
27541
|
+
} else {
|
|
27542
|
+
var _itemIndex = updateSelectToPrint.indexOf(foundItem);
|
|
27543
|
+
|
|
27544
|
+
updateSelectToPrint[_itemIndex].id = null;
|
|
27545
|
+
updateSelectToPrint[_itemIndex].children = null;
|
|
27546
|
+
}
|
|
27547
|
+
|
|
27548
|
+
setSelectedToPrint(updateSelectToPrint);
|
|
27549
|
+
};
|
|
27550
|
+
|
|
27551
|
+
var checkSelectedItem = function checkSelectedItem(id) {
|
|
27552
|
+
for (var _iterator = _createForOfIteratorHelperLoose(selectedToPrint), _step; !(_step = _iterator()).done;) {
|
|
27553
|
+
var item = _step.value;
|
|
27554
|
+
if (item.id === id) return true;
|
|
27555
|
+
}
|
|
27556
|
+
|
|
27557
|
+
return false;
|
|
27558
|
+
};
|
|
27565
27559
|
|
|
27566
27560
|
var LIST_FILTERS_LEFT = [{
|
|
27567
27561
|
name: FILTER_NAME.Calendar,
|
|
@@ -27785,7 +27779,16 @@ var useChartDatas = function useChartDatas() {
|
|
|
27785
27779
|
LIST_FILTERS_RIGHT: LIST_FILTERS_RIGHT,
|
|
27786
27780
|
totalCardData: totalCardData,
|
|
27787
27781
|
onChangeFilters: onChangeFilters,
|
|
27788
|
-
initialTypeChart: initialTypeChart
|
|
27782
|
+
initialTypeChart: initialTypeChart,
|
|
27783
|
+
handleSelectToPrint: handleSelectToPrint,
|
|
27784
|
+
checkSelectedItem: checkSelectedItem,
|
|
27785
|
+
selectedToPrint: selectedToPrint,
|
|
27786
|
+
setSelectedToPrint: setSelectedToPrint,
|
|
27787
|
+
chartOneToOneData: chartOneToOneData,
|
|
27788
|
+
topLearningStrategies: topLearningStrategies,
|
|
27789
|
+
chartClassReflection: chartClassReflection,
|
|
27790
|
+
chartConference: chartConference,
|
|
27791
|
+
safety: safety
|
|
27789
27792
|
};
|
|
27790
27793
|
};
|
|
27791
27794
|
|
|
@@ -27952,7 +27955,7 @@ var SelectFilter = function SelectFilter(_ref) {
|
|
|
27952
27955
|
label: "This Year"
|
|
27953
27956
|
},
|
|
27954
27957
|
gender: {
|
|
27955
|
-
value:
|
|
27958
|
+
value: 0,
|
|
27956
27959
|
label: "All"
|
|
27957
27960
|
},
|
|
27958
27961
|
grade: -1,
|
|
@@ -27987,8 +27990,9 @@ var SelectFilter = function SelectFilter(_ref) {
|
|
|
27987
27990
|
};
|
|
27988
27991
|
|
|
27989
27992
|
var onChangeGender = function onChangeGender(item) {
|
|
27993
|
+
console.log("item", item);
|
|
27990
27994
|
!!onChangeFilters && onChangeFilters({
|
|
27991
|
-
gender: item.value ===
|
|
27995
|
+
gender: item.value === -1 ? [LegalGenderType.None, LegalGenderType.Male, LegalGenderType.Female] : [item.value]
|
|
27992
27996
|
});
|
|
27993
27997
|
setLabelBox(_extends({}, labelBox, {
|
|
27994
27998
|
gender: {
|
|
@@ -28081,7 +28085,7 @@ var SelectFilter = function SelectFilter(_ref) {
|
|
|
28081
28085
|
alt: labelBox.gender.label
|
|
28082
28086
|
}), React.createElement("p", {
|
|
28083
28087
|
className: styles["color-filter"] + " my-0 mx-2"
|
|
28084
|
-
}, labelBox.gender.value ===
|
|
28088
|
+
}, labelBox.gender.value === -1 ? "Gender" : labelBox.gender.label), !isOpenCollapse ? React.createElement(FiChevronDown, null) : React.createElement(FiChevronUp, null)), React.createElement("div", {
|
|
28085
28089
|
className: styles["select-filter-component"] + " " + (!isOpenCollapse && "" + styles["hidden"])
|
|
28086
28090
|
}, React.createElement(Form, {
|
|
28087
28091
|
className: "" + styles["box-select"]
|
|
@@ -28286,16 +28290,13 @@ var headerLogo = "../images/logoV1-2.png";
|
|
|
28286
28290
|
var DashboardToPDF = function DashboardToPDF(props) {
|
|
28287
28291
|
var selectedToPDF = props.selectedToPDF,
|
|
28288
28292
|
initialData = props.initialData,
|
|
28289
|
-
typeChartList = props.typeChartList
|
|
28293
|
+
typeChartList = props.typeChartList,
|
|
28294
|
+
chartOneToOneData = props.chartOneToOneData,
|
|
28295
|
+
topLearningStrategies = props.topLearningStrategies,
|
|
28296
|
+
chartClassReflection = props.chartClassReflection,
|
|
28297
|
+
chartConference = props.chartConference,
|
|
28298
|
+
safety = props.safety;
|
|
28290
28299
|
var dispatch = useDispatch();
|
|
28291
|
-
|
|
28292
|
-
var _useDashboard = useDashboard(),
|
|
28293
|
-
chartOneToOneData = _useDashboard.chartOneToOneData,
|
|
28294
|
-
topLearningStrategies = _useDashboard.topLearningStrategies,
|
|
28295
|
-
chartClassReflection = _useDashboard.chartClassReflection,
|
|
28296
|
-
chartConference = _useDashboard.chartConference,
|
|
28297
|
-
safety = _useDashboard.safety;
|
|
28298
|
-
|
|
28299
28300
|
var chartHightImpactLearningStrategie = selectedToPDF.find(function (i) {
|
|
28300
28301
|
return i.id === "high_impact_learning_strategie";
|
|
28301
28302
|
});
|
|
@@ -28889,7 +28890,7 @@ var DashboardToPDF = function DashboardToPDF(props) {
|
|
|
28889
28890
|
}
|
|
28890
28891
|
}
|
|
28891
28892
|
|
|
28892
|
-
doc.addImage(canvas.toDataURL("image/png", 1.0), 15, line +
|
|
28893
|
+
doc.addImage(canvas.toDataURL("image/png", 1.0), 15, line + 120, 420, 170);
|
|
28893
28894
|
});
|
|
28894
28895
|
});
|
|
28895
28896
|
}
|
|
@@ -29062,7 +29063,16 @@ var Dashboard = function Dashboard() {
|
|
|
29062
29063
|
LIST_FILTERS_RIGHT = _useChartDatas.LIST_FILTERS_RIGHT,
|
|
29063
29064
|
totalCardData = _useChartDatas.totalCardData,
|
|
29064
29065
|
onChangeFilters = _useChartDatas.onChangeFilters,
|
|
29065
|
-
initialTypeChart = _useChartDatas.initialTypeChart
|
|
29066
|
+
initialTypeChart = _useChartDatas.initialTypeChart,
|
|
29067
|
+
handleSelectToPrint = _useChartDatas.handleSelectToPrint,
|
|
29068
|
+
checkSelectedItem = _useChartDatas.checkSelectedItem,
|
|
29069
|
+
selectedToPrint = _useChartDatas.selectedToPrint,
|
|
29070
|
+
setSelectedToPrint = _useChartDatas.setSelectedToPrint,
|
|
29071
|
+
chartOneToOneData = _useChartDatas.chartOneToOneData,
|
|
29072
|
+
topLearningStrategies = _useChartDatas.topLearningStrategies,
|
|
29073
|
+
chartClassReflection = _useChartDatas.chartClassReflection,
|
|
29074
|
+
chartConference = _useChartDatas.chartConference,
|
|
29075
|
+
safety = _useChartDatas.safety;
|
|
29066
29076
|
|
|
29067
29077
|
var _useBehavior = useBehavior(initialTypeChart),
|
|
29068
29078
|
chartIsOpened = _useBehavior.chartIsOpened,
|
|
@@ -29072,12 +29082,6 @@ var Dashboard = function Dashboard() {
|
|
|
29072
29082
|
teacherUserId = _useBehavior.teacherUserId,
|
|
29073
29083
|
changeCurrentTeacherUserId = _useBehavior.changeCurrentTeacherUserId;
|
|
29074
29084
|
|
|
29075
|
-
var _useDashboard = useDashboard(),
|
|
29076
|
-
handleSelectToPrint = _useDashboard.handleSelectToPrint,
|
|
29077
|
-
checkSelectedItem = _useDashboard.checkSelectedItem,
|
|
29078
|
-
selectedToPrint = _useDashboard.selectedToPrint,
|
|
29079
|
-
setSelectedToPrint = _useDashboard.setSelectedToPrint;
|
|
29080
|
-
|
|
29081
29085
|
var _useState = useState(false),
|
|
29082
29086
|
modal = _useState[0],
|
|
29083
29087
|
setModal = _useState[1];
|
|
@@ -29122,7 +29126,12 @@ var Dashboard = function Dashboard() {
|
|
|
29122
29126
|
}, "Cancel"), React.createElement(DashboardToPDF, {
|
|
29123
29127
|
selectedToPDF: selectedToPrint,
|
|
29124
29128
|
initialData: chartDashBoards,
|
|
29125
|
-
typeChartList: typeChartList
|
|
29129
|
+
typeChartList: typeChartList,
|
|
29130
|
+
chartOneToOneData: chartOneToOneData,
|
|
29131
|
+
topLearningStrategies: topLearningStrategies,
|
|
29132
|
+
chartClassReflection: chartClassReflection,
|
|
29133
|
+
chartConference: chartConference,
|
|
29134
|
+
safety: safety
|
|
29126
29135
|
}))), React.createElement("div", {
|
|
29127
29136
|
className: "d-flex align-items-center justify-content-between"
|
|
29128
29137
|
}, React.createElement("div", {
|