asicudl · mateullas · Nov 4, 2024 · Oct 31, 2024
diff --git a/library/src/morpheus-udl/sass/base/_extendables.scss b/library/src/morpheus-udl/sass/base/_extendables.scss
@@ -122,10 +122,75 @@
 		margin-bottom: 0;
 	}
 }
+@mixin sakai-banner-meetings($bordercolor, $bgcolor, $color, $icon, $isInline: false) {
+	position: relative;
+	@if $isInline {
+		display: inline-block;
+		margin: 0;
+		padding: 0 $standard-space 0 calc(#{$standard-spacing} * 2 + 18px); // making room on either side of the icon plus the width of the icon;
+	} @else {
+		display: block;
+		clear: both;
+		margin: $standard-spacing 0;
+		padding: $standard-spacing $standard-spacing $standard-spacing calc(#{$standard-spacing} * 2 + 18px); // making room on either side of the icon plus the width of the icon;
+	}
+	border-left: calc( #{$standard-spacing} / 2) solid $bordercolor;
+	background-color: $bgcolor;
+	color: $color;
+
+	// display an icon indicating banner type on the left of the text
+	&:before {
+		content: '';
+		@extend .fa;
+		@extend .fa-fw;		// fixed width icons
+		@extend #{$icon};	// icon passed in through mixin's parameter
+		top: calc(50% - 7px); 	// half the height of the icon
+		left: $standard-spacing;
+		margin-right: $standard-space;	// space between icon and message text
+		color: $color;
+	}
+
+	// display a closing X on the right of the banner to indicate that the banner is dismissible
+	.dismiss {
+		@if $isInline == false {
+			position: absolute;
+			top: calc(50% - 10px);			// vertically-align the icon with half its height
+			right: $standard-spacing;		// space between icon and right edge of banner
+		} @else {
+			margin-left: $standard-space;	// space between icon and end of message text
+		}
+		text-decoration: none;
+
+		span {
+			font-size: 0;		// hide the accessible text
+		}
+
+		&:before {
+			content: '';
+			@extend .fa;
+			@extend .fa-fw;	// fixed width icons
+			@extend .fa-close;
+		}
+	}
+
+	// any links in the banners should have the same text color contrast and be underlined
+	a[href] {
+		color: $color;
+		text-decoration: underline;
+	}
+
+	// remove end spacing from any paragraphs at the end of the banner
+	p:last-child {
+		margin-bottom: 0;
+	}
+}
 
 .sak-banner-info {
 	@include sakai-banner(var(--infoBanner-bordercolor), var(--infoBanner-bgcolor), var(--infoBanner-color), $infoBanner-icon, false);
 }
+.sak-banner-info-meetings {
+	@include sakai-banner-meetings(var(--infoBanner-bordercolor), var(--infoBanner-bgcolor), var(--infoBanner-color), $infoBanner-icon, false);
+}
 .sak-banner-info-inline {
 	@include sakai-banner(var(--infoBanner-bordercolor), var(--infoBanner-bgcolor), var(--infoBanner-color), $infoBanner-icon, true);
 }

diff --git a/meetings/tool/src/main/java/org/sakaiproject/meetings/controller/MeetingsController.java b/meetings/tool/src/main/java/org/sakaiproject/meetings/controller/MeetingsController.java
@@ -23,6 +23,8 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.Collections;
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -103,16 +105,6 @@ public class MeetingsController {
 	private static final String NOTIF_CONTENT = "notification.content";
 	private static final String SMTP_FROM = "[email protected]";
 	private static final String NO_REPLY = "no-reply@";
-	private static final String MEETING_ATTENDANCE_REPORT = rb.getString("meeting.attendance_report");
-	private static final String MEETING_COLUMN_NAME = rb.getString("meeting.column_name");
-	private static final String MEETING_COLUMN_EMAIL = rb.getString("meeting.column_email");
-	private static final String MEETING_COLUMN_ROL = rb.getString("meeting.column_role");
-	private static final String MEETING_COLUMN_DURATION = rb.getString("meeting.column_duration");
-	private static final String MEETING_DURATION_INTERVAL = rb.getString("meeting.interval_duration");
-	private static final String MEETING_ENTRY_DATE = rb.getString("meeting.entry_date");
-	private static final String MEETING_EXIT_DATE = rb.getString("meeting.exit_date");
-	private static final String MEETING_DETAILS= rb.getString("meeting.details");
-
 
 	/**
 	 * Check if there's an user logged
@@ -610,7 +602,7 @@ public ResponseEntity<?> getMeetingAttendanceReport(@PathVariable String meeting
 		String onlineMeetingId = meetingService.getMeetingProperty(meeting, ONLINE_MEETING_ID);
 		String organizerEmail = meetingService.getMeetingProperty(meeting, ORGANIZER_USER);
 		checkUpdatePermissions(meeting.getSiteId());
-		microsoftCommonService.inicializeMeetingNameColumns(MEETING_ATTENDANCE_REPORT, MEETING_COLUMN_NAME, MEETING_COLUMN_EMAIL, MEETING_COLUMN_ROL, MEETING_COLUMN_DURATION, MEETING_DURATION_INTERVAL, MEETING_ENTRY_DATE, MEETING_EXIT_DATE, MEETING_DETAILS);
+		microsoftCommonService.inicializeMeetingNameColumns(rb.getString("meeting.attendance_report"), rb.getString("meeting.column_name"), rb.getString("meeting.column_email"), rb.getString("meeting.column_role"), rb.getString("meeting.column_duration"), rb.getString("meeting.interval_duration"), rb.getString("meeting.entry_date"), rb.getString("meeting.exit_date"), rb.getString("meeting.details"));
 
 		try {
 			List<AttendanceRecord> attendanceRecords = microsoftCommonService.getMeetingAttendanceReport(onlineMeetingId, organizerEmail);

diff --git a/meetings/tool/src/main/resources/Messages_ca.properties b/meetings/tool/src/main/resources/Messages_ca.properties
@@ -9,5 +9,5 @@ meeting.column_role=Rol
 meeting.column_duration=Duraci\u00F3 (segons)
 meeting.entry_date=Data d\u2019entrada
 meeting.exit_date=Data d\u2019eixida
-meeting.interval_duration=Interval Duration (seconds)
+meeting.interval_duration=Interval de Duraci\u00F3 (segons)
 meeting.details=Detalls  d\u2019assist\u00e8ncia per a
diff --git a/meetings/tool/src/main/resources/card.properties b/meetings/tool/src/main/resources/card.properties
@@ -12,10 +12,12 @@ status_text_unknown=unknown status
 status_text_waiting=waiting for start
 edit_action=Edit
 delete_action=Delete
-download_attendance_report_action=Download attendance report
+close_action= Close
+attendance_report_action=Attendance report
 download_report_pdf= Download in pdf
 download_report_excel= Download in csv
 preview_report= Preview report
+no_preview_report=No attendance records available.
 get_link_action=Get Link
 message_link_copied=Link copied to clipboard
 check_recordings_action=Check recordings

diff --git a/meetings/tool/src/main/resources/card_ca.properties b/meetings/tool/src/main/resources/card_ca.properties
@@ -10,13 +10,15 @@ status_text_live=en directe
 status_text_starts=comen\u00E7a
 status_text_unknown=estat descononegut
 status_text_waiting=esperant per a comen\u00E7ar
-download_attendance_report_action=Descarregar informes d\u2019assist\u00e8ncia
+close_action= Tancar
+attendance_report_action=Informes d\u2019assist\u00e8ncia
 download_report_pdf= Descarregar en pdf
 download_report_excel= Descarregar en csv
 preview_report= Previsualitzar els informes
 edit_action=Edita
 delete_action=Elimina
 get_link_action=Obtindre un enlla\u00E7
+no_preview_report=No hi ha registres d\u2019assist\u00e8ncia disponibles.
 message_link_copied=Enlla\u00E7 copiat al portapapers
 check_recordings_action=Comprova els enregistraments
 availableParticipants=Participants disponibles: 

diff --git a/meetings/tool/src/main/resources/card_es.properties b/meetings/tool/src/main/resources/card_es.properties
@@ -12,10 +12,12 @@ status_text_unknown=estado desconocido
 status_text_waiting=esperando para comenzar
 edit_action=Editar
 delete_action=Eliminar
-download_attendance_report_action=Descargar informes de assistencia
+close_action=Cerrar
+attendance_report_action=Informes de assistencia
 download_report_pdf= Descargar en pdf
 download_report_excel= Descargar en csv
 preview_report= Previsualizar los informes
+no_preview_report=No hay registros de asistencia disponibles.
 get_link_action=Obtener Enlace
 message_link_copied=Enlace copiado al portapapeles
 check_recordings_action=Comprobar grabaciones

diff --git a/meetings/tool/src/main/resources/main.properties b/meetings/tool/src/main/resources/main.properties
@@ -13,3 +13,4 @@ meeting_login_application=Start session with the application.
 meeting_not_application_installed=If you do not have the application installed, clicking on
 meeting_link=it
 meeting_download_by_link=will allow you to download it.
+meeting_limited_funcionality=Alternatively, with limited functionality, you can use the web browser to access Teams.
diff --git a/meetings/tool/src/main/resources/main_ca.properties b/meetings/tool/src/main/resources/main_ca.properties
@@ -13,3 +13,4 @@ meeting_login_application=Inicia sessi\u00F3 amb l\u2019aplicaci\u00F3.
 meeting_not_application_installed=En cas de no tenir l\u2019aplicaci\u00F3 instal.lada, aquest
 meeting_link=enlla\u00E7
 meeting_download_by_link=et permetr\u00E0 descarregar\u2212te\u2212la.
+meeting_limited_funcionality=Altrament, amb funcionalitats limitades, pots usar el navegador web per accedir al Teams.
diff --git a/meetings/tool/src/main/resources/main_es.properties b/meetings/tool/src/main/resources/main_es.properties
@@ -12,4 +12,5 @@ meeting_alert=Para disponer de todas las funcionalidades de Teams, es imprescind
 meeting_login_application=Inicia sessi\u00F3n con la aplicaci\u00F3n.
 meeting_not_application_installed=En caso de no tener la aplicaci\u00F3n instalada, este
 meeting_link=enlace
-meeting_download_by_link=te permitir\u00E1 descargartela.
+meeting_download_by_link=te permitir\u00E1 descargartela.
+meeting_limited_funcionality=Alternativamente, con una funcionalidad limitada, puede utilizar el navegador web para acceder a Teams.
diff --git a/meetings/ui/src/main/frontend/src/components/sakai-dropdown.vue b/meetings/ui/src/main/frontend/src/components/sakai-dropdown.vue
@@ -4,7 +4,7 @@
       <slot name="activation"></slot>
     </div>
     <ul class="dropdown-menu" role="menu" :id="menuid">
-      <li v-for="item in items" :key="item.id" class="divider">
+      <li v-for="item in items" :key="item.id" class="divider" @mouseenter="showSubMenu($event)">
         <a
           v-if="item.show"
           class="dropdown-item"
@@ -22,7 +22,7 @@
           />
           {{ item.string }}
         </a>
-        <ul v-if="item.subMenu" role="menu" class="dropdown-submenu">
+        <ul v-if="item.subMenu" role="menu" :class="['dropdown-submenu', isSubMenuOverflowing ? 'left' : 'right']">
           <li v-for="subItem in item.subMenu" :key="subItem.string" class="divider">
             <a
               v-if="subItem.show"
@@ -64,6 +64,7 @@ export default {
     return {
       selectedId: null,
       expanded: false,
+      isSubMenuOverflowing: false,
     };
   },
   computed: {},
@@ -86,6 +87,18 @@ export default {
         item.action();
       }
     },
+    showSubMenu(event) {
+        const submenu = event.currentTarget.querySelector('.dropdown-submenu');
+
+        if (submenu) {
+          const rect = submenu.getBoundingClientRect();
+          const rightEdge = rect.right;
+
+          if (rightEdge > window.innerWidth) {
+            this.isSubMenuOverflowing = true;
+          }
+        }
+    },
     handleRoute(route) {
       this.$router.push({ path: route });
     },
@@ -172,5 +185,13 @@ li:hover > .dropdown-submenu {
   flex-direction: column;
   justify-content: flex-start;
 }
+.dropdown-submenu.left {
+  left: auto;
+  right: 100%;
+}
+
+.dropdown-submenu.right {
+  left: 100%;
+}
 }
 </style>