From 38b3cc0b134477da6e6c46fe10bce0e36237d694 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Tue, 25 Jul 2023 22:05:56 -0400 Subject: [PATCH] calculations --- TODO.txt | 4 ++++ benchtopdevices/sheets/forms.py | 2 ++ benchtopdevices/sheets/models.py | 4 ++-- benchtopdevices/sheets/parsers/transducer.py | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 TODO.txt diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..6915bfd --- /dev/null +++ b/TODO.txt @@ -0,0 +1,4 @@ +TODO: + AS LEFT + AS FOUND + prompt for files. \ No newline at end of file diff --git a/benchtopdevices/sheets/forms.py b/benchtopdevices/sheets/forms.py index 7c29523..a650932 100644 --- a/benchtopdevices/sheets/forms.py +++ b/benchtopdevices/sheets/forms.py @@ -14,6 +14,7 @@ class UploadFileForm(forms.Form): temperature = forms.FloatField(widget=forms.NumberInput(attrs={'step': 0.01, 'max': 1000.0, 'min': -459.67})) humidity = forms.FloatField(widget=forms.NumberInput(attrs={'step': 0.01, 'max': 100.0, 'min': 0.0})) + CHOICES = [ ('TV', _('Transducer Verify')), ('HC', _('Hardware Calibration')) @@ -23,4 +24,5 @@ class UploadFileForm(forms.Form): widget=forms.RadioSelect, choices=CHOICES, ) + file = forms.FileField() \ No newline at end of file diff --git a/benchtopdevices/sheets/models.py b/benchtopdevices/sheets/models.py index f64c9bc..b9b5208 100644 --- a/benchtopdevices/sheets/models.py +++ b/benchtopdevices/sheets/models.py @@ -3,8 +3,8 @@ from django.db import models # Create your models here. class Configuration(models.Model): - sertial = models.CharField(max_length = 200) - description = models.TextField() + serial = models.CharField(max_length=100) + device = models.CharField(max_length=100) calibration_date = models.DateField() calibration_due_date = models.DateField() diff --git a/benchtopdevices/sheets/parsers/transducer.py b/benchtopdevices/sheets/parsers/transducer.py index 8eb5d66..64ef693 100644 --- a/benchtopdevices/sheets/parsers/transducer.py +++ b/benchtopdevices/sheets/parsers/transducer.py @@ -92,10 +92,11 @@ def parse_transducer(content, accuracy): { "Value": v, "In Range": in_range(idx, v, transducer_info["Master Value"]), + "Delta":"TODO" } for idx, v in enumerate(transducer_info[f"Instrument {transducer_type}"]) ] - + if transducer_type == "Flow": del transducer_info["Instrument Pressure"] elif transducer_type == "Pressure":