Add column for subject

aleksis/apps/lesrooster/frontend/components/TimeboundCourseConfigRaster.vue

@@ -36,7 +36,24 @@ import ValidityRangeField from "./ValidityRangeField.vue";</script>
               <save-button />
             </v-toolbar>
           </template>
-          <template v-for="header in headers" #[tableItemSlotName(header)]="{ item, value }">
+
+          <template #item.subject="{ item, value }">
+            <v-tooltip bottom>
+              <template v-slot:activator="{ on, attrs }">
+                <v-chip
+                  :color="value.colourFg"
+                  v-on="on"
+                  v-bind="attrs"
+                  outlined
+                >
+                  {{ value.shortName }}
+                </v-chip>
+              </template>
+              <span>{{ value.name }}</span>
+            </v-tooltip>
+          </template>
+
+          <template v-for="header in groupHeaders" #[tableItemSlotName(header)]="{ item, value }">
             <template v-for="(course, index) in value">
               <v-card class="ma-2">
                 <v-card-title>
@@ -182,13 +199,19 @@ export default {
     subjectGroupCombinations() {
       return [].concat.apply([], this.items.map(subject => Object.keys(subject.groupCombinations)));
     },
-    headers() {
+    groupHeaders() {
       return this.groups.map(group => ({text: group.shortName, value: JSON.stringify([group.id])})).concat(this.subjectGroupCombinations.map(combination => {
         let parsedCombination = JSON.parse(combination);
         return {
           text: parsedCombination.map(groupID => this.groups.find(group => group.id === groupID).shortName).join(", "), value: combination
         };
-      })).filter((obj, index, self) => index === self.findIndex((o) => o.value === obj.value));
+      })).filter((obj, index, self) => index === self.findIndex((o) => o.value === obj.value))
+    },
+    headers() {
+      return [{
+        text: this.$t("lesrooster.timebound_course_config.subject"),
+        value: "subject",
+      }].concat(this.groupHeaders);
     },
     items() {
       return this.subjects.map(subject => {
@@ -212,7 +235,10 @@ export default {
       });
     },
     tableItems() {
-      return this.items.map(subject => subject.groupCombinations);
+      return this.items.map(subject => {
+        let { courses, groupCombinations, ...reducedSubject } = subject;
+        return {subject: reducedSubject, ...subject.groupCombinations};
+      });
     },
   },
   apollo: {

aleksis/apps/lesrooster/frontend/messages/en.json

@@ -47,7 +47,8 @@
       "scheduled_slot_count": "Scheduled lesson quota",
       "course": "Course",
       "teachers": "Teachers",
-      "create_timebound_course_config": "Create timebound course config"
+      "create_timebound_course_config": "Create timebound course config",
+      "subject": "Subject"
     },
     "lesson_raster": {
       "menu_title": "Lesson Raster"