Merge branch 'feat/discussions' of https://github.com/SELab-2/Dwengo-1 into feat/discussions
This commit is contained in:
commit
5646598229
2 changed files with 21 additions and 13 deletions
|
@ -66,7 +66,9 @@
|
|||
const createQuestionMutation = useCreateQuestionMutation(loID);
|
||||
const groupsQueryResult = useStudentGroupsQuery(authService.authState.user?.profile.preferred_username);
|
||||
|
||||
const showQuestionBox = computed(() => authService.authState.activeRole === AccountType.Student && pathIsAssignment.value);
|
||||
const showQuestionBox = computed(
|
||||
() => authService.authState.activeRole === AccountType.Student && pathIsAssignment.value,
|
||||
);
|
||||
|
||||
function submitQuestion(): void {
|
||||
const assignments = studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[];
|
||||
|
@ -96,8 +98,11 @@
|
|||
</script>
|
||||
|
||||
<template>
|
||||
<h3 v-if="props.withTitle && showQuestionBox">{{ t('askAQuestion') }}:</h3>
|
||||
<div class="question-box" v-if="showQuestionBox">
|
||||
<h3 v-if="props.withTitle && showQuestionBox">{{ t("askAQuestion") }}:</h3>
|
||||
<div
|
||||
class="question-box"
|
||||
v-if="showQuestionBox"
|
||||
>
|
||||
<v-textarea
|
||||
:label="t('question-input-placeholder')"
|
||||
v-model="questionInput"
|
||||
|
@ -105,7 +110,8 @@
|
|||
density="compact"
|
||||
rows="1"
|
||||
variant="outlined"
|
||||
auto-grow>
|
||||
auto-grow
|
||||
>
|
||||
<template v-slot:append-inner>
|
||||
<v-btn
|
||||
icon="mdi mdi-send"
|
||||
|
@ -113,7 +119,7 @@
|
|||
variant="plain"
|
||||
class="question-button"
|
||||
@click="submitQuestion"
|
||||
/>
|
||||
/>
|
||||
</template>
|
||||
</v-textarea>
|
||||
</div>
|
||||
|
|
|
@ -83,16 +83,18 @@
|
|||
</script>
|
||||
<template>
|
||||
<div class="space-y-4">
|
||||
<v-card
|
||||
class="question-card"
|
||||
>
|
||||
<v-card class="question-card">
|
||||
<v-card-title class="author-title">{{ displayNameFor(question.author) }}</v-card-title>
|
||||
<v-card-subtitle>{{ formatDate(question.timestamp) }}</v-card-subtitle>
|
||||
<v-card-text>
|
||||
{{ question.content }}
|
||||
</v-card-text>
|
||||
<template v-slot:actions
|
||||
v-if="authService.authState.activeRole === AccountType.Teacher || answersQuery.data?.value?.answers?.length > 0"
|
||||
<template
|
||||
v-slot:actions
|
||||
v-if="
|
||||
authService.authState.activeRole === AccountType.Teacher ||
|
||||
answersQuery.data?.value?.answers?.length > 0
|
||||
"
|
||||
>
|
||||
<div class="question-actions-container">
|
||||
<v-textarea
|
||||
|
@ -103,7 +105,8 @@
|
|||
density="compact"
|
||||
rows="1"
|
||||
variant="outlined"
|
||||
auto-grow>
|
||||
auto-grow
|
||||
>
|
||||
<template v-slot:append-inner>
|
||||
<v-btn
|
||||
icon="mdi mdi-send"
|
||||
|
@ -111,7 +114,7 @@
|
|||
variant="plain"
|
||||
class="answer-button"
|
||||
@click="submitAnswer"
|
||||
/>
|
||||
/>
|
||||
</template>
|
||||
</v-textarea>
|
||||
<using-query-result
|
||||
|
@ -149,7 +152,6 @@
|
|||
</div>
|
||||
</template>
|
||||
<style scoped>
|
||||
|
||||
.answer-field {
|
||||
max-width: 500px;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue