- Uncertainty Statement: The accuracy of measurement is determined by
+ Uncertainty Statement: The tolerance of measurement is determined by
the standards uncertainty, with a coverage factor of k=2 (confidence
of roughly 95%).
@@ -138,11 +141,11 @@ const props = defineProps({
calibration: Object,
});
-const onsite = () => {
+const onsite = computed(() => {
return props.customer?.onsite_cal ? "Yes" : "No";
-};
+});
-const i_date = () => {
+const instrumentDate = computed(() => {
if (!props.instrument?.date) {
return
}
@@ -151,10 +154,18 @@ const i_date = () => {
const month = (d.getMonth() + 1).toString().padStart(2, "0"); // Month is zero-based, so we add 1
const day = d.getDate().toString().padStart(2, "0");
return `${year}-${month}-${day}`;
-};
+});
+
+const issueDate = computed(() => {
+ const d = new Date();
+ const year = d.getFullYear();
+ const month = (d.getMonth() + 1).toString().padStart(2, "0"); // Month is zero-based, so we add 1
+ const day = d.getDate().toString().padStart(2, "0");
+ return `${year}-${month}-${day}`;
+});
-const i_due_date = () => {
+const instrumentDueDate = computed(() => {
if (!props.instrument?.due_date) {
return;
}
@@ -163,9 +174,9 @@ const i_due_date = () => {
const month = (d.getMonth() + 1).toString().padStart(2, "0"); // Month is zero-based, so we add 1
const day = d.getDate().toString().padStart(2, "0");
return `${year}-${month}-${day}`;
-};
+});
-const c_date = () => {
+const calibrationDate = computed(() => {
if (!props.calibration?.date) {
return;
}
@@ -174,8 +185,9 @@ const c_date = () => {
const month = (d.getMonth() + 1).toString().padStart(2, "0"); // Month is zero-based, so we add 1
const day = d.getDate().toString().padStart(2, "0");
return `${year}-${month}-${day}`;
-};
-const c_due_date = () => {
+});
+
+const calibrationDueDate = computed(() => {
if (!props.calibration?.due_date) {
return;
}
@@ -184,7 +196,49 @@ const c_due_date = () => {
const month = (d.getMonth() + 1).toString().padStart(2, "0"); // Month is zero-based, so we add 1
const day = d.getDate().toString().padStart(2, "0");
return `${year}-${month}-${day}`;
-};
+});
+
+const pages = computed(() => {
+ let pages = []
+ const actions = {
+ "Transducer Verify": ParseTransducer,
+ "Hardware Calibration": ParseHardwareCalibration,
+ }
+ // debugger
+
+ if (props.upload?.files?.length > 0) {
+ const acc = props.environment.tolerance
+ const parse = actions[props.upload.report_type]
+ for (const idx in props.upload.files) {
+ const page = {
+ asFound: [],
+ asLeft: []
+ }
+ const file = props.upload.files[idx]
+ const content = parse(file["value"], acc)
+ console.log("content", content)
+
+ // if first file is both, put as found as left
+ // if first file is as found
+ // next file is as left
+
+
+ if (file.kind === "found") {
+ page.asFound = [...page.asFound, ...content]
+ } else if (file.kind === "left") {
+ page.asLeft = [...page.asLeft, ...content]
+ } else if (file.kind === "both") {
+ page.asFound = [...page.asFound, ...content]
+ page.asLeft = [...page.asLeft, ...content]
+ }
+ pages.push(page)
+ console.log(pages)
+ }
+ }
+
+ return pages;
+});
+
const exportToPDF = () => {
if (props.upload.files.length > 0) {
@@ -192,36 +246,16 @@ const exportToPDF = () => {
var opt = {
margin: 0.4,
- filename: `${props.instrument.model}_${i_date()}.pdf`,
+ filename: `${props.instrument.model}_${instrumentDate}.pdf`,
image: {type: "jpeg", quality: 0.98},
html2canvas: {scale: 2},
+ pagebreak: { after: ['hr']},
jsPDF: {unit: "in", format: "letter", orientation: "portrait"},
};
html2pdf().from(element).set(opt).save();
}
};
-const tables = computed(() => {
- let content = ""
- let tables = []
-
- if (props.upload?.files?.length > 0) {
- const acc = props.environment.accuracy
- if (props.upload.report_type === "Transducer Verify") {
- for (const idx in props.upload.files) {
- content = ParseTransducer(props.upload.files[idx]["value"], acc)
- tables = [...tables, ...content]
- }
- } else if (props.upload.report_type === "Hardware Calibration") {
- for (const idx in props.upload.files) {
- content = ParseHardwareCalibration(props.upload.files[idx]["value"], acc)
- tables = [...tables, ...[content]]
- }
- }
- }
-
- return tables;
-})
diff --git a/benchtop-fe/src/components/PDF/ReadingTable.vue b/benchtop-fe/src/components/PDF/ReadingTable.vue
index b21eb53..37b3a92 100644
--- a/benchtop-fe/src/components/PDF/ReadingTable.vue
+++ b/benchtop-fe/src/components/PDF/ReadingTable.vue
@@ -5,93 +5,22 @@