Yay, John Bintz Fixed!

This commit is contained in:
Tyrel Souza 2024-07-07 14:40:33 -04:00
parent 291ff7d68d
commit 814ee9f653
No known key found for this signature in database
GPG Key ID: F3614B02ACBE438E
3 changed files with 23 additions and 33 deletions

View File

@ -6,10 +6,9 @@
Generate PDF and Label Generate PDF and Label
</button> </button>
<br> <br>
<br>
<div :class="{ hide: hide }" class="px666 scroll-pdf"> <div :class="{ hide: hide }" class="px666 scroll-pdf">
<div id="pdf" ref="document"> <div id="pdf" ref="document">
<div v-for="table of tables"> <div v-for="(table, index) in tables" :key="index">
<div class="header"> <div class="header">
<div class="flex-container"> <div class="flex-container">
<div class="column pct-25"> <div class="column pct-25">
@ -22,7 +21,7 @@
<div>Technician: {{ props.customer?.technician }}</div> <div>Technician: {{ props.customer?.technician }}</div>
</div> </div>
<div class="column pct-25"> <div class="column pct-25">
<img :src="Al2pCertUrl"/> <img :src="Al2pCertUrl" alt="AL2P Cert"/>
</div> </div>
</div> </div>
</div> </div>
@ -116,13 +115,11 @@
</div> </div>
</div> </div>
</div> </div>
<div>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
import {defineProps, ref} from "vue"; import {computed, defineProps, onMounted, ref} from "vue";
import html2pdf from "html2pdf.js"; import html2pdf from "html2pdf.js";
import BenchTopLogoUrl from "../../assets/BenchTopLogo.png"; import BenchTopLogoUrl from "../../assets/BenchTopLogo.png";
import Al2pCertUrl from "../../assets/al2pCert.png"; import Al2pCertUrl from "../../assets/al2pCert.png";
@ -132,7 +129,6 @@ import ParseHardwareCalibration from "../../parsers/Hardware.js"
import ReadingTable from "./ReadingTable.vue"; import ReadingTable from "./ReadingTable.vue";
const hide = ref(false); const hide = ref(false);
const tables = ref([])
const props = defineProps({ const props = defineProps({
upload: Object, upload: Object,
@ -147,10 +143,7 @@ const onsite = () => {
}; };
const i_date = () => { const i_date = () => {
if (props.instrument === undefined) { if (!props.instrument?.date) {
return
}
if (props.instrument.date === undefined) {
return return
} }
const d = props.instrument.date const d = props.instrument.date
@ -162,7 +155,7 @@ const i_date = () => {
const i_due_date = () => { const i_due_date = () => {
if (props.instrument?.due_date === undefined) { if (!props.instrument?.due_date) {
return; return;
} }
const d = props.instrument.due_date const d = props.instrument.due_date
@ -173,7 +166,7 @@ const i_due_date = () => {
}; };
const c_date = () => { const c_date = () => {
if (props.calibration?.date === undefined) { if (!props.calibration?.date) {
return; return;
} }
const d = props.calibration.date const d = props.calibration.date
@ -183,7 +176,7 @@ const c_date = () => {
return `${year}-${month}-${day}`; return `${year}-${month}-${day}`;
}; };
const c_due_date = () => { const c_due_date = () => {
if (props.calibration?.due_date === undefined) { if (!props.calibration?.due_date) {
return; return;
} }
const d = props.calibration.due_date const d = props.calibration.due_date
@ -194,7 +187,7 @@ const c_due_date = () => {
}; };
const exportToPDF = () => { const exportToPDF = () => {
if (props.upload !== undefined && props.upload.files.length > 0) { if (props.upload.files.length > 0) {
const element = document.getElementById("pdf"); const element = document.getElementById("pdf");
var opt = { var opt = {
@ -208,28 +201,27 @@ const exportToPDF = () => {
} }
}; };
const output = () => { const tables = computed(() => {
let content = "" let content = ""
tables.value = [] let tables = []
if (props.upload !== undefined && props.upload.files.length > 0) { if (props.upload?.files?.length > 0) {
const acc = props.environment.accuracy const acc = props.environment.accuracy
if (props.upload.report_type === "Transducer Verify") { if (props.upload.report_type === "Transducer Verify") {
for (const idx in props.upload.files) { for (const idx in props.upload.files) {
content = ParseTransducer(props.upload.files[idx]["value"], acc) content = ParseTransducer(props.upload.files[idx]["value"], acc)
tables.value = [...tables.value, ...content] tables = [...tables, ...content]
} }
} else if (props.upload.report_type === "Hardware Calibration") { } else if (props.upload.report_type === "Hardware Calibration") {
for (const idx in props.upload.files) { for (const idx in props.upload.files) {
content = ParseHardwareCalibration(props.upload.files[idx]["value"], acc) content = ParseHardwareCalibration(props.upload.files[idx]["value"], acc)
tables.value = [...tables.value, ...[content]] tables = [...tables, ...[content]]
} }
} }
} }
// return tables return tables;
} })
</script> </script>

View File

@ -14,7 +14,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>TBD</td> <td>HI?</td>
<td>TBD</td> <td>TBD</td>
<td>TBD</td> <td>TBD</td>
<td>TBD</td> <td>TBD</td>

View File

@ -62,19 +62,19 @@ import UploadForm from "./Upload/UploadForm.vue";
import PDF from "./PDF/PDF.vue"; import PDF from "./PDF/PDF.vue";
// Not needed yet // Not needed yet
const instrument_form_data = ref(), const instrument_form_data = ref(null),
calibration_form_data = ref(); calibration_form_data = ref(null);
// Booleans // Booleans
const show_new_instrument = ref(true), const show_new_instrument = ref(true),
show_new_calibration = ref(true); show_new_calibration = ref(true);
// form Data // form Data
const upload_form_data = ref(), const upload_form_data = ref(null),
customer_form_data = ref(), customer_form_data = ref(null),
environment_form_data = ref(), environment_form_data = ref(null),
new_instrument_form_data = ref(), new_instrument_form_data = ref(null),
new_calibration_form_data = ref(); new_calibration_form_data = ref(null);
const uploadForm = (form) => { const uploadForm = (form) => {
upload_form_data.value = form; upload_form_data.value = form;
@ -122,8 +122,6 @@ const emits = defineEmits([
"showNewInstrument", "showNewInstrument",
"showNewCalibration", "showNewCalibration",
]); ]);
</script> </script>
<style scoped> <style scoped>