Merge pull request #61 from LCOGT/fix/soar-spectra-config-types

Fix/soar spectra config types
observatorycontrolsystem · Aug 1, 2019 · 6876a84 · 6876a84
2 parents 97bfe51 + 8294355
commit 6876a84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/observation_portal/sciapplications/templates/sciapplications/index.html b/observation_portal/sciapplications/templates/sciapplications/index.html
@@ -107,7 +107,7 @@ <h4>Draft Proposals</h4>
                     <td>{{ app.status }}</td>
                     <td>
                         <a href="{% url 'sciapplications:detail' pk=app.id %}"><i class="fa fa-print"></i></a>
-                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="fa fa-file-pdf-o"></i></a>
+                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="far fa-file-pdf"></i></a>
                     </td>
                     <td><a href="{% url 'sciapplications:delete' pk=app.id %}" class="fa fa-trash" title="Delete draft"></a></td>
                 </tr>
@@ -146,7 +146,7 @@ <h4>Submitted Proposals</h4>
                     <td>{{ app.status }}</td>
                     <td>
                         <a href="{% url 'sciapplications:detail' pk=app.id %}"><i class="fa fa-print"></i></a>
-                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="fa fa-file-pdf-o"></i></a>
+                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="far fa-file-pdf"></i></a>
                     </td>
                 </tr>
                 {% endif %}
@@ -186,7 +186,7 @@ <h4>Draft Proposals</h4>
                     <td>{{ app.status }}</td>
                     <td>
                         <a href="{% url 'sciapplications:detail' pk=app.id %}"><i class="fa fa-print"></i></a>
-                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="fa fa-file-pdf-o"></i></a>
+                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="far fa-file-pdf"></i></a>
                     </td>
                     <td><a href="{% url 'sciapplications:delete' pk=app.id %}" class="fa fa-trash" title="Delete draft"></a></td>
                 </tr>
@@ -217,7 +217,7 @@ <h4>Submitted Proposals</h4>
                     <td>{{ app.status }}</td>
                     <td>
                         <a href="{% url 'sciapplications:detail' pk=app.id %}"><i class="fa fa-print"></i></a>
-                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="fa fa-file-pdf-o"></i></a>
+                        <a href="{% url 'sciapplications:pdf' pk=app.id %}"><i class="far fa-file-pdf"></i></a>
                     </td>
                 </tr>
                 {% endif %}

diff --git a/static/js/components/configuration.vue b/static/js/components/configuration.vue
@@ -139,6 +139,8 @@
   </panel>
 </template>
 <script>
+  import _ from 'lodash';
+
   import { collapseMixin } from '../utils.js';
   import panel from './util/panel.vue';
   import customalert from './util/customalert.vue';
@@ -189,12 +191,12 @@
     },
     computed: {
       spectraConfigurationOptions: function() {
-        if (this.selectedinstrument) {
+        if (_.get(this.available_instruments, this.selectedinstrument, {}).type === 'SPECTRA') {
           if (this.selectedinstrument.includes('NRES')) {
             return [
               {value: 'NRES_SPECTRUM', 'text': 'Spectrum'}
             ]
-          } else if (this.selectedinstrument.includes('FLOYDS')) {
+          } else {
             return [
               {value: 'SPECTRUM', text: 'Spectrum'},
               {value: 'LAMP_FLAT', text: 'Lamp Flat'},