mario-education 2.4.563-feedback → 2.4.565-feedback

package/dist/index.js

@@ -87,8 +87,6 @@ var AppBar = _interopDefault(require('@material-ui/core/AppBar'));
 var Toolbar = _interopDefault(require('@material-ui/core/Toolbar'));
 var Typography = _interopDefault(require('@material-ui/core/Typography'));
 var IconButton = _interopDefault(require('@material-ui/core/IconButton'));
-var MenuIcon = _interopDefault(require('@material-ui/icons/Menu'));
-var NotificationsIcon = _interopDefault(require('@material-ui/icons/Notifications'));
 var HelpOutlineIcon = _interopDefault(require('@material-ui/icons/HelpOutline'));
 var TrackChangesIcon = _interopDefault(require('@material-ui/icons/TrackChanges'));
 var generativeAi = require('@google/generative-ai');
@@ -1393,6 +1391,7 @@ var FILTER_NAME;
   FILTER_NAME["Search"] = "search";
 })(FILTER_NAME || (FILTER_NAME = {}));
 
+var defaultDate = '0001-01-01T00:00:00';
 var SMALL_FONT_DEFAULT = 12;
 var LARGE_FONT_DEFAULT = 20;
 var studentGrades = ["All Grades", "K", "G", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"];
@@ -30167,6 +30166,7 @@ var defaultFontSize = 16;
 var defaultFontSmall$1 = 12;
 var defaultFontLarge$1 = 20;
 var LOGO = "" + marioCore.getStaticFileUrl("/images/logo-white.png");
+var DEFAULT_USER_AVATAR = "/images/image-default.png";
 var SMALL_FONT_DEFAULT$1 = 12;
 var LARGE_FONT_DEFAULT$1 = 20;
 var SESSION_START_TIME = "sessionStartTime";
@@ -31197,7 +31197,7 @@ var AutocompleteField = function AutocompleteField(_ref) {
   }));
 };
 
-var style$2 = {"font-large":"_3Sup6","block-card-title":"_3Qn6F","btn-conduct-checkIn":"_1qNfu","btn-conduct-session":"_2K2FJ","total-card-title":"_3vk3b","total-card-value":"_IHasQ","header-left":"_11kCD","custom-header-title":"_d8RZe","custom-header-large-title":"_3lHAH","block-card-btn-title":"_3svb4","custom-button-content":"_1oCai","show-answers":"_1L_vx","detail-questions":"_3kMDk","detail":"_3TKX7","answers":"_ejtt2","answer-item":"_2SV9m","download-btn":"_oQC64","btn-favorite-text":"_3m4oI","box-slider":"_1bTW5","slider-text":"_1gs0Z","chip-slider":"_xowPU","value":"_3hnI_","compare-avr":"_lL-Yg","content":"_1EgBn","percent":"_3Bs0W","arrow":"_2BhP8","label-single-choice":"_3oSdM","btn-choice":"_hPL_o","font-small":"_2JnMg","reset-the-content":"_1zJw3","btn-duplicate-survey":"_11N79","menu-item-strategories":"_1oZYB","time-Date":"_1Q7w6","time-Hours-Minute":"_3ZcQD","arrow-icon":"_2NJ7E","word-break":"_27YiF","header-icon":"_dqAoB","full-width":"_2DGWF","header-right-student":"_1GQrw","header-right":"_1jTMg","header-student":"_SSISD","box-title-question":"_1DlZO","tooltip-question":"_29Hwk","font-description":"_2pyf5","header-component":"_2oMWx","btn-start":"_1M4r8","timer-start":"_-ZWIZ","btn-timer":"_3SGlg","timer-text":"_1Q--B","timer-session":"_26lTc","play-icon-pause":"_d_2HA","play-icon":"_1mIjz","block-right":"_2CN0T","filter-item":"_3jAEH","btn-conduct-session-disabled":"_3ae8F","btn-conduct-icon":"_2msER","animation-btn-conduct":"_3bftL","ring":"_3Jd73","answer-text":"_Vct9B","icon-text":"_1MuMl","icon-left":"_3bBeE","margin-right":"_2T6Ym","up-color-background":"_1cck_","down-color-background":"_2Z76g","grey-background":"_2ryO2","up-color-icon":"_RTrVT","up-color":"_3UMJw","down-color-icon":"_3hZXx","down-color":"_1u1gK","rotate":"_1yp9N","font-question-name":"_13S5D","font-question":"_t-JhH","font-question--all-bold":"_2t1gp","font-question-description":"_1YLGi","question-block":"_2gqE-","question-text":"_337MJ","question-slider":"_k_dl-","input-survey":"_24vPq","question-block-mobile":"_p-cUG","emotion-list":"_1M6M1","emotion-item":"_1wmi8","emotion-active":"_3JT39","block-learning-strategories":"_KKK4u","conference-learning-strategories":"_3o_lQ","item-learning-strategories":"_1k7-R","question-today":"_WkaIn","block-button":"_275AS","talk-conduct":"_28jd3","box-talk":"_3zlbc","box-p":"_IXk4X","form-upload":"_1spIR","title":"_g-p72","description":"_2U60d","form-title":"_qDlsm","form-upload-image-box":"_2xZUq","form-upload-image":"_3C-Xm","form-upload-icon":"_2zIn5","form-upload-title":"_yNCgm","form-upload-description":"_35Wqq","header-right-download":"_27SXJ","download-title":"_1EWKg","accomondation-content":"_2qhHZ","accomondation-content-title-box":"_XTfSF","accomondation-content-title":"_1Z_hd","accomondation-body":"_1DtTP","accomondation-content-function":"_3fJXr","function-edit":"_368JR","function-delete":"_2I-ej","accomondation-block-content":"_1fpsj","accomondation-block-note":"_2INhO","accomondation-content-description":"_2BEap","accomondation-content-status":"_UdBci","content-function-mobile":"_3gaSR","card-box":"_3Flx1","card-top":"_3Mi_n","card-top-title":"_21QGx","card-top-right":"_2eeiS","card-top-switch":"_9VWFe","card-view":"_Jwjv5","card-content":"_3AVYm","block-circle":"_3o7Sh","block-item-3":"_3JeRP","item-circle":"_2wunA","block-item-4":"_3P83R","icon-btn":"_3xYAk","slider-avatar":"_2wH1X","btn-delete":"_z69mr","send-icon":"_3oH01","radio-choice":"_2RwcR","checkbox-control":"_3woGH","block-question":"_3TJl8","question-choice":"_3LiGg","radio-disable":"_1WFdo","pointer-page-result":"_3mfi0","canva-item-container":"_1tBto","canva-item":"_3A0Al","title-circle":"_2QAQJ","accommodation-header-right":"_4OB3z","about-header-right":"_t4lD7","text-custom":"_22kUd","page-external":"_1Qrsk","custom-header":"_22CX0","custom-header-right":"_3EDTf","custom-header-button":"_2OUSw","disable-button":"_3rQql","border-none":"_3MpEU","block-btn-header":"_25ahZ","custom-preview-button":"_mpfwz","total-card-box":"_1Xx6l","total-card-box--hover":"_2_ntJ","total-card-box-3":"_2eiNE","total-card-box-4":"_3eYTQ","total-card-box-5":"_230Hu","total-card-box__content":"_3ua19","status-default":"_165c9","pending":"_ZcAbu","active":"_3oAH-","close":"_3XmhO","box-filter":"_KT2NK","block-total":"_2GGFc","filter-select":"_3xiAo","box-filter-left":"_1hkQM","filter-select-list":"_3zE9Z","box-filter-right":"_1SOsh","search-input-icon":"_Od6MC","inputInput":"_2st_0","filter-item-collapse":"_2opDJ","box-show-filter-mobile":"_3xvBF","icon-show-all-filter":"_3gNUH","space-item":"_1G-S_","block-card-name":"_2Wl9Z","block-card-btn":"_1Z1H6","block-card-btn-icon":"_2Bg4S","table-cell":"_2uhRa","table-cell--pointer":"_3DnAh","box-notification":"_iDxHF","notification-1":"_2ZvNu","notification-2":"_2zBWP","notification-3":"_1T24i","notification-4":"_2obEM","notification-5":"_20aq-","notification-6":"_RWFl1","box-item":"_Wtc0p","notification-7":"_3rw4Y","notification-assistant-1":"_1ybh1","notification-assistant-2":"_2o31Q","notification-assistant-3":"_11hn9","notification-assistant-4":"_2sPVk","notification-assistant-5":"_3ln0K","notification-assistant-6":"_3dsZQ","notification-student-1":"_1XdPP","notification-student-2":"_1I9Dc","notification-student-3":"_3DwX3","notification-student-4":"_2TKDh","notification-student-5":"_14nq1","notification-student-6":"_1zCX0","btn-got-it":"_uwWqF","yes-active":"_2AK7h","no-active":"_1UouU","item-select-role":"_1KcY7","item-role-active":"_dOVso","model-switch-roles":"_3ZqxI","box-switch":"_2Nd8Z","title-label":"_XYA0v","title-text":"_88rqO","header-contact":"_EKp5e","logo-home":"_24U3W","hide-in-desktop":"_2LIqK","hamburger-menu":"_2yRc8","collapse-box":"_WX97m","nav-home":"_1TT1q","contact":"_NszFe","active-current":"_19XSx","box-header-user":"_2UxPq","header-user-left":"_2GnfS","user-avatar":"_2voun","user-detail":"_2NSw4","user-name":"_2ncLc","user-chip":"_3MdPs","chip":"_2clqF","grade":"_WSIoQ","date":"_1fNCD","header-user-right":"_Nd4GQ","disable-slider":"_1Vzhe","h-200":"_1xJfb","h-250":"_2IoEF","half-circle-slider":"_CRJ3D","wrapper":"_yak_n","t-125":"_3O6h7","t-180":"_tTvT4","box-slider-text":"_3QJJx","text-right":"_tZ2Y_","icon":"_20YJX","circle-slider-text":"_1LcjC","circle-slider-value":"_3Ch7F","roundy-gradient":"_PnoOX","pointer":"_1gsNz","icon-info":"_37jaA","icon-warning":"_1eWQQ","answer--never":"_1mTcA","answer--rarely":"_Vu1zQ","answer--sometimes":"_X0wca","answer--often":"_2dDxa","answer--almost-always":"_390EV","answer--all-the-time":"_28JDY","block-container":"_1PGSC","the-container-admin":"_d3gb7","custom-scrollbar":"_12ysw","p-0-12":"_1sfzz","date-range":"_44xZV","date-range-item":"_3bulT","calendar-select":"_3RE3I","calendar-label":"_Ld-at","calendar-options":"_dxUCu","option-item":"_2Z66k","selected":"_2Z_Js","no-selected":"_3YPC1"};
+var style$2 = {"font-large":"_3Sup6","block-card-title":"_3Qn6F","btn-conduct-checkIn":"_1qNfu","btn-conduct-session":"_2K2FJ","total-card-title":"_3vk3b","total-card-value":"_IHasQ","header-left":"_11kCD","custom-header-title":"_d8RZe","custom-header-large-title":"_3lHAH","block-card-btn-title":"_3svb4","custom-button-content":"_1oCai","show-answers":"_1L_vx","detail-questions":"_3kMDk","detail":"_3TKX7","answers":"_ejtt2","answer-item":"_2SV9m","download-btn":"_oQC64","btn-favorite-text":"_3m4oI","box-slider":"_1bTW5","slider-text":"_1gs0Z","chip-slider":"_xowPU","value":"_3hnI_","compare-avr":"_lL-Yg","content":"_1EgBn","percent":"_3Bs0W","arrow":"_2BhP8","label-single-choice":"_3oSdM","btn-choice":"_hPL_o","font-small":"_2JnMg","reset-the-content":"_1zJw3","btn-duplicate-survey":"_11N79","menu-item-strategories":"_1oZYB","time-Date":"_1Q7w6","time-Hours-Minute":"_3ZcQD","arrow-icon":"_2NJ7E","word-break":"_27YiF","header-icon":"_dqAoB","full-width":"_2DGWF","header-right-student":"_1GQrw","header-right":"_1jTMg","header-student":"_SSISD","box-title-question":"_1DlZO","tooltip-question":"_29Hwk","font-description":"_2pyf5","header-component":"_2oMWx","btn-start":"_1M4r8","timer-start":"_-ZWIZ","btn-timer":"_3SGlg","timer-text":"_1Q--B","timer-session":"_26lTc","play-icon-pause":"_d_2HA","play-icon":"_1mIjz","block-right":"_2CN0T","filter-item":"_3jAEH","btn-conduct-session-disabled":"_3ae8F","btn-conduct-icon":"_2msER","animation-btn-conduct":"_3bftL","ring":"_3Jd73","answer-text":"_Vct9B","icon-text":"_1MuMl","icon-left":"_3bBeE","margin-right":"_2T6Ym","up-color-background":"_1cck_","down-color-background":"_2Z76g","grey-background":"_2ryO2","up-color-icon":"_RTrVT","up-color":"_3UMJw","down-color-icon":"_3hZXx","down-color":"_1u1gK","rotate":"_1yp9N","font-question-name":"_13S5D","font-question":"_t-JhH","font-question--all-bold":"_2t1gp","font-question-description":"_1YLGi","question-block":"_2gqE-","question-text":"_337MJ","question-slider":"_k_dl-","input-survey":"_24vPq","question-block-mobile":"_p-cUG","emotion-list":"_1M6M1","emotion-item":"_1wmi8","emotion-active":"_3JT39","block-learning-strategories":"_KKK4u","conference-learning-strategories":"_3o_lQ","item-learning-strategories":"_1k7-R","question-today":"_WkaIn","block-button":"_275AS","talk-conduct":"_28jd3","box-talk":"_3zlbc","box-p":"_IXk4X","form-upload":"_1spIR","title":"_g-p72","description":"_2U60d","form-title":"_qDlsm","form-upload-image-box":"_2xZUq","form-upload-image":"_3C-Xm","form-upload-icon":"_2zIn5","form-upload-title":"_yNCgm","form-upload-description":"_35Wqq","header-right-download":"_27SXJ","download-title":"_1EWKg","accomondation-content":"_2qhHZ","accomondation-content-title-box":"_XTfSF","accomondation-content-title":"_1Z_hd","accomondation-body":"_1DtTP","accomondation-content-function":"_3fJXr","function-edit":"_368JR","function-delete":"_2I-ej","accomondation-block-content":"_1fpsj","accomondation-block-note":"_2INhO","accomondation-content-description":"_2BEap","accomondation-content-status":"_UdBci","content-function-mobile":"_3gaSR","card-box":"_3Flx1","card-top":"_3Mi_n","card-top-title":"_21QGx","card-top-right":"_2eeiS","card-top-switch":"_9VWFe","card-view":"_Jwjv5","card-content":"_3AVYm","block-circle":"_3o7Sh","block-item-3":"_3JeRP","item-circle":"_2wunA","block-item-4":"_3P83R","icon-btn":"_3xYAk","slider-avatar":"_2wH1X","btn-delete":"_z69mr","send-icon":"_3oH01","radio-choice":"_2RwcR","checkbox-control":"_3woGH","block-question":"_3TJl8","question-choice":"_3LiGg","radio-disable":"_1WFdo","pointer-page-result":"_3mfi0","canva-item-container":"_1tBto","canva-item":"_3A0Al","title-circle":"_2QAQJ","accommodation-header-right":"_4OB3z","about-header-right":"_t4lD7","text-custom":"_22kUd","page-external":"_1Qrsk","custom-header":"_22CX0","custom-header-right":"_3EDTf","custom-header-button":"_2OUSw","disable-button":"_3rQql","border-none":"_3MpEU","block-btn-header":"_25ahZ","custom-preview-button":"_mpfwz","total-card-box":"_1Xx6l","total-card-box--hover":"_2_ntJ","total-card-box-3":"_2eiNE","total-card-box-4":"_3eYTQ","total-card-box-5":"_230Hu","total-card-box__content":"_3ua19","status-default":"_165c9","pending":"_ZcAbu","active":"_3oAH-","close":"_3XmhO","box-filter":"_KT2NK","block-total":"_2GGFc","filter-select":"_3xiAo","box-filter-left":"_1hkQM","filter-select-list":"_3zE9Z","box-filter-right":"_1SOsh","search-input-icon":"_Od6MC","inputInput":"_2st_0","filter-item-collapse":"_2opDJ","box-show-filter-mobile":"_3xvBF","icon-show-all-filter":"_3gNUH","space-item":"_1G-S_","block-card-name":"_2Wl9Z","block-card-btn":"_1Z1H6","block-card-btn-icon":"_2Bg4S","table-cell":"_2uhRa","table-cell--pointer":"_3DnAh","box-notification":"_iDxHF","notification-1":"_2ZvNu","notification-2":"_2zBWP","notification-3":"_1T24i","notification-4":"_2obEM","notification-5":"_20aq-","notification-6":"_RWFl1","box-item":"_Wtc0p","notification-7":"_3rw4Y","notification-assistant-1":"_1ybh1","notification-assistant-2":"_2o31Q","notification-assistant-3":"_11hn9","notification-assistant-4":"_2sPVk","notification-assistant-5":"_3ln0K","notification-assistant-6":"_3dsZQ","notification-student-1":"_1XdPP","notification-student-2":"_1I9Dc","notification-student-3":"_3DwX3","notification-student-4":"_2TKDh","notification-student-5":"_14nq1","notification-student-6":"_1zCX0","btn-got-it":"_uwWqF","yes-active":"_2AK7h","no-active":"_1UouU","item-select-role":"_1KcY7","item-role-active":"_dOVso","model-switch-roles":"_3ZqxI","btn-close":"_NhW9l","select-user-role":"_2oGz6","box-switch":"_2Nd8Z","title-label":"_XYA0v","title-text":"_88rqO","header-contact":"_EKp5e","logo-home":"_24U3W","hide-in-desktop":"_2LIqK","hamburger-menu":"_2yRc8","collapse-box":"_WX97m","nav-home":"_1TT1q","contact":"_NszFe","active-current":"_19XSx","box-header-user":"_2UxPq","header-user-left":"_2GnfS","user-avatar":"_2voun","user-detail":"_2NSw4","user-name":"_2ncLc","user-chip":"_3MdPs","chip":"_2clqF","grade":"_WSIoQ","date":"_1fNCD","header-user-right":"_Nd4GQ","disable-slider":"_1Vzhe","h-200":"_1xJfb","h-250":"_2IoEF","half-circle-slider":"_CRJ3D","wrapper":"_yak_n","t-125":"_3O6h7","t-180":"_tTvT4","box-slider-text":"_3QJJx","text-right":"_tZ2Y_","icon":"_20YJX","circle-slider-text":"_1LcjC","circle-slider-value":"_3Ch7F","roundy-gradient":"_PnoOX","pointer":"_1gsNz","icon-info":"_37jaA","icon-warning":"_1eWQQ","answer--never":"_1mTcA","answer--rarely":"_Vu1zQ","answer--sometimes":"_X0wca","answer--often":"_2dDxa","answer--almost-always":"_390EV","answer--all-the-time":"_28JDY","block-container":"_1PGSC","the-container-admin":"_d3gb7","custom-scrollbar":"_12ysw","p-0-12":"_1sfzz","date-range":"_44xZV","date-range-item":"_3bulT","calendar-select":"_3RE3I","calendar-label":"_Ld-at","calendar-options":"_dxUCu","option-item":"_2Z66k","selected":"_2Z_Js","no-selected":"_3YPC1"};
 
 var FilterDateRange = function FilterDateRange(_ref) {
   var endDate = _ref.endDate,
@@ -32359,7 +32359,7 @@ var convertTime = function convertTime(time) {
 };
 var flagSurveyOptions = ["All", "Red", "Yellow", "Green"];
 var DATE_MIN_VALUE = "0001-01-01T00:00:00";
-var DEFAULT_USER_AVATAR = "/images/image-default.png";
+var DEFAULT_USER_AVATAR$1 = "/images/image-default.png";
 var ratingOfQuestionColors = ["#169490", "#316CD9", "#FFB04F", "#C44140", "#0F9655", "#73C8E5"];
 var tooltipLabel = "you_can_only_select_number_kpis_at_a_time_To_select_a_new_one_please_switch_off_one_of_the_previous_ones";
 var FLAG_TYPES$1;
@@ -32611,7 +32611,7 @@ var LastAnswerTable = function LastAnswerTable(_ref) {
     }, React__default.createElement(core$1.Grid, {
       className: "d-flex align-items-center"
     }, React__default.createElement("img", {
-      src: !!r.studentProfileImage ? marioCore.getFileUrl(r.studentProfileImage) : DEFAULT_USER_AVATAR,
+      src: !!r.studentProfileImage ? marioCore.getFileUrl(r.studentProfileImage) : DEFAULT_USER_AVATAR$1,
       alt: "",
       className: "" + styles$4["avatar_user"]
     }), r.studentName))), React__default.createElement(core$1.TableCell, {
@@ -32838,7 +32838,7 @@ var SimpleDialog = function SimpleDialog(_ref) {
   }, "spacing")));
 };
 
-var DEFAULT_USER_AVATAR$1 = marioCore.getStaticFileUrl("/images/image-default.png");
+var DEFAULT_USER_AVATAR$2 = marioCore.getStaticFileUrl("/images/image-default.png");
 
 var StudentsMissingConversationModal = function StudentsMissingConversationModal(_ref) {
   var students = _ref.students,
@@ -32882,7 +32882,7 @@ var StudentsMissingConversationModal = function StudentsMissingConversationModal
     }, React__default.createElement("div", {
       className: styles$3["item__data"] + " " + styles$3["item__not-grade"] + " " + styles$3["item__student-information"]
     }, React__default.createElement("img", {
-      src: !!(res !== null && res !== void 0 && res.studentProfileImage) ? marioCore.getFileUrl(res === null || res === void 0 ? void 0 : res.studentProfileImage) : DEFAULT_USER_AVATAR$1,
+      src: !!(res !== null && res !== void 0 && res.studentProfileImage) ? marioCore.getFileUrl(res === null || res === void 0 ? void 0 : res.studentProfileImage) : DEFAULT_USER_AVATAR$2,
       alt: res === null || res === void 0 ? void 0 : res.studentName
     }), res === null || res === void 0 ? void 0 : res.studentName), React__default.createElement("div", {
       className: styles$3["item__data"] + " " + styles$3["item__grade"],
@@ -33604,6 +33604,13 @@ var DialogBody = function DialogBody(_ref2) {
   }), studentFiltered.map(function (r) {
     var _r$sessionResults, _r$sessionResults$fin, _r$sessionResults2, _r$sessionResults2$fi;
 
+    var teacherStartTime = r === null || r === void 0 ? void 0 : (_r$sessionResults = r.sessionResults) === null || _r$sessionResults === void 0 ? void 0 : (_r$sessionResults$fin = _r$sessionResults.find(function (i) {
+      return i.isTeacherResult;
+    })) === null || _r$sessionResults$fin === void 0 ? void 0 : _r$sessionResults$fin.startTime;
+    var studentStartTime = r === null || r === void 0 ? void 0 : (_r$sessionResults2 = r.sessionResults) === null || _r$sessionResults2 === void 0 ? void 0 : (_r$sessionResults2$fi = _r$sessionResults2.find(function (i) {
+      return !i.isTeacherResult;
+    })) === null || _r$sessionResults2$fi === void 0 ? void 0 : _r$sessionResults2$fi.startTime;
+    var startTime = !!studentStartTime && studentStartTime != defaultDate ? studentStartTime : teacherStartTime;
     return React__default.createElement("div", {
       className: styles$7["model-student-item"] + " d-flex"
     }, React__default.createElement("div", {
@@ -33628,17 +33635,13 @@ var DialogBody = function DialogBody(_ref2) {
       className: "" + styles$7["student-name"]
     }, r.studentName), React__default.createElement("div", null, React__default.createElement(core$1.Typography, {
       className: styles$7["tag"] + " text-nowrap"
-    }, tagName))), !!(r !== null && r !== void 0 && (_r$sessionResults = r.sessionResults) !== null && _r$sessionResults !== void 0 && (_r$sessionResults$fin = _r$sessionResults.find(function (i) {
-      return !i.isTeacherResult;
-    })) !== null && _r$sessionResults$fin !== void 0 && _r$sessionResults$fin.startTime) && React__default.createElement("div", {
+    }, tagName))), !!startTime && React__default.createElement("div", {
       className: "d-flex flex-wrap"
     }, React__default.createElement(core$1.Typography, {
       className: styles$7["time"] + " mr-1"
     }, (r.isSessionCheckIn ? t('last_check_in') : t('last_1_1')) + ": "), React__default.createElement("b", {
       className: "" + styles$7["time"]
-    }, formatSortDate((r === null || r === void 0 ? void 0 : (_r$sessionResults2 = r.sessionResults) === null || _r$sessionResults2 === void 0 ? void 0 : (_r$sessionResults2$fi = _r$sessionResults2.find(function (i) {
-      return !i.isTeacherResult;
-    })) === null || _r$sessionResults2$fi === void 0 ? void 0 : _r$sessionResults2$fi.startTime) || "")))), !isHiddenAvg && React__default.createElement("div", {
+    }, formatSortDate(startTime || "")))), !isHiddenAvg && React__default.createElement("div", {
       className: "d-flex align-items-center py-2"
     }, React__default.createElement(ChipImage, {
       className: "ml-0",
@@ -35014,23 +35017,6 @@ var BarChart = function BarChart(_ref) {
           if (!chartEl) return;
           var barEls = chartEl.querySelectorAll(".apexcharts-bar-series path");
           if (!barEls.length) return;
-
-          if (selectedBarRef.current === dataPointIndex) {
-            selectedBarRef.current = null;
-            barEls[dataPointIndex].setAttribute("fill", "#C4D4F3");
-            setTooltipData(null);
-            return;
-          }
-
-          if (selectedBarRef.current !== null) {
-            var prevIndex = selectedBarRef.current;
-            var prevBar = barEls[prevIndex];
-
-            if (prevBar) {
-              prevBar.setAttribute("fill", "#C4D4F3");
-            }
-          }
-
           var newBar = barEls[dataPointIndex];
 
           if (newBar) {
@@ -35043,16 +35029,22 @@ var BarChart = function BarChart(_ref) {
         dataPointMouseEnter: function dataPointMouseEnter(_event, _chartContext, config) {
           var dataPointIndex = config === null || config === void 0 ? void 0 : config.dataPointIndex;
           var currentTooltip = tooltipDataRef.current;
+          var chartEl = document.querySelector("#apexchartsmy-bar-chart");
+          if (!chartEl) return;
+          var barEls = chartEl.querySelectorAll(".apexcharts-bar-series path");
+          if (!barEls.length) return;
 
           if (dataPointIndex != undefined && dataPointIndex !== (currentTooltip === null || currentTooltip === void 0 ? void 0 : currentTooltip.dataPointIndex) && !(currentTooltip !== null && currentTooltip !== void 0 && currentTooltip.isSelect)) {
-            dataPointIndex == -1 ? setTooltipData(null) : showTooltipAtIndex(dataPointIndex);
-          }
-        },
-        dataPointMouseLeave: function dataPointMouseLeave(_event, _chartContext, config) {
-          var currentTooltip = tooltipDataRef.current;
-
-          if ((currentTooltip === null || currentTooltip === void 0 ? void 0 : currentTooltip.dataPointIndex) == config.dataPointIndex && !(currentTooltip !== null && currentTooltip !== void 0 && currentTooltip.isSelect)) {
-            setTooltipData(null);
+            if (dataPointIndex != -1) {
+              showTooltipAtIndex(dataPointIndex);
+              barEls.forEach(function (bar, i) {
+                if (i === dataPointIndex) {
+                  bar.setAttribute("fill", "#316CD9");
+                } else {
+                  bar.setAttribute("fill", "#C4D4F3");
+                }
+              });
+            }
           }
         }
       }
@@ -35149,29 +35141,6 @@ var BarChart = function BarChart(_ref) {
   React.useEffect(function () {
     tooltipDataRef.current = tooltipData;
   }, [tooltipData]);
-  React.useEffect(function () {
-    var handleClickOutside = function handleClickOutside(e) {
-      if (open) return;
-      var chartEl = document.querySelector("#apexchartsmy-bar-chart");
-      if (!chartEl) return;
-
-      if (!chartEl.contains(e.target)) {
-        var barEls = chartEl.querySelectorAll(".apexcharts-bar-series path");
-        var selectedIndex = selectedBarRef.current;
-
-        if (selectedIndex !== null && barEls[selectedIndex]) {
-          barEls[selectedIndex].setAttribute("fill", "#C4D4F3");
-          selectedBarRef.current = null;
-          setTooltipData(null);
-        }
-      }
-    };
-
-    document.addEventListener("click", handleClickOutside);
-    return function () {
-      document.removeEventListener("click", handleClickOutside);
-    };
-  }, [open]);
   return React__default.createElement("div", null, React__default.createElement("div", {
     ref: chartWrapperRef,
     style: {
@@ -53955,7 +53924,7 @@ var ConductSurveyModel = function ConductSurveyModel(_ref) {
   }, React__default.createElement(core$1.Grid, {
     className: "" + styles$9["header-conduct"]
   }, React__default.createElement("img", {
-    src: marioCore.getFileUrl((student === null || student === void 0 ? void 0 : student.avatar) || "") || DEFAULT_USER_AVATAR,
+    src: marioCore.getFileUrl((student === null || student === void 0 ? void 0 : student.avatar) || "") || DEFAULT_USER_AVATAR$1,
     alt: student === null || student === void 0 ? void 0 : student.studentName,
     className: "" + styles$9["avatar_user"]
   }), React__default.createElement(core$1.Grid, {
@@ -54057,7 +54026,7 @@ var ResponseQuestionModel = function ResponseQuestionModel(_ref) {
       hidden: !!isHiddenContact,
       className: "" + styles$9["student-detail"]
     }, React__default.createElement("img", {
-      src: marioCore.getFileUrl(r.studentAvatar || "") || DEFAULT_USER_AVATAR,
+      src: marioCore.getFileUrl(r.studentAvatar || "") || DEFAULT_USER_AVATAR$1,
       alt: r.studentName,
       className: "" + styles$9["avatar_user"]
     }), React__default.createElement(core$1.Grid, null, React__default.createElement(core$1.Typography, {
@@ -54458,7 +54427,7 @@ var BarChartQuestionAnswers = function BarChartQuestionAnswers(_ref) {
   }, t('number_of_answers')));
 };
 
-var DEFAULT_USER_AVATAR$2 = marioCore.getStaticFileUrl("/images/image-default.png");
+var DEFAULT_USER_AVATAR$3 = marioCore.getStaticFileUrl("/images/image-default.png");
 
 var AnswerQuestionInput = function AnswerQuestionInput(_ref) {
   var handleClickCollapse = _ref.handleClickCollapse,
@@ -54540,7 +54509,7 @@ var AnswerQuestionInput = function AnswerQuestionInput(_ref) {
       }, React__default.createElement("div", {
         className: styles$9["answer-head"]
       }, React__default.createElement("img", {
-        src: "" + (item.profileImageFileName != null ? marioCore.getFileUrl(item.profileImageFileName) : DEFAULT_USER_AVATAR$2),
+        src: "" + (item.profileImageFileName != null ? marioCore.getFileUrl(item.profileImageFileName) : DEFAULT_USER_AVATAR$3),
         alt: "",
         style: {
           width: '24px',
@@ -55315,7 +55284,7 @@ var StudentFlagList = function StudentFlagList(_ref) {
       align: "left",
       className: "" + styles$9["row_name"]
     }, React__default.createElement("img", {
-      src: !row.avatar ? DEFAULT_USER_AVATAR : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.avatar),
+      src: !row.avatar ? DEFAULT_USER_AVATAR$1 : marioCore.getFileUrl(row === null || row === void 0 ? void 0 : row.avatar),
       alt: "",
       className: "" + styles$9["avatar_user"]
     }), row === null || row === void 0 ? void 0 : row.studentName), React__default.createElement(core$1.TableCell, {
@@ -55358,7 +55327,7 @@ var StudentFlagList = function StudentFlagList(_ref) {
         color: "disabled"
       }),
       statusDetail: t((e === null || e === void 0 ? void 0 : e.status) !== "ActionNeed" ? e === null || e === void 0 ? void 0 : (_e$status = e.status) === null || _e$status === void 0 ? void 0 : (_e$status$toLocaleLow = _e$status.toLocaleLowerCase) === null || _e$status$toLocaleLow === void 0 ? void 0 : _e$status$toLocaleLow.call(_e$status) : "action_need"),
-      avatar: !e.avatar ? DEFAULT_USER_AVATAR : marioCore.getFileUrl(e.avatar)
+      avatar: !e.avatar ? DEFAULT_USER_AVATAR$1 : marioCore.getFileUrl(e.avatar)
     });
   })), !!listSurveyStudent && listSurveyStudent.items.length > 0 && React__default.createElement(core$1.TablePagination, {
     rowsPerPageOptions: [5, 10, 25],
@@ -68594,7 +68563,7 @@ var TableSelectStudent = function TableSelectStudent(_ref) {
       return React__default.createElement("div", {
         className: "" + styles$9["row_name"]
       }, React__default.createElement("img", {
-        src: !params.row.avatar ? DEFAULT_USER_AVATAR : marioCore.getFileUrl(params.row.avatar),
+        src: !params.row.avatar ? DEFAULT_USER_AVATAR$1 : marioCore.getFileUrl(params.row.avatar),
         alt: "",
         className: "" + styles$9["avatar_user"]
       }), params.row.fullName);
@@ -70022,7 +69991,7 @@ var TableSelectStaff = function TableSelectStaff(_ref) {
       return React__default.createElement("div", {
         className: "" + styles$9["row_name"]
       }, React__default.createElement("img", {
-        src: !params.row.avatar ? DEFAULT_USER_AVATAR : marioCore.getFileUrl(params.row.avatar),
+        src: !params.row.avatar ? DEFAULT_USER_AVATAR$1 : marioCore.getFileUrl(params.row.avatar),
         alt: "",
         className: "" + styles$9["avatar_user"]
       }), params.row.fullName);
@@ -72419,7 +72388,7 @@ var getConvertMinuteToHour$1 = function getConvertMinuteToHour(time, usingText)
   var timeSecond = time * 60;
   var hours = Math.floor(timeSecond / 3600);
   var minutes = Math.floor(timeSecond % 3600 / 60);
-  var remainingSeconds = timeSecond % 60;
+  var remainingSeconds = Math.floor(timeSecond % 60);
   var formattedHours = String(hours).padStart(2, '0');
   var formattedMinutes = String(minutes).padStart(2, '0');
   var formattedSeconds = String(remainingSeconds).padStart(2, '0');
@@ -73740,7 +73709,7 @@ var SimpleDialog$1 = function SimpleDialog(_ref) {
   }, "spacing")));
 };
 
-var DEFAULT_USER_AVATAR$3 = "/images/image-default.png";
+var DEFAULT_USER_AVATAR$4 = "/images/image-default.png";
 
 var StudentWellnessCheckInItem = function StudentWellnessCheckInItem(_ref) {
   var endTime = _ref.endTime,
@@ -73773,7 +73742,7 @@ var StudentWellnessCheckInItem = function StudentWellnessCheckInItem(_ref) {
     className: "d-flex w-100"
   }, React__default.createElement(core$1.Avatar, {
     alt: name === null || name === void 0 ? void 0 : name.toUpperCase(),
-    src: marioCore.getFileUrl(avatar) || DEFAULT_USER_AVATAR$3
+    src: marioCore.getFileUrl(avatar) || DEFAULT_USER_AVATAR$4
   }), React__default.createElement("div", {
     className: "ml-2 ml-sm-3 d-flex flex-column justify-content-center"
   }, React__default.createElement("div", {
@@ -75694,7 +75663,8 @@ var useHeaderSideBar = function useHeaderSideBar(_navigations) {
     icon: React__default.createElement(TrackChangesIcon, null)
   }];
   var renderNotificationBadge = React.useCallback(function () {
-    if (!unreadNoti) return React__default.createElement(NotificationsIcon, {
+    if (!unreadNoti) return React__default.createElement("img", {
+      src: "/images/bell-icon.png",
       onClick: function onClick() {
         return openNotification();
       }
@@ -75705,7 +75675,9 @@ var useHeaderSideBar = function useHeaderSideBar(_navigations) {
       onClick: function onClick() {
         return openNotification();
       }
-    }, React__default.createElement(NotificationsIcon, null));
+    }, React__default.createElement("img", {
+      src: "/images/bell-icon.png"
+    }));
   }, [unreadNoti, JSON.stringify(roles)]);
 
   var renderNavigationItem = function renderNavigationItem(navigation, isSubItem) {
@@ -75856,24 +75828,23 @@ var useStyles$l = styles$h.makeStyles(function (theme) {
       flexGrow: 1
     },
     menuItem: {
-      padding: 0,
+      padding: "8px 24px",
       "& > button > span > span": {
         marginLeft: "0.2rem !important"
       }
     },
+    menuText: {
+      fontSize: "16px"
+    },
     menuButton: (_menuButton = {
       marginRight: theme.spacing(2)
     }, _menuButton["@media(max-width: 768px)"] = {
       marginRight: 0
     }, _menuButton),
     title: (_title = {
-      flexGrow: 0.2,
+      flexGrow: 0.1,
       "& img": {
-        height: "50px",
-        borderRadius: "16px",
-        boxShadow: "0px 0px 24px 0px rgba(0, 0, 0, 0.16)",
-        padding: "5px 10px",
-        border: "2px solid #FFFFFF"
+        height: "40px"
       },
       "& img:hover": {
         boxShadow: "0px 0px 24px 0px rgba(0, 0, 0, 0.36)"
@@ -75881,17 +75852,29 @@ var useStyles$l = styles$h.makeStyles(function (theme) {
     }, _title['@media(min-width: 1440px)'] = {
       flexGrow: 0.1
     }, _title),
+    avatar: {
+      width: "44px",
+      height: "44px",
+      cursor: "pointer",
+      borderRadius: "50px"
+    },
     listItem: (_listItem = {}, _listItem["@media(max-width: 768px)"] = {
       padding: 0
     }, _listItem),
     header: {
       zIndex: 1000,
-      background: "#336DDA"
+      background: "#336DDA",
+      borderRadius: "0 0 12px 12px",
+      width: "calc(100vw - 32px)",
+      margin: "0 16px"
     },
     dropdown: {
       zIndex: "1410 !important",
       top: "40px !important"
     },
+    menuIcon: {
+      marginRight: "8px"
+    },
     sectionDesktop: {
       display: "flex"
     },
@@ -76016,7 +75999,7 @@ var useStyles$l = styles$h.makeStyles(function (theme) {
         easing: theme.transitions.easing.sharp,
         duration: theme.transitions.duration.leavingScreen
       }),
-      marginTop: 60,
+      marginTop: 64,
       maxHeight: 'calc(100vh - 120px)',
       minHeight: 'calc(100vh - 120px)',
       paddingTop: '0 !important',
@@ -76146,7 +76129,9 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     color: "inherit",
     "aria-label": "menu",
     onClick: toggleSideBar
-  }, isOpenSideBar && screenWidth < 1280 ? React__default.createElement(TimesIcon, null) : React__default.createElement(MenuIcon, null)), React__default.createElement(Typography, {
+  }, isOpenSideBar && screenWidth < 1280 ? React__default.createElement(TimesIcon, null) : React__default.createElement("img", {
+    src: "/images/burger-menu-icon.png"
+  })), React__default.createElement(Typography, {
     variant: "h6",
     className: classes.title
   }, React__default.createElement(reactRouterDom.Link, {
@@ -76156,7 +76141,8 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     alt: ""
   }))), screenWidth > 600 && React__default.createElement("span", {
     style: {
-      fontSize: "1.1rem"
+      fontSize: "16px",
+      opacity: 0.8
     }
   }, t('hi'), ", ", user === null || user === void 0 ? void 0 : user.firstName, " \uD83D\uDC4B"), React__default.createElement("div", {
     className: classes.grow
@@ -76173,15 +76159,25 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   }, "A"), React__default.createElement("span", {
     className: classes.fontBodySmall
   }, "A")), React__default.createElement(IconButton, {
-    "aria-label": "show 17 new notifications",
+    "aria-label": "policy",
     color: "inherit",
-    onClick: handleMenu
-  }, React__default.createElement(icons.AccountCircle, null)), !isReadOnly && React__default.createElement(IconButton, {
-    edge: "end",
+    onClick: function onClick() {
+      return window.open("/privacy-policy");
+    }
+  }, React__default.createElement("img", {
+    src: "/images/policy-icon.png"
+  })), !isReadOnly && React__default.createElement(IconButton, {
     "aria-label": "account of current user",
     "aria-haspopup": "true",
     color: "inherit"
-  }, renderNotificationBadge())), React__default.createElement(core$1.Menu, {
+  }, renderNotificationBadge()), React__default.createElement(IconButton, {
+    "aria-label": "show 17 new notifications",
+    color: "inherit",
+    onClick: handleMenu
+  }, React__default.createElement("img", {
+    className: classes.avatar,
+    src: !!(user !== null && user !== void 0 && user.profileImageFileName) ? marioCore.getFileUrl(user.profileImageFileName) : DEFAULT_USER_AVATAR
+  }))), React__default.createElement(core$1.Menu, {
     id: "menu-font",
     className: classes.dropdown,
     anchorEl: anchorFontEl,
@@ -76229,19 +76225,46 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
       horizontal: "right"
     },
     open: open,
-    onClose: handleClose
+    onClose: handleClose,
+    PaperProps: {
+      style: {
+        borderRadius: 16,
+        padding: "20px 0"
+      }
+    }
   }, screenWidth < 600 && React__default.createElement(core$1.MenuItem, {
     className: classes.menuItem
   }, React__default.createElement(LanguageDropdown, null)), !isReadOnly && React__default.createElement(core$1.MenuItem, {
+    className: classes.menuItem,
     onClick: openProfile
-  }, t('profile')), ((_handleUserRole = handleUserRole((user === null || user === void 0 ? void 0 : user.userRoles) || [])) === null || _handleUserRole === void 0 ? void 0 : _handleUserRole.length) > 1 && !isReadOnly && React__default.createElement(core$1.MenuItem, {
+  }, React__default.createElement("img", {
+    className: classes.menuIcon,
+    src: "/images/profile-icon.png"
+  }), React__default.createElement(Typography, {
+    className: classes.menuText
+  }, t("profile"))), ((_handleUserRole = handleUserRole((user === null || user === void 0 ? void 0 : user.userRoles) || [])) === null || _handleUserRole === void 0 ? void 0 : _handleUserRole.length) > 1 && !isReadOnly && React__default.createElement(core$1.MenuItem, {
+    className: classes.menuItem,
     onClick: function onClick() {
       onToggleModel === null || onToggleModel === void 0 ? void 0 : onToggleModel();
       handleClose();
     }
-  }, t('role_change')), React__default.createElement(core$1.MenuItem, {
+  }, React__default.createElement("img", {
+    className: classes.menuIcon,
+    src: "/images/role-change-icon.png"
+  }), React__default.createElement(Typography, {
+    className: classes.menuText
+  }, t("role_change"))), React__default.createElement(core$1.MenuItem, {
+    style: {
+      borderTop: "1px solid #e9e9e9"
+    },
+    className: classes.menuItem,
     onClick: signOut
-  }, t('log_out'))))), !isReadOnly && React__default.createElement(React__default.Fragment, null, isOpenSideBar && React__default.createElement("div", {
+  }, React__default.createElement("img", {
+    className: classes.menuIcon,
+    src: "/images/sign-out-icon.png"
+  }), React__default.createElement(Typography, {
+    className: classes.menuText
+  }, t("log_out")))))), !isReadOnly && React__default.createElement(React__default.Fragment, null, isOpenSideBar && React__default.createElement("div", {
     className: classes.positionBox
   }, React__default.createElement(core$1.Drawer, {
     id: "menu-sidebar",
@@ -76269,6 +76292,17 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   }, children));
 };
 
+var useStyles$m = core$1.makeStyles(function () {
+  return {
+    paper: {
+      borderRadius: 24,
+      position: "absolute",
+      top: "10%",
+      padding: "40px 48px"
+    }
+  };
+});
+
 var ModelSelectRole = function ModelSelectRole(_ref) {
   var _handleUserRole;
 
@@ -76280,6 +76314,7 @@ var ModelSelectRole = function ModelSelectRole(_ref) {
       t = _useTranslation.t;
 
   var history = reactRouterDom.useHistory();
+  var classes = useStyles$m();
   var pathname = window.location.pathname;
   var user = reactRedux.useSelector(function (state) {
     return state.common.user;
@@ -76311,10 +76346,21 @@ var ModelSelectRole = function ModelSelectRole(_ref) {
     onClose: function onClose() {
       return onToggleModel();
     },
-    className: "" + style$2["model-switch-roles"]
-  }, React__default.createElement(core$1.Typography, {
+    className: "" + style$2["model-switch-roles"],
+    classes: {
+      paper: classes.paper
+    }
+  }, React__default.createElement("button", {
+    type: "button",
+    className: style$2["btn-close"],
+    onClick: function onClick() {
+      return onToggleModel();
+    }
+  }, React__default.createElement(CloseIcon$1, null)), React__default.createElement(core$1.Typography, {
     className: "" + style$2["title"]
-  }, t('continue_as')), React__default.createElement("div", null, (_handleUserRole = handleUserRole(user === null || user === void 0 ? void 0 : user.userRoles)) === null || _handleUserRole === void 0 ? void 0 : _handleUserRole.map(function (r) {
+  }, t('continue_as')), React__default.createElement("div", {
+    className: "" + style$2["select-user-role"]
+  }, (_handleUserRole = handleUserRole(user === null || user === void 0 ? void 0 : user.userRoles)) === null || _handleUserRole === void 0 ? void 0 : _handleUserRole.map(function (r) {
     return React__default.createElement("p", {
       key: r,
       className: style$2["item-select-role"] + " " + style$2[roles.includes("Teacher") && roles.includes("Assistant") && r === "Teacher/Assistant" || roles.includes(r) ? "item-role-active" : ""],
@@ -76327,7 +76373,7 @@ var ModelSelectRole = function ModelSelectRole(_ref) {
 
 var styles$e = {"privacy-policy":"_2dEzh","privacy-policy-left":"_2lSk2","all-rights-reserved":"_2unK1","policy-link":"_1cFLY","privacy-policy-right":"_1a3Jo","product-link":"_3ztHM","image-link":"_1PDl3","margin-by-sidebar":"_1XXX_"};
 
-var useStyles$m = core$1.makeStyles(function () {
+var useStyles$n = core$1.makeStyles(function () {
   var _root, _fullWidth;
 
   return {
@@ -76360,7 +76406,7 @@ var Footer = function Footer(_ref) {
     return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
   });
   var isStudent = currentUser.roles.includes("Student");
-  var classes = useStyles$m();
+  var classes = useStyles$n();
   return React__default.createElement(core$1.Grid, {
     className: styles$e["privacy-policy"] + " " + (isOpenSideBar && !isNotification ? classes.root : classes.fullWidth)
   }, React__default.createElement(core$1.Grid, {
@@ -78053,7 +78099,7 @@ var SubSurveyQuestions = function SubSurveyQuestions(_ref) {
   }));
 };
 
-var useStyles$n = core$1.makeStyles(function () {
+var useStyles$o = core$1.makeStyles(function () {
   return core$1.createStyles({
     fullWidth: {
       width: "100%"
@@ -78081,7 +78127,7 @@ var SurveyAnswerList = function SurveyAnswerList(_ref) {
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
 
-  var classes = useStyles$n();
+  var classes = useStyles$o();
   var isEmotional = type === marioCore.QUESTION_TYPES.EMOTIONAL;
   var isSingleChoice = type === marioCore.QUESTION_TYPES.SINGLE_CHOICE;
   var hasFlag = questionType && parseInt(questionType) === QUESTION_TYPE_PARAMS.Survey && (type === marioCore.QUESTION_TYPES.EMOTIONAL || type === marioCore.QUESTION_TYPES.SINGLE_CHOICE || type == marioCore.QUESTION_TYPES.DROPDOWN || type === marioCore.QUESTION_TYPES.MULTIPLE_CHOICE);