mario-teacher-student-client 3.0.8-admin → 3.0.9-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/components/Dialog/ModalCounselor.d.ts +10 -0
- package/dist/components/selector/CounselorSelector.d.ts +3 -0
- package/dist/containers/ConductOneToOne/constant/types.d.ts +6 -0
- package/dist/containers/ConferenceRubric/configs/constants.d.ts +6 -0
- package/dist/containers/MyStudent/components/NewOverview/Chat/ApiClient/{Conference.d.ts → conference.d.ts} +0 -0
- package/dist/containers/MyStudent/hooks/useStudentList.d.ts +2 -0
- package/dist/index.css +1 -1
- package/dist/index.js +320 -106
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +320 -106
- package/dist/index.modern.js.map +1 -1
- package/dist/services/MyStudent.d.ts +1 -0
- package/package.json +107 -107
- package/dist/components/Button/SwitchComponent.d.ts +0 -9
- package/dist/components/Header/Header.d.ts +0 -3
- package/dist/components/Tabs/CustomTabNote.d.ts +0 -3
- package/dist/containers/ConductSurvey/components/ConductTop/ConductTop.d.ts +0 -17
- package/dist/containers/ConductSurvey/hooks/useConductOne.d.ts +0 -21
- package/dist/containers/ConductSurvey/hooks/useCountDown.d.ts +0 -8
- package/dist/containers/ConductSurvey/hooks/useIsMounted.d.ts +0 -2
- package/dist/containers/ConductSurvey/views/SessionResultComponent.d.ts +0 -3
- package/dist/containers/Contact/components/SendMassege.d.ts +0 -7
- package/dist/containers/Contact/configs/constants.d.ts +0 -15
- package/dist/containers/Contact/hooks/useContact.d.ts +0 -6
- package/dist/containers/Contact/services/contactService.d.ts +0 -1
- package/dist/containers/Contact/views/ContactPage.d.ts +0 -3
- package/dist/containers/ExternalSurvey/components/IBLearnerComponent.d.ts +0 -12
- package/dist/containers/ExternalSurvey/hooks/useConductSurvey.d.ts +0 -21
- package/dist/containers/GoalPage/apiClient/apiGoals.d.ts +0 -6
- package/dist/containers/GoalPage/components/CardGoalItem.d.ts +0 -3
- package/dist/containers/GoalPage/components/CardItem/CardGoalItem.d.ts +0 -4
- package/dist/containers/GoalPage/components/CardItem/StatusTargetComponent.d.ts +0 -4
- package/dist/containers/GoalPage/components/CardItem/TargetItem.d.ts +0 -4
- package/dist/containers/GoalPage/components/CreateGoalModel.d.ts +0 -4
- package/dist/containers/GoalPage/components/CustomInputDatePicker.d.ts +0 -4
- package/dist/containers/GoalPage/components/FilterGoalPage.d.ts +0 -3
- package/dist/containers/GoalPage/components/Steps/BaseLine.d.ts +0 -4
- package/dist/containers/GoalPage/components/Steps/ChooseArea.d.ts +0 -4
- package/dist/containers/GoalPage/components/Steps/DetailFormCreate.d.ts +0 -4
- package/dist/containers/GoalPage/components/Steps/ModelPickTarget.d.ts +0 -4
- package/dist/containers/GoalPage/components/Steps/ModelSelectCategory.d.ts +0 -4
- package/dist/containers/GoalPage/constants/constants.d.ts +0 -205
- package/dist/containers/GoalPage/hook/useGoals.d.ts +0 -20
- package/dist/containers/GoalPage/services/goalService.d.ts +0 -3
- package/dist/containers/GoalPage/styles/makeStyles.d.ts +0 -1
- package/dist/containers/GoalPage/types/types.d.ts +0 -90
- package/dist/containers/GoalPage/views/MyGoals.d.ts +0 -3
- package/dist/containers/Home/components/mutipleSelectBox/mutipleSelectBox.d.ts +0 -8
- package/dist/containers/LearningStrategies/hook/useEditaLearningStrategies.d.ts +0 -5
- package/dist/containers/MyConferences/components/Tabs/CustomTabNote.d.ts +0 -3
- package/dist/containers/MyConferences/components/dialog/DialogNodes.d.ts +0 -3
- package/dist/containers/MyOneToOne/components/dialog/DialogNodes.d.ts +0 -3
- package/dist/containers/MyStudent/components/ClassReflectionTable.d.ts +0 -3
- package/dist/containers/MyStudent/components/NewOverview/TopLearningStrategies/hooks/useChartConference.d.ts +0 -19
- package/dist/containers/MyStudent/components/NewOverview/TopLearningStrategies/services/ConferenceChart.d.ts +0 -1
- package/dist/containers/MyStudent/components/NewOverview/TopLearningStrategies/view/ConferenceChart.d.ts +0 -6
- package/dist/containers/MyStudent/hooks/useOverviewToPDF.d.ts +0 -7
- package/dist/containers/MySurvey/styles/makeStyles.d.ts +0 -2
- package/dist/containers/MySurvey/views/MySurvey.d.ts +0 -3
- package/dist/containers/ScaffoldingExample/components/OneToOne.d.ts +0 -3
- package/dist/containers/ScaffoldingExample/components/PicChat.d.ts +0 -2
- package/dist/containers/ScaffoldingExample/components/RightPicChatScreenFour.d.ts +0 -8
- package/dist/containers/ScaffoldingExample/components/RightPicChatScreenOne.d.ts +0 -8
- package/dist/containers/ScaffoldingExample/components/RightPicChatScreenThree.d.ts +0 -8
- package/dist/containers/ScaffoldingExample/components/RightPicChatScreenTwo.d.ts +0 -8
- package/dist/containers/ScaffoldingExample/components/ScaffoldingFloatTab/MineNotes/views/ScaffoldingNote.d.ts +0 -10
- package/dist/containers/ScaffoldingExample/components/ScreenTab.d.ts +0 -3
- package/dist/containers/ScaffoldingExample/components/SliderRange.d.ts +0 -2
- package/dist/containers/ScaffoldingExample/components/TeacherView/PrivateNotes/view/PrivateNote.d.ts +0 -3
- package/dist/containers/ScaffoldingExample/components/TeacherView/StudentNotes/view/StudentNote.d.ts +0 -3
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherNotes/hooks/useTeacherNotes.d.ts +0 -23
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherNotes/services/index.d.ts +0 -12
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherNotes/views/ScaffoldingFirstScreen.d.ts +0 -12
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherNotes/views/ScaffoldingQuestionAndAnswer.d.ts +0 -12
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherNotes/views/ScaffoldingSecondScreen.d.ts +0 -3
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherNotes/views/TeacherScreen.d.ts +0 -7
- package/dist/containers/ScaffoldingExample/components/TeacherView/TeacherTab.d.ts +0 -8
- package/dist/containers/SettingPageV1/contants/contants.d.ts +0 -41
- package/dist/containers/SettingPageV1/contants/type.d.ts +0 -23
- package/dist/containers/StageDebug/hooks/useStageDebug.d.ts +0 -4
- package/dist/containers/StageDebug/views/StageDebugPage.d.ts +0 -3
- package/dist/containers/Surveys/apiClient/survey.d.ts +0 -2
- package/dist/containers/Surveys/components/ChartOverview/BarChart.d.ts +0 -9
- package/dist/containers/Surveys/components/SurveyDetail.d.ts +0 -3
- package/dist/containers/Surveys/components/SurveyStudentCompleted.d.ts +0 -3
- package/dist/containers/Surveys/components/SurveyStudentMissed.d.ts +0 -3
- package/dist/containers/Surveys/components/SurveyStudentPending.d.ts +0 -3
- package/dist/containers/Surveys/hook/useActionNeededSurvey.d.ts +0 -9
- package/dist/containers/Surveys/hook/useAllSurvey.d.ts +0 -10
- package/dist/containers/Surveys/hook/usePendingSurvey.d.ts +0 -10
- package/dist/containers/Surveys/hook/useRepliedSurvey.d.ts +0 -9
- package/dist/containers/Surveys/views/ViewSurveyStudent.d.ts +0 -3
- package/dist/hooks/useUploadFile.d.ts +0 -4
- package/dist/services/File.d.ts +0 -1
- package/dist/utils/function.d.ts +0 -1
package/dist/index.modern.js
CHANGED
|
@@ -1733,7 +1733,6 @@ var MainLayout = function MainLayout(_ref) {
|
|
|
1733
1733
|
var _temp6 = _catch(function () {
|
|
1734
1734
|
return Promise.resolve(getInfo()).then(function (info) {
|
|
1735
1735
|
function _temp4() {
|
|
1736
|
-
console.log("end");
|
|
1737
1736
|
dispatch(setUser(_extends({}, user, userData, {
|
|
1738
1737
|
email: userData.email,
|
|
1739
1738
|
roles: roles,
|
|
@@ -1751,11 +1750,12 @@ var MainLayout = function MainLayout(_ref) {
|
|
|
1751
1750
|
var isStudent = roles.includes("Student");
|
|
1752
1751
|
var isAssistant = !(roles !== null && roles !== void 0 && roles.includes("Teacher")) && (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
|
|
1753
1752
|
var isTeacherAssistant = (roles === null || roles === void 0 ? void 0 : roles.includes("Teacher")) && (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
|
|
1753
|
+
var isCounselor = roles.includes("Counselor");
|
|
1754
1754
|
|
|
1755
1755
|
var _temp3 = function () {
|
|
1756
|
-
if (isTeacher || isStudent || isTeacherAssistant) {
|
|
1756
|
+
if (isTeacher || isStudent || isTeacherAssistant || isCounselor) {
|
|
1757
1757
|
return Promise.resolve(getStudentSimpleProfile()).then(function (profileRes) {
|
|
1758
|
-
var _profileRes$
|
|
1758
|
+
var _profileRes$data11;
|
|
1759
1759
|
|
|
1760
1760
|
if (isTeacherAssistant) {
|
|
1761
1761
|
var _profileRes$data, _profileRes$data2;
|
|
@@ -1766,21 +1766,25 @@ var MainLayout = function MainLayout(_ref) {
|
|
|
1766
1766
|
var _profileRes$data3;
|
|
1767
1767
|
|
|
1768
1768
|
userData.assistantId = (_profileRes$data3 = profileRes.data) === null || _profileRes$data3 === void 0 ? void 0 : _profileRes$data3.assistantId;
|
|
1769
|
+
} else if (isCounselor) {
|
|
1770
|
+
var _profileRes$data4;
|
|
1771
|
+
|
|
1772
|
+
userData.counselorId = (_profileRes$data4 = profileRes.data) === null || _profileRes$data4 === void 0 ? void 0 : _profileRes$data4.counselorId;
|
|
1769
1773
|
} else if (isStudent) {
|
|
1770
|
-
var _profileRes$
|
|
1774
|
+
var _profileRes$data5, _profileRes$data6, _profileRes$data7, _profileRes$data8, _profileRes$data9;
|
|
1771
1775
|
|
|
1772
|
-
userData.studentId = (_profileRes$
|
|
1773
|
-
userData.mainTeacherId = (_profileRes$
|
|
1774
|
-
userData.mainTeacherName = (_profileRes$
|
|
1775
|
-
userData.mainTeacherUserId = (_profileRes$
|
|
1776
|
-
userData.mainTeacherProfileImageFileName = (_profileRes$
|
|
1776
|
+
userData.studentId = (_profileRes$data5 = profileRes.data) === null || _profileRes$data5 === void 0 ? void 0 : _profileRes$data5.id;
|
|
1777
|
+
userData.mainTeacherId = (_profileRes$data6 = profileRes.data) === null || _profileRes$data6 === void 0 ? void 0 : _profileRes$data6.mainTeacherId;
|
|
1778
|
+
userData.mainTeacherName = (_profileRes$data7 = profileRes.data) === null || _profileRes$data7 === void 0 ? void 0 : _profileRes$data7.mainTeacherName;
|
|
1779
|
+
userData.mainTeacherUserId = (_profileRes$data8 = profileRes.data) === null || _profileRes$data8 === void 0 ? void 0 : _profileRes$data8.mainTeacherUserId;
|
|
1780
|
+
userData.mainTeacherProfileImageFileName = (_profileRes$data9 = profileRes.data) === null || _profileRes$data9 === void 0 ? void 0 : _profileRes$data9.mainTeacherProfileImageFileName;
|
|
1777
1781
|
} else {
|
|
1778
|
-
var _profileRes$
|
|
1782
|
+
var _profileRes$data10;
|
|
1779
1783
|
|
|
1780
|
-
userData.teacherId = (_profileRes$
|
|
1784
|
+
userData.teacherId = (_profileRes$data10 = profileRes.data) === null || _profileRes$data10 === void 0 ? void 0 : _profileRes$data10.id;
|
|
1781
1785
|
}
|
|
1782
1786
|
|
|
1783
|
-
userData.name = (_profileRes$
|
|
1787
|
+
userData.name = (_profileRes$data11 = profileRes.data) === null || _profileRes$data11 === void 0 ? void 0 : _profileRes$data11.name;
|
|
1784
1788
|
});
|
|
1785
1789
|
}
|
|
1786
1790
|
}();
|
|
@@ -2141,7 +2145,14 @@ var getEventFullCalendar = function getEventFullCalendar(userId, startCalendar)
|
|
|
2141
2145
|
return Promise.resolve(getEventCard(params)).then(function (res) {
|
|
2142
2146
|
setDataCardTotal(res.data);
|
|
2143
2147
|
});
|
|
2144
|
-
}, function () {
|
|
2148
|
+
}, function (err) {
|
|
2149
|
+
var _err$response2, _err$response2$data;
|
|
2150
|
+
|
|
2151
|
+
dispatch(setAlert({
|
|
2152
|
+
type: "danger",
|
|
2153
|
+
message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
|
|
2154
|
+
}));
|
|
2155
|
+
});
|
|
2145
2156
|
|
|
2146
2157
|
return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
|
|
2147
2158
|
} catch (e) {
|
|
@@ -3533,7 +3544,7 @@ var Dashboard = function Dashboard() {
|
|
|
3533
3544
|
|
|
3534
3545
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
3535
3546
|
});
|
|
3536
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
3547
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
3537
3548
|
var studentUserId = "";
|
|
3538
3549
|
var currentDate = moment();
|
|
3539
3550
|
var todayDate = moment().format("DD");
|
|
@@ -3706,7 +3717,7 @@ var useStudentList = function useStudentList() {
|
|
|
3706
3717
|
|
|
3707
3718
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
3708
3719
|
});
|
|
3709
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
3720
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
3710
3721
|
var getStudentSelector = useCallback(function () {
|
|
3711
3722
|
try {
|
|
3712
3723
|
var _temp3 = function _temp3() {
|
|
@@ -3855,7 +3866,7 @@ var DialogRequestOneToOne = function DialogRequestOneToOne(_ref) {
|
|
|
3855
3866
|
|
|
3856
3867
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
3857
3868
|
});
|
|
3858
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
3869
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
3859
3870
|
|
|
3860
3871
|
var _useState = useState("0"),
|
|
3861
3872
|
selectData = _useState[0],
|
|
@@ -4262,6 +4273,9 @@ var deleteActionPointApi$1 = function deleteActionPointApi(id) {
|
|
|
4262
4273
|
var updateTeacherAssignStudent = function updateTeacherAssignStudent(body) {
|
|
4263
4274
|
return api.post(TEACHER_URL$1 + "/update/teacher-assign-assistant", body);
|
|
4264
4275
|
};
|
|
4276
|
+
var updateTeacherAssignCounselor = function updateTeacherAssignCounselor(body) {
|
|
4277
|
+
return api.post(TEACHER_URL$1 + "/update/teacher-assign-counselor", body);
|
|
4278
|
+
};
|
|
4265
4279
|
var getAllEduTeacher = function getAllEduTeacher() {
|
|
4266
4280
|
return api.get("" + GENERAL_EDUCATION_TEACHER);
|
|
4267
4281
|
};
|
|
@@ -4338,7 +4352,7 @@ var useChangeRoteQuestion = function useChangeRoteQuestion() {
|
|
|
4338
4352
|
|
|
4339
4353
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
4340
4354
|
});
|
|
4341
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
4355
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
4342
4356
|
var changeRouteQuestion = useCallback(function (studentId) {
|
|
4343
4357
|
try {
|
|
4344
4358
|
var _temp4 = function _temp4() {
|
|
@@ -4646,7 +4660,7 @@ var useUpComing = function useUpComing() {
|
|
|
4646
4660
|
|
|
4647
4661
|
return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.defaultFontSize;
|
|
4648
4662
|
});
|
|
4649
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
4663
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
4650
4664
|
var search = location.search;
|
|
4651
4665
|
var params = new URLSearchParams(search);
|
|
4652
4666
|
var studentNameReq = params.get('studentNameReq');
|
|
@@ -5223,7 +5237,7 @@ var UpComing = function UpComing() {
|
|
|
5223
5237
|
|
|
5224
5238
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
5225
5239
|
});
|
|
5226
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
5240
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
5227
5241
|
var isStudent = roles === null || roles === void 0 ? void 0 : roles.includes("Student");
|
|
5228
5242
|
var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
|
|
5229
5243
|
|
|
@@ -5699,7 +5713,7 @@ var useSessionCompleted = function useSessionCompleted() {
|
|
|
5699
5713
|
|
|
5700
5714
|
return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.defaultFontSize;
|
|
5701
5715
|
});
|
|
5702
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
5716
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
5703
5717
|
var filters = null;
|
|
5704
5718
|
var setFilters = null;
|
|
5705
5719
|
var classFontSize = useMemo(function () {
|
|
@@ -5931,7 +5945,7 @@ var SessionCompleted = function SessionCompleted() {
|
|
|
5931
5945
|
|
|
5932
5946
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
5933
5947
|
});
|
|
5934
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
5948
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
5935
5949
|
|
|
5936
5950
|
var handleSort = function handleSort(e) {
|
|
5937
5951
|
if (e === "StartTime") {
|
|
@@ -6645,7 +6659,7 @@ var DialogRequestConferences = function DialogRequestConferences(_ref) {
|
|
|
6645
6659
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
6646
6660
|
});
|
|
6647
6661
|
var currentStudentId = currentUser.studentId;
|
|
6648
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
6662
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
6649
6663
|
|
|
6650
6664
|
var _useState = useState("0"),
|
|
6651
6665
|
selectData = _useState[0],
|
|
@@ -7553,7 +7567,7 @@ var UpComing$1 = function UpComing() {
|
|
|
7553
7567
|
|
|
7554
7568
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
7555
7569
|
});
|
|
7556
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
7570
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
7557
7571
|
var isStudent = roles.includes("Student");
|
|
7558
7572
|
var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
|
|
7559
7573
|
|
|
@@ -8131,7 +8145,7 @@ var SessionCompleted$1 = function SessionCompleted() {
|
|
|
8131
8145
|
|
|
8132
8146
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
8133
8147
|
});
|
|
8134
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
8148
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
8135
8149
|
|
|
8136
8150
|
var handleSort = function handleSort(e) {
|
|
8137
8151
|
if (e === "StartTime") {
|
|
@@ -8576,7 +8590,7 @@ var MyConferences = function MyConferences() {
|
|
|
8576
8590
|
|
|
8577
8591
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
8578
8592
|
});
|
|
8579
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
8593
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
8580
8594
|
return React__default.createElement(Box$1, null, React__default.createElement(CustomTabs$1, {
|
|
8581
8595
|
title: title,
|
|
8582
8596
|
tabs: tabs,
|
|
@@ -9237,6 +9251,15 @@ var TypeTime$1;
|
|
|
9237
9251
|
TypeTime[TypeTime["StopTime"] = 2] = "StopTime";
|
|
9238
9252
|
})(TypeTime$1 || (TypeTime$1 = {}));
|
|
9239
9253
|
|
|
9254
|
+
var RoleStartSessionEnum;
|
|
9255
|
+
|
|
9256
|
+
(function (RoleStartSessionEnum) {
|
|
9257
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Assistant"] = 0] = "Assistant";
|
|
9258
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Teacher"] = 1] = "Teacher";
|
|
9259
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Student"] = 2] = "Student";
|
|
9260
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Counselor"] = 3] = "Counselor";
|
|
9261
|
+
})(RoleStartSessionEnum || (RoleStartSessionEnum = {}));
|
|
9262
|
+
|
|
9240
9263
|
var EmotionComponent = function EmotionComponent(_ref) {
|
|
9241
9264
|
var emotionTypeList = _ref.emotionTypeList,
|
|
9242
9265
|
onChangeQuestionAnswer = _ref.onChangeQuestionAnswer,
|
|
@@ -9973,7 +9996,7 @@ var useConductOne = function useConductOne() {
|
|
|
9973
9996
|
|
|
9974
9997
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
9975
9998
|
});
|
|
9976
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
9999
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
9977
10000
|
var isStudent = currentUser.roles.includes("Student");
|
|
9978
10001
|
var pusherKey = useSelector(function (state) {
|
|
9979
10002
|
return state.common.user.pusherKey;
|
|
@@ -10100,10 +10123,10 @@ var useConductOne = function useConductOne() {
|
|
|
10100
10123
|
|
|
10101
10124
|
var _temp7 = _catch(function () {
|
|
10102
10125
|
return Promise.resolve(getQuestionTeacherDefault(parseInt(sessionId))).then(function (res) {
|
|
10103
|
-
var _res$
|
|
10126
|
+
var _res$data11, _res$data11$studentRe, _res$data$studentResu4, _res$data$teacherResu8, _res$data$teacherResu9, _res$data$teacherResu10;
|
|
10104
10127
|
|
|
10105
10128
|
function _temp3() {
|
|
10106
|
-
var _res$data, _res$data$teacherResu, _res$data4, _res$data4$teacherRes, _res$data$teacherResu2, _res$data$teacherResu3, _res$data$teacherResu4, _res$data$teacherResu5, _res$data$teacherResu6, _res$data$studentResu, _res$data$studentResu2, _res$data$teacherResu7, _res$data$studentResu3, _res$data5, _res$data5$studentRes, _res$data6, _res$data6$teacherRes, _res$data7, _res$data7$teacherRes, _res$data8, _res$data8$teacherRes, _res$data9, _res$data9$teacherRes;
|
|
10129
|
+
var _res$data, _res$data$teacherResu, _res$data4, _res$data4$teacherRes, _res$data$teacherResu2, _res$data$teacherResu3, _res$data$teacherResu4, _res$data$teacherResu5, _res$data$teacherResu6, _res$data$studentResu, _res$data$studentResu2, _res$data$teacherResu7, _res$data$studentResu3, _res$data5, _res$data5$studentRes, _res$data6, _res$data6$teacherRes, _res$data7, _res$data7$teacherRes, _res$data8, _res$data8$teacherRes, _res$data9, _res$data9$teacherRes, _res$data10, _res$data10$teacherRe;
|
|
10107
10130
|
|
|
10108
10131
|
if (isTeacher && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$teacherResu = _res$data.teacherResult) !== null && _res$data$teacherResu !== void 0 && _res$data$teacherResu.isDone) {
|
|
10109
10132
|
var _res$data2, _res$data3, _res$data3$teacherRes;
|
|
@@ -10135,16 +10158,20 @@ var useConductOne = function useConductOne() {
|
|
|
10135
10158
|
teacherUserId: res.data.teacherUserId,
|
|
10136
10159
|
startSessionRoleId: (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$teacherRes = _res$data7.teacherResult) === null || _res$data7$teacherRes === void 0 ? void 0 : _res$data7$teacherRes.startSessionRoleId,
|
|
10137
10160
|
sessionTypeId: (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : (_res$data8$teacherRes = _res$data8.teacherResult) === null || _res$data8$teacherRes === void 0 ? void 0 : _res$data8$teacherRes.learningSupportCategoryId,
|
|
10138
|
-
assistantId: (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : (_res$data9$teacherRes = _res$data9.teacherResult) === null || _res$data9$teacherRes === void 0 ? void 0 : _res$data9$teacherRes.assistantId
|
|
10161
|
+
assistantId: (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : (_res$data9$teacherRes = _res$data9.teacherResult) === null || _res$data9$teacherRes === void 0 ? void 0 : _res$data9$teacherRes.assistantId,
|
|
10162
|
+
counselorId: (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : (_res$data10$teacherRe = _res$data10.teacherResult) === null || _res$data10$teacherRe === void 0 ? void 0 : _res$data10$teacherRe.counselorId
|
|
10139
10163
|
};
|
|
10164
|
+
var isTeacherStart = res.data.teacherResult.isTeacherStart;
|
|
10140
10165
|
|
|
10141
|
-
if (isStudent
|
|
10166
|
+
if (isStudent) {
|
|
10142
10167
|
setIsUserChangeSession(true);
|
|
10143
10168
|
} else {
|
|
10144
10169
|
if (!!body.assistantId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.assistantId) == body.assistantId) {
|
|
10145
|
-
setIsUserChangeSession(
|
|
10170
|
+
setIsUserChangeSession(isTeacherStart == RoleStartSessionEnum.Assistant);
|
|
10171
|
+
} else if (!!body.counselorId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.counselorId) == body.counselorId) {
|
|
10172
|
+
setIsUserChangeSession(isTeacherStart == RoleStartSessionEnum.Counselor);
|
|
10146
10173
|
} else {
|
|
10147
|
-
setIsUserChangeSession(
|
|
10174
|
+
setIsUserChangeSession(isTeacherStart == RoleStartSessionEnum.Teacher);
|
|
10148
10175
|
}
|
|
10149
10176
|
}
|
|
10150
10177
|
|
|
@@ -10152,10 +10179,10 @@ var useConductOne = function useConductOne() {
|
|
|
10152
10179
|
setConversation(res.data.isOneToOneConversation);
|
|
10153
10180
|
}
|
|
10154
10181
|
|
|
10155
|
-
if (isStudent && (_res$
|
|
10156
|
-
var _res$
|
|
10182
|
+
if (isStudent && (_res$data11 = res.data) !== null && _res$data11 !== void 0 && (_res$data11$studentRe = _res$data11.studentResult) !== null && _res$data11$studentRe !== void 0 && _res$data11$studentRe.isDone) {
|
|
10183
|
+
var _res$data12, _res$data13, _res$data13$studentRe;
|
|
10157
10184
|
|
|
10158
|
-
history.push("/result-session/" + ((_res$
|
|
10185
|
+
history.push("/result-session/" + ((_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.sessionId) + "/" + ((_res$data13 = res.data) === null || _res$data13 === void 0 ? void 0 : (_res$data13$studentRe = _res$data13.studentResult) === null || _res$data13$studentRe === void 0 ? void 0 : _res$data13$studentRe.id));
|
|
10159
10186
|
}
|
|
10160
10187
|
|
|
10161
10188
|
setLearningSupportCategoryId((_res$data$studentResu4 = res.data.studentResult) === null || _res$data$studentResu4 === void 0 ? void 0 : _res$data$studentResu4.learningSupportCategoryId);
|
|
@@ -10170,9 +10197,9 @@ var useConductOne = function useConductOne() {
|
|
|
10170
10197
|
}
|
|
10171
10198
|
|
|
10172
10199
|
var _temp2 = function () {
|
|
10173
|
-
var _res$
|
|
10200
|
+
var _res$data14, _res$data14$teacherRe;
|
|
10174
10201
|
|
|
10175
|
-
if (!isStudent && !((_res$
|
|
10202
|
+
if (!isStudent && !((_res$data14 = res.data) !== null && _res$data14 !== void 0 && (_res$data14$teacherRe = _res$data14.teacherResult) !== null && _res$data14$teacherRe !== void 0 && _res$data14$teacherRe.isDone)) {
|
|
10176
10203
|
return Promise.resolve(getInformationTimer$1(parseInt(sessionId))).then(function (res1) {
|
|
10177
10204
|
var isTimer = res1.data.isSessionTimer;
|
|
10178
10205
|
|
|
@@ -11402,7 +11429,7 @@ var ScaffoldingListingNotes = function ScaffoldingListingNotes(props) {
|
|
|
11402
11429
|
|
|
11403
11430
|
return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
11404
11431
|
});
|
|
11405
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
11432
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
11406
11433
|
var classes = useStyles$8();
|
|
11407
11434
|
|
|
11408
11435
|
var _useState = useState(false),
|
|
@@ -12113,7 +12140,7 @@ var useNotes = function useNotes(sessionId, sessionResultId, conferenceId, confe
|
|
|
12113
12140
|
|
|
12114
12141
|
return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
12115
12142
|
});
|
|
12116
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
12143
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
12117
12144
|
|
|
12118
12145
|
var handleSubmitSingleNote = function handleSubmitSingleNote() {
|
|
12119
12146
|
try {
|
|
@@ -12498,7 +12525,7 @@ var MineNoteScreen = function MineNoteScreen(props) {
|
|
|
12498
12525
|
|
|
12499
12526
|
return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
12500
12527
|
});
|
|
12501
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
12528
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
12502
12529
|
|
|
12503
12530
|
var _useNotes = useNotes(sessionId, sessionResultId, conferenceId, conferenceResultId),
|
|
12504
12531
|
screenIndex = _useNotes.screenIndex,
|
|
@@ -12579,7 +12606,7 @@ var OtherNoteScreen = function OtherNoteScreen(props) {
|
|
|
12579
12606
|
|
|
12580
12607
|
return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
12581
12608
|
});
|
|
12582
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
12609
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
12583
12610
|
|
|
12584
12611
|
var renderNotesList = function renderNotesList() {
|
|
12585
12612
|
var data = isTeacher ? studentNotesData : teacherNotesData;
|
|
@@ -12746,7 +12773,7 @@ var ScaffoldingFloatTab = function ScaffoldingFloatTab(props) {
|
|
|
12746
12773
|
|
|
12747
12774
|
return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
12748
12775
|
});
|
|
12749
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
12776
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
12750
12777
|
var mineAvatar = isTeacher ? getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage) : getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage);
|
|
12751
12778
|
var otherAvatar = isTeacher ? getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage) : getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage);
|
|
12752
12779
|
|
|
@@ -12958,9 +12985,6 @@ var ConductIndex = function ConductIndex() {
|
|
|
12958
12985
|
onChangeConversationSession = _useConductOne.onChangeConversationSession,
|
|
12959
12986
|
isConversationOneToOne = _useConductOne.isConversationOneToOne;
|
|
12960
12987
|
|
|
12961
|
-
console.log({
|
|
12962
|
-
isConversation: isConversation
|
|
12963
|
-
});
|
|
12964
12988
|
var history = useHistory();
|
|
12965
12989
|
var questionRatings = listQuestionStudents.filter(function (item) {
|
|
12966
12990
|
return item.type == QuestionType.Rating && !!item.isBeforeSession;
|
|
@@ -16114,7 +16138,7 @@ var BookSession = function BookSession() {
|
|
|
16114
16138
|
if (handleCheckTimePass()) setCheckCreateSession(false);
|
|
16115
16139
|
};
|
|
16116
16140
|
|
|
16117
|
-
var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant");
|
|
16141
|
+
var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant") || user.roles.includes("Counselor");
|
|
16118
16142
|
var isStudent = user.roles.includes("Student");
|
|
16119
16143
|
var teacherFullName = useMemo(function () {
|
|
16120
16144
|
if (isTeacher) return (user === null || user === void 0 ? void 0 : user.name) || "";
|
|
@@ -16818,11 +16842,7 @@ var SessionDetail = function SessionDetail() {
|
|
|
16818
16842
|
setSelectedDate(date);
|
|
16819
16843
|
};
|
|
16820
16844
|
|
|
16821
|
-
var isTeacher =
|
|
16822
|
-
return user.roles.some(function (i) {
|
|
16823
|
-
return ["Teacher", "Assistant"].includes(i);
|
|
16824
|
-
});
|
|
16825
|
-
}, [user]);
|
|
16845
|
+
var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant") || user.roles.includes("Counselor");
|
|
16826
16846
|
var teacherFullName = useMemo(function () {
|
|
16827
16847
|
if (isTeacher) return (user === null || user === void 0 ? void 0 : user.name) || "";
|
|
16828
16848
|
return (user === null || user === void 0 ? void 0 : user.mainTeacherName) || "";
|
|
@@ -19123,6 +19143,10 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19123
19143
|
assistantId = _useState3[0],
|
|
19124
19144
|
setAssistantId = _useState3[1];
|
|
19125
19145
|
|
|
19146
|
+
var _useState4 = useState(0),
|
|
19147
|
+
counselorId = _useState4[0],
|
|
19148
|
+
setCounselorId = _useState4[1];
|
|
19149
|
+
|
|
19126
19150
|
var classFontSize = useMemo(function () {
|
|
19127
19151
|
if (defaultFont == defaultFontLarge$c) {
|
|
19128
19152
|
return "font-large";
|
|
@@ -19165,7 +19189,7 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19165
19189
|
});
|
|
19166
19190
|
}, [defaultFont]);
|
|
19167
19191
|
|
|
19168
|
-
var
|
|
19192
|
+
var _useState5 = useState({
|
|
19169
19193
|
currentPage: 1,
|
|
19170
19194
|
pageSize: 10,
|
|
19171
19195
|
searchString: "",
|
|
@@ -19175,8 +19199,8 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19175
19199
|
showAssistant: false,
|
|
19176
19200
|
grade: []
|
|
19177
19201
|
}),
|
|
19178
|
-
filters =
|
|
19179
|
-
setFilters =
|
|
19202
|
+
filters = _useState5[0],
|
|
19203
|
+
setFilters = _useState5[1];
|
|
19180
19204
|
|
|
19181
19205
|
var changeFilters = function changeFilters(updatedFilters) {
|
|
19182
19206
|
return setFilters(_extends({}, filters, updatedFilters));
|
|
@@ -19306,6 +19330,36 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19306
19330
|
}
|
|
19307
19331
|
};
|
|
19308
19332
|
|
|
19333
|
+
var onSubmitCounselor = function onSubmitCounselor(cb) {
|
|
19334
|
+
try {
|
|
19335
|
+
var _temp14 = _catch(function () {
|
|
19336
|
+
var body = {
|
|
19337
|
+
teacherId: teacherId,
|
|
19338
|
+
studentId: studentAssistant,
|
|
19339
|
+
counselorId: counselorId
|
|
19340
|
+
};
|
|
19341
|
+
return Promise.resolve(updateTeacherAssignCounselor(body)).then(function () {
|
|
19342
|
+
!!cb && cb();
|
|
19343
|
+
dispatch(setAlert({
|
|
19344
|
+
type: "success",
|
|
19345
|
+
message: "Assign Assistant successfully"
|
|
19346
|
+
}));
|
|
19347
|
+
});
|
|
19348
|
+
}, function (e) {
|
|
19349
|
+
var _e$response3, _e$response3$data;
|
|
19350
|
+
|
|
19351
|
+
dispatch(setAlert({
|
|
19352
|
+
type: "danger",
|
|
19353
|
+
message: ((_e$response3 = e.response) === null || _e$response3 === void 0 ? void 0 : (_e$response3$data = _e$response3.data) === null || _e$response3$data === void 0 ? void 0 : _e$response3$data.title) || e.message
|
|
19354
|
+
}));
|
|
19355
|
+
});
|
|
19356
|
+
|
|
19357
|
+
return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(function () {}) : void 0);
|
|
19358
|
+
} catch (e) {
|
|
19359
|
+
return Promise.reject(e);
|
|
19360
|
+
}
|
|
19361
|
+
};
|
|
19362
|
+
|
|
19309
19363
|
var convertTimeSecond = function convertTimeSecond(timeSecond) {
|
|
19310
19364
|
var hTime = '';
|
|
19311
19365
|
var d = parseInt(timeSecond || "0");
|
|
@@ -19330,13 +19384,13 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19330
19384
|
|
|
19331
19385
|
var downloadTemplate = function downloadTemplate() {
|
|
19332
19386
|
try {
|
|
19333
|
-
var
|
|
19387
|
+
var _temp17 = function _temp17() {
|
|
19334
19388
|
dispatch(setLoading(false));
|
|
19335
19389
|
};
|
|
19336
19390
|
|
|
19337
19391
|
dispatch(setLoading(true));
|
|
19338
19392
|
|
|
19339
|
-
var
|
|
19393
|
+
var _temp18 = _catch(function () {
|
|
19340
19394
|
return Promise.resolve(downloadTemplateFile()).then(function (res) {
|
|
19341
19395
|
var data = new Blob([res.data.content], {
|
|
19342
19396
|
type: 'text/csv'
|
|
@@ -19358,7 +19412,7 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19358
19412
|
}));
|
|
19359
19413
|
});
|
|
19360
19414
|
|
|
19361
|
-
return Promise.resolve(
|
|
19415
|
+
return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp17) : _temp17(_temp18));
|
|
19362
19416
|
} catch (e) {
|
|
19363
19417
|
return Promise.reject(e);
|
|
19364
19418
|
}
|
|
@@ -19380,7 +19434,9 @@ var useStudentList$1 = function useStudentList() {
|
|
|
19380
19434
|
useStyles: useStyles,
|
|
19381
19435
|
defaultFont: defaultFont,
|
|
19382
19436
|
onSubmitAssistant: onSubmitAssistant,
|
|
19437
|
+
onSubmitCounselor: onSubmitCounselor,
|
|
19383
19438
|
setAssistantId: setAssistantId,
|
|
19439
|
+
setCounselorId: setCounselorId,
|
|
19384
19440
|
setStudentAssistant: setStudentAssistant,
|
|
19385
19441
|
isRoleTeacherAndAssistant: isRoleTeacherAndAssistant,
|
|
19386
19442
|
nameTeacherAssistant: nameTeacherAssistant,
|
|
@@ -19479,6 +19535,100 @@ var ModalAssistant = function ModalAssistant(_ref) {
|
|
|
19479
19535
|
}, "Assign"))));
|
|
19480
19536
|
};
|
|
19481
19537
|
|
|
19538
|
+
var END_POINT$1 = BASE_URL + "/api/Counselor";
|
|
19539
|
+
|
|
19540
|
+
var getCounselors = function getCounselors() {
|
|
19541
|
+
return api.get(END_POINT$1);
|
|
19542
|
+
};
|
|
19543
|
+
|
|
19544
|
+
var CounselorSelector = function CounselorSelector(_ref) {
|
|
19545
|
+
var onChangeCounselor = _ref.onChangeCounselor;
|
|
19546
|
+
|
|
19547
|
+
var _useState = useState([]),
|
|
19548
|
+
counselors = _useState[0],
|
|
19549
|
+
setCounselors = _useState[1];
|
|
19550
|
+
|
|
19551
|
+
var getDataCounselor = function getDataCounselor() {
|
|
19552
|
+
try {
|
|
19553
|
+
return Promise.resolve(getCounselors()).then(function (res) {
|
|
19554
|
+
setCounselors(res.data.items);
|
|
19555
|
+
});
|
|
19556
|
+
} catch (e) {
|
|
19557
|
+
return Promise.reject(e);
|
|
19558
|
+
}
|
|
19559
|
+
};
|
|
19560
|
+
|
|
19561
|
+
useEffect(function () {
|
|
19562
|
+
getDataCounselor();
|
|
19563
|
+
}, []);
|
|
19564
|
+
return React__default.createElement(FormControl, {
|
|
19565
|
+
fullWidth: true
|
|
19566
|
+
}, React__default.createElement(Autocomplete, {
|
|
19567
|
+
freeSolo: true,
|
|
19568
|
+
id: "free-solo-2-demo",
|
|
19569
|
+
options: counselors,
|
|
19570
|
+
getOptionLabel: function getOptionLabel(option) {
|
|
19571
|
+
return option.fullName ? option.fullName + " - " + option.email : "";
|
|
19572
|
+
},
|
|
19573
|
+
onChange: function onChange(_event, newValue) {
|
|
19574
|
+
console.log({
|
|
19575
|
+
newValue: newValue
|
|
19576
|
+
});
|
|
19577
|
+
onChangeCounselor(newValue);
|
|
19578
|
+
},
|
|
19579
|
+
getOptionSelected: function getOptionSelected(option, value) {
|
|
19580
|
+
return option.id == value.id;
|
|
19581
|
+
},
|
|
19582
|
+
renderInput: function renderInput(params) {
|
|
19583
|
+
return React__default.createElement(TextField, Object.assign({}, params, {
|
|
19584
|
+
label: "Search Counselor",
|
|
19585
|
+
margin: "normal",
|
|
19586
|
+
variant: "outlined"
|
|
19587
|
+
}));
|
|
19588
|
+
}
|
|
19589
|
+
}));
|
|
19590
|
+
};
|
|
19591
|
+
|
|
19592
|
+
var ModalCounselor = function ModalCounselor(_ref) {
|
|
19593
|
+
var title = _ref.title,
|
|
19594
|
+
isOpen = _ref.isOpen,
|
|
19595
|
+
confirmAndClose = _ref.confirmAndClose,
|
|
19596
|
+
onChangeCounselor = _ref.onChangeCounselor,
|
|
19597
|
+
handleConfirm = _ref.handleConfirm;
|
|
19598
|
+
return React__default.createElement("div", null, React__default.createElement(Dialog, {
|
|
19599
|
+
open: isOpen,
|
|
19600
|
+
onClose: confirmAndClose,
|
|
19601
|
+
fullWidth: true,
|
|
19602
|
+
maxWidth: "sm"
|
|
19603
|
+
}, React__default.createElement(DialogTitle, null, React__default.createElement("p", {
|
|
19604
|
+
style: {
|
|
19605
|
+
fontSize: "18px",
|
|
19606
|
+
fontWeight: 700
|
|
19607
|
+
}
|
|
19608
|
+
}, title)), React__default.createElement(DialogContent, null, React__default.createElement(Grid, null, React__default.createElement(CounselorSelector, {
|
|
19609
|
+
onChangeCounselor: onChangeCounselor
|
|
19610
|
+
}))), React__default.createElement(DialogActions, {
|
|
19611
|
+
style: {
|
|
19612
|
+
padding: "20px"
|
|
19613
|
+
}
|
|
19614
|
+
}, React__default.createElement(Button, {
|
|
19615
|
+
onClick: confirmAndClose,
|
|
19616
|
+
style: {
|
|
19617
|
+
color: "white",
|
|
19618
|
+
backgroundColor: "#FF0000"
|
|
19619
|
+
}
|
|
19620
|
+
}, "Cancel"), React__default.createElement(Button, {
|
|
19621
|
+
onClick: function onClick() {
|
|
19622
|
+
return handleConfirm();
|
|
19623
|
+
},
|
|
19624
|
+
variant: "contained",
|
|
19625
|
+
style: {
|
|
19626
|
+
color: "white",
|
|
19627
|
+
backgroundColor: "#006E60"
|
|
19628
|
+
}
|
|
19629
|
+
}, "Assign"))));
|
|
19630
|
+
};
|
|
19631
|
+
|
|
19482
19632
|
var DEFAULT_USER_AVATAR$6 = "/images/image-default.png";
|
|
19483
19633
|
|
|
19484
19634
|
var StudentList = function StudentList() {
|
|
@@ -19494,7 +19644,9 @@ var StudentList = function StudentList() {
|
|
|
19494
19644
|
classFontSize = _useStudentList.classFontSize,
|
|
19495
19645
|
useStyles = _useStudentList.useStyles,
|
|
19496
19646
|
setAssistantId = _useStudentList.setAssistantId,
|
|
19647
|
+
setCounselorId = _useStudentList.setCounselorId,
|
|
19497
19648
|
onSubmitAssistant = _useStudentList.onSubmitAssistant,
|
|
19649
|
+
onSubmitCounselor = _useStudentList.onSubmitCounselor,
|
|
19498
19650
|
setStudentAssistant = _useStudentList.setStudentAssistant,
|
|
19499
19651
|
isRoleTeacherAndAssistant = _useStudentList.isRoleTeacherAndAssistant,
|
|
19500
19652
|
nameTeacherAssistant = _useStudentList.nameTeacherAssistant,
|
|
@@ -19526,6 +19678,10 @@ var StudentList = function StudentList() {
|
|
|
19526
19678
|
isOpen = _useState[0],
|
|
19527
19679
|
setIsOpen = _useState[1];
|
|
19528
19680
|
|
|
19681
|
+
var _useState2 = useState(false),
|
|
19682
|
+
isOpenCounselor = _useState2[0],
|
|
19683
|
+
setIsOpenCounselor = _useState2[1];
|
|
19684
|
+
|
|
19529
19685
|
var dispatch = useDispatch();
|
|
19530
19686
|
|
|
19531
19687
|
var handleChangeInputSearch = function handleChangeInputSearch(event) {
|
|
@@ -19548,15 +19704,29 @@ var StudentList = function StudentList() {
|
|
|
19548
19704
|
setStudentAssistant(studentId);
|
|
19549
19705
|
};
|
|
19550
19706
|
|
|
19707
|
+
var openModalCounselor = function openModalCounselor(studentId) {
|
|
19708
|
+
setIsOpenCounselor(true);
|
|
19709
|
+
setStudentAssistant(studentId);
|
|
19710
|
+
};
|
|
19711
|
+
|
|
19551
19712
|
var confirmAndClose = function confirmAndClose() {
|
|
19552
19713
|
setIsOpen(false);
|
|
19553
19714
|
setStudentAssistant(0);
|
|
19554
19715
|
};
|
|
19555
19716
|
|
|
19717
|
+
var confirmAndCloseCounselor = function confirmAndCloseCounselor() {
|
|
19718
|
+
setIsOpenCounselor(false);
|
|
19719
|
+
setStudentAssistant(0);
|
|
19720
|
+
};
|
|
19721
|
+
|
|
19556
19722
|
var onChangeAssistant = function onChangeAssistant(newAssistant) {
|
|
19557
19723
|
setAssistantId(newAssistant.assistantId);
|
|
19558
19724
|
};
|
|
19559
19725
|
|
|
19726
|
+
var onChangeCounselor = function onChangeCounselor(newCounselor) {
|
|
19727
|
+
setCounselorId(newCounselor === null || newCounselor === void 0 ? void 0 : newCounselor.counselorId);
|
|
19728
|
+
};
|
|
19729
|
+
|
|
19560
19730
|
var handleConfirm = function handleConfirm() {
|
|
19561
19731
|
onSubmitAssistant(function () {
|
|
19562
19732
|
setIsOpen(false);
|
|
@@ -19565,6 +19735,14 @@ var StudentList = function StudentList() {
|
|
|
19565
19735
|
});
|
|
19566
19736
|
};
|
|
19567
19737
|
|
|
19738
|
+
var handleConfirmCounselor = function handleConfirmCounselor() {
|
|
19739
|
+
onSubmitCounselor(function () {
|
|
19740
|
+
setIsOpenCounselor(false);
|
|
19741
|
+
setStudentAssistant(0);
|
|
19742
|
+
getData();
|
|
19743
|
+
});
|
|
19744
|
+
};
|
|
19745
|
+
|
|
19568
19746
|
var handleChangePage = function handleChangePage(_event, newPage) {
|
|
19569
19747
|
changeFilters({
|
|
19570
19748
|
currentPage: newPage + 1
|
|
@@ -19863,7 +20041,7 @@ var StudentList = function StudentList() {
|
|
|
19863
20041
|
style: {
|
|
19864
20042
|
marginLeft: "5px"
|
|
19865
20043
|
}
|
|
19866
|
-
}))), isTeacher && React__default.createElement(TableCell, {
|
|
20044
|
+
}))), isTeacher && React__default.createElement(React__default.Fragment, null, React__default.createElement(TableCell, {
|
|
19867
20045
|
align: "left",
|
|
19868
20046
|
style: {
|
|
19869
20047
|
fontWeight: 700,
|
|
@@ -19871,7 +20049,15 @@ var StudentList = function StudentList() {
|
|
|
19871
20049
|
textTransform: "uppercase"
|
|
19872
20050
|
},
|
|
19873
20051
|
width: "10%"
|
|
19874
|
-
}, t("assistant_name")),
|
|
20052
|
+
}, t("assistant_name")), React__default.createElement(TableCell, {
|
|
20053
|
+
align: "left",
|
|
20054
|
+
style: {
|
|
20055
|
+
fontWeight: 700,
|
|
20056
|
+
fontSize: 14,
|
|
20057
|
+
textTransform: "uppercase"
|
|
20058
|
+
},
|
|
20059
|
+
width: "10%"
|
|
20060
|
+
}, t("counselor_name"))), isRoleTeacherAndAssistant && React__default.createElement(TableCell, {
|
|
19875
20061
|
align: "left",
|
|
19876
20062
|
style: {
|
|
19877
20063
|
fontWeight: 700,
|
|
@@ -19958,7 +20144,24 @@ var StudentList = function StudentList() {
|
|
|
19958
20144
|
onClick: function onClick() {
|
|
19959
20145
|
return openModalAssistant(row.studentId);
|
|
19960
20146
|
}
|
|
19961
|
-
}, t("assign_assistant"))),
|
|
20147
|
+
}, t("assign_assistant"))), isTeacher && React__default.createElement(TableCell, {
|
|
20148
|
+
align: "center",
|
|
20149
|
+
className: "" + myStudent["row_type"]
|
|
20150
|
+
}, !!row.counselorName || isRoleTeacherAndAssistant && row.counselorName ? React__default.createElement("span", {
|
|
20151
|
+
className: "" + myStudent["time"]
|
|
20152
|
+
}, React__default.createElement("span", {
|
|
20153
|
+
style: {
|
|
20154
|
+
fontSize: "15.5px",
|
|
20155
|
+
fontWeight: "bold"
|
|
20156
|
+
}
|
|
20157
|
+
}, row.counselorName)) : React__default.createElement(Button, {
|
|
20158
|
+
variant: "contained",
|
|
20159
|
+
color: "primary",
|
|
20160
|
+
disableElevation: true,
|
|
20161
|
+
onClick: function onClick() {
|
|
20162
|
+
return openModalCounselor(row.studentId);
|
|
20163
|
+
}
|
|
20164
|
+
}, t("assign_counselor"))), isRoleTeacherAndAssistant && React__default.createElement(TableCell, {
|
|
19962
20165
|
align: "center",
|
|
19963
20166
|
style: {
|
|
19964
20167
|
fontWeight: 700,
|
|
@@ -20089,10 +20292,16 @@ var StudentList = function StudentList() {
|
|
|
20089
20292
|
}
|
|
20090
20293
|
}, t("add_new"), React__default.createElement(AddIcon, null))))), React__default.createElement(ModalAssistant, {
|
|
20091
20294
|
isOpen: isOpen,
|
|
20092
|
-
title: "
|
|
20295
|
+
title: t("assign_assistant"),
|
|
20093
20296
|
confirmAndClose: confirmAndClose,
|
|
20094
20297
|
onChangeAssistant: onChangeAssistant,
|
|
20095
20298
|
handleConfirm: handleConfirm
|
|
20299
|
+
}), React__default.createElement(ModalCounselor, {
|
|
20300
|
+
isOpen: isOpenCounselor,
|
|
20301
|
+
title: t("assign_counselor"),
|
|
20302
|
+
confirmAndClose: confirmAndCloseCounselor,
|
|
20303
|
+
onChangeCounselor: onChangeCounselor,
|
|
20304
|
+
handleConfirm: handleConfirmCounselor
|
|
20096
20305
|
}));
|
|
20097
20306
|
};
|
|
20098
20307
|
|
|
@@ -34345,7 +34554,7 @@ var ClassReflection = function ClassReflection() {
|
|
|
34345
34554
|
|
|
34346
34555
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
34347
34556
|
});
|
|
34348
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
34557
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
34349
34558
|
var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
|
|
34350
34559
|
var open = useCallback(function (row) {
|
|
34351
34560
|
var resultUrl = "/result-reflection/" + row.id;
|
|
@@ -35241,7 +35450,7 @@ var useStrengthsChallenges = function useStrengthsChallenges() {
|
|
|
35241
35450
|
var currentUser = useSelector(function (state) {
|
|
35242
35451
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
35243
35452
|
});
|
|
35244
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
35453
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
35245
35454
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
35246
35455
|
var currentId = currentUser.studentId;
|
|
35247
35456
|
|
|
@@ -35725,7 +35934,7 @@ var useThingTeachersCanHelp = function useThingTeachersCanHelp() {
|
|
|
35725
35934
|
var currentUser = useSelector(function (state) {
|
|
35726
35935
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
35727
35936
|
});
|
|
35728
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
35937
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
35729
35938
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
35730
35939
|
var currentId = currentUser.studentId;
|
|
35731
35940
|
var defaultFont = useSelector(function (state) {
|
|
@@ -36164,7 +36373,7 @@ var useAboutMyLearning = function useAboutMyLearning() {
|
|
|
36164
36373
|
var currentUser = useSelector(function (state) {
|
|
36165
36374
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
36166
36375
|
});
|
|
36167
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
36376
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
36168
36377
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
36169
36378
|
var currentId = currentUser.studentId;
|
|
36170
36379
|
|
|
@@ -36520,7 +36729,7 @@ var useAccommodation = function useAccommodation() {
|
|
|
36520
36729
|
var currentUser = useSelector(function (state) {
|
|
36521
36730
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
36522
36731
|
});
|
|
36523
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
36732
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
36524
36733
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
36525
36734
|
var currentId = currentUser.studentId;
|
|
36526
36735
|
|
|
@@ -36891,7 +37100,7 @@ var useGoals = function useGoals() {
|
|
|
36891
37100
|
var currentUser = useSelector(function (state) {
|
|
36892
37101
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
36893
37102
|
});
|
|
36894
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
37103
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
36895
37104
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
36896
37105
|
var currentId = currentUser.studentId;
|
|
36897
37106
|
var defaultFont = useSelector(function (state) {
|
|
@@ -37791,7 +38000,7 @@ var useTotalFriends = function useTotalFriends() {
|
|
|
37791
38000
|
|
|
37792
38001
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
37793
38002
|
});
|
|
37794
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
|
|
38003
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
37795
38004
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
37796
38005
|
var currentUserId = currentUser === null || currentUser === void 0 ? void 0 : currentUser.studentId;
|
|
37797
38006
|
var defaultFont = useSelector(function (state) {
|
|
@@ -37891,7 +38100,7 @@ var FriendCircleLearning = function FriendCircleLearning() {
|
|
|
37891
38100
|
|
|
37892
38101
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
37893
38102
|
});
|
|
37894
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
38103
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
37895
38104
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
37896
38105
|
var dispatch = useDispatch();
|
|
37897
38106
|
|
|
@@ -37996,7 +38205,7 @@ var useTotalActivity = function useTotalActivity() {
|
|
|
37996
38205
|
|
|
37997
38206
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
37998
38207
|
});
|
|
37999
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
|
|
38208
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
38000
38209
|
var currentUserId = currentUser === null || currentUser === void 0 ? void 0 : currentUser.studentId;
|
|
38001
38210
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
38002
38211
|
var defaultFont = useSelector(function (state) {
|
|
@@ -38095,7 +38304,7 @@ var ActivityCircleLearning = function ActivityCircleLearning() {
|
|
|
38095
38304
|
|
|
38096
38305
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
38097
38306
|
});
|
|
38098
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
38307
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
38099
38308
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
38100
38309
|
var dispatch = useDispatch();
|
|
38101
38310
|
|
|
@@ -38359,7 +38568,7 @@ var usePrintPlp = function usePrintPlp() {
|
|
|
38359
38568
|
var currentUser = useSelector(function (state) {
|
|
38360
38569
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
38361
38570
|
});
|
|
38362
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$roles = currentUser.roles) === null || _currentUser$roles === void 0 ? void 0 : _currentUser$roles.includes("Teacher")) || (currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$roles2 = currentUser.roles) === null || _currentUser$roles2 === void 0 ? void 0 : _currentUser$roles2.includes("Assistant"));
|
|
38571
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$roles = currentUser.roles) === null || _currentUser$roles === void 0 ? void 0 : _currentUser$roles.includes("Teacher")) || (currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$roles2 = currentUser.roles) === null || _currentUser$roles2 === void 0 ? void 0 : _currentUser$roles2.includes("Assistant")) || currentUser.roles.includes("Counselor");
|
|
38363
38572
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
38364
38573
|
var currentStudentId = currentUser === null || currentUser === void 0 ? void 0 : currentUser.studentId;
|
|
38365
38574
|
|
|
@@ -38659,7 +38868,7 @@ var PersonalLearningGoal = function PersonalLearningGoal() {
|
|
|
38659
38868
|
var currentUser = useSelector(function (state) {
|
|
38660
38869
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
38661
38870
|
});
|
|
38662
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
38871
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
38663
38872
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
38664
38873
|
var isEduTeacher = currentUser.roles.includes("EduTeacher");
|
|
38665
38874
|
studentId = isTeacher || isParent ? studentId : currentUser.studentId;
|
|
@@ -39695,7 +39904,7 @@ var useResultReflection = function useResultReflection() {
|
|
|
39695
39904
|
|
|
39696
39905
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
39697
39906
|
});
|
|
39698
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
39907
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
39699
39908
|
var defaultFont = useSelector(function (state) {
|
|
39700
39909
|
var _state$common2;
|
|
39701
39910
|
|
|
@@ -41297,6 +41506,14 @@ var initialResultAnswer = {
|
|
|
41297
41506
|
id: 0,
|
|
41298
41507
|
questionResponses: []
|
|
41299
41508
|
};
|
|
41509
|
+
var RoleStartSessionEnum$1;
|
|
41510
|
+
|
|
41511
|
+
(function (RoleStartSessionEnum) {
|
|
41512
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Assistant"] = 0] = "Assistant";
|
|
41513
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Teacher"] = 1] = "Teacher";
|
|
41514
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Student"] = 2] = "Student";
|
|
41515
|
+
RoleStartSessionEnum[RoleStartSessionEnum["Counselor"] = 3] = "Counselor";
|
|
41516
|
+
})(RoleStartSessionEnum$1 || (RoleStartSessionEnum$1 = {}));
|
|
41300
41517
|
|
|
41301
41518
|
var QuestionType$2;
|
|
41302
41519
|
|
|
@@ -41545,7 +41762,7 @@ var useConferenceRubric = function useConferenceRubric() {
|
|
|
41545
41762
|
|
|
41546
41763
|
return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
|
|
41547
41764
|
});
|
|
41548
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
41765
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
41549
41766
|
var isStudent = currentUser.roles.includes("Student");
|
|
41550
41767
|
var isAssistant = currentUser.roles.includes("Assistant") && !currentUser.roles.includes("Teacher");
|
|
41551
41768
|
|
|
@@ -41884,10 +42101,10 @@ var useConferenceRubric = function useConferenceRubric() {
|
|
|
41884
42101
|
|
|
41885
42102
|
var _temp20 = _catch(function () {
|
|
41886
42103
|
return Promise.resolve(getConferenceRubricDetail(parseInt(studentId), parseInt(conferenceId))).then(function (res) {
|
|
41887
|
-
var _res$
|
|
42104
|
+
var _res$data11, _res$data12;
|
|
41888
42105
|
|
|
41889
42106
|
function _temp16() {
|
|
41890
|
-
var _res$data9;
|
|
42107
|
+
var _res$data9, _res$data10;
|
|
41891
42108
|
|
|
41892
42109
|
function _temp14() {
|
|
41893
42110
|
function _temp12() {
|
|
@@ -41924,20 +42141,26 @@ var useConferenceRubric = function useConferenceRubric() {
|
|
|
41924
42141
|
teacherUserId: res.data.teacherUserId,
|
|
41925
42142
|
gradeLevel: res.data.gradeLevel,
|
|
41926
42143
|
assistantId: (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.assistantId,
|
|
42144
|
+
counselorId: (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.counselorId,
|
|
41927
42145
|
startConferenceRoleId: res.data.startConferenceRoleId
|
|
41928
42146
|
};
|
|
41929
42147
|
var result = {
|
|
41930
42148
|
teacherResultId: res.data.teacherResultId,
|
|
41931
42149
|
studentResultId: res.data.studentResultId
|
|
41932
42150
|
};
|
|
42151
|
+
var isTeacherStart = res.data.isTeacherStart;
|
|
41933
42152
|
|
|
41934
|
-
if (isStudent
|
|
42153
|
+
if (isStudent) {
|
|
41935
42154
|
setIsUserChangeConference(true);
|
|
41936
42155
|
} else {
|
|
41937
42156
|
if (!!body.assistantId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.assistantId) == body.assistantId) {
|
|
41938
|
-
setIsUserChangeConference(
|
|
42157
|
+
setIsUserChangeConference(isTeacherStart == RoleStartSessionEnum$1.Assistant);
|
|
42158
|
+
}
|
|
42159
|
+
|
|
42160
|
+
if (!!body.counselorId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.counselorId) == body.counselorId) {
|
|
42161
|
+
setIsUserChangeConference(isTeacherStart == RoleStartSessionEnum$1.Counselor);
|
|
41939
42162
|
} else {
|
|
41940
|
-
setIsUserChangeConference(
|
|
42163
|
+
setIsUserChangeConference(isTeacherStart == RoleStartSessionEnum$1.Teacher);
|
|
41941
42164
|
}
|
|
41942
42165
|
}
|
|
41943
42166
|
|
|
@@ -41970,8 +42193,8 @@ var useConferenceRubric = function useConferenceRubric() {
|
|
|
41970
42193
|
}
|
|
41971
42194
|
|
|
41972
42195
|
var isPaused = res.data.isPaused;
|
|
41973
|
-
var isClickPaused = (_res$
|
|
41974
|
-
var startTimerConference = (_res$
|
|
42196
|
+
var isClickPaused = (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.isClickPaused;
|
|
42197
|
+
var startTimerConference = (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.startTimeConference;
|
|
41975
42198
|
setStartTimerConference(startTimerConference);
|
|
41976
42199
|
|
|
41977
42200
|
if (startTimerConference != null && !!isClickPaused && !!isPaused) {
|
|
@@ -42381,7 +42604,6 @@ var ConferenceRubric = function ConferenceRubric() {
|
|
|
42381
42604
|
onChangeToogleAfterSession();
|
|
42382
42605
|
};
|
|
42383
42606
|
|
|
42384
|
-
console.log("run conference");
|
|
42385
42607
|
var listLearningStrategory = useMemo(function () {
|
|
42386
42608
|
return listQuestionConferenceAnswer.filter(function (item) {
|
|
42387
42609
|
return item.type == QuestionType$2.LearningStrategy;
|
|
@@ -42987,7 +43209,7 @@ var generateAvatar$2 = function generateAvatar(src) {
|
|
|
42987
43209
|
};
|
|
42988
43210
|
|
|
42989
43211
|
var BookSessionConferences = function BookSessionConferences() {
|
|
42990
|
-
var _t;
|
|
43212
|
+
var _user$roles, _user$roles2, _user$roles3, _t;
|
|
42991
43213
|
|
|
42992
43214
|
var _useTranslation = useTranslation(),
|
|
42993
43215
|
t = _useTranslation.t;
|
|
@@ -43005,11 +43227,7 @@ var BookSessionConferences = function BookSessionConferences() {
|
|
|
43005
43227
|
var user = useSelector(function (state) {
|
|
43006
43228
|
return state.common.user;
|
|
43007
43229
|
});
|
|
43008
|
-
var isTeacher =
|
|
43009
|
-
var _user$roles, _user$roles2;
|
|
43010
|
-
|
|
43011
|
-
return ((_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Teacher")) || ((_user$roles2 = user.roles) === null || _user$roles2 === void 0 ? void 0 : _user$roles2.includes("Assistant"));
|
|
43012
|
-
}, [user]);
|
|
43230
|
+
var isTeacher = ((_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Teacher")) || ((_user$roles2 = user.roles) === null || _user$roles2 === void 0 ? void 0 : _user$roles2.includes("Assistant")) || ((_user$roles3 = user.roles) === null || _user$roles3 === void 0 ? void 0 : _user$roles3.includes("Counselor"));
|
|
43013
43231
|
|
|
43014
43232
|
var _useState = useState(parseInt(currentId)),
|
|
43015
43233
|
studentId = _useState[0],
|
|
@@ -48721,7 +48939,7 @@ var ListPersonalinterrest = function ListPersonalinterrest() {
|
|
|
48721
48939
|
var currentUser = useSelector(function (state) {
|
|
48722
48940
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
48723
48941
|
});
|
|
48724
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
48942
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
48725
48943
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
48726
48944
|
|
|
48727
48945
|
var _usePersonalInterest = usePersonalInterest$1(parseInt(studentId)),
|
|
@@ -50278,7 +50496,7 @@ var useTeachingStrategiesAdd = function useTeachingStrategiesAdd() {
|
|
|
50278
50496
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
50279
50497
|
});
|
|
50280
50498
|
var currentId = currentUser.studentId;
|
|
50281
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
50499
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
50282
50500
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
50283
50501
|
|
|
50284
50502
|
var _useState = useState([]),
|
|
@@ -51829,7 +52047,7 @@ var useNote = function useNote() {
|
|
|
51829
52047
|
|
|
51830
52048
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
|
|
51831
52049
|
});
|
|
51832
|
-
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
|
|
52050
|
+
var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
|
|
51833
52051
|
var dispatch = useDispatch();
|
|
51834
52052
|
var history = useHistory();
|
|
51835
52053
|
var defaultFont = useSelector(function (state) {
|
|
@@ -52040,10 +52258,6 @@ var Note = function Note() {
|
|
|
52040
52258
|
setSelectStudent = _useNote.setSelectStudent,
|
|
52041
52259
|
isTeacher = _useNote.isTeacher;
|
|
52042
52260
|
|
|
52043
|
-
console.log({
|
|
52044
|
-
allNoteList: allNoteList
|
|
52045
|
-
});
|
|
52046
|
-
|
|
52047
52261
|
var _useFontStyles = useFontStyles(),
|
|
52048
52262
|
defaultFont = _useFontStyles.defaultFont;
|
|
52049
52263
|
|
|
@@ -52859,7 +53073,7 @@ var AddNote = function AddNote() {
|
|
|
52859
53073
|
xs: screenWidth > 768 ? 4 : 12
|
|
52860
53074
|
}, React__default.createElement("div", {
|
|
52861
53075
|
className: "" + styles$z["content-add"]
|
|
52862
|
-
}, ["Teacher", "Assistant"].includes(role) && React__default.createElement("div", null, React__default.createElement("p", {
|
|
53076
|
+
}, ["Teacher", "Assistant", "Counselor"].includes(role) && React__default.createElement("div", null, React__default.createElement("p", {
|
|
52863
53077
|
className: "" + styles$z["title-select"]
|
|
52864
53078
|
}, " ", t("select_student")), React__default.createElement(Autocomplete, {
|
|
52865
53079
|
id: "free-solo-demo",
|
|
@@ -53446,7 +53660,7 @@ var useListFriend = function useListFriend() {
|
|
|
53446
53660
|
|
|
53447
53661
|
return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
|
|
53448
53662
|
});
|
|
53449
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
|
|
53663
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
53450
53664
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
53451
53665
|
|
|
53452
53666
|
var _useParams = useParams(),
|
|
@@ -53583,7 +53797,7 @@ var useListDetail = function useListDetail() {
|
|
|
53583
53797
|
|
|
53584
53798
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
53585
53799
|
});
|
|
53586
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
|
|
53800
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
53587
53801
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
53588
53802
|
var defaultFont = useSelector(function (state) {
|
|
53589
53803
|
var _state$common2;
|
|
@@ -53876,7 +54090,7 @@ var ListFriendCircle = function ListFriendCircle() {
|
|
|
53876
54090
|
|
|
53877
54091
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
53878
54092
|
});
|
|
53879
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
54093
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
53880
54094
|
|
|
53881
54095
|
var _useState = useState(false),
|
|
53882
54096
|
openConfirmDeleteDialog = _useState[0],
|
|
@@ -54619,7 +54833,7 @@ var useListDetailActivity = function useListDetailActivity() {
|
|
|
54619
54833
|
|
|
54620
54834
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
54621
54835
|
});
|
|
54622
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$roles = currentUser.roles) === null || _currentUser$roles === void 0 ? void 0 : _currentUser$roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
|
|
54836
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$roles = currentUser.roles) === null || _currentUser$roles === void 0 ? void 0 : _currentUser$roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
54623
54837
|
var defaultFont = useSelector(function (state) {
|
|
54624
54838
|
var _state$common2;
|
|
54625
54839
|
|
|
@@ -54765,7 +54979,7 @@ var useListActivity = function useListActivity() {
|
|
|
54765
54979
|
|
|
54766
54980
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
54767
54981
|
});
|
|
54768
|
-
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
|
|
54982
|
+
var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
54769
54983
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
54770
54984
|
|
|
54771
54985
|
var _useParams = useParams(),
|
|
@@ -55150,7 +55364,7 @@ var ListActivityLearning = function ListActivityLearning() {
|
|
|
55150
55364
|
return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
55151
55365
|
});
|
|
55152
55366
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
55153
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
55367
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
55154
55368
|
|
|
55155
55369
|
var _useState2 = useState(false),
|
|
55156
55370
|
openConfirmDelete = _useState2[0],
|
|
@@ -55505,7 +55719,7 @@ var EditNote = function EditNote() {
|
|
|
55505
55719
|
var currentUser = useSelector(function (state) {
|
|
55506
55720
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
55507
55721
|
});
|
|
55508
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
55722
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
55509
55723
|
var selectedIndex = (studentList || []).findIndex(function (e) {
|
|
55510
55724
|
return (e === null || e === void 0 ? void 0 : e.id) === (student === null || student === void 0 ? void 0 : student.id);
|
|
55511
55725
|
});
|
|
@@ -55903,7 +56117,7 @@ var useEditLearningStrategies = function useEditLearningStrategies(_ref) {
|
|
|
55903
56117
|
var currentUser = useSelector(function (state) {
|
|
55904
56118
|
return state === null || state === void 0 ? void 0 : state.common.user;
|
|
55905
56119
|
});
|
|
55906
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
56120
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
55907
56121
|
var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
|
|
55908
56122
|
|
|
55909
56123
|
var _useState = useState(false),
|
|
@@ -60874,7 +61088,7 @@ var useAddClassReflection = function useAddClassReflection() {
|
|
|
60874
61088
|
|
|
60875
61089
|
return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
|
|
60876
61090
|
});
|
|
60877
|
-
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
|
|
61091
|
+
var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
|
|
60878
61092
|
var isStudent = currentUser.roles.includes("Student");
|
|
60879
61093
|
var email = currentUser.email;
|
|
60880
61094
|
var rowClass = {
|