mario-teacher-student-client 3.0.7-admin → 3.0.9-admin

package/dist/index.modern.js

@@ -1733,7 +1733,6 @@ var MainLayout = function MainLayout(_ref) {
       var _temp6 = _catch(function () {
         return Promise.resolve(getInfo()).then(function (info) {
           function _temp4() {
-            console.log("end");
             dispatch(setUser(_extends({}, user, userData, {
               email: userData.email,
               roles: roles,
@@ -1751,11 +1750,12 @@ var MainLayout = function MainLayout(_ref) {
           var isStudent = roles.includes("Student");
           var isAssistant = !(roles !== null && roles !== void 0 && roles.includes("Teacher")) && (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
           var isTeacherAssistant = (roles === null || roles === void 0 ? void 0 : roles.includes("Teacher")) && (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
+          var isCounselor = roles.includes("Counselor");
 
           var _temp3 = function () {
-            if (isTeacher || isStudent || isTeacherAssistant) {
+            if (isTeacher || isStudent || isTeacherAssistant || isCounselor) {
               return Promise.resolve(getStudentSimpleProfile()).then(function (profileRes) {
-                var _profileRes$data10;
+                var _profileRes$data11;
 
                 if (isTeacherAssistant) {
                   var _profileRes$data, _profileRes$data2;
@@ -1766,21 +1766,25 @@ var MainLayout = function MainLayout(_ref) {
                   var _profileRes$data3;
 
                   userData.assistantId = (_profileRes$data3 = profileRes.data) === null || _profileRes$data3 === void 0 ? void 0 : _profileRes$data3.assistantId;
+                } else if (isCounselor) {
+                  var _profileRes$data4;
+
+                  userData.counselorId = (_profileRes$data4 = profileRes.data) === null || _profileRes$data4 === void 0 ? void 0 : _profileRes$data4.counselorId;
                 } else if (isStudent) {
-                  var _profileRes$data4, _profileRes$data5, _profileRes$data6, _profileRes$data7, _profileRes$data8;
+                  var _profileRes$data5, _profileRes$data6, _profileRes$data7, _profileRes$data8, _profileRes$data9;
 
-                  userData.studentId = (_profileRes$data4 = profileRes.data) === null || _profileRes$data4 === void 0 ? void 0 : _profileRes$data4.id;
-                  userData.mainTeacherId = (_profileRes$data5 = profileRes.data) === null || _profileRes$data5 === void 0 ? void 0 : _profileRes$data5.mainTeacherId;
-                  userData.mainTeacherName = (_profileRes$data6 = profileRes.data) === null || _profileRes$data6 === void 0 ? void 0 : _profileRes$data6.mainTeacherName;
-                  userData.mainTeacherUserId = (_profileRes$data7 = profileRes.data) === null || _profileRes$data7 === void 0 ? void 0 : _profileRes$data7.mainTeacherUserId;
-                  userData.mainTeacherProfileImageFileName = (_profileRes$data8 = profileRes.data) === null || _profileRes$data8 === void 0 ? void 0 : _profileRes$data8.mainTeacherProfileImageFileName;
+                  userData.studentId = (_profileRes$data5 = profileRes.data) === null || _profileRes$data5 === void 0 ? void 0 : _profileRes$data5.id;
+                  userData.mainTeacherId = (_profileRes$data6 = profileRes.data) === null || _profileRes$data6 === void 0 ? void 0 : _profileRes$data6.mainTeacherId;
+                  userData.mainTeacherName = (_profileRes$data7 = profileRes.data) === null || _profileRes$data7 === void 0 ? void 0 : _profileRes$data7.mainTeacherName;
+                  userData.mainTeacherUserId = (_profileRes$data8 = profileRes.data) === null || _profileRes$data8 === void 0 ? void 0 : _profileRes$data8.mainTeacherUserId;
+                  userData.mainTeacherProfileImageFileName = (_profileRes$data9 = profileRes.data) === null || _profileRes$data9 === void 0 ? void 0 : _profileRes$data9.mainTeacherProfileImageFileName;
                 } else {
-                  var _profileRes$data9;
+                  var _profileRes$data10;
 
-                  userData.teacherId = (_profileRes$data9 = profileRes.data) === null || _profileRes$data9 === void 0 ? void 0 : _profileRes$data9.id;
+                  userData.teacherId = (_profileRes$data10 = profileRes.data) === null || _profileRes$data10 === void 0 ? void 0 : _profileRes$data10.id;
                 }
 
-                userData.name = (_profileRes$data10 = profileRes.data) === null || _profileRes$data10 === void 0 ? void 0 : _profileRes$data10.name;
+                userData.name = (_profileRes$data11 = profileRes.data) === null || _profileRes$data11 === void 0 ? void 0 : _profileRes$data11.name;
               });
             }
           }();
@@ -2141,7 +2145,14 @@ var getEventFullCalendar = function getEventFullCalendar(userId, startCalendar)
         return Promise.resolve(getEventCard(params)).then(function (res) {
           setDataCardTotal(res.data);
         });
-      }, function () {});
+      }, function (err) {
+        var _err$response2, _err$response2$data;
+
+        dispatch(setAlert({
+          type: "danger",
+          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
+        }));
+      });
 
       return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
     } catch (e) {
@@ -3533,7 +3544,7 @@ var Dashboard = function Dashboard() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var studentUserId = "";
   var currentDate = moment();
   var todayDate = moment().format("DD");
@@ -3706,7 +3717,7 @@ var useStudentList = function useStudentList() {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var getStudentSelector = useCallback(function () {
     try {
       var _temp3 = function _temp3() {
@@ -3855,7 +3866,7 @@ var DialogRequestOneToOne = function DialogRequestOneToOne(_ref) {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
 
   var _useState = useState("0"),
       selectData = _useState[0],
@@ -4262,6 +4273,9 @@ var deleteActionPointApi$1 = function deleteActionPointApi(id) {
 var updateTeacherAssignStudent = function updateTeacherAssignStudent(body) {
   return api.post(TEACHER_URL$1 + "/update/teacher-assign-assistant", body);
 };
+var updateTeacherAssignCounselor = function updateTeacherAssignCounselor(body) {
+  return api.post(TEACHER_URL$1 + "/update/teacher-assign-counselor", body);
+};
 var getAllEduTeacher = function getAllEduTeacher() {
   return api.get("" + GENERAL_EDUCATION_TEACHER);
 };
@@ -4338,7 +4352,7 @@ var useChangeRoteQuestion = function useChangeRoteQuestion() {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var changeRouteQuestion = useCallback(function (studentId) {
     try {
       var _temp4 = function _temp4() {
@@ -4646,7 +4660,7 @@ var useUpComing = function useUpComing() {
 
     return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.defaultFontSize;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var search = location.search;
   var params = new URLSearchParams(search);
   var studentNameReq = params.get('studentNameReq');
@@ -5223,7 +5237,7 @@ var UpComing = function UpComing() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var isStudent = roles === null || roles === void 0 ? void 0 : roles.includes("Student");
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
 
@@ -5699,7 +5713,7 @@ var useSessionCompleted = function useSessionCompleted() {
 
     return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.defaultFontSize;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var filters = null;
   var setFilters = null;
   var classFontSize = useMemo(function () {
@@ -5931,7 +5945,7 @@ var SessionCompleted = function SessionCompleted() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
 
   var handleSort = function handleSort(e) {
     if (e === "StartTime") {
@@ -6645,7 +6659,7 @@ var DialogRequestConferences = function DialogRequestConferences(_ref) {
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
   var currentStudentId = currentUser.studentId;
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
 
   var _useState = useState("0"),
       selectData = _useState[0],
@@ -7553,7 +7567,7 @@ var UpComing$1 = function UpComing() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var isStudent = roles.includes("Student");
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
 
@@ -8131,7 +8145,7 @@ var SessionCompleted$1 = function SessionCompleted() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
 
   var handleSort = function handleSort(e) {
     if (e === "StartTime") {
@@ -8576,7 +8590,7 @@ var MyConferences = function MyConferences() {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   return React__default.createElement(Box$1, null, React__default.createElement(CustomTabs$1, {
     title: title,
     tabs: tabs,
@@ -9237,6 +9251,15 @@ var TypeTime$1;
   TypeTime[TypeTime["StopTime"] = 2] = "StopTime";
 })(TypeTime$1 || (TypeTime$1 = {}));
 
+var RoleStartSessionEnum;
+
+(function (RoleStartSessionEnum) {
+  RoleStartSessionEnum[RoleStartSessionEnum["Assistant"] = 0] = "Assistant";
+  RoleStartSessionEnum[RoleStartSessionEnum["Teacher"] = 1] = "Teacher";
+  RoleStartSessionEnum[RoleStartSessionEnum["Student"] = 2] = "Student";
+  RoleStartSessionEnum[RoleStartSessionEnum["Counselor"] = 3] = "Counselor";
+})(RoleStartSessionEnum || (RoleStartSessionEnum = {}));
+
 var EmotionComponent = function EmotionComponent(_ref) {
   var emotionTypeList = _ref.emotionTypeList,
       onChangeQuestionAnswer = _ref.onChangeQuestionAnswer,
@@ -9282,17 +9305,7 @@ var SingleChoiceComponent = function SingleChoiceComponent(_ref) {
       isUserChangeSession = _ref$isUserChangeSess === void 0 ? true : _ref$isUserChangeSess,
       _ref$questionAnswer = _ref.questionAnswer,
       questionAnswer = _ref$questionAnswer === void 0 ? [] : _ref$questionAnswer;
-
-  var _useState = useState(valueText || ""),
-      active = _useState[0],
-      setActive = _useState[1];
-
   var isYesNoQuestion = questionAnswer.includes("Yes" );
-
-  var handleActive = function handleActive(value) {
-    setActive(value);
-  };
-
   return React__default.createElement(Grid, {
     className: "" + styles["totally-safe-select"]
   }, React__default.createElement(Grid, {
@@ -9322,9 +9335,8 @@ var SingleChoiceComponent = function SingleChoiceComponent(_ref) {
       value: i,
       onClick: function onClick() {
         onChangeQuestionAnswer === null || onChangeQuestionAnswer === void 0 ? void 0 : onChangeQuestionAnswer(questionId, i);
-        handleActive(i);
       },
-      className: styles["btn-choice"] + " " + (active === valueText && valueText === i && styles[valueText.toLowerCase() + "-active"])
+      className: styles["btn-choice"] + " " + (valueText === i && styles[valueText.toLowerCase() + "-active"])
     });
   })));
 };
@@ -9984,7 +9996,7 @@ var useConductOne = function useConductOne() {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isStudent = currentUser.roles.includes("Student");
   var pusherKey = useSelector(function (state) {
     return state.common.user.pusherKey;
@@ -10111,10 +10123,10 @@ var useConductOne = function useConductOne() {
 
       var _temp7 = _catch(function () {
         return Promise.resolve(getQuestionTeacherDefault(parseInt(sessionId))).then(function (res) {
-          var _res$data10, _res$data10$studentRe, _res$data$studentResu4, _res$data$teacherResu8, _res$data$teacherResu9, _res$data$teacherResu10;
+          var _res$data11, _res$data11$studentRe, _res$data$studentResu4, _res$data$teacherResu8, _res$data$teacherResu9, _res$data$teacherResu10;
 
           function _temp3() {
-            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;
+            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;
 
             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) {
               var _res$data2, _res$data3, _res$data3$teacherRes;
@@ -10146,16 +10158,20 @@ var useConductOne = function useConductOne() {
               teacherUserId: res.data.teacherUserId,
               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,
               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,
-              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
+              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,
+              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
             };
+            var isTeacherStart = res.data.teacherResult.isTeacherStart;
 
-            if (isStudent || !body.assistantId) {
+            if (isStudent) {
               setIsUserChangeSession(true);
             } else {
               if (!!body.assistantId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.assistantId) == body.assistantId) {
-                setIsUserChangeSession(!res.data.teacherResult.isTeacherStart);
+                setIsUserChangeSession(isTeacherStart == RoleStartSessionEnum.Assistant);
+              } else if (!!body.counselorId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.counselorId) == body.counselorId) {
+                setIsUserChangeSession(isTeacherStart == RoleStartSessionEnum.Counselor);
               } else {
-                setIsUserChangeSession(res.data.teacherResult.isTeacherStart);
+                setIsUserChangeSession(isTeacherStart == RoleStartSessionEnum.Teacher);
               }
             }
 
@@ -10163,10 +10179,10 @@ var useConductOne = function useConductOne() {
             setConversation(res.data.isOneToOneConversation);
           }
 
-          if (isStudent && (_res$data10 = res.data) !== null && _res$data10 !== void 0 && (_res$data10$studentRe = _res$data10.studentResult) !== null && _res$data10$studentRe !== void 0 && _res$data10$studentRe.isDone) {
-            var _res$data11, _res$data12, _res$data12$studentRe;
+          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) {
+            var _res$data12, _res$data13, _res$data13$studentRe;
 
-            history.push("/result-session/" + ((_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.sessionId) + "/" + ((_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : (_res$data12$studentRe = _res$data12.studentResult) === null || _res$data12$studentRe === void 0 ? void 0 : _res$data12$studentRe.id));
+            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));
           }
 
           setLearningSupportCategoryId((_res$data$studentResu4 = res.data.studentResult) === null || _res$data$studentResu4 === void 0 ? void 0 : _res$data$studentResu4.learningSupportCategoryId);
@@ -10181,9 +10197,9 @@ var useConductOne = function useConductOne() {
           }
 
           var _temp2 = function () {
-            var _res$data13, _res$data13$teacherRe;
+            var _res$data14, _res$data14$teacherRe;
 
-            if (!isStudent && !((_res$data13 = res.data) !== null && _res$data13 !== void 0 && (_res$data13$teacherRe = _res$data13.teacherResult) !== null && _res$data13$teacherRe !== void 0 && _res$data13$teacherRe.isDone)) {
+            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)) {
               return Promise.resolve(getInformationTimer$1(parseInt(sessionId))).then(function (res1) {
                 var isTimer = res1.data.isSessionTimer;
 
@@ -11413,7 +11429,7 @@ var ScaffoldingListingNotes = function ScaffoldingListingNotes(props) {
 
     return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var classes = useStyles$8();
 
   var _useState = useState(false),
@@ -12124,7 +12140,7 @@ var useNotes = function useNotes(sessionId, sessionResultId, conferenceId, confe
 
     return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
 
   var handleSubmitSingleNote = function handleSubmitSingleNote() {
     try {
@@ -12509,7 +12525,7 @@ var MineNoteScreen = function MineNoteScreen(props) {
 
     return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
 
   var _useNotes = useNotes(sessionId, sessionResultId, conferenceId, conferenceResultId),
       screenIndex = _useNotes.screenIndex,
@@ -12590,7 +12606,7 @@ var OtherNoteScreen = function OtherNoteScreen(props) {
 
     return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
 
   var renderNotesList = function renderNotesList() {
     var data = isTeacher ? studentNotesData : teacherNotesData;
@@ -12757,7 +12773,7 @@ var ScaffoldingFloatTab = function ScaffoldingFloatTab(props) {
 
     return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var mineAvatar = isTeacher ? getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage) : getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage);
   var otherAvatar = isTeacher ? getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.studentProfileImage) : getFileUrl(informationUser === null || informationUser === void 0 ? void 0 : informationUser.teacherProfileImage);
 
@@ -12969,9 +12985,6 @@ var ConductIndex = function ConductIndex() {
       onChangeConversationSession = _useConductOne.onChangeConversationSession,
       isConversationOneToOne = _useConductOne.isConversationOneToOne;
 
-  console.log({
-    isConversation: isConversation
-  });
   var history = useHistory();
   var questionRatings = listQuestionStudents.filter(function (item) {
     return item.type == QuestionType.Rating && !!item.isBeforeSession;
@@ -16125,7 +16138,7 @@ var BookSession = function BookSession() {
     if (handleCheckTimePass()) setCheckCreateSession(false);
   };
 
-  var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant");
+  var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant") || user.roles.includes("Counselor");
   var isStudent = user.roles.includes("Student");
   var teacherFullName = useMemo(function () {
     if (isTeacher) return (user === null || user === void 0 ? void 0 : user.name) || "";
@@ -16829,11 +16842,7 @@ var SessionDetail = function SessionDetail() {
     setSelectedDate(date);
   };
 
-  var isTeacher = useMemo(function () {
-    return user.roles.some(function (i) {
-      return ["Teacher", "Assistant"].includes(i);
-    });
-  }, [user]);
+  var isTeacher = user.roles.includes("Teacher") || user.roles.includes("Assistant") || user.roles.includes("Counselor");
   var teacherFullName = useMemo(function () {
     if (isTeacher) return (user === null || user === void 0 ? void 0 : user.name) || "";
     return (user === null || user === void 0 ? void 0 : user.mainTeacherName) || "";
@@ -19134,6 +19143,10 @@ var useStudentList$1 = function useStudentList() {
       assistantId = _useState3[0],
       setAssistantId = _useState3[1];
 
+  var _useState4 = useState(0),
+      counselorId = _useState4[0],
+      setCounselorId = _useState4[1];
+
   var classFontSize = useMemo(function () {
     if (defaultFont == defaultFontLarge$c) {
       return "font-large";
@@ -19176,7 +19189,7 @@ var useStudentList$1 = function useStudentList() {
     });
   }, [defaultFont]);
 
-  var _useState4 = useState({
+  var _useState5 = useState({
     currentPage: 1,
     pageSize: 10,
     searchString: "",
@@ -19186,8 +19199,8 @@ var useStudentList$1 = function useStudentList() {
     showAssistant: false,
     grade: []
   }),
-      filters = _useState4[0],
-      setFilters = _useState4[1];
+      filters = _useState5[0],
+      setFilters = _useState5[1];
 
   var changeFilters = function changeFilters(updatedFilters) {
     return setFilters(_extends({}, filters, updatedFilters));
@@ -19317,6 +19330,36 @@ var useStudentList$1 = function useStudentList() {
     }
   };
 
+  var onSubmitCounselor = function onSubmitCounselor(cb) {
+    try {
+      var _temp14 = _catch(function () {
+        var body = {
+          teacherId: teacherId,
+          studentId: studentAssistant,
+          counselorId: counselorId
+        };
+        return Promise.resolve(updateTeacherAssignCounselor(body)).then(function () {
+          !!cb && cb();
+          dispatch(setAlert({
+            type: "success",
+            message: "Assign Assistant successfully"
+          }));
+        });
+      }, function (e) {
+        var _e$response3, _e$response3$data;
+
+        dispatch(setAlert({
+          type: "danger",
+          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
+        }));
+      });
+
+      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   var convertTimeSecond = function convertTimeSecond(timeSecond) {
     var hTime = '';
     var d = parseInt(timeSecond || "0");
@@ -19341,13 +19384,13 @@ var useStudentList$1 = function useStudentList() {
 
   var downloadTemplate = function downloadTemplate() {
     try {
-      var _temp15 = function _temp15() {
+      var _temp17 = function _temp17() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp16 = _catch(function () {
+      var _temp18 = _catch(function () {
         return Promise.resolve(downloadTemplateFile()).then(function (res) {
           var data = new Blob([res.data.content], {
             type: 'text/csv'
@@ -19369,7 +19412,7 @@ var useStudentList$1 = function useStudentList() {
         }));
       });
 
-      return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
+      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp17) : _temp17(_temp18));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -19391,7 +19434,9 @@ var useStudentList$1 = function useStudentList() {
     useStyles: useStyles,
     defaultFont: defaultFont,
     onSubmitAssistant: onSubmitAssistant,
+    onSubmitCounselor: onSubmitCounselor,
     setAssistantId: setAssistantId,
+    setCounselorId: setCounselorId,
     setStudentAssistant: setStudentAssistant,
     isRoleTeacherAndAssistant: isRoleTeacherAndAssistant,
     nameTeacherAssistant: nameTeacherAssistant,
@@ -19490,6 +19535,100 @@ var ModalAssistant = function ModalAssistant(_ref) {
   }, "Assign"))));
 };
 
+var END_POINT$1 = BASE_URL + "/api/Counselor";
+
+var getCounselors = function getCounselors() {
+  return api.get(END_POINT$1);
+};
+
+var CounselorSelector = function CounselorSelector(_ref) {
+  var onChangeCounselor = _ref.onChangeCounselor;
+
+  var _useState = useState([]),
+      counselors = _useState[0],
+      setCounselors = _useState[1];
+
+  var getDataCounselor = function getDataCounselor() {
+    try {
+      return Promise.resolve(getCounselors()).then(function (res) {
+        setCounselors(res.data.items);
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  useEffect(function () {
+    getDataCounselor();
+  }, []);
+  return React__default.createElement(FormControl, {
+    fullWidth: true
+  }, React__default.createElement(Autocomplete, {
+    freeSolo: true,
+    id: "free-solo-2-demo",
+    options: counselors,
+    getOptionLabel: function getOptionLabel(option) {
+      return option.fullName ? option.fullName + " - " + option.email : "";
+    },
+    onChange: function onChange(_event, newValue) {
+      console.log({
+        newValue: newValue
+      });
+      onChangeCounselor(newValue);
+    },
+    getOptionSelected: function getOptionSelected(option, value) {
+      return option.id == value.id;
+    },
+    renderInput: function renderInput(params) {
+      return React__default.createElement(TextField, Object.assign({}, params, {
+        label: "Search Counselor",
+        margin: "normal",
+        variant: "outlined"
+      }));
+    }
+  }));
+};
+
+var ModalCounselor = function ModalCounselor(_ref) {
+  var title = _ref.title,
+      isOpen = _ref.isOpen,
+      confirmAndClose = _ref.confirmAndClose,
+      onChangeCounselor = _ref.onChangeCounselor,
+      handleConfirm = _ref.handleConfirm;
+  return React__default.createElement("div", null, React__default.createElement(Dialog, {
+    open: isOpen,
+    onClose: confirmAndClose,
+    fullWidth: true,
+    maxWidth: "sm"
+  }, React__default.createElement(DialogTitle, null, React__default.createElement("p", {
+    style: {
+      fontSize: "18px",
+      fontWeight: 700
+    }
+  }, title)), React__default.createElement(DialogContent, null, React__default.createElement(Grid, null, React__default.createElement(CounselorSelector, {
+    onChangeCounselor: onChangeCounselor
+  }))), React__default.createElement(DialogActions, {
+    style: {
+      padding: "20px"
+    }
+  }, React__default.createElement(Button, {
+    onClick: confirmAndClose,
+    style: {
+      color: "white",
+      backgroundColor: "#FF0000"
+    }
+  }, "Cancel"), React__default.createElement(Button, {
+    onClick: function onClick() {
+      return handleConfirm();
+    },
+    variant: "contained",
+    style: {
+      color: "white",
+      backgroundColor: "#006E60"
+    }
+  }, "Assign"))));
+};
+
 var DEFAULT_USER_AVATAR$6 = "/images/image-default.png";
 
 var StudentList = function StudentList() {
@@ -19505,7 +19644,9 @@ var StudentList = function StudentList() {
       classFontSize = _useStudentList.classFontSize,
       useStyles = _useStudentList.useStyles,
       setAssistantId = _useStudentList.setAssistantId,
+      setCounselorId = _useStudentList.setCounselorId,
       onSubmitAssistant = _useStudentList.onSubmitAssistant,
+      onSubmitCounselor = _useStudentList.onSubmitCounselor,
       setStudentAssistant = _useStudentList.setStudentAssistant,
       isRoleTeacherAndAssistant = _useStudentList.isRoleTeacherAndAssistant,
       nameTeacherAssistant = _useStudentList.nameTeacherAssistant,
@@ -19537,6 +19678,10 @@ var StudentList = function StudentList() {
       isOpen = _useState[0],
       setIsOpen = _useState[1];
 
+  var _useState2 = useState(false),
+      isOpenCounselor = _useState2[0],
+      setIsOpenCounselor = _useState2[1];
+
   var dispatch = useDispatch();
 
   var handleChangeInputSearch = function handleChangeInputSearch(event) {
@@ -19559,15 +19704,29 @@ var StudentList = function StudentList() {
     setStudentAssistant(studentId);
   };
 
+  var openModalCounselor = function openModalCounselor(studentId) {
+    setIsOpenCounselor(true);
+    setStudentAssistant(studentId);
+  };
+
   var confirmAndClose = function confirmAndClose() {
     setIsOpen(false);
     setStudentAssistant(0);
   };
 
+  var confirmAndCloseCounselor = function confirmAndCloseCounselor() {
+    setIsOpenCounselor(false);
+    setStudentAssistant(0);
+  };
+
   var onChangeAssistant = function onChangeAssistant(newAssistant) {
     setAssistantId(newAssistant.assistantId);
   };
 
+  var onChangeCounselor = function onChangeCounselor(newCounselor) {
+    setCounselorId(newCounselor === null || newCounselor === void 0 ? void 0 : newCounselor.counselorId);
+  };
+
   var handleConfirm = function handleConfirm() {
     onSubmitAssistant(function () {
       setIsOpen(false);
@@ -19576,6 +19735,14 @@ var StudentList = function StudentList() {
     });
   };
 
+  var handleConfirmCounselor = function handleConfirmCounselor() {
+    onSubmitCounselor(function () {
+      setIsOpenCounselor(false);
+      setStudentAssistant(0);
+      getData();
+    });
+  };
+
   var handleChangePage = function handleChangePage(_event, newPage) {
     changeFilters({
       currentPage: newPage + 1
@@ -19874,7 +20041,15 @@ var StudentList = function StudentList() {
     style: {
       marginLeft: "5px"
     }
-  }))), isTeacher && React__default.createElement(TableCell, {
+  }))), isTeacher && React__default.createElement(React__default.Fragment, null, React__default.createElement(TableCell, {
+    align: "left",
+    style: {
+      fontWeight: 700,
+      fontSize: 14,
+      textTransform: "uppercase"
+    },
+    width: "10%"
+  }, t("assistant_name")), React__default.createElement(TableCell, {
     align: "left",
     style: {
       fontWeight: 700,
@@ -19882,7 +20057,7 @@ var StudentList = function StudentList() {
       textTransform: "uppercase"
     },
     width: "10%"
-  }, t("assistant_name")), isRoleTeacherAndAssistant && React__default.createElement(TableCell, {
+  }, t("counselor_name"))), isRoleTeacherAndAssistant && React__default.createElement(TableCell, {
     align: "left",
     style: {
       fontWeight: 700,
@@ -19969,7 +20144,24 @@ var StudentList = function StudentList() {
       onClick: function onClick() {
         return openModalAssistant(row.studentId);
       }
-    }, t("assign_assistant"))), isRoleTeacherAndAssistant && React__default.createElement(TableCell, {
+    }, t("assign_assistant"))), isTeacher && React__default.createElement(TableCell, {
+      align: "center",
+      className: "" + myStudent["row_type"]
+    }, !!row.counselorName || isRoleTeacherAndAssistant && row.counselorName ? React__default.createElement("span", {
+      className: "" + myStudent["time"]
+    }, React__default.createElement("span", {
+      style: {
+        fontSize: "15.5px",
+        fontWeight: "bold"
+      }
+    }, row.counselorName)) : React__default.createElement(Button, {
+      variant: "contained",
+      color: "primary",
+      disableElevation: true,
+      onClick: function onClick() {
+        return openModalCounselor(row.studentId);
+      }
+    }, t("assign_counselor"))), isRoleTeacherAndAssistant && React__default.createElement(TableCell, {
       align: "center",
       style: {
         fontWeight: 700,
@@ -20100,10 +20292,16 @@ var StudentList = function StudentList() {
     }
   }, t("add_new"), React__default.createElement(AddIcon, null))))), React__default.createElement(ModalAssistant, {
     isOpen: isOpen,
-    title: "Assign Assistant",
+    title: t("assign_assistant"),
     confirmAndClose: confirmAndClose,
     onChangeAssistant: onChangeAssistant,
     handleConfirm: handleConfirm
+  }), React__default.createElement(ModalCounselor, {
+    isOpen: isOpenCounselor,
+    title: t("assign_counselor"),
+    confirmAndClose: confirmAndCloseCounselor,
+    onChangeCounselor: onChangeCounselor,
+    handleConfirm: handleConfirmCounselor
   }));
 };
 
@@ -34356,7 +34554,7 @@ var ClassReflection = function ClassReflection() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var screenWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
   var open = useCallback(function (row) {
     var resultUrl = "/result-reflection/" + row.id;
@@ -35252,7 +35450,7 @@ var useStrengthsChallenges = function useStrengthsChallenges() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentId = currentUser.studentId;
 
@@ -35736,7 +35934,7 @@ var useThingTeachersCanHelp = function useThingTeachersCanHelp() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentId = currentUser.studentId;
   var defaultFont = useSelector(function (state) {
@@ -36175,7 +36373,7 @@ var useAboutMyLearning = function useAboutMyLearning() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentId = currentUser.studentId;
 
@@ -36531,7 +36729,7 @@ var useAccommodation = function useAccommodation() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentId = currentUser.studentId;
 
@@ -36902,7 +37100,7 @@ var useGoals = function useGoals() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentId = currentUser.studentId;
   var defaultFont = useSelector(function (state) {
@@ -37802,7 +38000,7 @@ var useTotalFriends = function useTotalFriends() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
+  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentUserId = currentUser === null || currentUser === void 0 ? void 0 : currentUser.studentId;
   var defaultFont = useSelector(function (state) {
@@ -37902,7 +38100,7 @@ var FriendCircleLearning = function FriendCircleLearning() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var dispatch = useDispatch();
 
@@ -38007,7 +38205,7 @@ var useTotalActivity = function useTotalActivity() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
+  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var currentUserId = currentUser === null || currentUser === void 0 ? void 0 : currentUser.studentId;
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var defaultFont = useSelector(function (state) {
@@ -38106,7 +38304,7 @@ var ActivityCircleLearning = function ActivityCircleLearning() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var dispatch = useDispatch();
 
@@ -38370,7 +38568,7 @@ var usePrintPlp = function usePrintPlp() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  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"));
+  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");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var currentStudentId = currentUser === null || currentUser === void 0 ? void 0 : currentUser.studentId;
 
@@ -38670,7 +38868,7 @@ var PersonalLearningGoal = function PersonalLearningGoal() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var isEduTeacher = currentUser.roles.includes("EduTeacher");
   studentId = isTeacher || isParent ? studentId : currentUser.studentId;
@@ -39706,7 +39904,7 @@ var useResultReflection = function useResultReflection() {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var defaultFont = useSelector(function (state) {
     var _state$common2;
 
@@ -41308,6 +41506,14 @@ var initialResultAnswer = {
   id: 0,
   questionResponses: []
 };
+var RoleStartSessionEnum$1;
+
+(function (RoleStartSessionEnum) {
+  RoleStartSessionEnum[RoleStartSessionEnum["Assistant"] = 0] = "Assistant";
+  RoleStartSessionEnum[RoleStartSessionEnum["Teacher"] = 1] = "Teacher";
+  RoleStartSessionEnum[RoleStartSessionEnum["Student"] = 2] = "Student";
+  RoleStartSessionEnum[RoleStartSessionEnum["Counselor"] = 3] = "Counselor";
+})(RoleStartSessionEnum$1 || (RoleStartSessionEnum$1 = {}));
 
 var QuestionType$2;
 
@@ -41556,7 +41762,7 @@ var useConferenceRubric = function useConferenceRubric() {
 
     return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isStudent = currentUser.roles.includes("Student");
   var isAssistant = currentUser.roles.includes("Assistant") && !currentUser.roles.includes("Teacher");
 
@@ -41895,10 +42101,10 @@ var useConferenceRubric = function useConferenceRubric() {
 
       var _temp20 = _catch(function () {
         return Promise.resolve(getConferenceRubricDetail(parseInt(studentId), parseInt(conferenceId))).then(function (res) {
-          var _res$data10, _res$data11;
+          var _res$data11, _res$data12;
 
           function _temp16() {
-            var _res$data9;
+            var _res$data9, _res$data10;
 
             function _temp14() {
               function _temp12() {
@@ -41935,20 +42141,26 @@ var useConferenceRubric = function useConferenceRubric() {
               teacherUserId: res.data.teacherUserId,
               gradeLevel: res.data.gradeLevel,
               assistantId: (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.assistantId,
+              counselorId: (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.counselorId,
               startConferenceRoleId: res.data.startConferenceRoleId
             };
             var result = {
               teacherResultId: res.data.teacherResultId,
               studentResultId: res.data.studentResultId
             };
+            var isTeacherStart = res.data.isTeacherStart;
 
-            if (isStudent || !body.assistantId) {
+            if (isStudent) {
               setIsUserChangeConference(true);
             } else {
               if (!!body.assistantId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.assistantId) == body.assistantId) {
-                setIsUserChangeConference(!res.data.isTeacherStart);
+                setIsUserChangeConference(isTeacherStart == RoleStartSessionEnum$1.Assistant);
+              }
+
+              if (!!body.counselorId && (currentUser === null || currentUser === void 0 ? void 0 : currentUser.counselorId) == body.counselorId) {
+                setIsUserChangeConference(isTeacherStart == RoleStartSessionEnum$1.Counselor);
               } else {
-                setIsUserChangeConference(res.data.isTeacherStart);
+                setIsUserChangeConference(isTeacherStart == RoleStartSessionEnum$1.Teacher);
               }
             }
 
@@ -41981,8 +42193,8 @@ var useConferenceRubric = function useConferenceRubric() {
           }
 
           var isPaused = res.data.isPaused;
-          var isClickPaused = (_res$data10 = res.data) === null || _res$data10 === void 0 ? void 0 : _res$data10.isClickPaused;
-          var startTimerConference = (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.startTimeConference;
+          var isClickPaused = (_res$data11 = res.data) === null || _res$data11 === void 0 ? void 0 : _res$data11.isClickPaused;
+          var startTimerConference = (_res$data12 = res.data) === null || _res$data12 === void 0 ? void 0 : _res$data12.startTimeConference;
           setStartTimerConference(startTimerConference);
 
           if (startTimerConference != null && !!isClickPaused && !!isPaused) {
@@ -42392,7 +42604,6 @@ var ConferenceRubric = function ConferenceRubric() {
     onChangeToogleAfterSession();
   };
 
-  console.log("run conference");
   var listLearningStrategory = useMemo(function () {
     return listQuestionConferenceAnswer.filter(function (item) {
       return item.type == QuestionType$2.LearningStrategy;
@@ -42998,7 +43209,7 @@ var generateAvatar$2 = function generateAvatar(src) {
 };
 
 var BookSessionConferences = function BookSessionConferences() {
-  var _t;
+  var _user$roles, _user$roles2, _user$roles3, _t;
 
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
@@ -43016,11 +43227,7 @@ var BookSessionConferences = function BookSessionConferences() {
   var user = useSelector(function (state) {
     return state.common.user;
   });
-  var isTeacher = useMemo(function () {
-    var _user$roles, _user$roles2;
-
-    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"));
-  }, [user]);
+  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"));
 
   var _useState = useState(parseInt(currentId)),
       studentId = _useState[0],
@@ -48732,7 +48939,7 @@ var ListPersonalinterrest = function ListPersonalinterrest() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
 
   var _usePersonalInterest = usePersonalInterest$1(parseInt(studentId)),
@@ -50289,7 +50496,7 @@ var useTeachingStrategiesAdd = function useTeachingStrategiesAdd() {
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
   var currentId = currentUser.studentId;
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
 
   var _useState = useState([]),
@@ -51840,7 +52047,7 @@ var useNote = function useNote() {
 
     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;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant") || roles.includes("Counselor");
   var dispatch = useDispatch();
   var history = useHistory();
   var defaultFont = useSelector(function (state) {
@@ -52051,10 +52258,6 @@ var Note = function Note() {
       setSelectStudent = _useNote.setSelectStudent,
       isTeacher = _useNote.isTeacher;
 
-  console.log({
-    allNoteList: allNoteList
-  });
-
   var _useFontStyles = useFontStyles(),
       defaultFont = _useFontStyles.defaultFont;
 
@@ -52870,7 +53073,7 @@ var AddNote = function AddNote() {
     xs: screenWidth > 768 ? 4 : 12
   }, React__default.createElement("div", {
     className: "" + styles$z["content-add"]
-  }, ["Teacher", "Assistant"].includes(role) && React__default.createElement("div", null, React__default.createElement("p", {
+  }, ["Teacher", "Assistant", "Counselor"].includes(role) && React__default.createElement("div", null, React__default.createElement("p", {
     className: "" + styles$z["title-select"]
   }, " ", t("select_student")), React__default.createElement(Autocomplete, {
     id: "free-solo-demo",
@@ -53457,7 +53660,7 @@ var useListFriend = function useListFriend() {
 
     return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
   });
-  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
+  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
 
   var _useParams = useParams(),
@@ -53594,7 +53797,7 @@ var useListDetail = function useListDetail() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
+  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
   var defaultFont = useSelector(function (state) {
     var _state$common2;
@@ -53887,7 +54090,7 @@ var ListFriendCircle = function ListFriendCircle() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
 
   var _useState = useState(false),
       openConfirmDeleteDialog = _useState[0],
@@ -54630,7 +54833,7 @@ var useListDetailActivity = function useListDetailActivity() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  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");
+  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");
   var defaultFont = useSelector(function (state) {
     var _state$common2;
 
@@ -54776,7 +54979,7 @@ var useListActivity = function useListActivity() {
 
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant");
+  var isTeacher = (currentUser === null || currentUser === void 0 ? void 0 : currentUser.roles.includes("Teacher")) || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
 
   var _useParams = useParams(),
@@ -55161,7 +55364,7 @@ var ListActivityLearning = function ListActivityLearning() {
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
 
   var _useState2 = useState(false),
       openConfirmDelete = _useState2[0],
@@ -55516,7 +55719,7 @@ var EditNote = function EditNote() {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var selectedIndex = (studentList || []).findIndex(function (e) {
     return (e === null || e === void 0 ? void 0 : e.id) === (student === null || student === void 0 ? void 0 : student.id);
   });
@@ -55914,7 +56117,7 @@ var useEditLearningStrategies = function useEditLearningStrategies(_ref) {
   var currentUser = useSelector(function (state) {
     return state === null || state === void 0 ? void 0 : state.common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isParent = currentUser.roles.includes("Parent") || currentUser.roles.includes("EduTeacher");
 
   var _useState = useState(false),
@@ -60885,7 +61088,7 @@ var useAddClassReflection = function useAddClassReflection() {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
-  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant");
+  var isTeacher = currentUser.roles.includes("Teacher") || currentUser.roles.includes("Assistant") || currentUser.roles.includes("Counselor");
   var isStudent = currentUser.roles.includes("Student");
   var email = currentUser.email;
   var rowClass = {
@@ -64657,6 +64860,7 @@ var COLOR_LABEL_PIE = ["#006E60", "#FF7670", "#994700"];
 var COLOR_NAME = ["Green", "Red", "Yellow"];
 var optionTotalSurvey = ["Total survey done", "Total survey not done"];
 var LABEL_NAME_PIE_CHART = ["Green", "Red", "Yellow"];
+var flagSurveyOptions = ["All", "Red", "Yellow", "Green"];
 
 var useListSurvey = function useListSurvey() {
   var dispatch = useDispatch();
@@ -64695,7 +64899,9 @@ var useListSurvey = function useListSurvey() {
     startDate: moment().startOf("day").valueOf(),
     endDate: moment().add(7, "days").endOf("day").valueOf(),
     status: undefined,
-    isFavorite: false
+    isFavorite: false,
+    isSchedule: false,
+    flag: ""
   }),
       filters = _useState5[0],
       setFilters = _useState5[1];
@@ -64747,6 +64953,19 @@ var useListSurvey = function useListSurvey() {
     });
   };
 
+  var handleChangeFlag = function handleChangeFlag(newValue) {
+    changeFilters({
+      currentPage: 1,
+      flag: newValue
+    });
+  };
+
+  var handleChangeFilter = function handleChangeFilter(event) {
+    var _extends2;
+
+    setFilters(_extends({}, filters, (_extends2 = {}, _extends2[event.target.name] = event.target.checked, _extends2)));
+  };
+
   var handleSelectFavorite = function handleSelectFavorite(isFavorite) {
     changeFilters({
       currentPage: 1,
@@ -64901,7 +65120,9 @@ var useListSurvey = function useListSurvey() {
     isShowFilter: isShowFilter,
     handleShowFilter: handleShowFilter,
     isShowFilterCalendar: isShowFilterCalendar,
-    handleShowFilterCalendar: handleShowFilterCalendar
+    handleShowFilterCalendar: handleShowFilterCalendar,
+    handleChangeFilter: handleChangeFilter,
+    handleChangeFlag: handleChangeFlag
   };
 };
 
@@ -64945,7 +65166,12 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
       placeholderSearch = _ref.placeholderSearch,
       handleSelectFavorite = _ref.handleSelectFavorite,
       studentList = _ref.studentList,
-      onSelectStudent = _ref.onSelectStudent;
+      onSelectStudent = _ref.onSelectStudent,
+      toggleKeyCustom = _ref.toggleKeyCustom,
+      handleToggleCustom = _ref.handleToggleCustom,
+      toggleContentCustom = _ref.toggleContentCustom,
+      optionCustomSelect = _ref.optionCustomSelect,
+      handleChangeCustomSelect = _ref.handleChangeCustomSelect;
   return React__default.createElement(Grid, {
     className: "" + styles["box-filter"]
   }, React__default.createElement(Grid, {
@@ -65002,6 +65228,23 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
         variant: "outlined"
       }));
     }
+  }), !!optionCustomSelect && React__default.createElement(Autocomplete, {
+    fullWidth: true,
+    id: "combo-box-demo",
+    options: optionCustomSelect,
+    className: "" + styles["filter-item"],
+    getOptionLabel: function getOptionLabel(option) {
+      return option;
+    },
+    onChange: function onChange(_e, newValue) {
+      return handleChangeCustomSelect === null || handleChangeCustomSelect === void 0 ? void 0 : handleChangeCustomSelect(newValue);
+    },
+    renderInput: function renderInput(params) {
+      return React__default.createElement(TextField, Object.assign({}, params, {
+        label: "Flag",
+        variant: "outlined"
+      }));
+    }
   }), !!handleSelectFavorite && React__default.createElement("div", {
     className: "" + styles["btn-favorite-text"]
   }, React__default.createElement(Checkbox, {
@@ -65014,7 +65257,20 @@ var CustomFilterComponent = function CustomFilterComponent(_ref) {
     }
   }), React__default.createElement("div", {
     className: "" + styles["btn-favorite-text"]
-  }, "Show only favorite")))), React__default.createElement(Grid, {
+  }, "Show only favorite")), !!toggleKeyCustom && React__default.createElement("div", {
+    className: "" + styles["btn-favorite-text"]
+  }, React__default.createElement(Checkbox, {
+    name: "isSchedule",
+    inputProps: {
+      "aria-label": "uncontrolled-checkbox"
+    },
+    value: (filters === null || filters === void 0 ? void 0 : filters[toggleKeyCustom]) || null,
+    onChange: function onChange(event) {
+      return handleToggleCustom === null || handleToggleCustom === void 0 ? void 0 : handleToggleCustom(event);
+    }
+  }), React__default.createElement("div", {
+    className: "" + styles["btn-favorite-text"]
+  }, toggleContentCustom)))), React__default.createElement(Grid, {
     className: "" + styles["block-right"]
   }, !!isShowSelectRight && React__default.createElement(Autocomplete, {
     fullWidth: true,
@@ -65078,7 +65334,12 @@ var CustomFilterMobile = function CustomFilterMobile(_ref) {
       onShowFilter = _ref.onShowFilter,
       isShowFilter = _ref.isShowFilter,
       isShowCalendar = _ref.isShowCalendar,
-      onShowFilterCalendar = _ref.onShowFilterCalendar;
+      onShowFilterCalendar = _ref.onShowFilterCalendar,
+      optionCustomSelect = _ref.optionCustomSelect,
+      handleChangeCustomSelect = _ref.handleChangeCustomSelect,
+      toggleKeyCustom = _ref.toggleKeyCustom,
+      toggleContentCustom = _ref.toggleContentCustom,
+      handleToggleCustom = _ref.handleToggleCustom;
   return React__default.createElement(Grid, {
     className: "" + styles["box-filter"]
   }, React__default.createElement(Grid, {
@@ -65165,6 +65426,23 @@ var CustomFilterMobile = function CustomFilterMobile(_ref) {
         variant: "outlined"
       }));
     }
+  }), !!optionCustomSelect && React__default.createElement(Autocomplete, {
+    fullWidth: true,
+    id: "combo-box-demo",
+    options: optionCustomSelect,
+    className: styles["filter-item"] + " " + styles["space-item"],
+    getOptionLabel: function getOptionLabel(option) {
+      return option;
+    },
+    onChange: function onChange(_e, newValue) {
+      return handleChangeCustomSelect === null || handleChangeCustomSelect === void 0 ? void 0 : handleChangeCustomSelect(newValue);
+    },
+    renderInput: function renderInput(params) {
+      return React__default.createElement(TextField, Object.assign({}, params, {
+        label: "Flag",
+        variant: "outlined"
+      }));
+    }
   }), !!handleSelectFavorite && React__default.createElement("div", {
     className: styles["btn-favorite-text"] + " " + styles["space-item"]
   }, React__default.createElement(Checkbox, {
@@ -65177,7 +65455,20 @@ var CustomFilterMobile = function CustomFilterMobile(_ref) {
     }
   }), React__default.createElement("div", {
     className: "" + styles["btn-favorite-text"]
-  }, "Show only favorite"))));
+  }, "Show only favorite")), !!toggleKeyCustom && React__default.createElement("div", {
+    className: styles["btn-favorite-text"] + " " + styles["space-item"]
+  }, React__default.createElement(Checkbox, {
+    name: "isSchedule",
+    inputProps: {
+      "aria-label": "uncontrolled-checkbox"
+    },
+    value: (filters === null || filters === void 0 ? void 0 : filters[toggleKeyCustom]) || null,
+    onChange: function onChange(event) {
+      return handleToggleCustom === null || handleToggleCustom === void 0 ? void 0 : handleToggleCustom(event);
+    }
+  }), React__default.createElement("div", {
+    className: "" + styles["btn-favorite-text"]
+  }, toggleContentCustom))));
 };
 
 var CardSurveyMobile = function CardSurveyMobile(_ref) {
@@ -65543,7 +65834,9 @@ var ListSurveys = function ListSurveys() {
       isShowFilter = _useListSurvey.isShowFilter,
       handleShowFilter = _useListSurvey.handleShowFilter,
       isShowFilterCalendar = _useListSurvey.isShowFilterCalendar,
-      handleShowFilterCalendar = _useListSurvey.handleShowFilterCalendar;
+      handleShowFilterCalendar = _useListSurvey.handleShowFilterCalendar,
+      handleChangeFilter = _useListSurvey.handleChangeFilter,
+      handleChangeFlag = _useListSurvey.handleChangeFlag;
 
   return React__default.createElement(Grid, {
     className: "" + styles$N["block-list-survey"]
@@ -65565,7 +65858,12 @@ var ListSurveys = function ListSurveys() {
     handleChangeStartDate: handleChangeStartDate,
     handleChangeEndDate: handleChangeEndDate,
     handleChangeStatus: handleChangeStatus,
-    handleSelectFavorite: handleSelectFavorite
+    handleSelectFavorite: handleSelectFavorite,
+    handleToggleCustom: handleChangeFilter,
+    toggleKeyCustom: "isSchedule",
+    toggleContentCustom: "session schedule",
+    optionCustomSelect: flagSurveyOptions,
+    handleChangeCustomSelect: handleChangeFlag
   })), React__default.createElement(Grid, {
     className: "" + styles$N["filter-mobile"]
   }, React__default.createElement(CustomFilterMobile, {
@@ -65579,7 +65877,12 @@ var ListSurveys = function ListSurveys() {
     handleChangeStatus: handleChangeStatus,
     handleSelectFavorite: handleSelectFavorite,
     isShowCalendar: isShowFilterCalendar,
-    onShowFilterCalendar: handleShowFilterCalendar
+    onShowFilterCalendar: handleShowFilterCalendar,
+    handleToggleCustom: handleChangeFilter,
+    toggleKeyCustom: "isSchedule",
+    toggleContentCustom: "session schedule",
+    optionCustomSelect: flagSurveyOptions,
+    handleChangeCustomSelect: handleChangeFlag
   }))), React__default.createElement(Grid, {
     className: "" + styles$N["table-desktop"]
   }, React__default.createElement(TableContainer, null, React__default.createElement(Table$2, {
@@ -67224,9 +67527,7 @@ var useFormCreateSurvey = function useFormCreateSurvey(_ref) {
 
     if ((dataFormCreateSurvey === null || dataFormCreateSurvey === void 0 ? void 0 : (_dataFormCreateSurvey = dataFormCreateSurvey.studentIds) === null || _dataFormCreateSurvey === void 0 ? void 0 : _dataFormCreateSurvey.length) > 0 && dataFormCreateSurvey.activeStep === 0) {
       return false;
-    } else if (dataFormCreateSurvey.activeStep === 1 && !!dataFormCreateSurvey.title.trim() && dataFormCreateSurvey.templateQuestions.length > 0 && !!dataFormCreateSurvey.deadline && !!dataFormCreateSurvey.templateQuestions.some(function (r) {
-      return r.questionTemplates.length > 0;
-    })) {
+    } else if (dataFormCreateSurvey.activeStep === 1 && !!dataFormCreateSurvey.title.trim() && dataFormCreateSurvey.additionalQuestions.length > 0 && !!dataFormCreateSurvey.deadline) {
       return false;
     } else if (dataFormCreateSurvey.activeStep === 2) {
       return false;
@@ -68464,9 +68765,7 @@ var CreateSurveyComponent = function CreateSurveyComponent(_ref) {
     className: "" + styles$N["box-form-input"]
   }, React__default.createElement(Typography$1, {
     className: "" + styles$N["form-input-title"]
-  }, "Survey Questions", React__default.createElement("sup", {
-    className: "" + styles$N["sup-require"]
-  }, "*")), React__default.createElement(TextField, {
+  }, "Survey Questions"), React__default.createElement(TextField, {
     disabled: true,
     fullWidth: true,
     variant: "outlined",
@@ -68553,7 +68852,9 @@ var CreateSurveyComponent = function CreateSurveyComponent(_ref) {
     className: "" + styles$N["box-form-input"]
   }, React__default.createElement(Typography$1, {
     className: "" + styles$N["form-input-title"]
-  }, "Additional Question"), React__default.createElement("button", {
+  }, "Additional Question", React__default.createElement("sup", {
+    className: "" + styles$N["sup-require"]
+  }, "*")), React__default.createElement("button", {
     onClick: function onClick() {
       return handleToggleModelAdditional();
     },