- {{ title }}
+
+
+ {{ getFileDisplayName(file) }}
+
-
-
-
+
+
+
-
-
-
+
+ | {{ index + 1 }} |
+
+
+
+ |
+
+
+
-
Empty File
+
Empty File
@@ -55,120 +46,87 @@
+
+
diff --git a/report-viewer/src/components/DistributionDiagram.vue b/report-viewer/src/components/DistributionDiagram.vue
index c53e51433..c6ca774d5 100644
--- a/report-viewer/src/components/DistributionDiagram.vue
+++ b/report-viewer/src/components/DistributionDiagram.vue
@@ -22,6 +22,11 @@ const props = defineProps({
distribution: {
type: Object as PropType
,
required: true
+ },
+ xScale: {
+ type: String as PropType<'linear' | 'logarithmic'>,
+ required: false,
+ default: 'linear'
}
})
@@ -69,9 +74,25 @@ const options = computed(() => {
x: {
//Highest count of submissions in a percentage range. We set the diagrams maximum shown value to maxVal + 5,
//otherwise maximum is set to the highest count of submissions and is one bar always reaches the end.
- suggestedMax: maxVal.value + 5,
+ suggestedMax:
+ props.xScale === 'linear'
+ ? maxVal.value + 5
+ : 10 ** Math.ceil(Math.log10(maxVal.value + 5)),
+ type: props.xScale,
ticks: {
- color: graphColors.ticksAndFont.value
+ // ensures that in log mode tick labels are not overlappein
+ minRotation: props.xScale === 'logarithmic' ? 30 : 0,
+ autoSkipPadding: 10,
+ color: graphColors.ticksAndFont.value,
+ // ensures that in log mode ticks are placed evenly appart
+ callback: function (value: any) {
+ if (props.xScale === 'logarithmic' && (value + '').match(/1(0)*[^1-9.]/)) {
+ return value
+ }
+ if (props.xScale !== 'logarithmic') {
+ return value
+ }
+ }
},
grid: {
color: graphColors.gridLines.value
diff --git a/report-viewer/src/components/FilesContainer.vue b/report-viewer/src/components/FilesContainer.vue
index 7fb2952bb..f9fb206dc 100644
--- a/report-viewer/src/components/FilesContainer.vue
+++ b/report-viewer/src/components/FilesContainer.vue
@@ -4,22 +4,21 @@
- Files of {{ anonymous ? filesOwnerDefault : filesOwner }}:
+ Files of
+ {{ fileOwnerDisplayName }}:
@@ -28,107 +27,63 @@
-
-
+defineExpose({
+ scrollTo
+})
+
diff --git a/report-viewer/src/components/LineOfCode.vue b/report-viewer/src/components/LineOfCode.vue
deleted file mode 100644
index 074872e26..000000000
--- a/report-viewer/src/components/LineOfCode.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
{{ lineNumber }} {{ text }}
-
@@ -66,18 +68,18 @@
import type { Match } from '@/model/Match'
import { onMounted, ref, watch, type Ref, computed, onErrorCaptured } from 'vue'
-import { generateLineCodeLink } from '@/utils/ComparisonUtils'
import TextInformation from '@/components/TextInformation.vue'
import MatchList from '@/components/MatchList.vue'
import { ComparisonFactory } from '@/model/factories/ComparisonFactory'
import FilesContainer from '@/components/FilesContainer.vue'
import { store } from '@/stores/store'
import Container from '@/components/ContainerComponent.vue'
-
+import { getHighlightLanguage } from '@/model/Language'
import hljsLightMode from 'highlight.js/styles/vs.css?raw'
import hljsDarkMode from 'highlight.js/styles/vs2015.css?raw'
import { router } from '@/router'
import { MetricType } from '@/model/MetricType'
+import { OverviewFactory } from '@/model/factories/OverviewFactory'
const props = defineProps({
firstId: {
@@ -90,60 +92,31 @@ const props = defineProps({
}
})
+const language = OverviewFactory.getOverview().language
const comparison = computed(() => ComparisonFactory.getComparison(props.firstId, props.secondId))
const filesOfFirst = ref(comparison.value.filesOfFirstSubmission)
const filesOfSecond = ref(comparison.value.filesOfSecondSubmission)
-/**
- * Collapses a file in the first files container.
- * @param title title of the file
- */
-function toggleCollapseFirst(title: string) {
- const file = filesOfFirst.value.get(title)
- if (file) {
- file.collapsed = !file.collapsed
- }
-}
-
-/**
- * Collapses a file in the second files container.
- * @param title title of the file
- */
-function toggleCollapseSecond(title: string) {
- const file = filesOfSecond.value.get(title)
- if (file) {
- file.collapsed = !file.collapsed
- }
-}
+const panel1: Ref
= ref(null)
+const panel2: Ref = ref(null)
/**
* Shows a match in the first files container when clicked on a line in the second files container.
- * @param e The click event
- * @param panel panel number (1 for left, 2 for right)
* @param file (file name)
* @param line (line number)
*/
-
-function showMatchInFirst(e: unknown, panel: number, file: string, line: number) {
- if (!filesOfFirst.value.get(file)?.collapsed) {
- toggleCollapseFirst(file)
- }
- document.getElementById(generateLineCodeLink(panel, file, line))?.scrollIntoView()
+function showMatchInFirst(match: Match) {
+ panel1.value?.scrollTo(match.firstFile, match.startInFirst)
}
/**
* Shows a match in the second files container, when clicked on a line in the second files container.
- * @param e The click event
- * @param panel panel number (1 for left, 2 for right)
* @param file (file name)
* @param line (line number)
*/
-function showMatchInSecond(e: unknown, panel: number, file: string, line: number) {
- if (!filesOfSecond.value.get(file)?.collapsed) {
- toggleCollapseSecond(file)
- }
- document.getElementById(generateLineCodeLink(panel, file, line))?.scrollIntoView()
+function showMatchInSecond(match: Match) {
+ panel2.value?.scrollTo(match.secondFile, match.startInSecond)
}
/**
@@ -151,9 +124,9 @@ function showMatchInSecond(e: unknown, panel: number, file: string, line: number
* @param e The click event
* @param match The match to show
*/
-function showMatch(e: unknown, match: Match) {
- showMatchInFirst(e, 1, match.firstFile, match.startInFirst)
- showMatchInSecond(e, 2, match.secondFile, match.startInSecond)
+function showMatch(match: Match) {
+ showMatchInFirst(match)
+ showMatchInSecond(match)
}
function isAnonymous(id: string) {
diff --git a/report-viewer/src/views/FileUploadView.vue b/report-viewer/src/views/FileUploadView.vue
index be693d572..8d1f8030c 100644
--- a/report-viewer/src/views/FileUploadView.vue
+++ b/report-viewer/src/views/FileUploadView.vue
@@ -190,8 +190,9 @@ async function handleZipFile(file: Blob) {
)
await zip.files[originalFileName].async('string').then((data) => {
store().saveSubmissionFile({
- name: slash(submissionFileName),
- file: { fileName: slash(fullPathFileName), data: data }
+ submissionId: slash(submissionFileName),
+ fileName: slash(fullPathFileName),
+ data: data
})
})
} else {
diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
index 9bd976329..4da8aca4d 100644
--- a/report-viewer/src/views/OverviewView.vue
+++ b/report-viewer/src/views/OverviewView.vue
@@ -27,6 +27,7 @@
Distribution of Comparisons:
@@ -39,6 +40,14 @@
(i: number) => (selectedDistributionDiagramMetric = getMetricFromNumber(i))
"
/>
+
@@ -77,7 +86,7 @@