pdf fixes

BenchtopPDF/BenchtopPDF/Program.cs

@@ -4,7 +4,6 @@ using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
 
 
-
 namespace BenchtopPDF
 {
     internal class Program
@@ -19,8 +18,7 @@ namespace BenchtopPDF
             var model = JsonConvert.DeserializeObject<Sheet>(data);
 
             var document = new SheetDocument(model);
-                document.GeneratePdfAndShow();
-
+            document.GeneratePdfAndShow();
         }
     }
 }

BenchtopPDF/BenchtopPDF/SheetModel.cs

@@ -10,43 +10,34 @@ namespace BenchtopPDF
     {
         public int Value { get; set; }
 
-        [JsonProperty("In Range")]
-        public bool InRange { get; set; }
+        [JsonProperty("In Range")] public bool InRange { get; set; }
         public int Delta { get; set; }
     }
 
 
     public class MasterValue
     {
-        [JsonProperty("Low Limit")]
-        public int LowLimit { get; set; }
-        
-        [JsonProperty("Master Value")]
-        public int Value { get; set; }
+        [JsonProperty("Low Limit")] public int LowLimit { get; set; }
 
-        [JsonProperty("High Limit")]
-        public int HighLimit { get; set; }
+        [JsonProperty("Master Value")] public int Value { get; set; }
+
+        [JsonProperty("High Limit")] public int HighLimit { get; set; }
     }
 
     public class Sheet
     {
         public string Instrument { get; set; }
 
-        [JsonProperty("Customer Name")]
-        public string CustomerName { get; set; }
+        [JsonProperty("Customer Name")] public string CustomerName { get; set; }
 
-        [JsonProperty("Customer Address")]
-        public string CustomerAddress { get; set; }
+        [JsonProperty("Customer Address")] public string CustomerAddress { get; set; }
 
-        [JsonProperty("Control Number")]
-        public string ControlNumber { get; set; }
+        [JsonProperty("Control Number")] public string ControlNumber { get; set; }
 
-        [JsonProperty("Serial Number")]
-        public string SerialNumber { get; set; }
+        [JsonProperty("Serial Number")] public string SerialNumber { get; set; }
         public double Accuracy { get; set; }
 
-        [JsonProperty("Barometric Pressure")]
-        public double BarometricPressure { get; set; }
+        [JsonProperty("Barometric Pressure")] public double BarometricPressure { get; set; }
         public double Temperature { get; set; }
         public int Humidity { get; set; }
         public List<Transducer> Transducers { get; set; }
@@ -56,38 +47,24 @@ namespace BenchtopPDF
     {
         public double Accuracy { get; set; }
 
-        [JsonProperty("Part Number")]
-        public string PartNumber { get; set; }
-        
+        [JsonProperty("Part Number")] public string PartNumber { get; set; }
+
         public int Value { get; set; }
-        
+
         public string Unit { get; set; }
-        
-        [JsonProperty("Limit ABS")]
-        public int LimitABS { get; set; }
 
-        [JsonProperty("Transducer Name")]
-        public string TransducerName { get; set; }
+        [JsonProperty("Limit ABS")] public int LimitABS { get; set; }
 
-        [JsonProperty("Transducer Type")]
-        public string TransducerType { get; set; }
+        [JsonProperty("Transducer Name")] public string TransducerName { get; set; }
 
-        [JsonProperty("Gauge Reading")]
-        public List<GaugeReading> GaugeReading { get; set; }
+        [JsonProperty("Transducer Type")] public string TransducerType { get; set; }
 
-        [JsonProperty("Master Value")]
-        public List<MasterValue> MasterValue { get; set; }
+        [JsonProperty("Gauge Reading")] public List<GaugeReading> GaugeReading { get; set; }
 
-        [JsonProperty("Verify Date")]
-        public string VerifyDate { get; set; }
+        [JsonProperty("Master Value")] public List<MasterValue> MasterValue { get; set; }
 
-        [JsonProperty("Verify Time")]
-        public string VerifyTime { get; set; }
+        [JsonProperty("Verify Date")] public string VerifyDate { get; set; }
 
+        [JsonProperty("Verify Time")] public string VerifyTime { get; set; }
     }
-
-
-
-
-    
 }

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

@@ -0,0 +1,36 @@
+<template>
+  <div class="card-header">Primary Cal Device</div>
+  <div class="card-body">
+    <table class="table">
+      <tbody>
+        <tr>
+          <td>Serial #</td>
+          <td>
+            <input
+              type="text"
+              name="serial"
+              maxlength="100"
+              v-model="serial"
+              required
+              id="id_serial"
+            />
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+<script setup>
+import { ref, defineEmits, watchEffect } from "vue";
+
+const
+  serial = ref("")
+
+
+const emit = defineEmits();
+watchEffect(() => {
+  emit("calibration-form", {
+    serial,
+  });
+});
+</script>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="card-header">Primary Calibration Device</div>
+  <div class="card-header">Primary Cal Device</div>
   <div class="card-body">
     <table class="table">
       <tbody>

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

@@ -0,0 +1,36 @@
+<template>
+  <div class="card-header">Instrument</div>
+  <div class="card-body">
+    <table class="table">
+      <tbody>
+        <tr>
+          <td>Serial #</td>
+          <td>
+            <input
+              type="text"
+              name="serial"
+              maxlength="100"
+              v-model="serial"
+              required
+              id="id_serial"
+            />
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+<script setup>
+import { ref, defineEmits, watchEffect } from "vue";
+
+const
+  serial = ref("")
+
+
+const emit = defineEmits();
+watchEffect(() => {
+  emit("instrument-form", {
+    serial,
+  });
+});
+</script>

benchtop-fe/src/components/Sheet.vue

@@ -14,11 +14,14 @@
     </div>
 
     <div class="item card">
-      <NewInstrumentForm @newInstrumentForm="newInstrumentForm" />
+      <InstrumentForm @instrumentForm="instrumentForm" />
+      <!-- <NewInstrumentForm @newInstrumentForm="newInstrumentForm" /> -->
     </div>
     <div class="item card">
-      <NewCalibrationDeviceForm @newCalibrationForm="newCalibrationForm" />
+      <CalibrationDeviceForm @calibrationForm="calibrationForm" />
+      <!-- <NewCalibrationDeviceForm @newCalibrationForm="newCalibrationForm" /> -->
     </div>
+
   </div>
 </template>
 
@@ -27,7 +30,9 @@ import { ref, defineEmits } from "vue";
 
 import CustomerForm from "./CustomerForm.vue";
 import NewInstrumentForm from "./Instrument/NewInstrumentForm.vue";
+import InstrumentForm from "./Instrument/InstrumentForm.vue";
 import NewCalibrationDeviceForm from "./CalibrationDevice/NewCalibrationDeviceForm.vue";
+import CalibrationDeviceForm from "./CalibrationDevice/CalibrationDeviceForm.vue";
 import EnvironmentForm from "./EnvironmentForm.vue";
 import UploadForm from "./UploadForm.vue";
 

benchtop-fe/src/components/UploadForm.vue

@@ -81,8 +81,7 @@
 <script setup>
 import { ref, computed, watchEffect } from "vue";
 
-const
-  report_type = ref(""),
+const report_type = ref(""),
   files = ref([]),
   current_file = ref(null),
   doc = ref();

benchtop-fe/src/style.css

@@ -5,6 +5,7 @@ body {
 
 .card {
     border: 1px solid;
+    min-height: 300px;
 }
 .card-header{
     font-size: 2rem;