change submissioncard

SELab-2 · May 22, 2024 · 6f6ecf0 · 6f6ecf0
1 parent 087f6b8
commit 6f6ecf0
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 80 deletions.
diff --git a/frontend/src/components/submission/SubmissionCard.vue b/frontend/src/components/submission/SubmissionCard.vue
@@ -1,86 +1,80 @@
 <template>
     <v-divider />
     <v-card variant="flat">
-        <v-row>
-            <v-col>
-                <v-card-title>
-                    {{ $t("submission.status") }}
-                    <p
-                        v-if="new Date(submission.date) <= deadline"
-                        :class="Status[submission.status]"
-                    >
-                        {{ Status[submission.status] }}
-                    </p>
-                    <p v-else class="Deadline">{{ $t("submission.after_deadline") }}</p>
-                </v-card-title>
-                <v-card-subtitle>
-                    {{ $t("submission.datetime") }} {{ $d(submission.date, "long") }}
-                </v-card-subtitle>
-                <v-card-item>
-                    <v-card-title>
-                        {{ $t("submission.remarks") }}
-                    </v-card-title>
-                    <v-card-text v-if="submission.remarks">
-                        {{ submission.remarks }}
-                    </v-card-text>
-                    <v-card-subtitle v-else>
-                        {{ $t("submission.remarks_empty") }}
-                    </v-card-subtitle>
-                </v-card-item>
-                <v-card-item
-                    v-if="submission.stderr || submission.stdout || submission.testresults.length"
-                >
-                    <v-card-title>{{ $t("submission.docker_test") }}</v-card-title>
-                    <v-card-text>
-                        <p v-if="submission.stdout">Stdout: {{ submission.stdout }}</p>
-                        <p v-if="submission.stderr">Sterr: {{ submission.stderr }}</p>
-                        <ul>
-                            <li v-for="result in submission.testresults" :key="result">
-                                <p v-if="result.succeeded" class="text-green">{{ result.value }}</p>
-                                <p v-else class="text-red">{{ result.value }}</p>
-                            </li>
-                        </ul>
-                    </v-card-text>
-                </v-card-item>
-            </v-col>
-            <v-col>
-                <v-card-item>
-                    <v-card-title>
-                        {{ $t("submission.files") }}
-                    </v-card-title>
-                    <v-card-subtitle>
-                        {{ $t("submission.download_info") }}
-                    </v-card-subtitle>
-                    <v-container>
-                        <v-alert
-                            v-if="isError"
-                            title="Error"
-                            color="error"
-                            :text="error!.message"
-                        ></v-alert>
-                        <v-skeleton-loader v-else :loading="isLoading" type="card">
-                            <v-col>
-                                <v-chip
-                                    class="ma-2"
-                                    v-for="(item, index) in files"
-                                    label
-                                    color="blue"
-                                    :key="item.filesortedname"
-                                    @click="() => downloadFile(index)"
-                                >
-                                    {{ item.filename }}
-                                </v-chip>
-                            </v-col>
-                        </v-skeleton-loader>
-                    </v-container>
-                    <v-card-actions>
-                        <v-btn @click="downloadAll">
-                            {{ $t("submission.download_all_files") }}
-                        </v-btn>
-                    </v-card-actions>
-                </v-card-item>
-            </v-col>
-        </v-row>
+        <v-card-title>
+            {{ $t("submission.status") }}
+            <p
+                v-if="new Date(submission.date) <= deadline"
+                :class="Status[submission.status]"
+            >
+                {{ Status[submission.status] }}
+            </p>
+            <p v-else class="Deadline">{{ $t("submission.after_deadline") }}</p>
+        </v-card-title>
+        <v-card-subtitle>
+            {{ $t("submission.datetime") }} {{ $d(submission.date, "long") }}
+        </v-card-subtitle>
+        <v-card-item>
+            <v-card-title>
+                {{ $t("submission.remarks") }}
+            </v-card-title>
+            <v-card-text v-if="submission.remarks">
+                {{ submission.remarks }}
+            </v-card-text>
+            <v-card-subtitle v-else>
+                {{ $t("submission.remarks_empty") }}
+            </v-card-subtitle>
+        </v-card-item>
+        <v-card-item
+            v-if="submission.stderr || submission.stdout || submission.testresults.length"
+        >
+            <v-card-title>{{ $t("submission.docker_test") }}</v-card-title>
+            <v-card-text>
+                <p v-if="submission.stdout">Stdout: {{ submission.stdout }}</p>
+                <p v-if="submission.stderr">Sterr: {{ submission.stderr }}</p>
+                <ul>
+                    <li v-for="result in submission.testresults" :key="result">
+                        <p v-if="result.succeeded" class="text-green">{{ result.value }}</p>
+                        <p v-else class="text-red">{{ result.value }}</p>
+                    </li>
+                </ul>
+            </v-card-text>
+        </v-card-item>
+        <v-card-item>
+            <v-card-title>
+                {{ $t("submission.files") }}
+            </v-card-title>
+            <v-card-subtitle>
+                {{ $t("submission.download_info") }}
+            </v-card-subtitle>
+            <v-container>
+                <v-alert
+                    v-if="isError"
+                    title="Error"
+                    color="error"
+                    :text="error!.message"
+                ></v-alert>
+                <v-skeleton-loader v-else :loading="isLoading" type="card">
+                    <v-col>
+                        <v-chip
+                            class="ma-2"
+                            v-for="(item, index) in files"
+                            label
+                            color="blue"
+                            :key="item.filesortedname"
+                            @click="() => downloadFile(index)"
+                        >
+                            {{ item.filename }}
+                        </v-chip>
+                    </v-col>
+                </v-skeleton-loader>
+            </v-container>
+            <v-card-actions>
+                <v-btn @click="downloadAll">
+                    {{ $t("submission.download_all_files") }}
+                </v-btn>
+            </v-card-actions>
+        </v-card-item>
     </v-card>
 </template>
 

diff --git a/frontend/src/components/submission/SubmissionTeacherCard.vue b/frontend/src/components/submission/SubmissionTeacherCard.vue
@@ -4,6 +4,7 @@
             {{ $t("project.group", { number: submission.group_id }) }}
         </v-card-title>
         <SubmissionCard class="ma-3" :submission="submission" :deadline="deadline" />
+        <v-divider class="divider"/>
         <v-card-actions>
             <v-btn :to="`/groups/${submission.group_id}`" class="button">
                 {{ $t("project.submissions_list") }}
@@ -38,4 +39,8 @@ const { submission } = toRefs(props);
 .button {
     background-color: rgb(var(--v-theme-secondary));
 }
+
+.divider {
+    margin-bottom: 10px;
+}
 </style>