ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Style submissions page

This commit is contained in:
Christian Cueni 2019-11-18 15:15:25 +01:00
parent 662071d066
commit 6bdce35f7f
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/AssignmentWithSubmissions.vue
View File

@ -1,6 +1,5 @@
<template> <template>
<div class="assignment-with-submissions"> <div class="assignment-with-submissions">
<!--<h1 class="assignment-with-submissions__title">{{assignment.assignment}}</h1>-->
<p class="assignment-with-submissions__text">{{assignment.assignment}}</p> <p class="assignment-with-submissions__text">{{assignment.assignment}}</p>
<div> <div>
@ -21,9 +20,9 @@
</div> </div>
<router-link <router-link
:to="submissionLink(submission)" :to="submissionLink(submission)"
v-for="(submission, index) in submissions" v-for="submission in submissions"
class="assignment-with-submissions__link" class="assignment-with-submissions__link"
:key="index"> :key="submission.id">
<student-submission class="assignment-with-submissions__submission" <student-submission class="assignment-with-submissions__submission"
:submission="submission" :submission="submission"
> >

4
client/src/components/content-blocks/assignment/Assignment.vue
View File

@ -41,8 +41,8 @@
<final-submission <final-submission
v-if="final" v-if="final"
:user-input="assignment.submission" :user-input="assignment.submission.text"
:text="assignment.submission.text" :shared-msg="'Das Ergebnis wurde mit der Lehrperson geteilt'"
@reopen="reopen"></final-submission> @reopen="reopen"></final-submission>
</div> </div>
</template> </template>

1
client/src/graphql/gql/studentSubmissionQuery.gql
View File

@ -12,6 +12,7 @@ query StudentSubmissions($id: ID!) {
assignment assignment
} }
submissionfeedback { submissionfeedback {
id
text text
final final
} }

9
client/src/pages/submissions.vue
View File

@ -51,14 +51,21 @@
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_mixins.scss"; @import "@/styles/_mixins.scss";
@import "@/styles/_variables.scss";
.submissions-page { .submissions-page {
display: grid; display: grid;
grid-row-gap: $large-spacing;
grid-template-rows: auto 1fr; grid-template-rows: auto 1fr;
margin-top: 2rem; margin-top: 2rem;
margin-left: $large-spacing;
margin-right: $large-spacing;
@include desktop {
margin-left: $medium-spacing;
margin-right: $medium-spacing;
}
} }
</style> </style>

11
client/src/styles/_student-submission.scss
View File

@ -1,9 +1,16 @@
@import "@/styles/_variables.scss"; @import "@/styles/_variables.scss";
@import "@/styles/_mixins.scss";
.student-submission-row { .student-submission-row {
display: grid; display: grid;
grid-template-columns: 170px 1fr 1fr; grid-template-columns: 100px 1fr 1fr;
grid-column-gap: 80px; grid-column-gap: 20px;
@include desktop {
grid-template-columns: 170px 1fr 1fr;
grid-column-gap: 80px;
}
align-items: center; align-items: center;
border-bottom: 1px solid $color-silver-dark; border-bottom: 1px solid $color-silver-dark;
padding: 15px 0; padding: 15px 0;