SAK-50690 Meetings add banner to register and add option to download assistance reports CSV #13027
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The banner is optional, it can be hidden using a property |
bgarciaentornos
requested changes
Nov 20, 2024
| # SAK-50690 Meetings: select message and option to show attendance reports | ||
| # Select whether to display the informational alert of the meetings tool. | ||
| # DEFAULT: false | ||
| # show.meeting.banner=false |
There was a problem hiding this comment.
Suggested change
| # show.meeting.banner=false | |
| # show.meeting.banner=true |
Comment on lines
622
to
623
| List<AttendanceRecord> attendanceRecords = microsoftCommonService.getMeetingAttendanceReport(onlineMeetingId, organizerEmail); | ||
| if ("csv".equalsIgnoreCase(format)) { |
There was a problem hiding this comment.
Please fix tabulation
| meeting.entry_date=Entry Date | ||
| meeting.exit_date=Exit Date | ||
| meeting.interval_duration=Interval Duration (seconds) | ||
| meeting.details=Assistance Details for |
There was a problem hiding this comment.
Suggested change
| meeting.details=Assistance Details for | |
| meeting.details=Assistance Details for | |
| meeting.exit_date=Data de sortida | ||
| meeting.interval_duration=Interval de Duraci\u00F3 (segons) | ||
| meeting.details=Detalls d\u2019assist\u00e8ncia per a |
There was a problem hiding this comment.
Suggested change
| meeting.details=Detalls d\u2019assist\u00e8ncia per a | |
| meeting.details=Detalls d\u2019assist\u00e8ncia per a | |
| meeting.entry_date=Fecha de entrada | ||
| meeting.exit_date=Fecha de salida | ||
| meeting.interval_duration=Intervalo de Duraci\u00f3n (segundos) | ||
| meeting.details=Detalles de asistencia para |
There was a problem hiding this comment.
Suggested change
| meeting.details=Detalles de asistencia para | |
| meeting.details=Detalles de asistencia para | |
| console.error('Error loading meeting banner configuration.'); | ||
| } | ||
| } catch (error) { | ||
| console.error('Error loading meeting banner configuration:', error); |
There was a problem hiding this comment.
Suggested change
| console.error('Error loading meeting banner configuration:', error); | |
| console.error('Error loading default configuration:', error); |
Let's make it more generic in case we need it for other properties in the future
|
|
||
| try { | ||
| List<AttendanceRecord> attendanceRecords = microsoftCommonService.getMeetingAttendanceReport(onlineMeetingId, organizerEmail); | ||
| if ("csv".equalsIgnoreCase(format)) { |
There was a problem hiding this comment.
Please use a constant defined at the top, something like REPORT_FORMAT_CSV = "csv"
| if ("csv".equalsIgnoreCase(format)) { | ||
| byte[] csvContent = microsoftCommonService.createAttendanceReportCsv(attendanceRecords); | ||
| return ResponseEntity.ok() | ||
| .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"attendance_report.csv\"") |
There was a problem hiding this comment.
I think it would be good to use a constante for the filename too
|
|
||
|
|
||
| public void inicializeMeetingNameColumns(String meetingAttendanceReport, String meetingName, String meetingEmail, String meetingRole, String meetingDuration, String meetingDurationInterval, String meetingEntryDate, String meetingExitDate, String meetingsDetails) { | ||
| MEETING_ATTENDANCE_REPORT= meetingAttendanceReport; |
There was a problem hiding this comment.
I'm not sure this variable is used anywhere else
| String onlineMeetingId = meetingService.getMeetingProperty(meeting, ONLINE_MEETING_ID); | ||
| String organizerEmail = meetingService.getMeetingProperty(meeting, ORGANIZER_USER); | ||
| checkUpdatePermissions(meeting.getSiteId()); | ||
| 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")); |
There was a problem hiding this comment.
I think this method is not necessary, it might be better doing that inside the create report method directly
microsoft-integration/impl/pom.xml
Outdated
Comment on lines
89
to
95
| </dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-csv</artifactId> | ||
| <version>1.10.0</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> |
Comment on lines
631
to
636
| microsoftCommonService.inicializeMeetingNameColumns(columnsName); | ||
|
|
||
| try { | ||
| List<AttendanceRecord> attendanceRecords = microsoftCommonService.getMeetingAttendanceReport(onlineMeetingId, organizerEmail); | ||
| if (REPORT_FORMAT_CSV.equalsIgnoreCase(format)) { | ||
| byte[] csvContent = microsoftCommonService.createAttendanceReportCsv(attendanceRecords); |
There was a problem hiding this comment.
Suggested change
| microsoftCommonService.inicializeMeetingNameColumns(columnsName); | |
| try { | |
| List<AttendanceRecord> attendanceRecords = microsoftCommonService.getMeetingAttendanceReport(onlineMeetingId, organizerEmail); | |
| if (REPORT_FORMAT_CSV.equalsIgnoreCase(format)) { | |
| byte[] csvContent = microsoftCommonService.createAttendanceReportCsv(attendanceRecords); | |
| try { | |
| List<AttendanceRecord> attendanceRecords = microsoftCommonService.getMeetingAttendanceReport(onlineMeetingId, organizerEmail); | |
| if (REPORT_FORMAT_CSV.equalsIgnoreCase(format)) { | |
| byte[] csvContent = microsoftCommonService.createAttendanceReportCsv(attendanceRecords, columnsName); |
| @@ -115,7 +116,10 @@ public static enum PermissionRoles { READ, WRITE } | |||
| TeamsMeetingData createOnlineMeeting(String userEmail, String subject, Instant startDate, Instant endDate, List<String> coorganizerEmails) throws MicrosoftCredentialsException; | |||
| void updateOnlineMeeting(String userEmail, String meetingId, String subject, Instant startDate, Instant endDate, List<String> coorganizerEmails) throws MicrosoftCredentialsException; | |||
| List<MeetingRecordingData> getOnlineMeetingRecordings(String onlineMeetingId, List<String> teamIdsList, boolean force) throws MicrosoftCredentialsException; | |||
|
|
|||
| List<AttendanceRecord> getMeetingAttendanceReport(String onlineMeetingId, String userEmail) throws MicrosoftCredentialsException; | |||
| void inicializeMeetingNameColumns(List<String> columnsName); | |||
|
|
||
| List<AttendanceRecord> getMeetingAttendanceReport(String onlineMeetingId, String userEmail) throws MicrosoftCredentialsException; | ||
| void inicializeMeetingNameColumns(List<String> columnsName); | ||
| byte[] createAttendanceReportCsv(List<AttendanceRecord> attendanceRecords); |
There was a problem hiding this comment.
Suggested change
| byte[] createAttendanceReportCsv(List<AttendanceRecord> attendanceRecords); | |
| byte[] createAttendanceReportCsv(List<AttendanceRecord> attendanceRecords, List<String> columnsName); |
Aniii10
force-pushed
the
EVDOC01-163
branch
2 times, most recently
from
fa645a5
to
8a152b9
Compare
bgarciaentornos
changed the title
jesusmmp
reviewed
Nov 20, 2024
| @@ -12,6 +12,13 @@ status_text_unknown=estado desconocido | |||
| status_text_waiting=esperando para comenzar | |||
| edit_action=Editar | |||
| delete_action=Eliminar | |||
| close_action=Cerrar | |||
| attendance_report_action=Informes de assistencia | |||
jesusmmp
reviewed
Nov 20, 2024
| close_action=Cerrar | ||
| attendance_report_action=Informes de assistencia | ||
| download_report_excel= Descargar en csv | ||
| download_report_error_message=Los datos de assistencia no se han cargado correctamente. Probarlo m\u00e1s tarde. |
jesusmmp
reviewed
Nov 20, 2024
| 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. |
There was a problem hiding this comment.
te permitir\u00E1 descarg\u00E1rtela.
jesusmmp
reviewed
Nov 20, 2024
| spinner: "fa-spinner fa-spin", | ||
| download: "fa fa-download", | ||
| fileCsv: "fa fa-file", | ||
| eye: "fa fa-eye", |
jesusmmp
reviewed
Nov 20, 2024
microsoft-integration/impl/pom.xml
Outdated
| <dependency> | ||
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-csv</artifactId> | ||
| <version>1.10.0</version> |
jesusmmp
reviewed
Nov 20, 2024
|
|
||
| @Transactional(readOnly = true) | ||
| public byte[] createAttendanceReportCsv(List<AttendanceRecord> attendanceRecords, List<String> columnNames) { | ||
| if (columnNames == null || columnNames.size() != 7) { |
There was a problem hiding this comment.
I'll use a constant defined at the top for the number 7.
public static int COLUMN_SIZE = 7.
ern
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the Meetings tool, add an informational alert at the top of the tool to inform the user that they need to register with Microsoft to sign in. Additionally, for each created meeting, provide the option to download the attendance report in CSV format and preview it.