From a822acfe31f66832eca1f787bcb4d126a66b7309 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Fri, 6 Oct 2023 23:32:36 -0400 Subject: [PATCH] emit changes --- benchtop-fe/package-lock.json | 8 +- benchtop-fe/package.json | 3 +- benchtop-fe/public/funky-lines.webp | Bin 0 -> 7180 bytes .../NewCalibrationDeviceForm.vue | 122 +++++++++---- benchtop-fe/src/components/CustomerForm.vue | 21 ++- .../src/components/EnvironmentForm.vue | 31 ++-- .../Instrument/NewInstrumentForm.vue | 166 ++++++++++++------ benchtop-fe/src/components/Sheet.vue | 54 +++++- benchtop-fe/src/components/UploadForm.vue | 9 +- benchtop-fe/src/components/_UploadForm.vue | 111 ------------ benchtop-fe/src/style.css | 12 +- 11 files changed, 293 insertions(+), 244 deletions(-) create mode 100644 benchtop-fe/public/funky-lines.webp delete mode 100644 benchtop-fe/src/components/_UploadForm.vue diff --git a/benchtop-fe/package-lock.json b/benchtop-fe/package-lock.json index 1434980..bbbb888 100644 --- a/benchtop-fe/package-lock.json +++ b/benchtop-fe/package-lock.json @@ -12,8 +12,7 @@ "@vuepic/vue-datepicker": "^7.0.0", "vls": "^0.8.5", "volar-service-vetur": "^0.0.13", - "vue": "^3.3.4", - "vue-upload-component": "^3.1.8" + "vue": "^3.3.4" }, "devDependencies": { "@vitejs/plugin-vue": "^4.2.3", @@ -2513,11 +2512,6 @@ "eslint": ">=6.0.0" } }, - "node_modules/vue-upload-component": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/vue-upload-component/-/vue-upload-component-3.1.8.tgz", - "integrity": "sha512-8LHCrgmEZPg+1hbkKjQgMce2uasmGLEnIsLE8YG+vNyfNDuaQA71T+5t6kdDSG/szeh+E8mjb26uEd9WkVSFtg==" - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/benchtop-fe/package.json b/benchtop-fe/package.json index 4d6ecb1..9cc46a5 100644 --- a/benchtop-fe/package.json +++ b/benchtop-fe/package.json @@ -13,8 +13,7 @@ "@vuepic/vue-datepicker": "^7.0.0", "vls": "^0.8.5", "volar-service-vetur": "^0.0.13", - "vue": "^3.3.4", - "vue-upload-component": "^3.1.8" + "vue": "^3.3.4" }, "devDependencies": { "@vitejs/plugin-vue": "^4.2.3", diff --git a/benchtop-fe/public/funky-lines.webp b/benchtop-fe/public/funky-lines.webp new file mode 100644 index 0000000000000000000000000000000000000000..9385220d0d7196797a9abfccdd6f25a6d7c26555 GIT binary patch literal 7180 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 literal 0 HcmV?d00001 diff --git a/benchtop-fe/src/components/CalibrationDevice/NewCalibrationDeviceForm.vue b/benchtop-fe/src/components/CalibrationDevice/NewCalibrationDeviceForm.vue index abae57e..f204175 100644 --- a/benchtop-fe/src/components/CalibrationDevice/NewCalibrationDeviceForm.vue +++ b/benchtop-fe/src/components/CalibrationDevice/NewCalibrationDeviceForm.vue @@ -3,49 +3,93 @@
- - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + +

Calibration Date

- -

Calibration Due Date

- -
Model - -
Serial # - -
+

Calibration Date

+ + 		+

Calibration Due Date

+ +
Model + +
Serial # + +
Cert ID - -
Cert ID + +
\ No newline at end of file +import VueDatePicker from "@vuepic/vue-datepicker"; +import "@vuepic/vue-datepicker/dist/main.css"; + +const + model = ref(""), + serial = ref(""), + cert_id = ref(""), + due_date = ref(""), + date = ref("") + +const flow = ref(["year", "month", "calendar"]); + +const emit = defineEmits(); +watchEffect(() => { + emit("new-calibration-form", { + model, + serial, + cert_id, + due_date, + date, + }); +}); + diff --git a/benchtop-fe/src/components/CustomerForm.vue b/benchtop-fe/src/components/CustomerForm.vue index 125ee24..aee8b30 100644 --- a/benchtop-fe/src/components/CustomerForm.vue +++ b/benchtop-fe/src/components/CustomerForm.vue @@ -34,10 +34,21 @@ \ No newline at end of file diff --git a/benchtop-fe/src/components/EnvironmentForm.vue b/benchtop-fe/src/components/EnvironmentForm.vue index de7e39a..8d3de13 100644 --- a/benchtop-fe/src/components/EnvironmentForm.vue +++ b/benchtop-fe/src/components/EnvironmentForm.vue @@ -6,14 +6,14 @@ Accuracy - + - Barometric Pressure (mbar) + Barometric Pressure (psi) - + @@ -24,7 +24,7 @@ - Humidity + Humidity (%RH) @@ -35,10 +35,21 @@ \ No newline at end of file diff --git a/benchtop-fe/src/components/Instrument/NewInstrumentForm.vue b/benchtop-fe/src/components/Instrument/NewInstrumentForm.vue index 3f14a7a..4390cc9 100644 --- a/benchtop-fe/src/components/Instrument/NewInstrumentForm.vue +++ b/benchtop-fe/src/components/Instrument/NewInstrumentForm.vue @@ -3,65 +3,121 @@
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +

Calibration Date

- -

Calibration Due Date

- -
Model - -
Serial Number - -
Channel - -
Transducer Model - -
Transducer Span - -
+

Calibration Date

+ + 		+

Calibration Due Date

+ +
Model + +
Serial Number + +
Channel + +
Transducer Model + +
Transducer Span + +
\ No newline at end of file +const + channel = ref(""), + serial_number = ref(""), + model = ref(""), + transducer_model = ref(""), + transducer_span = ref(""), + due_date = ref(""), + date = ref(""), + flow = ["year", "month", "calendar"] + +const emit = defineEmits(); +watchEffect(() => { + emit("new-instrument-form", { + channel, + serial_number, + model, + transducer_model, + transducer_span, + due_date, + date, + }); +}); + diff --git a/benchtop-fe/src/components/Sheet.vue b/benchtop-fe/src/components/Sheet.vue index 286ddb8..a48d686 100644 --- a/benchtop-fe/src/components/Sheet.vue +++ b/benchtop-fe/src/components/Sheet.vue @@ -7,19 +7,18 @@
- +
- +
- +
- +
-
@@ -32,12 +31,51 @@ import NewCalibrationDeviceForm from "./CalibrationDevice/NewCalibrationDeviceFo import EnvironmentForm from "./EnvironmentForm.vue"; import UploadForm from "./UploadForm.vue"; -const upload_form_data = ref(); +const + upload_form_data = ref(), + calibration_form_data = ref(), + customer_form_data = ref(), + environment_form_data = ref(), + new_instrument_form_data = ref(), + instrument_form_data = ref(), + new_calibration_form_data = ref() + const uploadForm = (form) => { upload_form_data.value = form; -} +}; +const customerForm = (form) => { + customer_form_data.value = form; +}; -const emits = defineEmits(["uploadForm"]); +const environmentForm = (form) => { + environment_form_data.value = form; +}; + +const newInstrumentForm = (form) => { + new_instrument_form_data.value = form; +}; + +const instrumentForm = (form) => { + instrument_form_data.value = form; +}; + +const newCalibrationForm = (form) => { + new_calibration_form_data.value = form; +}; + +const calibrationForm = (form) => { + calibration_form_data.value = form; +}; + +const emits = defineEmits([ + "uploadForm", + "customerForm", + "environmentForm", + "instrumentForm", + "newInstrumentForm", + "calibrationForm", + "newCalibrationForm", +]); diff --git a/benchtop-fe/src/components/UploadForm.vue b/benchtop-fe/src/components/UploadForm.vue index d5acf60..3172ea2 100644 --- a/benchtop-fe/src/components/UploadForm.vue +++ b/benchtop-fe/src/components/UploadForm.vue @@ -81,10 +81,11 @@ \ No newline at end of file diff --git a/benchtop-fe/src/style.css b/benchtop-fe/src/style.css index cbec394..4539eb0 100644 --- a/benchtop-fe/src/style.css +++ b/benchtop-fe/src/style.css @@ -1,5 +1,6 @@ body { margin: 1rem; + background: url("/public/funky-lines.webp") } .card { @@ -7,6 +8,9 @@ body { } .card-header{ font-size: 2rem; + color:black; + font-weight: bold; + } .container { @@ -15,7 +19,7 @@ body { align-content: space-between; /* Your container needs a fixed height, and it * needs to be taller than your tallest column. */ - height: 1300px; + height: 1200px; border-radius: 3px; counter-reset: items; @@ -34,7 +38,7 @@ body { 0 8px 8px rgba(0,90,250,0.05), 0 16px 16px rgba(0,90,250,0.05); color: #fff; - padding: 15px; + /* padding: 15px; */ box-sizing: border-box; } .item::before { @@ -53,4 +57,6 @@ body { width: 0; order: 2; } -h3 { text-align: center; } \ No newline at end of file +h3 { + text-align: center; +} \ No newline at end of file