LIMS-167: Dont default to mx type for calendar/logistics views (#942)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

Author: ndg63276

api/src/Page/Proposal.php

@@ -389,7 +389,11 @@ function _get_visits($visit = null, $output = true)
         }
 
         if ($this->has_arg('ty')) {
-            $beamlines = $this->_get_beamlines_from_type($this->arg('ty'));
+            if ($this->arg('ty') == 'calendar') {
+                $beamlines = $this->_get_beamlines_from_type($this->ty);
+            } else {
+                $beamlines = $this->_get_beamlines_from_type($this->arg('ty'));
+            }
 
             if (!empty($beamlines)) {
                 $bls = implode("', '", $beamlines);

api/src/Page/Shipment.php

@@ -1677,7 +1677,11 @@ function _get_dewars()
         }
 
         if ($this->has_arg('ty')) {
-            $bls_tmp = $this->_get_beamlines_from_type($this->arg('ty'));
+            if ($this->arg('ty') == 'overview') {
+                $bls_tmp = $this->_get_beamlines_from_type($this->ty);
+            } else {
+                $bls_tmp = $this->_get_beamlines_from_type($this->arg('ty'));
+            }
             if (!empty($bls_tmp)) {
                 $bls = implode("', '", $bls_tmp);
                 $where .= " AND se.beamlinename IN ('$bls')";

client/src/js/modules/calendar/views/calendar-view.vue

@@ -244,7 +244,7 @@ export default {
           all: 1,
         }
 
-        if (app.staff) queryParams.ty = this.proposalType
+        if (app.staff) queryParams.ty = 'calendar'
         if (this.selectedBeamline !== 'all') queryParams.bl = this.selectedBeamline
 
         const visitsCollection = new Visits(null, {

client/src/js/modules/shipment/components/dewars-overview-wrapper.vue

@@ -54,7 +54,7 @@ export default {
             }
         },
         proposalType : function() {
-            return this.$store.state.proposal.proposalType
+            return 'overview'
         }
     },
     created: function() {
@@ -95,4 +95,4 @@ export default {
         },
     },
 }
-</script>
+</script>