mario-teacher-student-client 1.7.2 → 1.7.3

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.
Files changed (64) hide show
  1. package/dist/containers/MyProfile/hooks/useChangePassword.d.ts +4 -0
  2. package/dist/containers/MyProfile/views/ChangePassword.d.ts +3 -0
  3. package/dist/index.css +26 -18
  4. package/dist/index.d.ts +1 -1
  5. package/dist/index.js +108 -51
  6. package/dist/index.js.map +1 -1
  7. package/dist/index.modern.js +109 -52
  8. package/dist/index.modern.js.map +1 -1
  9. package/dist/services/MyProfile.d.ts +1 -0
  10. package/package.json +102 -102
  11. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Button/AddButton.d.ts +0 -8
  12. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Button/ChipButton.d.ts +0 -8
  13. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Button/ChipImage.d.ts +0 -6
  14. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Button/NodeDraggable.d.ts +0 -3
  15. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Header/HeaderComponent.d.ts +0 -7
  16. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Input/TextFieldComponent.d.ts +0 -3
  17. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/QuestionTypes/EmotionComponent.d.ts +0 -10
  18. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/QuestionTypes/LearningStrategyComponent.d.ts +0 -7
  19. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/QuestionTypes/QuestionComponent.d.ts +0 -14
  20. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/QuestionTypes/SliderComponent.d.ts +0 -10
  21. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Tabs/CustomTab.d.ts +0 -3
  22. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/Tabs/CustomTabNote.d.ts +0 -3
  23. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/layouts/HeaderSideBar.d.ts +0 -7
  24. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/components/selector/StudentSelector.d.ts +0 -3
  25. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/components/ConductTop/ConductItem.d.ts +0 -7
  26. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/components/ConductTop/ConductTop.d.ts +0 -7
  27. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/components/Note/Note.d.ts +0 -6
  28. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/components/Note/PrivateNote.d.ts +0 -3
  29. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/components/Note/SessionResultNote.d.ts +0 -3
  30. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/components/QuestionConduct.d.ts +0 -8
  31. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/constant/types.d.ts +0 -34
  32. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/hooks/useConductOne.d.ts +0 -12
  33. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/ConductOneToOne/views/ConductIndex.d.ts +0 -3
  34. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/Home/views/TeacherHomePage.d.ts +0 -3
  35. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/BookSession.d.ts +0 -3
  36. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/Completed.d.ts +0 -3
  37. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/DialogRequestOneToOne.d.ts +0 -3
  38. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/GoogleCalendar.d.ts +0 -17
  39. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/Loading.d.ts +0 -3
  40. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/UpComing.d.ts +0 -3
  41. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/dialog/DialogNodes.d.ts +0 -3
  42. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/dialog/DialogRequestOneToOne.d.ts +0 -7
  43. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/tab/Me.d.ts +0 -3
  44. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/components/tab/Student.d.ts +0 -3
  45. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/constants/types.d.ts +0 -43
  46. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/hooks/useAsync.d.ts +0 -7
  47. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/hooks/useSessionCompleted.d.ts +0 -7
  48. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/hooks/useUpComing.d.ts +0 -11
  49. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/containers/MyOneToOne/views/MyOneToOne.d.ts +0 -3
  50. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/index.d.ts +0 -5
  51. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/index.test.d.ts +0 -1
  52. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/layouts/MainLayout.d.ts +0 -3
  53. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/services/ConductOneToOne.d.ts +0 -5
  54. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/services/OneToOne.d.ts +0 -6
  55. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/services/SimpleProfile.d.ts +0 -1
  56. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/utils/CountMinutesUTC.d.ts +0 -1
  57. package/dist/MarioFramework.TeacherStudentClient/ClientApp/src/utils/constants.d.ts +0 -9
  58. package/dist/containers/Home/views/TeacherHomePage.d.ts +0 -3
  59. package/dist/containers/MyConferences/components/dialog/StudentDetail.d.ts +0 -3
  60. package/dist/containers/MyOneToOne/components/DialogRequestOneToOne.d.ts +0 -3
  61. package/dist/containers/MyOneToOne/components/dialog/StudentDetail.d.ts +0 -4
  62. package/dist/containers/MyOneToOne/components/tab/Me.d.ts +0 -3
  63. package/dist/containers/MyOneToOne/components/tab/Student.d.ts +0 -3
  64. package/dist/containers/MyStudent/hooks/useLearningPlan.d.ts +0 -4
@@ -0,0 +1,4 @@
1
+ declare const useChangePassword: () => {
2
+ changePassword: (data: any) => Promise<void>;
3
+ };
4
+ export default useChangePassword;
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const ChangePassword: () => JSX.Element;
3
+ export default ChangePassword;
package/dist/index.css CHANGED
@@ -1813,6 +1813,13 @@ h2._1OAmb {
1813
1813
  font-weight: normal;
1814
1814
  padding-bottom: 10px; }
1815
1815
 
1816
+ ._20_3n {
1817
+ word-wrap: break-word;
1818
+ overflow: auto;
1819
+ max-height: 400px;
1820
+ text-align: justify;
1821
+ padding-right: 10px !important; }
1822
+
1816
1823
  ._3tSGF {
1817
1824
  font-size: 12px;
1818
1825
  font-weight: normal;
@@ -2431,7 +2438,7 @@ h2._1OAmb {
2431
2438
  justify-content: space-between;
2432
2439
  min-width: 220px; }
2433
2440
  ._1a4Tr ._3D6Xv {
2434
- color: #cbd4c9; }
2441
+ color: #7f7777; }
2435
2442
  ._1a4Tr > label {
2436
2443
  margin-bottom: 0;
2437
2444
  white-space: nowrap; }
@@ -2607,7 +2614,7 @@ h2._1OAmb {
2607
2614
 
2608
2615
  ._3uYAt {
2609
2616
  background: #f8f8f8;
2610
- padding: 0px 20px; }
2617
+ padding: 10px 20px; }
2611
2618
  ._3uYAt ._1V3nf {
2612
2619
  background: #fff;
2613
2620
  border-radius: 10px;
@@ -2625,7 +2632,7 @@ h2._1OAmb {
2625
2632
  ._J8fJn {
2626
2633
  margin-right: 12px;
2627
2634
  height: 100%; }
2628
- @media (max-width: 767px) {
2635
+ @media (max-width: 820px) {
2629
2636
  ._J8fJn {
2630
2637
  width: 100%;
2631
2638
  margin-right: 0;
@@ -2637,7 +2644,7 @@ h2._1OAmb {
2637
2644
  align-items: center;
2638
2645
  padding-bottom: 10px;
2639
2646
  flex-wrap: wrap; }
2640
- @media (max-width: 767px) {
2647
+ @media (max-width: 820) {
2641
2648
  ._1qCwl {
2642
2649
  display: flex;
2643
2650
  align-items: center;
@@ -2673,6 +2680,9 @@ h2._1OAmb {
2673
2680
  margin-left: 10px; }
2674
2681
  ._1clLN ._1RV8f ._286sF:last-child {
2675
2682
  margin-right: 10px; } }
2683
+ @media (max-width: 767px) {
2684
+ ._1clLN {
2685
+ top: 11%; } }
2676
2686
 
2677
2687
  @media (max-width: 767px) {
2678
2688
  canvas {
@@ -2731,7 +2741,7 @@ h2._1OAmb {
2731
2741
  ._3sc5l ._2UlJW::before {
2732
2742
  opacity: 0 !important; }
2733
2743
 
2734
- @media (max-width: 767px) {
2744
+ @media (max-width: 820px) {
2735
2745
  ._l-kLp {
2736
2746
  width: 100%; } }
2737
2747
 
@@ -2747,8 +2757,6 @@ h2._1OAmb {
2747
2757
  max-height: 13vh !important; }
2748
2758
 
2749
2759
  @media only screen and (max-width: 767px) {
2750
- ._3F0Tm {
2751
- margin-top: 45px; }
2752
2760
  ._1jSN5 {
2753
2761
  margin-top: 130px; }
2754
2762
  ._286sF:last-child {
@@ -4830,43 +4838,43 @@ h2._1KpSK {
4830
4838
  font-weight: normal;
4831
4839
  font-style: normal; }
4832
4840
 
4833
- ._1s_YB {
4841
+ ._2dPW9 {
4834
4842
  display: flex;
4835
4843
  flex-direction: column;
4836
4844
  max-width: 500px;
4837
4845
  width: 100%;
4838
4846
  margin-left: 16px; }
4839
4847
  @media (max-width: 767px) {
4840
- ._1s_YB {
4848
+ ._2dPW9 {
4841
4849
  width: 90%; } }
4842
- ._1s_YB ._XHOmj {
4850
+ ._2dPW9 ._QtS3M {
4843
4851
  margin: 20px 0 5px;
4844
4852
  font-size: 12px;
4845
4853
  font-weight: 400;
4846
4854
  color: #6b6b6b; }
4847
- ._1s_YB ._XHOmj sup {
4855
+ ._2dPW9 ._QtS3M sup {
4848
4856
  color: red;
4849
4857
  font-size: 14px; }
4850
- ._1s_YB ._1WBm5 {
4858
+ ._2dPW9 ._3W0Q2 {
4851
4859
  margin: 10px 0 10px 0;
4852
4860
  word-wrap: break-word;
4853
4861
  width: 100%; }
4854
- ._1s_YB ._1WBm5 ._1tyMm {
4862
+ ._2dPW9 ._3W0Q2 ._21cvx {
4855
4863
  color: black;
4856
4864
  font-weight: 400; }
4857
- ._1s_YB ._1WBm5 ._2I74E {
4865
+ ._2dPW9 ._3W0Q2 ._32y35 {
4858
4866
  color: black;
4859
4867
  font-weight: 600; }
4860
- ._1s_YB ._1WBm5 ._2I74E ._3TwHu {
4868
+ ._2dPW9 ._3W0Q2 ._32y35 ._1tSfF {
4861
4869
  word-wrap: break-word; }
4862
- ._1s_YB ._fRT0E {
4870
+ ._2dPW9 ._3L0_p {
4863
4871
  margin: 10px 0 10px 0;
4864
4872
  width: 100%;
4865
4873
  border-radius: 12px;
4866
4874
  background-color: #308252; }
4867
- ._1s_YB ._fRT0E:hover {
4875
+ ._2dPW9 ._3L0_p:hover {
4868
4876
  background-color: #308252; }
4869
4877
 
4870
- ._1bAMH {
4878
+ ._5P9LZ {
4871
4879
  font-size: 15px;
4872
4880
  color: red; }
package/dist/index.d.ts CHANGED
@@ -17,6 +17,6 @@ import MyProfile from "./containers/MyProfile/views/MyProfile";
17
17
  import NewLearningPlan from './containers/MyStudent/components/NewLearningPlan';
18
18
  import UpdateStudentProfile from "./containers/MyStudent/components/UpdateStudentProfile";
19
19
  import CreateStudent from "./containers/MyStudent/components/CreateStudent";
20
- import ChangePassword from "./containers/MyStudent/components/ChangePassword";
20
+ import ChangePassword from "./containers/MyProfile/views/ChangePassword";
21
21
  import StageDebugPage from "./containers/StageDebug/views/StageDebugPage";
22
22
  export { MainLayout, HomePage, MyOneToOne, MyConferences, ConductIndex, MyStudent, SessionResultComponent, BookSession, StudentDetail, StartReflection, ResultReflection, StudentReflection, ConferenceRubric, ResultConferenceRubric, BookSessionConferences, MyProfile, NewLearningPlan, UpdateStudentProfile, CreateStudent, ChangePassword, StageDebugPage };
package/dist/index.js CHANGED
@@ -5194,7 +5194,7 @@ var HeaderComponent = function HeaderComponent(_ref) {
5194
5194
  }))));
5195
5195
  };
5196
5196
 
5197
- var styles$2 = {"block-question":"_3bYTs","box-last":"_1SQC-","top-session":"_3dcqs","block-session-type":"_xLN0K","session-text":"_3ijmc","page-conduct":"_3A-A9","conduct-contain":"_1saEt","title-conduct":"_2HROs","name-conduct":"_3mJSQ","title":"_3RuBx","list-conduct":"_29kva","session-select":"_Dgvz2","item-conduct":"_T1fJ4","item":"_2hOFE","font-question":"_3-Mx5","talk-conduct":"_2MUjA","box-talk":"_3cwEi","box-p":"_1bzoU","font-title":"_1OAmb","box-question":"_D7nB-","title-strategories":"_3JCHg","strategories-image":"_YKzPb","img-session":"_1WobV","switch-session":"_3T9GL","body-session":"_FuViQ","modal-finished":"_1kr7b","title-modal":"_31ujp","body-modal":"_22YdW","tite-body":"_81XA0","btn-cancel":"_1p4Cd","btn-submit":"_36jLj","partner-profile-header":"_2HAFW","partner-name":"_1rCfd","close-btn":"_3qkoh","close-icon":"_R5ivj","partner-detail-content":"_3Yl8e","partner-detail-email":"_zsML4","partner-detail":"_A-c6O","no-data":"_3tSGF","partner-profiles-diallog":"_gOdCz","partner-profile":"_3h4fG","profile-box-mobile":"_2xyvg","partner-profile-mobile":"_1IckI","partner-profile-header-mobile":"_2-Nhf","partner-profile-avt":"_sSpfT","partner-schedule":"_smLhQ","partner-schedule-meeting":"_1MX_1","no-schedule-box":"_3tmRq","schedule-meeting-element":"_vE2nJ","time-detail":"_JAWru","name-detail":"_3RlQ2","avatar_user":"_3d254","btn-done":"_9SOPe","btn-done-session":"_3Id4g","btn-scroll-top":"_WEfrE","info-container":"_3KbBU"};
5197
+ var styles$2 = {"block-question":"_3bYTs","box-last":"_1SQC-","top-session":"_3dcqs","block-session-type":"_xLN0K","session-text":"_3ijmc","page-conduct":"_3A-A9","conduct-contain":"_1saEt","title-conduct":"_2HROs","name-conduct":"_3mJSQ","title":"_3RuBx","list-conduct":"_29kva","session-select":"_Dgvz2","item-conduct":"_T1fJ4","item":"_2hOFE","font-question":"_3-Mx5","talk-conduct":"_2MUjA","box-talk":"_3cwEi","box-p":"_1bzoU","font-title":"_1OAmb","box-question":"_D7nB-","title-strategories":"_3JCHg","strategories-image":"_YKzPb","img-session":"_1WobV","switch-session":"_3T9GL","body-session":"_FuViQ","modal-finished":"_1kr7b","title-modal":"_31ujp","body-modal":"_22YdW","tite-body":"_81XA0","btn-cancel":"_1p4Cd","btn-submit":"_36jLj","partner-profile-header":"_2HAFW","partner-name":"_1rCfd","close-btn":"_3qkoh","close-icon":"_R5ivj","partner-detail-content":"_3Yl8e","partner-detail-email":"_zsML4","partner-detail":"_A-c6O","health-note-text":"_20_3n","no-data":"_3tSGF","partner-profiles-diallog":"_gOdCz","partner-profile":"_3h4fG","profile-box-mobile":"_2xyvg","partner-profile-mobile":"_1IckI","partner-profile-header-mobile":"_2-Nhf","partner-profile-avt":"_sSpfT","partner-schedule":"_smLhQ","partner-schedule-meeting":"_1MX_1","no-schedule-box":"_3tmRq","schedule-meeting-element":"_vE2nJ","time-detail":"_JAWru","name-detail":"_3RlQ2","avatar_user":"_3d254","btn-done":"_9SOPe","btn-done-session":"_3Id4g","btn-scroll-top":"_WEfrE","info-container":"_3KbBU"};
5198
5198
 
5199
5199
  var BACKGROUND_COLOR = "#CDCDCD";
5200
5200
 
@@ -5880,8 +5880,8 @@ var useConductOne = function useConductOne() {
5880
5880
  setSessionResultId = _useState5[1];
5881
5881
 
5882
5882
  var _useState6 = React.useState(0),
5883
- sessionResultTeacherId = _useState6[0],
5884
- setSessionResultTeacherId = _useState6[1];
5883
+ sessionResultStudentId = _useState6[0],
5884
+ setSessionResultStudentId = _useState6[1];
5885
5885
 
5886
5886
  var _useState7 = React.useState(false),
5887
5887
  isUnlocked = _useState7[0],
@@ -5910,7 +5910,7 @@ var useConductOne = function useConductOne() {
5910
5910
 
5911
5911
  var _temp4 = _catch(function () {
5912
5912
  return Promise.resolve(getQuestionTeacherDefault(parseInt(sessionId))).then(function (res) {
5913
- var _res$data, _res$data$studentResu, _res$data4, _res$data4$teacherRes, _res$data$teacherResu, _res$data$teacherResu2, _res$data$teacherResu3, _res$data$teacherResu4, _res$data$studentResu2, _res$data$teacherResu5, _res$data$studentResu3, _res$data7, _res$data7$studentRes, _res$data8, _res$data8$teacherRes, _res$data9, _res$data9$teacherRes;
5913
+ var _res$data, _res$data$studentResu, _res$data4, _res$data4$teacherRes, _res$data$teacherResu, _res$data$teacherResu2, _res$data$teacherResu3, _res$data$teacherResu4, _res$data$teacherResu5, _res$data$studentResu2, _res$data$studentResu3, _res$data$studentResu4, _res$data7, _res$data7$studentRes, _res$data8, _res$data8$teacherRes, _res$data9, _res$data9$teacherRes;
5914
5914
 
5915
5915
  if (isStudent && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$studentResu = _res$data.studentResult) !== null && _res$data$studentResu !== void 0 && _res$data$studentResu.isDone) {
5916
5916
  var _res$data2, _res$data3, _res$data3$studentRes;
@@ -5927,10 +5927,10 @@ var useConductOne = function useConductOne() {
5927
5927
  setListQuestionTeacherAnswer((_res$data$teacherResu = res.data.teacherResult) === null || _res$data$teacherResu === void 0 ? void 0 : (_res$data$teacherResu2 = _res$data$teacherResu.questions) === null || _res$data$teacherResu2 === void 0 ? void 0 : _res$data$teacherResu2[0]);
5928
5928
  setListQuestionStudentAnswer(res.data.studentResult.questions);
5929
5929
  setListLearningStrategory((_res$data$teacherResu3 = res.data.teacherResult) === null || _res$data$teacherResu3 === void 0 ? void 0 : (_res$data$teacherResu4 = _res$data$teacherResu3.questions) === null || _res$data$teacherResu4 === void 0 ? void 0 : _res$data$teacherResu4[0].learningStrategyAnswers);
5930
- setSessionResultId((_res$data$studentResu2 = res.data.studentResult) === null || _res$data$studentResu2 === void 0 ? void 0 : _res$data$studentResu2.id);
5931
- setSessionResultTeacherId((_res$data$teacherResu5 = res.data.teacherResult) === null || _res$data$teacherResu5 === void 0 ? void 0 : _res$data$teacherResu5.id);
5930
+ setSessionResultId(isTeacher ? (_res$data$teacherResu5 = res.data.teacherResult) === null || _res$data$teacherResu5 === void 0 ? void 0 : _res$data$teacherResu5.id : (_res$data$studentResu2 = res.data.studentResult) === null || _res$data$studentResu2 === void 0 ? void 0 : _res$data$studentResu2.id);
5931
+ setSessionResultStudentId((_res$data$studentResu3 = res.data.studentResult) === null || _res$data$studentResu3 === void 0 ? void 0 : _res$data$studentResu3.id);
5932
5932
  setIsUnclocked(res.data.isUnlocked);
5933
- setLength((_res$data$studentResu3 = res.data.studentResult) === null || _res$data$studentResu3 === void 0 ? void 0 : _res$data$studentResu3.length);
5933
+ setLength((_res$data$studentResu4 = res.data.studentResult) === null || _res$data$studentResu4 === void 0 ? void 0 : _res$data$studentResu4.length);
5934
5934
  setStartTime(isStudent ? (_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : (_res$data7$studentRes = _res$data7.studentResult) === null || _res$data7$studentRes === void 0 ? void 0 : _res$data7$studentRes.startTime : (_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.startTime);
5935
5935
  var body = {
5936
5936
  studentName: res.data.studentName,
@@ -5972,10 +5972,10 @@ var useConductOne = function useConductOne() {
5972
5972
 
5973
5973
  return item;
5974
5974
  });
5975
- var isCheckTeacherLearning = listQuestionTeachers.id == questionId;
5975
+ var isCheckTeacherLearning = listQuestionTeachers.id != questionId;
5976
5976
  setListQuestionStudentAnswer(arrNew);
5977
5977
  var body = {
5978
- sessionResultId: isCheckTeacherLearning ? sessionResultTeacherId : sessionResultId,
5978
+ sessionResultId: isCheckTeacherLearning ? sessionResultStudentId : sessionResultId,
5979
5979
  questionId: questionId,
5980
5980
  text: text
5981
5981
  };
@@ -6013,7 +6013,7 @@ var useConductOne = function useConductOne() {
6013
6013
  return Promise.reject(e);
6014
6014
  }
6015
6015
  }, 500);
6016
- }, [sessionResultId, listQuestionStudents, listQuestionTeachers, sessionResultTeacherId]);
6016
+ }, [sessionResultId, listQuestionStudents, listQuestionTeachers, sessionResultStudentId]);
6017
6017
  var fnfinishSession = React.useCallback(function (sessionTypeCategoryId, cb) {
6018
6018
  try {
6019
6019
  var _temp9 = function _temp9() {
@@ -6028,8 +6028,7 @@ var useConductOne = function useConductOne() {
6028
6028
  length: lengthSession,
6029
6029
  sessionTypeCategoryId: sessionTypeCategoryId
6030
6030
  };
6031
- var idSessionResult = isTeacher ? sessionResultTeacherId : sessionResultId;
6032
- var runFinishSession = isTeacher ? finishSession(idSessionResult, body) : finishSession(idSessionResult, {});
6031
+ var runFinishSession = isTeacher ? finishSession(sessionResultId, body) : finishSession(sessionResultId, {});
6033
6032
  return Promise.resolve(runFinishSession).then(function () {
6034
6033
  !!cb && cb();
6035
6034
  });
@@ -6046,7 +6045,7 @@ var useConductOne = function useConductOne() {
6046
6045
  } catch (e) {
6047
6046
  return Promise.reject(e);
6048
6047
  }
6049
- }, [sessionResultId, length, isTeacher, sessionResultTeacherId]);
6048
+ }, [sessionResultId, length, isTeacher]);
6050
6049
  var getSessionType = React.useCallback(function () {
6051
6050
  try {
6052
6051
  var _temp13 = function _temp13() {
@@ -11328,7 +11327,7 @@ var StudentTabs = function StudentTabs(props) {
11328
11327
  }, renderContent());
11329
11328
  };
11330
11329
 
11331
- var styles$3 = {"box-overview":"_3uYAt","overview-left":"_1V3nf","overview-schedule":"_2AQxk","overview-partner-profiles":"_J8fJn","show-arrange-today":"_1qCwl","gr-date-time":"_1clLN","date-picker-overview":"_1RV8f","date-time":"_286sF","box":"_2QGnx","title-box":"_175nT","content-box":"_fEaRj","overview-right":"_3sc5l","accordion-item":"_2UlJW","collap-box":"_l-kLp","title-overview":"_3aapW","width-90":"_2wWhs","height-13vh":"_2WNUe","date-picker-mobile":"_3F0Tm","chartDataAndLabelData":"_1jSN5","date-picker-to":"_3140u"};
11330
+ var styles$3 = {"box-overview":"_3uYAt","overview-left":"_1V3nf","overview-schedule":"_2AQxk","overview-partner-profiles":"_J8fJn","show-arrange-today":"_1qCwl","gr-date-time":"_1clLN","date-picker-overview":"_1RV8f","date-time":"_286sF","box":"_2QGnx","title-box":"_175nT","content-box":"_fEaRj","overview-right":"_3sc5l","accordion-item":"_2UlJW","collap-box":"_l-kLp","title-overview":"_3aapW","width-90":"_2wWhs","height-13vh":"_2WNUe","chartDataAndLabelData":"_1jSN5","date-picker-mobile":"_3F0Tm","date-picker-to":"_3140u"};
11332
11331
 
11333
11332
  var _excluded$8 = ["children", "value", "index"];
11334
11333
  var DEFAULT_USER_AVATAR$6 = "/images/image-default.png";
@@ -11563,7 +11562,7 @@ var OverviewLeft = function OverviewLeft(props) {
11563
11562
  }, "- No data"), React__default.createElement(core.Typography, {
11564
11563
  className: "" + styles$2["partner-detail-content"]
11565
11564
  }, "Note"), !!partnerData.note ? React__default.createElement("p", {
11566
- className: "" + styles$2["partner-detail"]
11565
+ className: styles$2["partner-detail"] + " " + styles$2["health-note-text"]
11567
11566
  }, partnerData === null || partnerData === void 0 ? void 0 : partnerData.note) : React__default.createElement("p", {
11568
11567
  className: "" + styles$2["no-data"]
11569
11568
  }, "- No data"))), React__default.createElement(core.Grid, {
@@ -12218,6 +12217,15 @@ var Overview = function Overview(props) {
12218
12217
  };
12219
12218
  });
12220
12219
  }, [overviewCollap, informationWellbeing]);
12220
+ React.useEffect(function () {
12221
+ var firstChildId = !!overviewTotal && overviewTotal.length > 0 ? overviewTotal[0].id : 0;
12222
+ var openPanel = "panel" + firstChildId;
12223
+ setExpanded(openPanel);
12224
+
12225
+ if (expanded != openPanel) {
12226
+ getInformationWellbeing(firstChildId, moment().startOf("month").valueOf(), Date.now());
12227
+ }
12228
+ }, [overviewTotal, overviewCollap, informationWellbeing]);
12221
12229
  console.log({
12222
12230
  overviewTotal: overviewTotal
12223
12231
  });
@@ -12260,7 +12268,7 @@ var Overview = function Overview(props) {
12260
12268
  var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
12261
12269
  return React__default.createElement("div", {
12262
12270
  className: styles$3["box-overview"]
12263
- }, screenWidth > 680 ? React__default.createElement(core.Grid, {
12271
+ }, screenWidth > 820 ? React__default.createElement(core.Grid, {
12264
12272
  container: true
12265
12273
  }, React__default.createElement(core.Grid, {
12266
12274
  item: true,
@@ -18001,6 +18009,7 @@ var TEACHER_PROFILE = marioCore.BASE_URL + "/api/TeacherProfile";
18001
18009
  var UPDATE_TEACHER_PROFILE = marioCore.BASE_URL + "/api/TeacherProfile";
18002
18010
  var UPLOAD_FILE_URL = marioCore.BASE_URL + "/api/file";
18003
18011
  var SYSTEM_PROFILE$1 = UPLOAD_FILE_URL + "/system/profile";
18012
+ var CHANGE_PASSWORD = marioCore.BASE_URL + "/api/Account/changePassword";
18004
18013
  var getProfileTeacher = function getProfileTeacher() {
18005
18014
  return marioCore.api.get(TEACHER_PROFILE + "/current");
18006
18015
  };
@@ -18010,6 +18019,9 @@ var updateProfileTeacher = function updateProfileTeacher(data) {
18010
18019
  var systemProfileUpload$1 = function systemProfileUpload(formData) {
18011
18020
  return marioCore.api.post(SYSTEM_PROFILE$1, formData);
18012
18021
  };
18022
+ var changePasswordApi = function changePasswordApi(formData) {
18023
+ marioCore.api.post(CHANGE_PASSWORD, formData);
18024
+ };
18013
18025
 
18014
18026
  var useProfile = function useProfile() {
18015
18027
  var dispatch = reactRedux.useDispatch();
@@ -18125,7 +18137,7 @@ var MyProfile = function MyProfile() {
18125
18137
  }, []);
18126
18138
 
18127
18139
  var goToChangePass = function goToChangePass() {
18128
- history.push("/change-password");
18140
+ history.push("/my-profile/change-password");
18129
18141
  };
18130
18142
 
18131
18143
  var MAX_FILE_SIZE = 20097152;
@@ -18943,10 +18955,10 @@ var NewLearningPlan = function NewLearningPlan() {
18943
18955
  };
18944
18956
  var initialValuesSchema = yup.object({
18945
18957
  disabilityArea: yup.string().required("Disability Area is required"),
18946
- iefMeetingDate: yup.string().required("IEP Meeting Date is required"),
18947
- iefImplementationDate: yup.string().required("IEP Implementation Date is required"),
18948
- annualReviewDate: yup.string().required("Annual Review Date is required"),
18949
- triennialDate: yup.string().required("Triennial Date is required"),
18958
+ iefMeetingDate: yup.string().typeError("IEP Meeting Date is required").required("IEP Meeting Date is required"),
18959
+ iefImplementationDate: yup.string().typeError("IEP Implementation Date is required").required("IEP Implementation Date is required"),
18960
+ annualReviewDate: yup.string().typeError("Annual Review Date is required").required("Annual Review Date is required"),
18961
+ triennialDate: yup.string().typeError("Triennial Date is required").required("Triennial Date is required"),
18950
18962
  typeOfIef: yup.array().test("test-Type of IEP", "Type of IEP is required", function (value) {
18951
18963
  for (var i = 0; i < value.length; i++) {
18952
18964
  if (!!value[i]) {
@@ -19180,7 +19192,11 @@ var NewLearningPlan = function NewLearningPlan() {
19180
19192
  className: "" + myStudent["student-information-type"]
19181
19193
  }, React__default.createElement(core.Typography, {
19182
19194
  className: "" + myStudent["information-type-title"]
19183
- }, "Type of IEP"), React__default.createElement(core.FormGroup, {
19195
+ }, "Type of IEP", React__default.createElement("sup", {
19196
+ style: {
19197
+ color: "red"
19198
+ }
19199
+ }, "*")), React__default.createElement(core.FormGroup, {
19184
19200
  row: true
19185
19201
  }, typeOfIefModel.map(function (e) {
19186
19202
  return React__default.createElement(core.FormControlLabel, {
@@ -19198,7 +19214,11 @@ var NewLearningPlan = function NewLearningPlan() {
19198
19214
  className: "" + myStudent["student-information-source"]
19199
19215
  }, React__default.createElement(core.Typography, {
19200
19216
  className: "" + myStudent["information-source-title"]
19201
- }, "Source of Eligibility (for initial)"), React__default.createElement(core.FormGroup, {
19217
+ }, "Source of Eligibility (for initial)", React__default.createElement("sup", {
19218
+ style: {
19219
+ color: "red"
19220
+ }
19221
+ }, "*")), React__default.createElement(core.FormGroup, {
19202
19222
  row: true
19203
19223
  }, typeSourceofEligibilityModel.map(function (e) {
19204
19224
  return React__default.createElement(core.FormControlLabel, {
@@ -19791,10 +19811,6 @@ var UpdateStudentProfile = function UpdateStudentProfile() {
19791
19811
  history.push("/student-detail/overview/" + studentId);
19792
19812
  };
19793
19813
 
19794
- var goToChangePass = function goToChangePass() {
19795
- history.push("/change-password");
19796
- };
19797
-
19798
19814
  React.useEffect(function () {
19799
19815
  document.title = "Student Profile Edit";
19800
19816
  }, []);
@@ -20076,10 +20092,7 @@ var UpdateStudentProfile = function UpdateStudentProfile() {
20076
20092
  onChange: function onChange(e) {
20077
20093
  return setFieldValue("calendarId", e.target.value);
20078
20094
  }
20079
- }), React__default.createElement("p", {
20080
- className: "" + styles$8["link"],
20081
- onClick: goToChangePass
20082
- }, "Change Password"), React__default.createElement(core.Button, {
20095
+ }), React__default.createElement(core.Button, {
20083
20096
  variant: "contained",
20084
20097
  color: "primary",
20085
20098
  size: "large",
@@ -20478,17 +20491,58 @@ var CreateStudent = function CreateStudent() {
20478
20491
  });
20479
20492
  };
20480
20493
 
20481
- var styles$a = {"change-form":"_1s_YB","label":"_XHOmj","input-field":"_1WBm5","MuiInputLabel-outlined":"_1tyMm","MuiFormLabel-root":"_2I74E","MuiInputBase-input":"_3TwHu","btn-submit":"_fRT0E","input-error":"_1bAMH"};
20494
+ var styles$a = {"change-form":"_2dPW9","label":"_QtS3M","input-field":"_3W0Q2","MuiInputLabel-outlined":"_21cvx","MuiFormLabel-root":"_32y35","MuiInputBase-input":"_1tSfF","btn-submit":"_3L0_p","input-error":"_5P9LZ"};
20495
+
20496
+ var useChangePassword = function useChangePassword() {
20497
+ var dispatch = reactRedux.useDispatch();
20498
+
20499
+ var changePassword = function changePassword(data) {
20500
+ try {
20501
+ var _temp3 = function _temp3() {
20502
+ dispatch(marioCore.setLoading(false));
20503
+ };
20504
+
20505
+ dispatch(marioCore.setLoading(true));
20506
+
20507
+ var _temp4 = _catch(function () {
20508
+ return Promise.resolve(changePasswordApi(data)).then(function () {
20509
+ dispatch(marioCore.setAlert({
20510
+ type: "success",
20511
+ message: "Change password successfully"
20512
+ }));
20513
+ });
20514
+ }, function (err) {
20515
+ var _err$response, _err$response$data;
20516
+
20517
+ dispatch(marioCore.setAlert({
20518
+ type: "danger",
20519
+ message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message
20520
+ }));
20521
+ });
20522
+
20523
+ return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
20524
+ } catch (e) {
20525
+ return Promise.reject(e);
20526
+ }
20527
+ };
20528
+
20529
+ return {
20530
+ changePassword: changePassword
20531
+ };
20532
+ };
20482
20533
 
20483
20534
  var schema$2 = yup.object({
20484
- email: yup.string().email('Invalid email').required('Email is required'),
20485
- newPassword: yup.string().required('Password is required'),
20486
- otp: yup.string().required('OTP is required')
20535
+ oldPassword: yup.string().required("Old password is required"),
20536
+ newPassword: yup.string().required("New password is required"),
20537
+ confirmedNewPassword: yup.string().oneOf([yup.ref("newPassword"), null], "New password must match").required("Confirm your new password")
20487
20538
  });
20488
20539
 
20489
20540
  var ChangePassword = function ChangePassword() {
20490
20541
  var history = reactRouterDom.useHistory();
20491
20542
 
20543
+ var _useChangePassword = useChangePassword(),
20544
+ changePassword = _useChangePassword.changePassword;
20545
+
20492
20546
  var goBack = function goBack() {
20493
20547
  history.push("/my-one-to-one/up-coming");
20494
20548
  };
@@ -20498,13 +20552,13 @@ var ChangePassword = function ChangePassword() {
20498
20552
  }, []);
20499
20553
  return React__default.createElement(formik.Formik, {
20500
20554
  initialValues: {
20501
- email: "",
20555
+ oldPassword: "",
20502
20556
  newPassword: "",
20503
- otp: ""
20557
+ confirmedNewPassword: ""
20504
20558
  },
20505
20559
  enableReinitialize: true,
20506
20560
  onSubmit: function onSubmit(values) {
20507
- console.log(values);
20561
+ changePassword(values);
20508
20562
  },
20509
20563
  validateOnChange: false,
20510
20564
  validateOnBlur: false,
@@ -20533,21 +20587,23 @@ var ChangePassword = function ChangePassword() {
20533
20587
  className: "" + styles$a["change-form"]
20534
20588
  }, React__default.createElement(core.Typography, {
20535
20589
  className: "" + styles$a["label"]
20536
- }, "Email", React__default.createElement("sup", null, "*")), React__default.createElement(core.TextField, {
20537
- name: "email",
20590
+ }, "Old password", React__default.createElement("sup", null, "*")), React__default.createElement(core.TextField, {
20591
+ name: "oldPassword",
20538
20592
  variant: "outlined",
20539
- value: values === null || values === void 0 ? void 0 : values.email,
20593
+ type: "password",
20594
+ value: values === null || values === void 0 ? void 0 : values.oldPassword,
20540
20595
  className: "" + styles$a["input-field"],
20541
20596
  onChange: function onChange(e) {
20542
- setFieldValue("email", e.target.value);
20597
+ setFieldValue("oldPassword", e.target.value);
20543
20598
  }
20544
- }), errors.email && touched.email && React__default.createElement("div", {
20599
+ }), errors.oldPassword && touched.oldPassword && React__default.createElement("div", {
20545
20600
  className: "" + styles$a["input-error"]
20546
- }, errors.email), React__default.createElement(core.Typography, {
20601
+ }, errors.oldPassword), React__default.createElement(core.Typography, {
20547
20602
  className: "" + styles$a["label"]
20548
20603
  }, "New Password", React__default.createElement("sup", null, "*")), React__default.createElement(core.TextField, {
20549
- name: "password",
20604
+ name: "newPassword",
20550
20605
  variant: "outlined",
20606
+ type: "password",
20551
20607
  value: values === null || values === void 0 ? void 0 : values.newPassword,
20552
20608
  className: "" + styles$a["input-field"],
20553
20609
  onChange: function onChange(e) {
@@ -20557,17 +20613,18 @@ var ChangePassword = function ChangePassword() {
20557
20613
  className: "" + styles$a["input-error"]
20558
20614
  }, errors.newPassword), React__default.createElement(core.Typography, {
20559
20615
  className: "" + styles$a["label"]
20560
- }, "OTP", React__default.createElement("sup", null, "*")), React__default.createElement(core.TextField, {
20561
- name: "otp",
20616
+ }, "Confirm new password", React__default.createElement("sup", null, "*")), React__default.createElement(core.TextField, {
20617
+ name: "confirmedNewPassword",
20562
20618
  variant: "outlined",
20563
- value: values === null || values === void 0 ? void 0 : values.otp,
20619
+ type: "password",
20620
+ value: values === null || values === void 0 ? void 0 : values.confirmedNewPassword,
20564
20621
  className: "" + styles$a["input-field"],
20565
20622
  onChange: function onChange(e) {
20566
- setFieldValue("otp", e.target.value);
20623
+ setFieldValue("confirmedNewPassword", e.target.value);
20567
20624
  }
20568
- }), errors.otp && touched.otp && React__default.createElement("div", {
20625
+ }), errors.confirmedNewPassword && touched.confirmedNewPassword && React__default.createElement("div", {
20569
20626
  className: "" + styles$a["input-error"]
20570
- }, errors.otp), React__default.createElement(core.Button, {
20627
+ }, errors.confirmedNewPassword), React__default.createElement(core.Button, {
20571
20628
  variant: "contained",
20572
20629
  color: "primary",
20573
20630
  size: "large",