From 99fbb9e8881a4e072c0029d7d86744f3787b7b9c Mon Sep 17 00:00:00 2001
From: Leon Vreling <l.m.vreling@student.tue.nl>
Date: Sun, 14 Jan 2024 10:13:59 +0100
Subject: [PATCH 1/2] fix(statutory): Remove option to set cancelled
 application as delegate

---
 src/views/statutory/BoardView.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/statutory/BoardView.vue b/src/views/statutory/BoardView.vue
index 06f9ce6c3..ef36205fc 100644
--- a/src/views/statutory/BoardView.vue
+++ b/src/views/statutory/BoardView.vue
@@ -75,7 +75,7 @@
                 <div class="select">
                   <select v-model="props.row.user_id">
                     <option :value="null">Not set</option>
-                    <option v-for="application in applications" v-bind:key="application.user_id" v-bind:value="application.user_id">
+                    <option v-for="application in nonCancelledApplications" v-bind:key="application.user_id" v-bind:value="application.user_id">
                       {{ application.first_name }} {{ application.last_name }}
                     </option>
                   </select>
@@ -260,6 +260,9 @@ export default {
     canEditSelectedBody () {
       return this.can.set_board_comment_and_participant_type.global
         || this.can.set_board_comment_and_participant_type[this.selectedBody]
+    },
+    nonCancelledApplications () {
+      return this.applications.filter(app => !app.cancelled)
     }
   },
   methods: {

From db7e87c25c5aa1d7e35822a76175f25235052f67 Mon Sep 17 00:00:00 2001
From: Leon Vreling <l.m.vreling@student.tue.nl>
Date: Sun, 14 Jan 2024 10:32:58 +0100
Subject: [PATCH 2/2] feat(SU): Display cancelled application status on board
 view

---
 src/views/summeruniversity/BoardView.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/summeruniversity/BoardView.vue b/src/views/summeruniversity/BoardView.vue
index 194f8236f..7f595fe5d 100644
--- a/src/views/summeruniversity/BoardView.vue
+++ b/src/views/summeruniversity/BoardView.vue
@@ -59,10 +59,15 @@
             </b-table-column>
 
             <b-table-column field="status" label="Status" sortable>
-              <span v-if="props.row.status === 'accepted'">Accepted</span>
-              <span v-if="props.row.status === 'rejected'">Rejected</span>
-              <span v-if="props.row.status === 'waiting_list'">Waiting list</span>
-              <span v-if="props.row.status === 'pending'">Pending</span>
+              <span v-if="props.row.cancelled">
+                <span class="tag is-danger" v-if="props.row.cancelled">
+                  Cancelled
+                </span>
+              </span>
+              <span v-if="!props.row.cancelled && props.row.status === 'accepted'">Accepted</span>
+              <span v-if="!props.row.cancelled && props.row.status === 'rejected'">Rejected</span>
+              <span v-if="!props.row.cancelled && props.row.status === 'waiting_list'">Waiting list</span>
+              <span v-if="!props.row.cancelled && props.row.status === 'pending'">Pending</span>
             </b-table-column>
 
             <b-table-column field="board_comment" label="Board comment">