LIMS-1286: Show ERA status on calendar and visits list (#834)

Co-authored-by: Mark Williams <[email protected]>
DiamondLightSource · Oct 1, 2024 · d09aa59 · d09aa59
1 parent 98b6d45
commit d09aa59
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git 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
@@ -21,7 +21,12 @@
             class="tw-no-underline tw-text-content-page-color"
           >
             {{ session['VISIT'] }}
-          </router-link> <span> ({{ session['LEN'] }})</span>
+          </router-link>
+          <span v-if="session['RISKRATING'] == 'Low'" title="Risk Rating: Low">&#128994;</span>
+          <span v-else-if="session['RISKRATING'] == 'Medium'" title="Risk Rating: Medium">&#128993;</span>
+          <span v-else-if="session['RISKRATING'] == 'High'" title="Risk Rating: High">&#128308;</span>
+          <span v-else title="No approved ERA">&#9899;</span>
+          <span> ({{ session['LEN'] }})</span>
         </p>
         <p class="tw-ml-2">
           - {{ session['BEAMLINEOPERATOR'] }}
@@ -105,4 +110,4 @@ export default {
   }
 }
 </script>
-<style></style>
+<style></style>
diff --git a/client/src/js/modules/visits/views/visit_list.vue b/client/src/js/modules/visits/views/visit_list.vue
@@ -57,7 +57,10 @@
                                 <a v-if="value.key == 'LINKS' && visit.DCCOUNT>0" class="button button-notext" title="View Statistics" id="STATS"><i class="fa fa-pie-chart"></i></a>
                                 <a v-if="value.key == 'LINKS' && visit.DCCOUNT>0" class="button button-notext" title="Download PDF Report" id="PDF"><i class="fa fa-list"></i></a>
                                 <a v-if="value.key == 'LINKS' && visit.DCCOUNT>0" class="button button-notext" title="Export Data Collections to CSV" id="CSV"><i class="fa fa-file-o"></i></a>
-
+                                <span v-if="value.key == 'ERA' && visit.RISKRATING == 'Low'" title="Risk Rating: Low">&#128994;</span>
+                                <span v-else-if="value.key == 'ERA' && visit.RISKRATING == 'Medium'" title="Risk Rating: Medium">&#128993;</span>
+                                <span v-else-if="value.key == 'ERA' && visit.RISKRATING == 'High'" title="Risk Rating: High">&#128308;</span>
+                                <span v-else-if="value.key == 'ERA'" title="No approved ERA">&#9899;</span>
                                 <div data-testid="visit-table-archived" v-if="value.key == 'ARCHIVED' && visit.ARCHIVED == 1">
                                     <i class="fa fa-archive r" :title="'The raw data from this visit have been '+ isArchived + '. You can no longer reprocess data or view full sized diffraction images.'"></i>
                                 </div>
@@ -134,6 +137,10 @@ export default {
                     key: "BEAMLINENAME",
                     title: 'Beamline'
                 },
+                {
+                    key: "ERA",
+                    title: 'ERA'
+                },
                 {
                     key: "DEWARS",
                     title: 'Dewar(s)'