diff options
| -rw-r--r-- | resources/vue/components/my-courses/TableView.vue | 6 | ||||
| -rw-r--r-- | resources/vue/mixins/MyCoursesMixin.js | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/resources/vue/components/my-courses/TableView.vue b/resources/vue/components/my-courses/TableView.vue index f8ffa85..ed32d48 100644 --- a/resources/vue/components/my-courses/TableView.vue +++ b/resources/vue/components/my-courses/TableView.vue @@ -5,7 +5,7 @@ <colgroup> <col style="width: 7px"> <col style="width: 25px"> - <col style="width: 70px" v-if="displaySemNumber"> + <col style="width: 70px" v-if="displaySemNumberSeparate"> <col> <col v-if="!responsiveDisplay" :style="{width: (2 * 5 + numberOfNavElements * (iconSize + 2 * 3 + 3) - 3) + 'px'}"> <col v-if="!responsiveDisplay" style="width: 24px"> @@ -18,7 +18,7 @@ </span> </th> <th></th> - <th v-if="displaySemNumber" :class="getOrderClasses('number')"> + <th v-if="displaySemNumberSeparate" :class="getOrderClasses('number')"> <a href="#" @click.prevent="changeOrder('number')"> {{ $gettext('Nr.') }} </a> @@ -52,7 +52,7 @@ <td :class="{'subcourse-indented': isChild(course)}"> <span :style="{backgroundImage: `url(${course.avatar}`}" class="my-courses-avatar course-avatar-small" :title="course.name" alt=""></span> </td> - <td v-if="displaySemNumber" :class="{'subcourse-indented': isChild(course)}"> + <td v-if="displaySemNumberSeparate" :class="{'subcourse-indented': isChild(course)}"> {{ course.number }} </td> <td :class="{'subcourse-indented': isChild(course)}"> diff --git a/resources/vue/mixins/MyCoursesMixin.js b/resources/vue/mixins/MyCoursesMixin.js index 5d9f811..db30924 100644 --- a/resources/vue/mixins/MyCoursesMixin.js +++ b/resources/vue/mixins/MyCoursesMixin.js @@ -16,7 +16,7 @@ function createMixin(minimal = false) { let name = course.name; // Include sem number - if (this.displaySemNumber) { + if (this.displaySemNumberInCourseName) { name = `${course.number} ${name}`; } @@ -43,7 +43,11 @@ function createMixin(minimal = false) { csrf() { return STUDIP.CSRF_TOKEN; }, - displaySemNumber() { + displaySemNumberInCourseName() { + return !this.displaySemNumberSeparate + || this.getViewConfig('tiled'); + }, + displaySemNumberSeparate() { return this.config?.sem_number_always || ( this.config?.sem_number |