Skip to content
Snippets Groups Projects
Commit 1f635175 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Merge branch '256-add-simple-course-book-list' of...

Merge branch '256-add-simple-course-book-list' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 256-add-simple-course-book-list
parents b2f54874 60a6fe08
No related branches found
No related tags found
2 merge requests!352Draft: Resolve "Add dialog with each lesson's students",!350Resolve "Add simple course book list"
Pipeline #179313 failed
......@@ -10,6 +10,7 @@
@lastQuery="lastQuery = $event"
ref="iterator"
hide-default-footer
use-deep-search
>
<template #additionalActions="{ attrs, on }">
<div class="d-flex flex-grow-1 justify-end">
......
<template>
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-icon
:color="currentStatus?.color"
class="mr-md-4"
......
......@@ -43,6 +43,7 @@ import PersonChip from "aleksis.core/components/person/PersonChip.vue";
<div :class="{ 'd-flex align-center flex-wrap gap': true }">
<person-chip
v-for="teacher in documentation.teachers"
:key="documentation.id + '-teacher-' + teacher.id"
:person="teacher"
no-link
v-bind="compact ? dialogActivator.attrs : {}"
......
......@@ -2,6 +2,7 @@
<div
class="d-flex align-center justify-space-between justify-md-end flex-wrap gap"
>
<!-- eslint-disable @intlify/vue-i18n/no-raw-text -->
<v-chip dense color="success">
<v-chip small dense class="mr-2" color="green darken-3 white--text"
>26</v-chip
......@@ -29,6 +30,7 @@
<v-chip dense color="primary" outlined>
<v-icon>$edit</v-icon>
</v-chip>
<!-- eslint-enable @intlify/vue-i18n/no-raw-text -->
</div>
</template>
......
......@@ -394,7 +394,7 @@ export default {
{
path: "coursebook/",
component: () => import("./components/coursebook/Coursebook.vue"),
redirect: (to) => {
redirect: () => {
return {
name: "alsijil.coursebook_by_type_and_date",
params: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment