From d09aa59eac0b0a1b8164c4e2c809c242aff4e4d2 Mon Sep 17 00:00:00 2001
From: Mark W <24956497+ndg63276@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:56:21 +0100
Subject: [PATCH] LIMS-1286: Show ERA status on calendar and visits list (#834)
Co-authored-by: Mark Williams
---
api/src/Page/Proposal.php | 1 +
.../calendar/views/components/calendar-day-events.vue | 9 +++++++--
client/src/js/modules/visits/views/visit_list.vue | 9 ++++++++-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/api/src/Page/Proposal.php b/api/src/Page/Proposal.php
index ab719e2e7..f8207ed2f 100644
--- a/api/src/Page/Proposal.php
+++ b/api/src/Page/Proposal.php
@@ -456,6 +456,7 @@ function _get_visits($visit = null, $output = true)
s.beamlineoperator AS lc,
s.comments,
s.scheduled,
+ s.riskrating,
st.typename AS sessiontype,
DATE_FORMAT(s.startdate, '%d-%m-%Y %H:%i') AS startdate,
DATE_FORMAT(s.enddate, '%d-%m-%Y %H:%i') AS enddate,
diff --git a/client/src/js/modules/calendar/views/components/calendar-day-events.vue b/client/src/js/modules/calendar/views/components/calendar-day-events.vue
index 7c2b70a20..319978312 100644
--- a/client/src/js/modules/calendar/views/components/calendar-day-events.vue
+++ b/client/src/js/modules/calendar/views/components/calendar-day-events.vue
@@ -21,7 +21,12 @@
class="tw-no-underline tw-text-content-page-color"
>
{{ session['VISIT'] }}
- ({{ session['LEN'] }})
+
+ 🟢
+ 🟡
+ 🔴
+ ⚫
+ ({{ session['LEN'] }})
- {{ session['BEAMLINEOPERATOR'] }}
@@ -105,4 +110,4 @@ export default {
}
}
-
\ No newline at end of file
+
diff --git a/client/src/js/modules/visits/views/visit_list.vue b/client/src/js/modules/visits/views/visit_list.vue
index 5b1abbf84..c3feef51a 100644
--- a/client/src/js/modules/visits/views/visit_list.vue
+++ b/client/src/js/modules/visits/views/visit_list.vue
@@ -57,7 +57,10 @@
-
+ 🟢
+ 🟡
+ 🔴
+ ⚫
@@ -134,6 +137,10 @@ export default {
key: "BEAMLINENAME",
title: 'Beamline'
},
+ {
+ key: "ERA",
+ title: 'ERA'
+ },
{
key: "DEWARS",
title: 'Dewar(s)'