changes during sync

benchtop-fe/src/components/CalibrationDevice/NewCalibrationDeviceForm.vue

@@ -1,72 +1,50 @@
 <template>
-  <div class="card-header">Primary Cal Device</div>
+  <div class="card-header">Calibration Devices</div>
   <div class="card-body">
-    <table class="table">
+    <h3>Primary Device</h3>
-      <tbody>
+    <select
-        <tr>
+      name="primary_device"
+      v-model="report_type"
+      required
+      id="id_report_type"
+    >
+      <option value="-" selected>----Primary-----</option>
+      <option value="TV">Menzer1</option>
+      <option value="HC">Blackbelt</option>
+    </select>
     <td colspan="2">
       <h3>Calibration Date</h3>
+      <div class="date-picker">
         <VueDatePicker
           v-model="date"
           auto-apply
           :enableTimePicker="false"
           :flow="flow"
         ></VueDatePicker>
+      </div>
     </td>
-        </tr>
+    <hr />
-        <tr>
+    <h3>Secondary Device</h3>
-          <td colspan="2">
+
-            <h3>Calibration Due Date</h3>
+    <select
+      name="secondary_device"
+      v-model="report_type"
+      required
+      id="id_report_type"
+    >
+      <option value="-" selected>----Secondary-----</option>
+      <option value="TV">Menzer1</option>
+      <option value="HC">Blackbelt</option>
+    </select>
+    <h3>Calibration Date</h3>
+    <div class="date-picker">
       <VueDatePicker
-              v-model="due_date"
+        v-model="date"
         auto-apply
         :enableTimePicker="false"
         :flow="flow"
       ></VueDatePicker>
-          </td>
+    </div>
-        </tr>
-        <tr>
-          <td>Model</td>
-          <td>
-            <input
-              type="text"
-              name="model"
-              maxlength="100"
-              v-model="model"
-              required
-              id="id_model"
-            />
-          </td>
-        </tr>
-        <tr>
-          <td>Serial #</td>
-          <td>
-            <input
-              type="text"
-              name="serial"
-              maxlength="100"
-              v-model="serial"
-              required
-              id="id_serial"
-            />
-          </td>
-        </tr>
-
-        <tr>
-          <td>Cert ID</td>
-          <td>
-            <input
-              type="text"
-              name="cert_id"
-              maxlength="100"
-              v-model="cert_id"
-              required
-              id="id_cert_id"
-            />
-          </td>
-        </tr>
-      </tbody>
-    </table>
   </div>
 </template>
 <script setup>
@@ -78,8 +56,8 @@ import "@vuepic/vue-datepicker/dist/main.css";
 const model = ref(""),
   serial = ref(""),
   cert_id = ref(""),
-  due_date = ref(new Date),
+  due_date = ref(new Date()),
-  date = ref(new Date);
+  date = ref(new Date());
 
 const flow = ref(["year", "month", "calendar"]);
 

benchtop-fe/src/components/Instrument/NewInstrumentForm.vue

@@ -82,7 +82,7 @@
           </td>
         </tr>
         <tr>
-          <td>Transducer Span</td>
+          <td>Transducer Span (psia)</td>
           <td>
             <input
               type="text"
@@ -126,3 +126,4 @@ watchEffect(() => {
   });
 });
 </script>
+

benchtop-fe/src/style.css

@@ -1,4 +1,7 @@
-
+body {
+  margin: 1rem;
+  background: url("/public/funky-lines.webp");
+}
 
 .card {
     border: 1px solid;