-
+
diff --git a/src/composable/useApi.ts b/src/composable/useApi.ts
index 4a1dbacf..6af82a65 100644
--- a/src/composable/useApi.ts
+++ b/src/composable/useApi.ts
@@ -20,6 +20,7 @@ import {
DataApi,
ConfigurationApi,
CalendarApi,
+ AuditLogApi
} from '@gs';
const apiConfig = {
@@ -41,6 +42,7 @@ let calendarApi: CalendarApi;
let importExportApi: ImportExportApi;
let dataApi: DataApi;
let uiConfigApi: ConfigurationApi;
+let auditLogApi: AuditLogApi;
export function useStudiesApi(): {
studiesApi: StudiesApi;
@@ -149,3 +151,13 @@ export function useUiConfigApi(): {
uiConfigApi,
};
}
+
+
+export function useAuditLogApi(): {
+ auditLogApi: AuditLogApi;
+} {
+ auditLogApi = auditLogApi || new AuditLogApi(apiConfig);
+ return {
+ auditLogApi,
+ };
+}
diff --git a/src/i18n/de.json b/src/i18n/de.json
index e6617708..2104593b 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -61,13 +61,20 @@
"dataDownload": {
"description": "Hier können die Studiendaten basierend auf diverse Filter heruntergeladen werden.",
"title": "Studiendaten herunterladen"
+ },
+ "auditLogDownload": {
+ "title": "Auditlog herunterladen",
+ "description": "Die Anzahl der aktuellen Auditlog Einträge beträgt: {length}.",
+ "btnLabel": "Aktuellen Auditlog herunterladen",
+ "notStartedInfo": "Auditlog-Daten werden erst bei einer aktiven Studie aufgezeichnet.",
+ "noDataInfo": "Die Studie hat noch keine Auditlog-Daten aufgezeichnet."
}
},
"global": {
"error": {
"general": "Ein allgemeiner Fehler ist aufgetreten.",
"immutable": "Der Wert von '{value}' darf nicht geändert werden.",
- "inComponentTitle": "In Aufzeichnung '{title}': ",
+ "inComponentTitle": "In Aufzeichnung {title}: ",
"required": "Erforderlicher Wert '{value}' fehlt.",
"type": {
"error": "Fehler",
@@ -118,7 +125,8 @@
"setPause": "Pausieren",
"start": "Start",
"time": "Zeit",
- "to": "zu"
+ "to": "zu",
+ "leavePage": "Möchten Sie die Seite wirklich verlassen?"
},
"placeholder": {
"all": "Alle",
@@ -246,7 +254,8 @@
"addTriggerTypeConfig": "Der Trigger ist erforderlich, um die Bedingugn für die Intervention zu definieren. Bitte fügen Sie einen Trigger mit Konfiguration hinzu.",
"emptyTriggerConditions": "Bitte fügen Sie mindesetens eine Auslöserkondition zu ihrem Trigger hinzu.",
"interventionRowIsOpen": "Bitte speichern Sie alle Konfigurationszeilen, bevor Sie die Intervention speichern.",
- "triggerProp": "Ein Trigger-Property hat einen Fehler."
+ "triggerProp": "Ein Trigger-Property hat einen Fehler.",
+ "observationDeleted": "Die verlinkte Datenerhebung (ID: {observationId}, Type: {observationType}) wurde gelöscht und kann nicht mehr referenziert werden. Bitte verlinke eine andere Datenerhebung, entferne diese Aktion oder lösche die Intervention komplett. Beachte, dass eine Intervention stets mindestens eine Aktion enthalten muss."
},
"factory": {
"actions": {
@@ -383,7 +392,18 @@
"tabs": {
"dataDownload": "Studiendaten herunterladen",
"lastDataPoints": "Letzte Datenpunkte",
- "recordedObservation": "Erhobene Daten"
+ "recordedObservation": "Erhobene Daten",
+ "auditLog": "Auditlog herunterladen"
+ },
+ "dialog": {
+ "waitForDownload": "Auf Download warten",
+ "navigatePage": "Seite verlassen",
+ "msg": {
+ "downloadStudyData": "Der Daten-Download läuft noch. Sie können die Seite trotzdem verlassen – der Vorgang wird im Hintergrund gebuffert und der Download öffnet sich automatisch in einem neuen Tab, sobald er bereitsteht. Änderungen, die Sie ab jetzt vornehmen, sind darin nicht enthalten."
+ },
+ "header": {
+ "downloadStudyData": "Seite navigieren"
+ }
}
},
"moreTable": {
@@ -442,7 +462,7 @@
"idDesc": "Die ID des Lime Surveys",
"idName": "Fragebogen"
},
- "description": "Diese Datenerhebung ermöglicht Ihnen, eine über die More Platform erstelltes Lime Survey Umfrage in MORE einzubinden. Bitte verwenden Sie dafür More Lime Survey Instanz. Denken Sie daran die Option \"multiple responses or update responses with one access code\" innerhalb ihres Lime Surveys zu aktivieren und das Lime Survey auf aktive zu stellen.",
+ "description": "Diese Datenerhebung ermöglicht Ihnen, eine über die More Platform erstelltes Lime Survey Umfrage in MORE einzubinden. Bitte verwenden Sie dafür More Lime Survey Instanz. Denken Sie daran die Option \"multiple responses or update responses with one access code\" innerhalb ihres Lime Surveys zu aktivieren und das Lime Survey auf aktive zu stellen.",
"title": "Lime Survey"
},
"polarVerity": {
@@ -1088,7 +1108,9 @@
"studyEnd": "Studienende",
"studyStart": "Studienstart",
"today": "Heute",
- "type": "Typ"
+ "type": "Typ",
+ "showFullTimeline": "0-24 Uhr",
+ "collapseTimeline": "8-19 Uhr"
}
},
"title": "Titel",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ac1688d7..5c3ce919 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -61,6 +61,13 @@
"dataDownload": {
"description": "Here you can download the study data based on various filters.",
"title": "Download study data"
+ },
+ "auditLogDownload": {
+ "title": "Download Audit log",
+ "description": "The number of the current audit log entries is: {length}.",
+ "btnLabel": "Download current audit log",
+ "notStartedInfo": "Audit log data is only recorded when a study is active.",
+ "noDataInfo": "The study has not recorded any audit log data yet."
}
},
"global": {
@@ -118,7 +125,8 @@
"setPause": "Pause",
"start": "Start",
"time": "Time",
- "to": "to"
+ "to": "to",
+ "leavePage": "Do you really want to leave the page?"
},
"placeholder": {
"all": "All",
@@ -246,7 +254,8 @@
"addTriggerTypeConfig": "The trigger is required. Please add a trigger and its config.",
"emptyTriggerConditions": "Please save at least one trigger condition to your trigger.",
"interventionRowIsOpen": "Please save all trigger conditions before saving the intervention.",
- "triggerProp": "A Trigger property has an error."
+ "triggerProp": "A Trigger property has an error.",
+ "observationDeleted": "The linked observation (ID: {observationId}, Type: {observationType}) has been deleted and cannot be referenced. Please link a different data collection, remove this action or delete the intervention completely. Keep in mind that an intervention always requires at least one action."
},
"factory": {
"actions": {
@@ -383,7 +392,18 @@
"tabs": {
"dataDownload": "Export study data",
"lastDataPoints": "Latest Data Points",
- "recordedObservation": "Recorded Observations"
+ "recordedObservation": "Recorded Observations",
+ "auditLog": "Download AuditLog"
+ },
+ "dialog": {
+ "navigatePage": "Leave page",
+ "waitForDownload": "Wait for download",
+ "msg": {
+ "downloadStudyData": "The data download is still in progress. You may leave the page – the process will be buffered in the background and the download will automatically open in a new tab once it is ready. Any changes you make from now on will not be included in this download."
+ },
+ "header": {
+ "downloadStudyData": "Navigate page"
+ }
}
},
"moreTable": {
@@ -442,7 +462,7 @@
"idDesc": "The id of the survey",
"idName": "Survey"
},
- "description": "This observation enables you to link a Lime Survey questionnaire created on the More Platform with its ID. Use the Lime Survey. Remember to check within Lime Survey that your survey allows for \"multiple responses or update responses with one access code\", and that your survey is active.",
+ "description": "This observation enables you to link a Lime Survey questionnaire created on the More Platform with its ID. Use the Lime Survey. Remember to check within Lime Survey that your survey allows for \"multiple responses or update responses with one access code\", and that your survey is active.",
"title": "Lime Survey"
},
"polarVerity": {
@@ -1088,7 +1108,9 @@
"studyEnd": "Study end",
"studyStart": "Study start",
"today": "Today",
- "type": "Type"
+ "type": "Type",
+ "showFullTimeline": "24 hours",
+ "collapseTimeline": "8 to 7"
}
},
"title": "Title",
diff --git a/src/main.ts b/src/main.ts
index 6706e17b..53b88234 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,13 +9,23 @@
import { createApp } from 'vue';
import App from './App.vue';
import './index.pcss';
+
+// Tailwind + deine Overrides -> set theme and ovverride with brand colors -> flexibility to switch themes later
+// animations and optimization run over the theme since the last update, so we need a basic theme before overriding it with our brand colors
+import 'primevue/resources/themes/lara-light-blue/theme.css';
+import "primevue/resources/primevue.min.css";
+import '../src/styles/more-light/theme.pcss';
import '../src/style.pcss';
+
// PrimeVue
import PrimeVue from 'primevue/config';
import Tooltip from 'primevue/tooltip';
import ConfirmationService from 'primevue/confirmationservice';
import DialogService from 'primevue/dialogservice';
import ToastService from 'primevue/toastservice';
+
+
+
// Router
import { Router } from './router';
import AuthService from './service/AuthService';
diff --git a/src/service/AuthService.ts b/src/service/AuthService.ts
index 9f55d1c7..ead3eebb 100644
--- a/src/service/AuthService.ts
+++ b/src/service/AuthService.ts
@@ -25,7 +25,7 @@ export default class AuthService {
.updateToken(70)
.then((refreshed) => {
if (refreshed) {
- console.log(`Token refreshed: ${refreshed}, ${new Date()}`);
+ console.info(`Token refreshed: ${refreshed}, ${new Date()}`);
}
})
.catch((e) => {
diff --git a/src/stores/globalStore.ts b/src/stores/globalStore.ts
index 14fec271..b1cc1a3a 100644
--- a/src/stores/globalStore.ts
+++ b/src/stores/globalStore.ts
@@ -25,7 +25,7 @@ function getBrowserDateFormat(): string {
case 'year':
return 'yy';
default:
- console.log('Unknown Intl.DateTimeFormat value:', value);
+ console.info('Unknown Intl.DateTimeFormat value:', value);
return '';
}
}
diff --git a/src/stores/studyStore.ts b/src/stores/studyStore.ts
index d0905e6d..d5c19829 100644
--- a/src/stores/studyStore.ts
+++ b/src/stores/studyStore.ts
@@ -8,8 +8,8 @@
*/
import { computed, ComputedRef, ref, Ref } from 'vue';
import { defineStore } from 'pinia';
-import { Study, StudyRole, StudyStatus } from '@gs';
-import { useImportExportApi, useStudiesApi } from '../composable/useApi';
+import { AuditLogMetadata, AuditLogEntry, Study, StudyRole, StudyStatus, DataExportInner } from '@gs';
+import { useAuditLogApi, useImportExportApi, useStudiesApi } from '../composable/useApi';
import { AxiosError, AxiosResponse } from 'axios';
import { useErrorHandling } from '../composable/useErrorHandling';
import { useStudyGroupStore } from './studyGroupStore';
@@ -19,12 +19,15 @@ import { useToastService } from '../composable/toastService';
export const useStudyStore = defineStore('study', () => {
const { studiesApi } = useStudiesApi();
const { importExportApi } = useImportExportApi();
+ const { auditLogApi } = useAuditLogApi();
const { handleIndividualError } = useErrorHandling();
const studyGroupStore = useStudyGroupStore();
const { handleToastErrors } = useToastService();
// State
const study: Ref = ref({});
const studies: Ref = ref([]);
+ const auditLogMetadata: Ref = ref();
+ const auditLogEntries: Ref> = ref([]);
// Actions
async function getStudy(studyId: number): Promise {
@@ -159,8 +162,43 @@ export const useStudyStore = defineStore('study', () => {
from,
to,
)
- .then((rs) => {
- window.open(rs.headers.location);
+ .then(async (rs) => {
+ if (rs && rs?.data?.token) {
+ await importExportApi.exportStudyData(
+ studyId,
+ rs.data.token,
+ studyGroupId,
+ participantId,
+ observationId,
+ from,
+ to
+ ).then((response) => {
+ window.open(response.headers.location);
+ const filename: string = 'study_data_' + studyId + '.json';
+ downloadJSON(filename, response.data);
+
+ }).catch((e: AxiosError) => {
+ handleIndividualError(
+ e,
+ 'cannot export data despite of existing download token',
+ );
+ } );
+ }
+ })
+ .catch((e: AxiosError) => {
+ handleIndividualError(
+ e,
+ 'cannot generate download token to export study data',
+ );
+ });
+ }
+
+ async function exportAuditLog(studyId: number): Promise {
+ await auditLogApi.exportAuditLog(studyId)
+ .then((response:AxiosResponse) => {
+ window.open(response.headers.location);
+ const filename: string = `study_auditlog_${studyId}.json`;
+ downloadJSON(filename, response.data)
})
.catch((e: AxiosError) => {
handleIndividualError(
@@ -170,7 +208,7 @@ export const useStudyStore = defineStore('study', () => {
});
}
- function downloadJSON(filename: string, file: File): void {
+ function downloadJSON(filename: string, file: File | AuditLogEntry[] | DataExportInner[]): void {
const fileJSON = JSON.stringify(file);
const link = document.createElement('a');
if (link) {
@@ -186,6 +224,11 @@ export const useStudyStore = defineStore('study', () => {
}
}
+ async function getAuditLogMetadata(studyId: number): Promise {
+ auditLogMetadata.value = await auditLogApi.getAuditLogMetadata(studyId)
+ .then((response: AxiosResponse) => response.data)
+ }
+
// Getters
const studyUserRoles: ComputedRef> = computed(() => [
...(study.value.userRoles || []),
@@ -211,5 +254,9 @@ export const useStudyStore = defineStore('study', () => {
studyUserRoles,
studyStatus,
studyId,
+ auditLogMetadata,
+ auditLogEntries,
+ getAuditLogMetadata,
+ exportAuditLog
};
});
diff --git a/src/styles/more-light/theme.pcss b/src/styles/more-light/theme.pcss
index 9cef8bca..616c7207 100644
--- a/src/styles/more-light/theme.pcss
+++ b/src/styles/more-light/theme.pcss
@@ -5867,3 +5867,7 @@
box-shadow: inset 0 -2px 0 0 var(--primary-color);
}
+:deep(.p-progress-spinner-circle) {
+ stroke: currentColor!important; /* nimmt dann die text-red-600 aus Tailwind */
+}
+
diff --git a/src/views/MonitoringData.vue b/src/views/MonitoringData.vue
index 87a6219b..6c171773 100644
--- a/src/views/MonitoringData.vue
+++ b/src/views/MonitoringData.vue
@@ -13,12 +13,19 @@ Licensed under the Elastic License 2.0. */
import TabPanel from 'primevue/tabpanel';
import DatapointList from '../components/subComponents/DatapointList.vue';
import ParticipationDataList from '../components/ParticipationDataList.vue';
+ import AuditLogDownload from '../components/subComponents/AuditLogDownload.vue';
+ import { ref } from 'vue';
const studyStore = useStudyStore();
const accessRoles: StudyRole[] = [
StudyRole.StudyAdmin,
StudyRole.StudyViewer,
];
+ const auditLogAccessRoles: StudyRole[] = [
+ StudyRole.StudyAdmin,
+ ];
+
+ const activeIndex = ref(0)
@@ -36,18 +43,26 @@ Licensed under the Elastic License 2.0. */
"
class="container rounded-lg bg-white p-10"
>
-
+
-
+
+
+
+