From e981595dbb575d5bc47f6ff3ba454ce11a1f8017 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Tue, 25 Feb 2020 11:42:58 -0500 Subject: [PATCH 01/53] create inital calibration app, model, and form --- config/settings/base.py | 1 + config/urls.py | 1 + roundabout/calibrations/__init__.py | 0 roundabout/calibrations/admin.py | 3 + roundabout/calibrations/apps.py | 5 + roundabout/calibrations/forms.py | 12 +++ .../calibrations/migrations/0001_initial.py | 24 +++++ .../calibrations/migrations/__init__.py | 0 roundabout/calibrations/models.py | 17 ++++ roundabout/calibrations/tests.py | 3 + roundabout/calibrations/urls.py | 8 ++ roundabout/calibrations/views.py | 41 ++++++++ .../calibrations/calibrations_form.html | 94 +++++++++++++++++++ .../inventory/ajax_inventory_detail.html | 8 ++ 14 files changed, 217 insertions(+) create mode 100644 roundabout/calibrations/__init__.py create mode 100644 roundabout/calibrations/admin.py create mode 100644 roundabout/calibrations/apps.py create mode 100644 roundabout/calibrations/forms.py create mode 100644 roundabout/calibrations/migrations/0001_initial.py create mode 100644 roundabout/calibrations/migrations/__init__.py create mode 100644 roundabout/calibrations/models.py create mode 100644 roundabout/calibrations/tests.py create mode 100644 roundabout/calibrations/urls.py create mode 100644 roundabout/calibrations/views.py create mode 100644 roundabout/templates/calibrations/calibrations_form.html diff --git a/config/settings/base.py b/config/settings/base.py index 6d317972d..ce3f6b0d5 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -107,6 +107,7 @@ 'roundabout.userdefinedfields', 'roundabout.assemblies', 'roundabout.builds', + 'roundabout.calibrations', ] # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS diff --git a/config/urls.py b/config/urls.py index 400919f02..740a7b0fc 100644 --- a/config/urls.py +++ b/config/urls.py @@ -57,6 +57,7 @@ path('builds/', include('roundabout.builds.urls', namespace='builds')), path('reports/', include('roundabout.reports.urls', namespace='reports')), path('search/', include('roundabout.search.urls', namespace='search')), + path('calibrations/', include('roundabout.calibrations.urls', namespace='calibrations')), # API urls path('api/v1/', include('roundabout.inventory.api.urls')), path('api/v1/', include('roundabout.locations.api.urls')), diff --git a/roundabout/calibrations/__init__.py b/roundabout/calibrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/roundabout/calibrations/admin.py b/roundabout/calibrations/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/roundabout/calibrations/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/roundabout/calibrations/apps.py b/roundabout/calibrations/apps.py new file mode 100644 index 000000000..68e2c2786 --- /dev/null +++ b/roundabout/calibrations/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CalibrationsConfig(AppConfig): + name = 'calibrations' diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py new file mode 100644 index 000000000..49f2ea30a --- /dev/null +++ b/roundabout/calibrations/forms.py @@ -0,0 +1,12 @@ +from django import forms +from .models import Calibration + +class CalibrationAddForm(forms.ModelForm): + + class Meta: + model = Calibration + fields = ['name', 'coefficient'] + labels = { + 'name': 'Name', + 'coefficient': 'Coefficient Value', + } \ No newline at end of file diff --git a/roundabout/calibrations/migrations/0001_initial.py b/roundabout/calibrations/migrations/0001_initial.py new file mode 100644 index 000000000..1aa758772 --- /dev/null +++ b/roundabout/calibrations/migrations/0001_initial.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.9 on 2020-02-25 16:35 + +from decimal import Decimal +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Calibration', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(db_index=True, max_length=255)), + ('coefficient', models.DecimalField(blank=True, decimal_places=2, default='0.00', max_digits=9, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])), + ], + ), + ] diff --git a/roundabout/calibrations/migrations/__init__.py b/roundabout/calibrations/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py new file mode 100644 index 000000000..54acf593b --- /dev/null +++ b/roundabout/calibrations/models.py @@ -0,0 +1,17 @@ +from django.db import models +from django.core.validators import MinValueValidator + +from decimal import Decimal + +# # Create your models here. +class Calibration(models.Model): + name = models.CharField(max_length=255, unique=False, db_index=True) + coefficient = models.DecimalField(max_digits=9, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') + + def __str__(self): + return self.name + + def get_object_type(self): + return 'calibration' + + \ No newline at end of file diff --git a/roundabout/calibrations/tests.py b/roundabout/calibrations/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/roundabout/calibrations/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/roundabout/calibrations/urls.py b/roundabout/calibrations/urls.py new file mode 100644 index 000000000..509b7605f --- /dev/null +++ b/roundabout/calibrations/urls.py @@ -0,0 +1,8 @@ +from django.urls import path + +from . import views + +app_name = 'calibrations' +urlpatterns = [ + path('ajax/add/', view=views.CalibrationsAddView.as_view(), name='calibrations_form') +] \ No newline at end of file diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py new file mode 100644 index 000000000..b68b13579 --- /dev/null +++ b/roundabout/calibrations/views.py @@ -0,0 +1,41 @@ +from django.shortcuts import render +from django.http import HttpResponse +from django.contrib.auth.mixins import LoginRequiredMixin +from django.views.generic import CreateView +from .models import Calibration +from .forms import CalibrationAddForm +from common.util.mixins import AjaxFormMixin + +# Calibraitons landing page +class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): + model = Calibration + form_class = CalibrationAddForm + context_object_name = 'calibration_item' + template_name ='calibrations/calibrations_form.html' + + def get_context_data(self, **kwargs): + context = super(CalibrationsAddView, self).get_context_data(**kwargs) + context.update({ + 'node_type': 'calibrations' + }) + return context + + def get_success_url(self): + return reverse('calibrations:calibrations_detail', args=(self.object.id,)) + + def form_valid(self, form): + self.object = form.save() + + response = HttpResponseRedirect(self.get_success_url()) + + if self.request.is_ajax(): + print(form.cleaned_data) + data = { + 'message': "Successfully submitted form data.", + 'object_id': self.object.id, + 'object_type': self.object.get_object_type(), + 'detail_path': self.get_success_url(), + } + return JsonResponse(data) + else: + return response \ No newline at end of file diff --git a/roundabout/templates/calibrations/calibrations_form.html b/roundabout/templates/calibrations/calibrations_form.html new file mode 100644 index 000000000..e20fc071a --- /dev/null +++ b/roundabout/templates/calibrations/calibrations_form.html @@ -0,0 +1,94 @@ + + +{% load static i18n %} +{% load mptt_tags %} +{% load crispy_forms_tags %} + +
+ {% if calibration_item.id %} +

{{ calibration_item.name }}

+ {% else %} +

Add Calibration

+ {% endif %} +
+ +
+ + {% if latest_flag.detail %}

Why Flagged: {{ latest_flag.detail }}

{% endif %} +
+ {% csrf_token %} + {{ form.media }} + {{ form|crispy }} + +
+ {% if form.errors %} + {% for field in form %} + {% for error in field.errors %} +
+ {{ error|escape }} +
+ {% endfor %} + {% endfor %} + {% for error in form.non_field_errors %} +
+ {{ error|escape }} +
+ {% endfor %} + {% endif %} + + +
+ +
+
+ {% if calibration_item.id %} + {% if action_type == 'movetotrash' %} + + {% else %} + + {% endif %} + {% else %} + + {% endif %} + + {% if calibration_item.id %} + + {% endif %} +
+
+
+ + +
+ + +{% block javascript %} + + +{% endblock javascript %} \ No newline at end of file diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 589df35e3..9e6671e16 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -142,6 +142,14 @@ data-location-id="{{ inventory_item.location.id}}" data-node-type="detail">Edit Inventory Details + + Add {{inventory_item.part.part_type}} calibration + + From 45dfdd1b136cbf3e04f34b5ac52c34b4267b0d0b Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Thu, 27 Feb 2020 12:06:37 -0500 Subject: [PATCH 02/53] created initial coefficient model, linked with inventory, linked calibration with part --- roundabout/calibrations/forms.py | 5 ++-- .../calibrations/migrations/0001_initial.py | 19 +++++++++++++-- roundabout/calibrations/models.py | 13 +++++++++-- roundabout/calibrations/views.py | 5 ++-- .../calibrations/calibrations_form.html | 8 ++----- .../inventory/ajax_inventory_detail.html | 23 +++++++++++++++++++ 6 files changed, 58 insertions(+), 15 deletions(-) diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index 49f2ea30a..08db8f87f 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -5,8 +5,7 @@ class CalibrationAddForm(forms.ModelForm): class Meta: model = Calibration - fields = ['name', 'coefficient'] + fields = ['name'] labels = { - 'name': 'Name', - 'coefficient': 'Coefficient Value', + 'name': 'Name' } \ No newline at end of file diff --git a/roundabout/calibrations/migrations/0001_initial.py b/roundabout/calibrations/migrations/0001_initial.py index 1aa758772..e338a8756 100644 --- a/roundabout/calibrations/migrations/0001_initial.py +++ b/roundabout/calibrations/migrations/0001_initial.py @@ -1,8 +1,10 @@ -# Generated by Django 2.2.9 on 2020-02-25 16:35 +# Generated by Django 2.2.9 on 2020-02-27 17:05 from decimal import Decimal import django.core.validators from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone class Migration(migrations.Migration): @@ -10,15 +12,28 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('inventory', '0003_auto_20191023_1347'), + ('parts', '0004_auto_20191023_1735'), ] operations = [ + migrations.CreateModel( + name='Coefficient', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(db_index=True, max_length=255)), + ('value', models.DecimalField(blank=True, decimal_places=2, default='0.00', max_digits=9, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])), + ('notes', models.TextField(blank=True)), + ('created_at', models.DateTimeField(default=django.utils.timezone.now)), + ('inventory', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient', to='inventory.Inventory')), + ], + ), migrations.CreateModel( name='Calibration', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(db_index=True, max_length=255)), - ('coefficient', models.DecimalField(blank=True, decimal_places=2, default='0.00', max_digits=9, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])), + ('part', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='calibration', to='parts.Part')), ], ), ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index 54acf593b..189c737f6 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -1,12 +1,15 @@ from django.db import models from django.core.validators import MinValueValidator +from django.utils import timezone +from roundabout.parts.models import Part +from roundabout.inventory.models import Inventory from decimal import Decimal # # Create your models here. class Calibration(models.Model): name = models.CharField(max_length=255, unique=False, db_index=True) - coefficient = models.DecimalField(max_digits=9, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') + part = models.ForeignKey(Part, related_name='calibration', on_delete=models.CASCADE, null=True) def __str__(self): return self.name @@ -14,4 +17,10 @@ def __str__(self): def get_object_type(self): return 'calibration' - \ No newline at end of file + +class Coefficient(models.Model): + name = models.CharField(max_length=255, unique=False, db_index=True) + value = models.DecimalField(max_digits=9, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') + notes = models.TextField(blank=True) + created_at = models.DateTimeField(default=timezone.now) + inventory = models.ForeignKey(Inventory, related_name='coefficient', on_delete=models.CASCADE, null=True) \ No newline at end of file diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index b68b13579..d60db7bb2 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -1,10 +1,11 @@ from django.shortcuts import render -from django.http import HttpResponse +from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView from .models import Calibration from .forms import CalibrationAddForm from common.util.mixins import AjaxFormMixin +from django.urls import reverse, reverse_lazy # Calibraitons landing page class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): @@ -21,7 +22,7 @@ def get_context_data(self, **kwargs): return context def get_success_url(self): - return reverse('calibrations:calibrations_detail', args=(self.object.id,)) + return reverse('calibrations:calibrations_form') def form_valid(self, form): self.object = form.save() diff --git a/roundabout/templates/calibrations/calibrations_form.html b/roundabout/templates/calibrations/calibrations_form.html index e20fc071a..892d627d3 100644 --- a/roundabout/templates/calibrations/calibrations_form.html +++ b/roundabout/templates/calibrations/calibrations_form.html @@ -34,12 +34,8 @@

Add Calibration

{% if latest_flag.detail %}

Why Flagged: {{ latest_flag.detail }}

{% endif %} -
+ {% csrf_token %} {{ form.media }} {{ form|crispy }} diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 9e6671e16..ddd120a3a 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -298,6 +298,12 @@ Part Specs + +
  • + {{inventory_item.part.part_type}} Calibration +
    • + +
    @@ -480,6 +486,23 @@
    {{ inventory_item.assembly_part.assembly }}
    +
    + + + + + + + + + {% for calibration in inventory_item.part.calibrations.all %} + + + + {% endfor %} + +
    Name
    {{ calibration.name }}
    +
    From f044e558f8c13b4e90f5b80b339bfe048b97ccf1 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Thu, 5 Mar 2020 09:16:11 -0500 Subject: [PATCH 03/53] remove name from coefficient model, add calibration inline factory to part form --- .../0002_remove_coefficient_name.py | 17 ++++++++++ roundabout/calibrations/models.py | 9 +++-- roundabout/parts/forms.py | 2 ++ roundabout/parts/views.py | 5 +-- .../inventory/ajax_inventory_detail.html | 2 +- .../templates/parts/ajax_part_form.html | 33 +++++++++++++++++++ 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 roundabout/calibrations/migrations/0002_remove_coefficient_name.py diff --git a/roundabout/calibrations/migrations/0002_remove_coefficient_name.py b/roundabout/calibrations/migrations/0002_remove_coefficient_name.py new file mode 100644 index 000000000..c3924d9bd --- /dev/null +++ b/roundabout/calibrations/migrations/0002_remove_coefficient_name.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.9 on 2020-03-05 14:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0001_initial'), + ] + + operations = [ + migrations.RemoveField( + model_name='coefficient', + name='name', + ), + ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index 189c737f6..2c52cebd0 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -19,8 +19,13 @@ def get_object_type(self): class Coefficient(models.Model): - name = models.CharField(max_length=255, unique=False, db_index=True) value = models.DecimalField(max_digits=9, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') notes = models.TextField(blank=True) created_at = models.DateTimeField(default=timezone.now) - inventory = models.ForeignKey(Inventory, related_name='coefficient', on_delete=models.CASCADE, null=True) \ No newline at end of file + inventory = models.ForeignKey(Inventory, related_name='coefficient', on_delete=models.CASCADE, null=True) + + def __str__(self): + return self.name + + def get_object_type(self): + return 'calibration' \ No newline at end of file diff --git a/roundabout/parts/forms.py b/roundabout/parts/forms.py index afd6ae380..193940832 100644 --- a/roundabout/parts/forms.py +++ b/roundabout/parts/forms.py @@ -33,6 +33,7 @@ from roundabout.locations.models import Location from roundabout.parts.widgets import PartParentWidget, PartLocationWidget from roundabout.userdefinedfields.models import Field, FieldValue +from roundabout.calibrations.models import Calibration, Coefficient class PartForm(forms.ModelForm): @@ -60,6 +61,7 @@ def clean_part_number(self): 'note': SummernoteWidget(), }, extra=1, can_delete=False) DocumentationFormset = inlineformset_factory(Revision, Documentation, fields=('name', 'doc_type', 'doc_link'), extra=1, can_delete=True) +CalibrationFormset = inlineformset_factory(Part, Calibration, fields=('name',), extra=1, can_delete=True) class RevisionForm(forms.ModelForm): diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index 64334a052..068d299d9 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -31,7 +31,7 @@ from django.template.defaultfilters import slugify from .models import Part, PartType, Revision, Documentation -from .forms import PartForm, PartTypeForm, RevisionForm, DocumentationFormset, RevisionFormset, PartUdfAddFieldForm, PartUdfFieldSetValueForm +from .forms import PartForm, PartTypeForm, RevisionForm, DocumentationFormset, RevisionFormset, PartUdfAddFieldForm, PartUdfFieldSetValueForm, CalibrationFormset from roundabout.locations.models import Location from roundabout.inventory.models import Inventory @@ -141,7 +141,8 @@ def get(self, request, *args, **kwargs): form = self.get_form(form_class) revision_form = RevisionFormset(instance=self.object) documentation_form = DocumentationFormset(instance=self.object) - return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form)) + calibration_form = CalibrationFormset(instance=self.object) + return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form)) def post(self, request, *args, **kwargs): self.object = None diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index ddd120a3a..d424a162e 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -300,7 +300,7 @@
  • - {{inventory_item.part.part_type}} Calibration + Calibrations
    • diff --git a/roundabout/templates/parts/ajax_part_form.html b/roundabout/templates/parts/ajax_part_form.html index d34d422e9..bf0c36ad7 100644 --- a/roundabout/templates/parts/ajax_part_form.html +++ b/roundabout/templates/parts/ajax_part_form.html @@ -142,6 +142,39 @@
    Revision Documentation
    {% endif %} +
    +
    Calibrations
    + + + + + + {{ calibration_form.management_form }} + + {% if calibration_form.errors %} + +
    + {% for dict in calibration_form.errors %} + + {% for error in dict.values %} + {{ error|escape }} + {% endfor %} + + {% endfor %} +
    + + {% endif %} + + {% for cal in calibration_form %} + + + + + {% endfor %} + +
    Name
    {% if cal.id %}{{ cal.DELETE }}{% endif %} {{ cal.id }} {{ cal.name }}
    +
    +
    {% if part_template.id %} From 411493590268757b7a3915a5a6fa513f2a625631 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Thu, 5 Mar 2020 15:59:15 -0500 Subject: [PATCH 04/53] part creation form allows multiple calibration inputs --- roundabout/parts/views.py | 18 ++++++++++++------ .../templates/parts/ajax_part_detail.html | 14 ++++++++++++++ roundabout/templates/parts/ajax_part_form.html | 6 +++++- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index 068d299d9..0df9cfe06 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -152,12 +152,14 @@ def post(self, request, *args, **kwargs): self.request.POST, instance=self.object) documentation_form = DocumentationFormset( self.request.POST, instance=self.object) + calibration_form = CalibrationFormset( + self.request.POST, instance=self.object) - if (form.is_valid() and revision_form.is_valid() and documentation_form.is_valid()): - return self.form_valid(form, revision_form, documentation_form) - return self.form_invalid(form, revision_form, documentation_form) + if (form.is_valid() and revision_form.is_valid() and documentation_form.is_valid() and calibration_form.is_valid()): + return self.form_valid(form, revision_form, documentation_form, calibration_form) + return self.form_invalid(form, revision_form, documentation_form, calibration_form) - def form_valid(self, form, revision_form, documentation_form): + def form_valid(self, form, revision_form, documentation_form, calibration_form): self.object = form.save() # Save the Revision inline model form revision_form.instance = self.object @@ -174,6 +176,10 @@ def form_valid(self, form, revision_form, documentation_form): # instance.revision = revision documentation_form.save() + # Save Calibration form + calibration_form.instance = self.object + calibration_form.save() + # Check for any global Part Type custom fields for this Part custom_fields = self.object.part_type.custom_fields.all() @@ -195,14 +201,14 @@ def form_valid(self, form, revision_form, documentation_form): else: return response - def form_invalid(self, form, documentation_form): + def form_invalid(self, form, documentation_form, calibration_form): form_errors = documentation_form.errors if self.request.is_ajax(): data = form.errors return JsonResponse(data, status=400) else: - return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, form_errors=form_errors)) + return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, form_errors=form_errors)) def get_success_url(self): return reverse('parts:ajax_parts_detail', args=(self.object.id, )) diff --git a/roundabout/templates/parts/ajax_part_detail.html b/roundabout/templates/parts/ajax_part_detail.html index bd2d3bd92..f22591e61 100644 --- a/roundabout/templates/parts/ajax_part_detail.html +++ b/roundabout/templates/parts/ajax_part_detail.html @@ -207,6 +207,20 @@

    Custom Fields

    {% endfor %} +
    + + + +

    Calibrations

    + +
      + {% for calibration in part_template.calibration.all %} +
    • + {{ calibration.name }} +
      • + {% endfor %} +
    +
    diff --git a/roundabout/templates/parts/ajax_part_form.html b/roundabout/templates/parts/ajax_part_form.html index bf0c36ad7..f5ec8af2f 100644 --- a/roundabout/templates/parts/ajax_part_form.html +++ b/roundabout/templates/parts/ajax_part_form.html @@ -213,7 +213,11 @@
    Calibrations
    addText: 'add document', deleteText: 'remove', }); - + $('.calibration-form tbody tr').formset({ + prefix: 'calibration', + addText: 'add calibration', + deleteText: 'remove', + }); // AJAX functions for form $("#id_part_number").on("blur", function(){ From d141686e815a0642fa2f65a6817506faf2846f4d Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Wed, 11 Mar 2020 08:51:44 -0400 Subject: [PATCH 05/53] add coefficient formset to part and inventory detail templates --- .../0003_coefficient_calibration.py | 19 ++++++ roundabout/calibrations/models.py | 5 +- roundabout/parts/forms.py | 2 + roundabout/parts/views.py | 28 +++++--- .../inventory/ajax_inventory_detail.html | 16 +++-- .../templates/parts/ajax_part_detail.html | 28 +++++--- .../templates/parts/ajax_part_form.html | 67 ++++++++++--------- 7 files changed, 112 insertions(+), 53 deletions(-) create mode 100644 roundabout/calibrations/migrations/0003_coefficient_calibration.py diff --git a/roundabout/calibrations/migrations/0003_coefficient_calibration.py b/roundabout/calibrations/migrations/0003_coefficient_calibration.py new file mode 100644 index 000000000..097755517 --- /dev/null +++ b/roundabout/calibrations/migrations/0003_coefficient_calibration.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.9 on 2020-03-09 15:56 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0002_remove_coefficient_name'), + ] + + operations = [ + migrations.AddField( + model_name='coefficient', + name='calibration', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient', to='calibrations.Calibration'), + ), + ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index 2c52cebd0..bfdc2af85 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -23,9 +23,10 @@ class Coefficient(models.Model): notes = models.TextField(blank=True) created_at = models.DateTimeField(default=timezone.now) inventory = models.ForeignKey(Inventory, related_name='coefficient', on_delete=models.CASCADE, null=True) + calibration = models.ForeignKey(Calibration, related_name='coefficient', on_delete=models.CASCADE, null=True) def __str__(self): - return self.name + return self.value def get_object_type(self): - return 'calibration' \ No newline at end of file + return 'coefficient' \ No newline at end of file diff --git a/roundabout/parts/forms.py b/roundabout/parts/forms.py index 193940832..a84283a3f 100644 --- a/roundabout/parts/forms.py +++ b/roundabout/parts/forms.py @@ -34,6 +34,7 @@ from roundabout.parts.widgets import PartParentWidget, PartLocationWidget from roundabout.userdefinedfields.models import Field, FieldValue from roundabout.calibrations.models import Calibration, Coefficient +from roundabout.inventory.models import Inventory class PartForm(forms.ModelForm): @@ -62,6 +63,7 @@ def clean_part_number(self): }, extra=1, can_delete=False) DocumentationFormset = inlineformset_factory(Revision, Documentation, fields=('name', 'doc_type', 'doc_link'), extra=1, can_delete=True) CalibrationFormset = inlineformset_factory(Part, Calibration, fields=('name',), extra=1, can_delete=True) +CoefficientFormset = inlineformset_factory(Calibration, Coefficient, fields=('value','notes',), extra=1, can_delete=True) class RevisionForm(forms.ModelForm): diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index 0df9cfe06..b3a386ec3 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -31,7 +31,7 @@ from django.template.defaultfilters import slugify from .models import Part, PartType, Revision, Documentation -from .forms import PartForm, PartTypeForm, RevisionForm, DocumentationFormset, RevisionFormset, PartUdfAddFieldForm, PartUdfFieldSetValueForm, CalibrationFormset +from .forms import PartForm, PartTypeForm, RevisionForm, DocumentationFormset, RevisionFormset, PartUdfAddFieldForm, PartUdfFieldSetValueForm, CalibrationFormset, CoefficientFormset from roundabout.locations.models import Location from roundabout.inventory.models import Inventory @@ -142,7 +142,8 @@ def get(self, request, *args, **kwargs): revision_form = RevisionFormset(instance=self.object) documentation_form = DocumentationFormset(instance=self.object) calibration_form = CalibrationFormset(instance=self.object) - return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form)) + coefficient_form = CoefficientFormset(instance=self.object) + return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, coefficient_form=coefficient_form)) def post(self, request, *args, **kwargs): self.object = None @@ -154,12 +155,14 @@ def post(self, request, *args, **kwargs): self.request.POST, instance=self.object) calibration_form = CalibrationFormset( self.request.POST, instance=self.object) + coefficient_form = CoefficientFormset( + self.request.POST, instance=self.object) - if (form.is_valid() and revision_form.is_valid() and documentation_form.is_valid() and calibration_form.is_valid()): - return self.form_valid(form, revision_form, documentation_form, calibration_form) - return self.form_invalid(form, revision_form, documentation_form, calibration_form) + if (form.is_valid() and revision_form.is_valid() and documentation_form.is_valid() and calibration_form.is_valid() and coefficient_form.is_valid()): + return self.form_valid(form, revision_form, documentation_form, calibration_form, coefficient_form) + return self.form_invalid(form, revision_form, documentation_form, calibration_form, coefficient_form) - def form_valid(self, form, revision_form, documentation_form, calibration_form): + def form_valid(self, form, revision_form, documentation_form, calibration_form, coefficient_form): self.object = form.save() # Save the Revision inline model form revision_form.instance = self.object @@ -178,7 +181,14 @@ def form_valid(self, form, revision_form, documentation_form, calibration_form): # Save Calibration form calibration_form.instance = self.object - calibration_form.save() + saved_cals = calibration_form.save() + + # Save Coefficient form + for cal in saved_cals: + coefficient_form.instance = cal + coefficient_form.save() + + # Check for any global Part Type custom fields for this Part custom_fields = self.object.part_type.custom_fields.all() @@ -201,14 +211,14 @@ def form_valid(self, form, revision_form, documentation_form, calibration_form): else: return response - def form_invalid(self, form, documentation_form, calibration_form): + def form_invalid(self, form, documentation_form, calibration_form, coefficient_form): form_errors = documentation_form.errors if self.request.is_ajax(): data = form.errors return JsonResponse(data, status=400) else: - return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, form_errors=form_errors)) + return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, coefficient_form=coefficient_form, form_errors=form_errors)) def get_success_url(self): return reverse('parts:ajax_parts_detail', args=(self.object.id, )) diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index d424a162e..509a7b8b0 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -300,7 +300,7 @@
  • - Calibrations + Calibration Coefficient History
    • @@ -492,14 +492,22 @@
    {{ inventory_item.assembly_part.assembly }}
    Name + Value + Notes + Created - {% for calibration in inventory_item.part.calibrations.all %} + {% for cal in inventory_item.part.calibration.all %} + {% for coeff in cal.coefficient.all %} - {{ calibration.name }} + {{ cal.name }} + {{ coeff.value }} + {{ coeff.notes }} + {{ coeff.created_at }} - {% endfor %} + {% endfor %} + {% endfor %}
    diff --git a/roundabout/templates/parts/ajax_part_detail.html b/roundabout/templates/parts/ajax_part_detail.html index f22591e61..722865979 100644 --- a/roundabout/templates/parts/ajax_part_detail.html +++ b/roundabout/templates/parts/ajax_part_detail.html @@ -212,14 +212,26 @@

    Custom Fields

    Calibrations

    - -
      - {% for calibration in part_template.calibration.all %} -
    • - {{ calibration.name }} -
      • - {% endfor %} -
    + + + + + + + + + {% for cal in part_template.calibration.all %} + {% for coeff in cal.coefficient.all %} + + + + + + + {% endfor %} + {% endfor %} + +
    NameValueNotesCreated
    {{ cal.name }}{{ coeff.value }}{{ coeff.notes }}{{ coeff.created_at }}
    diff --git a/roundabout/templates/parts/ajax_part_form.html b/roundabout/templates/parts/ajax_part_form.html index f5ec8af2f..962ca6f0d 100644 --- a/roundabout/templates/parts/ajax_part_form.html +++ b/roundabout/templates/parts/ajax_part_form.html @@ -144,36 +144,43 @@
    Revision Documentation
    Calibrations
    - - - - - - {{ calibration_form.management_form }} - - {% if calibration_form.errors %} - -
    - {% for dict in calibration_form.errors %} - - {% for error in dict.values %} - {{ error|escape }} - {% endfor %} - - {% endfor %} -
    - - {% endif %} - - {% for cal in calibration_form %} - - - - - {% endfor %} - -
    Name
    {% if cal.id %}{{ cal.DELETE }}{% endif %} {{ cal.id }} {{ cal.name }}
    -
    + + + + + + + + {{ calibration_form.management_form }} + {{ coefficient_form.management_form }} + + {% if calibration_form.errors %} + +
    + {% for dict in calibration_form.errors %} + + {% for error in dict.values %} + {{ error|escape }} + {% endfor %} + + {% endfor %} +
    + + {% endif %} + + {% for cal in calibration_form %} + {% for coeff in coefficient_form %} + + + + + + + {% endfor %} + {% endfor %} + +
    NameValueNotes
    {% if cal.id %}{{ cal.DELETE }}{% endif %} {{ cal.id }} {{ cal.name }}{{ cal.id }} {{ coeff.value }}{{ cal.id }} {{ coeff.notes }}
    +
    From 44315fcb1d373fad13327a680df28159884201ef Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Fri, 13 Mar 2020 20:26:43 -0400 Subject: [PATCH 06/53] modified Calibration and Coefficient models, added Calibration Event model, modified references --- roundabout/calibrations/forms.py | 8 +-- .../migrations/0004_auto_20200313_2300.py | 67 +++++++++++++++++++ roundabout/calibrations/models.py | 47 +++++++++---- roundabout/calibrations/views.py | 4 +- roundabout/parts/forms.py | 5 +- roundabout/parts/views.py | 26 +++---- .../inventory/ajax_inventory_detail.html | 12 +--- .../templates/parts/ajax_part_detail.html | 16 ++--- .../templates/parts/ajax_part_form.html | 11 +-- 9 files changed, 126 insertions(+), 70 deletions(-) create mode 100644 roundabout/calibrations/migrations/0004_auto_20200313_2300.py diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index 08db8f87f..b2d48cfa2 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -1,11 +1,11 @@ from django import forms -from .models import Calibration +from .models import CoefficientName class CalibrationAddForm(forms.ModelForm): class Meta: - model = Calibration - fields = ['name'] + model = CoefficientName + fields = ['calibration_name'] labels = { - 'name': 'Name' + 'calibration_name': 'Name' } \ No newline at end of file diff --git a/roundabout/calibrations/migrations/0004_auto_20200313_2300.py b/roundabout/calibrations/migrations/0004_auto_20200313_2300.py new file mode 100644 index 000000000..28ffe1242 --- /dev/null +++ b/roundabout/calibrations/migrations/0004_auto_20200313_2300.py @@ -0,0 +1,67 @@ +# Generated by Django 2.2.9 on 2020-03-13 23:00 + +from decimal import Decimal +from django.conf import settings +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('parts', '0004_auto_20191023_1735'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('inventory', '0003_auto_20191023_1347'), + ('calibrations', '0003_coefficient_calibration'), + ] + + operations = [ + migrations.CreateModel( + name='CalibrationEvent', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(default=django.utils.timezone.now)), + ('calibration_date', models.DateTimeField(default=django.utils.timezone.now)), + ('approved', models.BooleanField(choices=[(True, 'Approved'), (False, 'Draft')], default=False)), + ('deployment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='calibration_events', to='inventory.Deployment')), + ('inventory', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='calibration_events', to='inventory.Inventory')), + ('user_approver', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='calibration_events_approver', to=settings.AUTH_USER_MODEL)), + ('user_draft', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='calibration_events_drafter', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='CoefficientName', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('calibration_name', models.CharField(db_index=True, max_length=255)), + ('part', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_names', to='parts.Part')), + ], + ), + migrations.CreateModel( + name='CoefficientValue', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.DecimalField(blank=True, decimal_places=2, default='0.00', max_digits=9, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])), + ('notes', models.TextField(blank=True)), + ('created_at', models.DateTimeField(default=django.utils.timezone.now)), + ('calibration_event', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_values', to='calibrations.CalibrationEvent')), + ('coefficient_name', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_values', to='calibrations.CoefficientName')), + ], + ), + migrations.RemoveField( + model_name='coefficient', + name='calibration', + ), + migrations.RemoveField( + model_name='coefficient', + name='inventory', + ), + migrations.DeleteModel( + name='Calibration', + ), + migrations.DeleteModel( + name='Coefficient', + ), + ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index bfdc2af85..c60bb9f5a 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -2,31 +2,54 @@ from django.core.validators import MinValueValidator from django.utils import timezone from roundabout.parts.models import Part -from roundabout.inventory.models import Inventory - +from roundabout.inventory.models import Inventory, Deployment +from roundabout.users.models import User from decimal import Decimal -# # Create your models here. -class Calibration(models.Model): - name = models.CharField(max_length=255, unique=False, db_index=True) - part = models.ForeignKey(Part, related_name='calibration', on_delete=models.CASCADE, null=True) + +class CoefficientName(models.Model): + calibration_name = models.CharField(max_length=255, unique=False, db_index=True) + part = models.ForeignKey(Part, related_name='coefficient_names', on_delete=models.CASCADE, null=True) + + def __str__(self): + return self.name + + def get_object_type(self): + return 'coefficient_name' + + +class CalibrationEvent(models.Model): + APPROVAL_STATUS = ( + (True, "Approved"), + (False, "Draft"), + ) + created_at = models.DateTimeField(default=timezone.now) + calibration_date = models.DateTimeField(default=timezone.now) + user_draft = models.ForeignKey(User, related_name='calibration_events_drafter', + on_delete=models.SET_NULL, null=True, blank=False) + user_approver = models.ForeignKey(User, related_name='calibration_events_approver', + on_delete=models.SET_NULL, null=True, blank=False) + inventory = models.ForeignKey(Inventory, related_name='calibration_events', on_delete=models.CASCADE, null=False) + deployment = models.ForeignKey(Deployment, related_name='calibration_events', on_delete=models.CASCADE, null=True) + approved = models.BooleanField(choices=APPROVAL_STATUS, blank=False, default=False) def __str__(self): return self.name def get_object_type(self): - return 'calibration' - + return 'calibration_event' + + -class Coefficient(models.Model): +class CoefficientValue(models.Model): value = models.DecimalField(max_digits=9, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') notes = models.TextField(blank=True) created_at = models.DateTimeField(default=timezone.now) - inventory = models.ForeignKey(Inventory, related_name='coefficient', on_delete=models.CASCADE, null=True) - calibration = models.ForeignKey(Calibration, related_name='coefficient', on_delete=models.CASCADE, null=True) + coefficient_name = models.ForeignKey(CoefficientName, related_name='coefficient_values', on_delete=models.CASCADE, null=True) + calibration_event = models.ForeignKey(CalibrationEvent, related_name='coefficient_values', on_delete=models.CASCADE, null=True) def __str__(self): return self.value def get_object_type(self): - return 'coefficient' \ No newline at end of file + return 'coefficient_value' diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index d60db7bb2..288177f45 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -2,14 +2,14 @@ from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView -from .models import Calibration +from .models import CoefficientName from .forms import CalibrationAddForm from common.util.mixins import AjaxFormMixin from django.urls import reverse, reverse_lazy # Calibraitons landing page class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): - model = Calibration + model = CoefficientName form_class = CalibrationAddForm context_object_name = 'calibration_item' template_name ='calibrations/calibrations_form.html' diff --git a/roundabout/parts/forms.py b/roundabout/parts/forms.py index a84283a3f..4bd97ee63 100644 --- a/roundabout/parts/forms.py +++ b/roundabout/parts/forms.py @@ -33,7 +33,7 @@ from roundabout.locations.models import Location from roundabout.parts.widgets import PartParentWidget, PartLocationWidget from roundabout.userdefinedfields.models import Field, FieldValue -from roundabout.calibrations.models import Calibration, Coefficient +from roundabout.calibrations.models import CoefficientName from roundabout.inventory.models import Inventory @@ -62,8 +62,7 @@ def clean_part_number(self): 'note': SummernoteWidget(), }, extra=1, can_delete=False) DocumentationFormset = inlineformset_factory(Revision, Documentation, fields=('name', 'doc_type', 'doc_link'), extra=1, can_delete=True) -CalibrationFormset = inlineformset_factory(Part, Calibration, fields=('name',), extra=1, can_delete=True) -CoefficientFormset = inlineformset_factory(Calibration, Coefficient, fields=('value','notes',), extra=1, can_delete=True) +CalibrationFormset = inlineformset_factory(Part, CoefficientName, fields=('calibration_name',), extra=1, can_delete=True) class RevisionForm(forms.ModelForm): diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index b3a386ec3..f03fcabbf 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -31,7 +31,7 @@ from django.template.defaultfilters import slugify from .models import Part, PartType, Revision, Documentation -from .forms import PartForm, PartTypeForm, RevisionForm, DocumentationFormset, RevisionFormset, PartUdfAddFieldForm, PartUdfFieldSetValueForm, CalibrationFormset, CoefficientFormset +from .forms import PartForm, PartTypeForm, RevisionForm, DocumentationFormset, RevisionFormset, PartUdfAddFieldForm, PartUdfFieldSetValueForm, CalibrationFormset from roundabout.locations.models import Location from roundabout.inventory.models import Inventory @@ -142,8 +142,7 @@ def get(self, request, *args, **kwargs): revision_form = RevisionFormset(instance=self.object) documentation_form = DocumentationFormset(instance=self.object) calibration_form = CalibrationFormset(instance=self.object) - coefficient_form = CoefficientFormset(instance=self.object) - return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, coefficient_form=coefficient_form)) + return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form)) def post(self, request, *args, **kwargs): self.object = None @@ -155,14 +154,12 @@ def post(self, request, *args, **kwargs): self.request.POST, instance=self.object) calibration_form = CalibrationFormset( self.request.POST, instance=self.object) - coefficient_form = CoefficientFormset( - self.request.POST, instance=self.object) - if (form.is_valid() and revision_form.is_valid() and documentation_form.is_valid() and calibration_form.is_valid() and coefficient_form.is_valid()): - return self.form_valid(form, revision_form, documentation_form, calibration_form, coefficient_form) - return self.form_invalid(form, revision_form, documentation_form, calibration_form, coefficient_form) + if (form.is_valid() and revision_form.is_valid() and documentation_form.is_valid() and calibration_form.is_valid()): + return self.form_valid(form, revision_form, documentation_form, calibration_form) + return self.form_invalid(form, revision_form, documentation_form, calibration_form) - def form_valid(self, form, revision_form, documentation_form, calibration_form, coefficient_form): + def form_valid(self, form, revision_form, documentation_form, calibration_form): self.object = form.save() # Save the Revision inline model form revision_form.instance = self.object @@ -183,13 +180,6 @@ def form_valid(self, form, revision_form, documentation_form, calibration_form, calibration_form.instance = self.object saved_cals = calibration_form.save() - # Save Coefficient form - for cal in saved_cals: - coefficient_form.instance = cal - coefficient_form.save() - - - # Check for any global Part Type custom fields for this Part custom_fields = self.object.part_type.custom_fields.all() @@ -211,14 +201,14 @@ def form_valid(self, form, revision_form, documentation_form, calibration_form, else: return response - def form_invalid(self, form, documentation_form, calibration_form, coefficient_form): + def form_invalid(self, form, documentation_form, calibration_form): form_errors = documentation_form.errors if self.request.is_ajax(): data = form.errors return JsonResponse(data, status=400) else: - return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, coefficient_form=coefficient_form, form_errors=form_errors)) + return self.render_to_response(self.get_context_data(form=form, revision_form=revision_form, documentation_form=documentation_form, calibration_form=calibration_form, form_errors=form_errors)) def get_success_url(self): return reverse('parts:ajax_parts_detail', args=(self.object.id, )) diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 509a7b8b0..023acc442 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -492,22 +492,14 @@
    {{ inventory_item.assembly_part.assembly }}
    Name - Value - Notes - Created - {% for cal in inventory_item.part.calibration.all %} - {% for coeff in cal.coefficient.all %} + {% for cal in inventory_item.part.coefficient_names.all %} - {{ cal.name }} - {{ coeff.value }} - {{ coeff.notes }} - {{ coeff.created_at }} + {{ cal.calibration_name }} {% endfor %} - {% endfor %}
    diff --git a/roundabout/templates/parts/ajax_part_detail.html b/roundabout/templates/parts/ajax_part_detail.html index 722865979..a20513378 100644 --- a/roundabout/templates/parts/ajax_part_detail.html +++ b/roundabout/templates/parts/ajax_part_detail.html @@ -215,20 +215,12 @@

    Calibrations

    - - - - {% for cal in part_template.calibration.all %} - {% for coeff in cal.coefficient.all %} - - - - - - - {% endfor %} + {% for cal in part_template.coefficient_names.all %} + + + {% endfor %}
    NameValueNotesCreated
    {{ cal.name }}{{ coeff.value }}{{ coeff.notes }}{{ coeff.created_at }}
    {{ cal.calibration_name }}
    diff --git a/roundabout/templates/parts/ajax_part_form.html b/roundabout/templates/parts/ajax_part_form.html index 962ca6f0d..f7a94f4e5 100644 --- a/roundabout/templates/parts/ajax_part_form.html +++ b/roundabout/templates/parts/ajax_part_form.html @@ -147,12 +147,9 @@
    Calibrations
    - - {{ calibration_form.management_form }} - {{ coefficient_form.management_form }} {% if calibration_form.errors %} @@ -169,15 +166,11 @@
    Calibrations
    {% endif %} {% for cal in calibration_form %} - {% for coeff in coefficient_form %} - - - + {% endfor %} - {% endfor %}
    NameValueNotes
    {% if cal.id %}{{ cal.DELETE }}{% endif %} {{ cal.id }} {{ cal.name }}{{ cal.id }} {{ coeff.value }}{{ cal.id }} {{ coeff.notes }}{% if cal.id %}{{ cal.DELETE }}{% endif %} {{ cal.id }} {{ cal.calibration_name }}
    @@ -221,7 +214,7 @@
    Calibrations
    deleteText: 'remove', }); $('.calibration-form tbody tr').formset({ - prefix: 'calibration', + prefix: 'coefficient_names', addText: 'add calibration', deleteText: 'remove', }); From a85ee17768cf376e2dcd94012681f3d5fdefaaa3 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Mon, 16 Mar 2020 16:07:46 -0400 Subject: [PATCH 07/53] included coefficient name to the coefficient value form, obtained inventory item for calibration event instance, first pass at populating calibration event model --- roundabout/calibrations/forms.py | 15 +++-- roundabout/calibrations/models.py | 24 +++---- roundabout/calibrations/views.py | 63 ++++++++++++++----- .../calibrations/calibrations_form.html | 1 + .../inventory/ajax_inventory_detail.html | 12 +++- 5 files changed, 83 insertions(+), 32 deletions(-) diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index b2d48cfa2..675a6073c 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -1,11 +1,16 @@ from django import forms -from .models import CoefficientName +from .models import CoefficientName, CoefficientValue +from django.forms.models import inlineformset_factory class CalibrationAddForm(forms.ModelForm): class Meta: - model = CoefficientName - fields = ['calibration_name'] + model = CoefficientValue + fields = ['coefficient_name', 'value', 'notes'] labels = { - 'calibration_name': 'Name' - } \ No newline at end of file + 'coefficient_name': 'Name', + 'value': 'Value', + 'notes': 'Notes' + } + +CoefficientFormset = inlineformset_factory(CoefficientName, CoefficientValue, fields=('value','notes',), extra=1, can_delete=True) \ No newline at end of file diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index c60bb9f5a..89a2ccb01 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -12,7 +12,7 @@ class CoefficientName(models.Model): part = models.ForeignKey(Part, related_name='coefficient_names', on_delete=models.CASCADE, null=True) def __str__(self): - return self.name + return self.calibration_name def get_object_type(self): return 'coefficient_name' @@ -20,36 +20,38 @@ def get_object_type(self): class CalibrationEvent(models.Model): APPROVAL_STATUS = ( - (True, "Approved"), - (False, "Draft"), + (True, "Approved"), + (False, "Draft"), ) created_at = models.DateTimeField(default=timezone.now) calibration_date = models.DateTimeField(default=timezone.now) user_draft = models.ForeignKey(User, related_name='calibration_events_drafter', - on_delete=models.SET_NULL, null=True, blank=False) + on_delete=models.SET_NULL, null=True, blank=False) user_approver = models.ForeignKey(User, related_name='calibration_events_approver', - on_delete=models.SET_NULL, null=True, blank=False) + on_delete=models.SET_NULL, null=True, blank=False) inventory = models.ForeignKey(Inventory, related_name='calibration_events', on_delete=models.CASCADE, null=False) deployment = models.ForeignKey(Deployment, related_name='calibration_events', on_delete=models.CASCADE, null=True) approved = models.BooleanField(choices=APPROVAL_STATUS, blank=False, default=False) def __str__(self): - return self.name + return self.calibration_date def get_object_type(self): return 'calibration_event' - class CoefficientValue(models.Model): - value = models.DecimalField(max_digits=9, decimal_places=2, validators=[MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') + value = models.DecimalField(max_digits=9, decimal_places=2, validators=[ + MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') notes = models.TextField(blank=True) created_at = models.DateTimeField(default=timezone.now) - coefficient_name = models.ForeignKey(CoefficientName, related_name='coefficient_values', on_delete=models.CASCADE, null=True) - calibration_event = models.ForeignKey(CalibrationEvent, related_name='coefficient_values', on_delete=models.CASCADE, null=True) + coefficient_name = models.ForeignKey( + CoefficientName, related_name='coefficient_values', on_delete=models.CASCADE, null=True) + calibration_event = models.ForeignKey( + CalibrationEvent, related_name='coefficient_values', on_delete=models.CASCADE, null=True) def __str__(self): - return self.value + return self.notes def get_object_type(self): return 'coefficient_value' diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index 288177f45..a19b04b22 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -2,31 +2,54 @@ from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView -from .models import CoefficientName -from .forms import CalibrationAddForm +from .models import CoefficientName, CalibrationEvent +from .forms import CalibrationAddForm, CoefficientFormset from common.util.mixins import AjaxFormMixin from django.urls import reverse, reverse_lazy +from roundabout.parts.models import Part +from roundabout.users.models import User +from roundabout.inventory.models import Inventory # Calibraitons landing page class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): model = CoefficientName form_class = CalibrationAddForm - context_object_name = 'calibration_item' - template_name ='calibrations/calibrations_form.html' + context_object_name = 'part_template' + template_name='calibrations/calibrations_form.html' - def get_context_data(self, **kwargs): - context = super(CalibrationsAddView, self).get_context_data(**kwargs) - context.update({ - 'node_type': 'calibrations' - }) - return context + def get(self, request, *args, **kwargs): + self.object = None + form_class = self.get_form_class() + form = self.get_form(form_class) + coefficient_form = CoefficientFormset(instance=self.object) - def get_success_url(self): - return reverse('calibrations:calibrations_form') + return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form)) + + def post(self, request, *args, **kwargs): + self.object = None + form_class = self.get_form_class() + form = self.get_form(form_class) + + coefficient_form = CoefficientFormset( + self.request.POST, instance=self.object) - def form_valid(self, form): + if (form.is_valid() and coefficient_form.is_valid()): + return self.form_valid(form, coefficient_form) + return self.form_invalid(form, coefficient_form) + + def form_valid(self, form, coefficient_form): self.object = form.save() + # Save CoefficientValue form using CoefficientName instance + calibration_name = form.cleaned_data['coefficient_name'] + coeffname_inst = CoefficientName.objects.get(calibration_name=calibration_name) + coefficient_form.instance = coeffname_inst + coefficient_form.save() + + inv_inst = coeffname_inst.part.inventory.all() + inv_id = inv_inst[0] + event_record = CalibrationEvent.objects.create(inventory=inv_id, user_draft=self.request.user) + response = HttpResponseRedirect(self.get_success_url()) if self.request.is_ajax(): @@ -39,4 +62,16 @@ def form_valid(self, form): } return JsonResponse(data) else: - return response \ No newline at end of file + return response + + def form_invalid(self, form, coefficient_form): + form_errors = coefficient_form.errors + + if self.request.is_ajax(): + data = form.errors + return JsonResponse(data, status=400) + else: + return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form, form_errors=form_errors)) + + def get_success_url(self): + return reverse('inventory:ajax_inventory_detail', args=(self.object.id, )) \ No newline at end of file diff --git a/roundabout/templates/calibrations/calibrations_form.html b/roundabout/templates/calibrations/calibrations_form.html index 892d627d3..042c2f410 100644 --- a/roundabout/templates/calibrations/calibrations_form.html +++ b/roundabout/templates/calibrations/calibrations_form.html @@ -38,6 +38,7 @@

    Add Calibration

    enctype="multipart/form-data" data-url='{{ request.build_absolute_uri|safe }}'> {% csrf_token %} {{ form.media }} + {{ coefficient_form.management_form }} {{ form|crispy }}
    diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 023acc442..bd569a555 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -491,13 +491,21 @@
    {{ inventory_item.assembly_part.assembly }}
    + + + + - {% for cal in inventory_item.part.coefficient_names.all %} + {% for caL_event in inventory_item.calibration_events.all %} - + + + + + {% endfor %} From 9fb87bb79a4d4c043c2c9efb26b7fbb0a2bf63ee Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Tue, 17 Mar 2020 16:00:46 -0400 Subject: [PATCH 08/53] added unique constraint on calibration names, returned inventory detail template on completion of coefficient form using the inventory id, added logic to display related coefficient information for event history --- .../migrations/0005_auto_20200317_1916.py | 17 +++++++ roundabout/calibrations/models.py | 5 ++ roundabout/calibrations/views.py | 10 ++-- roundabout/parts/views.py | 6 +-- .../inventory/ajax_inventory_detail.html | 50 ++++++++++--------- 5 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 roundabout/calibrations/migrations/0005_auto_20200317_1916.py diff --git a/roundabout/calibrations/migrations/0005_auto_20200317_1916.py b/roundabout/calibrations/migrations/0005_auto_20200317_1916.py new file mode 100644 index 000000000..e978acf99 --- /dev/null +++ b/roundabout/calibrations/migrations/0005_auto_20200317_1916.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.9 on 2020-03-17 19:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0004_auto_20200313_2300'), + ] + + operations = [ + migrations.AddConstraint( + model_name='coefficientname', + constraint=models.UniqueConstraint(fields=('calibration_name',), name='unique_name'), + ), + ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index 89a2ccb01..d07a08f0e 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -17,6 +17,11 @@ def __str__(self): def get_object_type(self): return 'coefficient_name' + class Meta: + constraints = [ + models.UniqueConstraint(fields=['calibration_name'], name='unique_name'), + ] + class CalibrationEvent(models.Model): APPROVAL_STATUS = ( diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index a19b04b22..e781885fd 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -46,9 +46,11 @@ def form_valid(self, form, coefficient_form): coefficient_form.instance = coeffname_inst coefficient_form.save() - inv_inst = coeffname_inst.part.inventory.all() - inv_id = inv_inst[0] - event_record = CalibrationEvent.objects.create(inventory=inv_id, user_draft=self.request.user) + inventory = coeffname_inst.part.inventory.all() + inv_inst = inventory[0] + event_record = CalibrationEvent.objects.create(inventory=inv_inst, user_draft=self.request.user) + + self.inv_inst_id = inv_inst.id response = HttpResponseRedirect(self.get_success_url()) @@ -74,4 +76,4 @@ def form_invalid(self, form, coefficient_form): return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form, form_errors=form_errors)) def get_success_url(self): - return reverse('inventory:ajax_inventory_detail', args=(self.object.id, )) \ No newline at end of file + return reverse('inventory:ajax_inventory_detail', args=(self.inv_inst_id, )) \ No newline at end of file diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index f03fcabbf..e5db001e7 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -178,8 +178,8 @@ def form_valid(self, form, revision_form, documentation_form, calibration_form): # Save Calibration form calibration_form.instance = self.object - saved_cals = calibration_form.save() - + calibration_form.save() + # Check for any global Part Type custom fields for this Part custom_fields = self.object.part_type.custom_fields.all() @@ -201,7 +201,7 @@ def form_valid(self, form, revision_form, documentation_form, calibration_form): else: return response - def form_invalid(self, form, documentation_form, calibration_form): + def form_invalid(self, form, revision_form, documentation_form, calibration_form): form_errors = documentation_form.errors if self.request.is_ajax(): diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index bd569a555..979bbd7ee 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -487,31 +487,33 @@
    {{ inventory_item.assembly_part.assembly }}
    - -
    Date NameValueNotesUser
    {{ cal.calibration_name }}{{ caL_event.calibration_date }}{{ caL_event.coefficient_values.all }}{{ caL_event.coefficient_values.value }}{{ caL_event.coefficient_values.notes }}{{ caL_event.user_draft.username }}
    - - - - - - - - - - - {% for caL_event in inventory_item.calibration_events.all %} - - - - - - - - {% endfor %} - -
    DateNameValueNotesUser
    {{ caL_event.calibration_date }}{{ caL_event.coefficient_values.all }}{{ caL_event.coefficient_values.value }}{{ caL_event.coefficient_values.notes }}{{ caL_event.user_draft.username }}
    + {% for cal_event in inventory_item.calibration_events.all %} +
      +
    • Calibration Date: {{ cal_event.calibration_date }}
      • +
    • User (Draft): {{ cal_event.user_draft.username }}
      • +
    • User (Approved): {{ cal_event.user_approver.username }}
      • +
    • Approved: {{ cal_event.approved }}
      • +
    • + + + + + + + + {% for coeff_val in cal_event.coefficient_values.all %} + + + + + + {% endfor %} + +
      NameValueNotes
      {{ coeff_val.coefficient_name }}{{ coeff_val.value }}{{ coeff_val.notes }}
      +
      • +
    + {% endfor %}
    -
    From b4b4003121daab1370848ece14f6af4244bf9b04 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Thu, 19 Mar 2020 15:08:01 -0400 Subject: [PATCH 09/53] modified value formset to include event, added inventory pk to calibration form url route, modified coefficient history template --- roundabout/calibrations/forms.py | 4 +- roundabout/calibrations/urls.py | 2 +- roundabout/calibrations/views.py | 13 ++-- .../inventory/ajax_inventory_detail.html | 71 ++++++++++++------- 4 files changed, 54 insertions(+), 36 deletions(-) diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index 675a6073c..fab82a656 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -1,5 +1,5 @@ from django import forms -from .models import CoefficientName, CoefficientValue +from .models import CoefficientName, CoefficientValue, CalibrationEvent from django.forms.models import inlineformset_factory class CalibrationAddForm(forms.ModelForm): @@ -13,4 +13,4 @@ class Meta: 'notes': 'Notes' } -CoefficientFormset = inlineformset_factory(CoefficientName, CoefficientValue, fields=('value','notes',), extra=1, can_delete=True) \ No newline at end of file +CoefficientFormset = inlineformset_factory(CalibrationEvent, CoefficientValue, fields=('value','notes',), extra=1, can_delete=True) \ No newline at end of file diff --git a/roundabout/calibrations/urls.py b/roundabout/calibrations/urls.py index 509b7605f..c77159ae1 100644 --- a/roundabout/calibrations/urls.py +++ b/roundabout/calibrations/urls.py @@ -4,5 +4,5 @@ app_name = 'calibrations' urlpatterns = [ - path('ajax/add/', view=views.CalibrationsAddView.as_view(), name='calibrations_form') + path('ajax/add//', view=views.CalibrationsAddView.as_view(), name='calibrations_form') ] \ No newline at end of file diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index e781885fd..519bc8cf2 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -12,7 +12,7 @@ # Calibraitons landing page class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): - model = CoefficientName + model = CalibrationEvent form_class = CalibrationAddForm context_object_name = 'part_template' template_name='calibrations/calibrations_form.html' @@ -40,17 +40,16 @@ def post(self, request, *args, **kwargs): def form_valid(self, form, coefficient_form): self.object = form.save() - # Save CoefficientValue form using CoefficientName instance + # # Save CoefficientValue form using CoefficientName instance calibration_name = form.cleaned_data['coefficient_name'] coeffname_inst = CoefficientName.objects.get(calibration_name=calibration_name) - coefficient_form.instance = coeffname_inst - coefficient_form.save() + coefficient_form.coefficient_name = coeffname_inst inventory = coeffname_inst.part.inventory.all() inv_inst = inventory[0] event_record = CalibrationEvent.objects.create(inventory=inv_inst, user_draft=self.request.user) - - self.inv_inst_id = inv_inst.id + coefficient_form.instance = event_record + coefficient_form.save() response = HttpResponseRedirect(self.get_success_url()) @@ -76,4 +75,4 @@ def form_invalid(self, form, coefficient_form): return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form, form_errors=form_errors)) def get_success_url(self): - return reverse('inventory:ajax_inventory_detail', args=(self.inv_inst_id, )) \ No newline at end of file + return reverse('inventory:ajax_inventory_detail', args=(self.kwargs['pk'], )) \ No newline at end of file diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 979bbd7ee..7343f47d6 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -144,10 +144,10 @@ Add {{inventory_item.part.part_type}} calibration + data-node-type="detail">Add Calibration Coefficients
    @@ -487,32 +487,51 @@
    {{ inventory_item.assembly_part.assembly }}
    - {% for cal_event in inventory_item.calibration_events.all %} -
      -
    • Calibration Date: {{ cal_event.calibration_date }}
      • -
    • User (Draft): {{ cal_event.user_draft.username }}
      • -
    • User (Approved): {{ cal_event.user_approver.username }}
      • -
    • Approved: {{ cal_event.approved }}
      • +
        + {% for event in inventory_item.calibration_events.all %}
      • - - - - - - - - {% for coeff_val in cal_event.coefficient_values.all %} - - - - - - {% endfor %} - -
        NameValueNotes
        {{ coeff_val.coefficient_name }}{{ coeff_val.value }}{{ coeff_val.notes }}
        + + +
        +
        +

        Approved: {{ event.approved }}

        +

        Approved by: {{ event.user_approver.username }}

        + +
        + {% if event.coefficient_values.all %} +
        + + + + + + + + {% for val in event.coefficient_values.all %} + + + + + + {% endfor %} + +
        NameValueNotes
        {{ val.coefficient_name }}{{ val.value }}{{ val.notes }}
        +
        + {% endif %} +
        +
        • -
      - {% endfor %} + {% endfor %} +
    From eafa9e84f240ea3130f7174a0895396349d766c9 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Mon, 23 Mar 2020 15:55:39 -0400 Subject: [PATCH 10/53] multiple coeficient values now generated per event --- roundabout/calibrations/forms.py | 20 ++++++--- .../migrations/0006_auto_20200323_1851.py | 26 ++++++++++++ .../migrations/0007_auto_20200323_1900.py | 21 ++++++++++ .../migrations/0008_auto_20200323_1940.py | 21 ++++++++++ .../migrations/0009_auto_20200323_1951.py | 21 ++++++++++ roundabout/calibrations/models.py | 6 +-- roundabout/calibrations/views.py | 17 +++----- .../calibrations/calibrations_form.html | 42 +++++++++++++++++++ .../inventory/ajax_inventory_detail.html | 3 +- 9 files changed, 156 insertions(+), 21 deletions(-) create mode 100644 roundabout/calibrations/migrations/0006_auto_20200323_1851.py create mode 100644 roundabout/calibrations/migrations/0007_auto_20200323_1900.py create mode 100644 roundabout/calibrations/migrations/0008_auto_20200323_1940.py create mode 100644 roundabout/calibrations/migrations/0009_auto_20200323_1951.py diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index fab82a656..d850f2578 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -5,12 +5,20 @@ class CalibrationAddForm(forms.ModelForm): class Meta: - model = CoefficientValue - fields = ['coefficient_name', 'value', 'notes'] + model = CalibrationEvent + fields = ['calibration_date', 'approved'] labels = { - 'coefficient_name': 'Name', - 'value': 'Value', - 'notes': 'Notes' + 'calibration_date': 'Calibration Date', + 'approved': 'Approved' + } + widgets = { + 'calibration_date': forms.DateInput(), } -CoefficientFormset = inlineformset_factory(CalibrationEvent, CoefficientValue, fields=('value','notes',), extra=1, can_delete=True) \ No newline at end of file +CoefficientFormset = inlineformset_factory( + CalibrationEvent, + CoefficientValue, + fields=('coefficient_name','value','notes',), + extra=1, + can_delete=True + ) \ No newline at end of file diff --git a/roundabout/calibrations/migrations/0006_auto_20200323_1851.py b/roundabout/calibrations/migrations/0006_auto_20200323_1851.py new file mode 100644 index 000000000..42ac59146 --- /dev/null +++ b/roundabout/calibrations/migrations/0006_auto_20200323_1851.py @@ -0,0 +1,26 @@ +# Generated by Django 2.2.9 on 2020-03-23 18:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0005_auto_20200317_1916'), + ] + + operations = [ + migrations.RemoveConstraint( + model_name='coefficientname', + name='unique_name', + ), + migrations.AlterField( + model_name='coefficientvalue', + name='value', + field=models.CharField(max_length=20), + ), + migrations.AddConstraint( + model_name='coefficientname', + constraint=models.UniqueConstraint(fields=('part', 'calibration_name'), name='unique_name'), + ), + ] diff --git a/roundabout/calibrations/migrations/0007_auto_20200323_1900.py b/roundabout/calibrations/migrations/0007_auto_20200323_1900.py new file mode 100644 index 000000000..63bc8a38e --- /dev/null +++ b/roundabout/calibrations/migrations/0007_auto_20200323_1900.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.9 on 2020-03-23 19:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0006_auto_20200323_1851'), + ] + + operations = [ + migrations.RemoveConstraint( + model_name='coefficientname', + name='unique_name', + ), + migrations.AddConstraint( + model_name='coefficientname', + constraint=models.UniqueConstraint(fields=('calibration_name', 'part'), name='unique_name'), + ), + ] diff --git a/roundabout/calibrations/migrations/0008_auto_20200323_1940.py b/roundabout/calibrations/migrations/0008_auto_20200323_1940.py new file mode 100644 index 000000000..b4ea60607 --- /dev/null +++ b/roundabout/calibrations/migrations/0008_auto_20200323_1940.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.9 on 2020-03-23 19:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0007_auto_20200323_1900'), + ] + + operations = [ + migrations.RemoveConstraint( + model_name='coefficientname', + name='unique_name', + ), + migrations.AddConstraint( + model_name='coefficientname', + constraint=models.UniqueConstraint(fields=('part',), name='unique_names_per_part'), + ), + ] diff --git a/roundabout/calibrations/migrations/0009_auto_20200323_1951.py b/roundabout/calibrations/migrations/0009_auto_20200323_1951.py new file mode 100644 index 000000000..d47c954ae --- /dev/null +++ b/roundabout/calibrations/migrations/0009_auto_20200323_1951.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.9 on 2020-03-23 19:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('calibrations', '0008_auto_20200323_1940'), + ] + + operations = [ + migrations.RemoveConstraint( + model_name='coefficientname', + name='unique_names_per_part', + ), + migrations.AddConstraint( + model_name='coefficientname', + constraint=models.UniqueConstraint(fields=('part', 'calibration_name'), name='unique_names_per_part'), + ), + ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index d07a08f0e..6ca08fa04 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -19,7 +19,7 @@ def get_object_type(self): class Meta: constraints = [ - models.UniqueConstraint(fields=['calibration_name'], name='unique_name'), + models.UniqueConstraint(fields=['part','calibration_name'], name='unique_names_per_part'), ] @@ -46,8 +46,8 @@ def get_object_type(self): class CoefficientValue(models.Model): - value = models.DecimalField(max_digits=9, decimal_places=2, validators=[ - MinValueValidator(Decimal('0.00'))], null=False, blank=True, default='0.00') + # + value = models.CharField(max_length=20, unique=False, db_index=False) notes = models.TextField(blank=True) created_at = models.DateTimeField(default=timezone.now) coefficient_name = models.ForeignKey( diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index 519bc8cf2..d38ce2589 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -14,7 +14,7 @@ class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): model = CalibrationEvent form_class = CalibrationAddForm - context_object_name = 'part_template' + context_object_name = 'event_template' template_name='calibrations/calibrations_form.html' def get(self, request, *args, **kwargs): @@ -38,17 +38,12 @@ def post(self, request, *args, **kwargs): return self.form_invalid(form, coefficient_form) def form_valid(self, form, coefficient_form): + inv_inst = Inventory.objects.get(id=self.kwargs['pk']) + form.instance.inventory = inv_inst + form.instance.user_draft = self.request.user self.object = form.save() - - # # Save CoefficientValue form using CoefficientName instance - calibration_name = form.cleaned_data['coefficient_name'] - coeffname_inst = CoefficientName.objects.get(calibration_name=calibration_name) - coefficient_form.coefficient_name = coeffname_inst - - inventory = coeffname_inst.part.inventory.all() - inv_inst = inventory[0] - event_record = CalibrationEvent.objects.create(inventory=inv_inst, user_draft=self.request.user) - coefficient_form.instance = event_record + + coefficient_form.instance = self.object coefficient_form.save() response = HttpResponseRedirect(self.get_success_url()) diff --git a/roundabout/templates/calibrations/calibrations_form.html b/roundabout/templates/calibrations/calibrations_form.html index 042c2f410..5a454170c 100644 --- a/roundabout/templates/calibrations/calibrations_form.html +++ b/roundabout/templates/calibrations/calibrations_form.html @@ -41,6 +41,39 @@

    Add Calibration

    {{ coefficient_form.management_form }} {{ form|crispy }} +
    +
    Calibrations
    + + + + + + + {% if coefficient_form.errors %} + +
    + {% for dict in coefficient_form.errors %} + + {% for error in dict.values %} + {{ error|escape }} + {% endfor %} + + {% endfor %} +
    + + {% endif %} + + {% for coeff in coefficient_form %} + + + + + + {% endfor %} + +
    Name
    {% if coeff.id %}{{ coeff.DELETE }}{% endif %} {{ coeff.id }} {{ coeff.coefficient_name }}{% if coeff.id %}{{ coeff.DELETE }}{% endif %} {{ coeff.id }} {{ coeff.value }}{% if coeff.id %}{{ coeff.DELETE }}{% endif %} {{ coeff.id }} {{ coeff.notes }}
    +
    +
    {% if form.errors %} {% for field in form %} @@ -86,6 +119,15 @@

    Add Calibration

    {% block javascript %} + {% endblock javascript %} \ No newline at end of file diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 7343f47d6..d035336be 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -491,7 +491,7 @@
    {{ inventory_item.assembly_part.assembly }}
    {% for event in inventory_item.calibration_events.all %}
    • From f1b50a5577b65cf61e2a844e0950c05a4a6eec3a Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Tue, 7 Apr 2020 15:32:01 -0400 Subject: [PATCH 12/53] coefficient value decimals, added or updated, are now formatted with a variable number of decimal places defined by the part, including trailing zeroes, regenerated calibration migrations --- requirements/base.txt | 1 + roundabout/calibrations/forms.py | 3 +- .../calibrations/migrations/0001_initial.py | 43 +++++++--- .../0002_remove_coefficient_name.py | 17 ---- .../0003_coefficient_calibration.py | 19 ----- .../migrations/0004_auto_20200313_2300.py | 67 --------------- .../migrations/0005_auto_20200317_1916.py | 17 ---- .../migrations/0006_auto_20200323_1851.py | 26 ------ .../migrations/0007_auto_20200323_1900.py | 21 ----- .../migrations/0008_auto_20200323_1940.py | 21 ----- .../migrations/0009_auto_20200323_1951.py | 21 ----- .../migrations/0010_auto_20200330_1937.py | 19 ----- .../migrations/0011_auto_20200401_1846.py | 19 ----- .../migrations/0012_auto_20200401_1853.py | 18 ---- .../migrations/0013_auto_20200401_1930.py | 17 ---- .../migrations/0014_auto_20200403_1650.py | 18 ---- .../migrations/0015_auto_20200403_1714.py | 21 ----- .../migrations/0016_auto_20200406_1347.py | 18 ---- roundabout/calibrations/models.py | 12 +-- roundabout/calibrations/urls.py | 3 +- roundabout/calibrations/views.py | 84 +++++++++++++++++-- roundabout/parts/views.py | 22 ++++- .../inventory/ajax_inventory_detail.html | 19 ++++- .../templates/parts/ajax_part_detail.html | 36 ++++---- .../templates/parts/ajax_part_form.html | 22 ++++- 25 files changed, 195 insertions(+), 389 deletions(-) delete mode 100644 roundabout/calibrations/migrations/0002_remove_coefficient_name.py delete mode 100644 roundabout/calibrations/migrations/0003_coefficient_calibration.py delete mode 100644 roundabout/calibrations/migrations/0004_auto_20200313_2300.py delete mode 100644 roundabout/calibrations/migrations/0005_auto_20200317_1916.py delete mode 100644 roundabout/calibrations/migrations/0006_auto_20200323_1851.py delete mode 100644 roundabout/calibrations/migrations/0007_auto_20200323_1900.py delete mode 100644 roundabout/calibrations/migrations/0008_auto_20200323_1940.py delete mode 100644 roundabout/calibrations/migrations/0009_auto_20200323_1951.py delete mode 100644 roundabout/calibrations/migrations/0010_auto_20200330_1937.py delete mode 100644 roundabout/calibrations/migrations/0011_auto_20200401_1846.py delete mode 100644 roundabout/calibrations/migrations/0012_auto_20200401_1853.py delete mode 100644 roundabout/calibrations/migrations/0013_auto_20200401_1930.py delete mode 100644 roundabout/calibrations/migrations/0014_auto_20200403_1650.py delete mode 100644 roundabout/calibrations/migrations/0015_auto_20200403_1714.py delete mode 100644 roundabout/calibrations/migrations/0016_auto_20200406_1347.py diff --git a/requirements/base.txt b/requirements/base.txt index 8adb8db47..929726386 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -23,3 +23,4 @@ django-mptt==0.9.1 django-summernote==0.8.11.4 whitenoise==4.1.2 django-bootstrap-datepicker-plus==3.0.5 +sigfig==1.1.8 #https://pypi.org/project/sigfig/ \ No newline at end of file diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index f935ace12..53c802aeb 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -27,8 +27,7 @@ def __init__(self, *args, **kwargs): super(CoefficientValueForm, self).__init__(*args, **kwargs) if hasattr(self,'inv_id'): inv_inst = Inventory.objects.get(id=self.inv_id) - part_inst = Part.objects.get(id=inv_inst.part.id) - self.fields['coefficient_name'].queryset = CoefficientName.objects.filter(part=part_inst) + self.fields['coefficient_name'].queryset = CoefficientName.objects.filter(part=inv_inst.part) CoefficientFormset = inlineformset_factory( diff --git a/roundabout/calibrations/migrations/0001_initial.py b/roundabout/calibrations/migrations/0001_initial.py index e338a8756..648259789 100644 --- a/roundabout/calibrations/migrations/0001_initial.py +++ b/roundabout/calibrations/migrations/0001_initial.py @@ -1,7 +1,6 @@ -# Generated by Django 2.2.9 on 2020-02-27 17:05 +# Generated by Django 2.2.9 on 2020-04-07 19:24 -from decimal import Decimal -import django.core.validators +from django.conf import settings from django.db import migrations, models import django.db.models.deletion import django.utils.timezone @@ -13,27 +12,47 @@ class Migration(migrations.Migration): dependencies = [ ('inventory', '0003_auto_20191023_1347'), - ('parts', '0004_auto_20191023_1735'), + ('parts', '0006_auto_20200406_1347'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name='Coefficient', + name='CalibrationEvent', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(db_index=True, max_length=255)), - ('value', models.DecimalField(blank=True, decimal_places=2, default='0.00', max_digits=9, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])), - ('notes', models.TextField(blank=True)), ('created_at', models.DateTimeField(default=django.utils.timezone.now)), - ('inventory', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient', to='inventory.Inventory')), + ('calibration_date', models.DateTimeField(default=django.utils.timezone.now)), + ('approved', models.BooleanField(choices=[(True, 'Approved'), (False, 'Draft')], default=False)), + ('deployment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='calibration_events', to='inventory.Deployment')), + ('inventory', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='calibration_events', to='inventory.Inventory')), + ('user_approver', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='calibration_events_approver', to=settings.AUTH_USER_MODEL)), + ('user_draft', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='calibration_events_drafter', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ['-calibration_date'], + }, + ), + migrations.CreateModel( + name='CoefficientName', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('calibration_name', models.CharField(db_index=True, max_length=255)), + ('part', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_names', to='parts.Part')), ], + options={ + 'ordering': ['calibration_name'], + }, ), migrations.CreateModel( - name='Calibration', + name='CoefficientValue', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(db_index=True, max_length=255)), - ('part', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='calibration', to='parts.Part')), + ('value', models.CharField(max_length=20)), + ('notes', models.TextField(blank=True)), + ('created_at', models.DateTimeField(default=django.utils.timezone.now)), + ('calibration_event', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_values', to='calibrations.CalibrationEvent')), + ('coefficient_name', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_values', to='calibrations.CoefficientName')), ], ), ] diff --git a/roundabout/calibrations/migrations/0002_remove_coefficient_name.py b/roundabout/calibrations/migrations/0002_remove_coefficient_name.py deleted file mode 100644 index c3924d9bd..000000000 --- a/roundabout/calibrations/migrations/0002_remove_coefficient_name.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-05 14:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='coefficient', - name='name', - ), - ] diff --git a/roundabout/calibrations/migrations/0003_coefficient_calibration.py b/roundabout/calibrations/migrations/0003_coefficient_calibration.py deleted file mode 100644 index 097755517..000000000 --- a/roundabout/calibrations/migrations/0003_coefficient_calibration.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-09 15:56 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0002_remove_coefficient_name'), - ] - - operations = [ - migrations.AddField( - model_name='coefficient', - name='calibration', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient', to='calibrations.Calibration'), - ), - ] diff --git a/roundabout/calibrations/migrations/0004_auto_20200313_2300.py b/roundabout/calibrations/migrations/0004_auto_20200313_2300.py deleted file mode 100644 index 28ffe1242..000000000 --- a/roundabout/calibrations/migrations/0004_auto_20200313_2300.py +++ /dev/null @@ -1,67 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-13 23:00 - -from decimal import Decimal -from django.conf import settings -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('parts', '0004_auto_20191023_1735'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('inventory', '0003_auto_20191023_1347'), - ('calibrations', '0003_coefficient_calibration'), - ] - - operations = [ - migrations.CreateModel( - name='CalibrationEvent', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(default=django.utils.timezone.now)), - ('calibration_date', models.DateTimeField(default=django.utils.timezone.now)), - ('approved', models.BooleanField(choices=[(True, 'Approved'), (False, 'Draft')], default=False)), - ('deployment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='calibration_events', to='inventory.Deployment')), - ('inventory', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='calibration_events', to='inventory.Inventory')), - ('user_approver', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='calibration_events_approver', to=settings.AUTH_USER_MODEL)), - ('user_draft', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='calibration_events_drafter', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='CoefficientName', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('calibration_name', models.CharField(db_index=True, max_length=255)), - ('part', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_names', to='parts.Part')), - ], - ), - migrations.CreateModel( - name='CoefficientValue', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('value', models.DecimalField(blank=True, decimal_places=2, default='0.00', max_digits=9, validators=[django.core.validators.MinValueValidator(Decimal('0.00'))])), - ('notes', models.TextField(blank=True)), - ('created_at', models.DateTimeField(default=django.utils.timezone.now)), - ('calibration_event', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_values', to='calibrations.CalibrationEvent')), - ('coefficient_name', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='coefficient_values', to='calibrations.CoefficientName')), - ], - ), - migrations.RemoveField( - model_name='coefficient', - name='calibration', - ), - migrations.RemoveField( - model_name='coefficient', - name='inventory', - ), - migrations.DeleteModel( - name='Calibration', - ), - migrations.DeleteModel( - name='Coefficient', - ), - ] diff --git a/roundabout/calibrations/migrations/0005_auto_20200317_1916.py b/roundabout/calibrations/migrations/0005_auto_20200317_1916.py deleted file mode 100644 index e978acf99..000000000 --- a/roundabout/calibrations/migrations/0005_auto_20200317_1916.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-17 19:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0004_auto_20200313_2300'), - ] - - operations = [ - migrations.AddConstraint( - model_name='coefficientname', - constraint=models.UniqueConstraint(fields=('calibration_name',), name='unique_name'), - ), - ] diff --git a/roundabout/calibrations/migrations/0006_auto_20200323_1851.py b/roundabout/calibrations/migrations/0006_auto_20200323_1851.py deleted file mode 100644 index 42ac59146..000000000 --- a/roundabout/calibrations/migrations/0006_auto_20200323_1851.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-23 18:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0005_auto_20200317_1916'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='coefficientname', - name='unique_name', - ), - migrations.AlterField( - model_name='coefficientvalue', - name='value', - field=models.CharField(max_length=20), - ), - migrations.AddConstraint( - model_name='coefficientname', - constraint=models.UniqueConstraint(fields=('part', 'calibration_name'), name='unique_name'), - ), - ] diff --git a/roundabout/calibrations/migrations/0007_auto_20200323_1900.py b/roundabout/calibrations/migrations/0007_auto_20200323_1900.py deleted file mode 100644 index 63bc8a38e..000000000 --- a/roundabout/calibrations/migrations/0007_auto_20200323_1900.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-23 19:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0006_auto_20200323_1851'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='coefficientname', - name='unique_name', - ), - migrations.AddConstraint( - model_name='coefficientname', - constraint=models.UniqueConstraint(fields=('calibration_name', 'part'), name='unique_name'), - ), - ] diff --git a/roundabout/calibrations/migrations/0008_auto_20200323_1940.py b/roundabout/calibrations/migrations/0008_auto_20200323_1940.py deleted file mode 100644 index b4ea60607..000000000 --- a/roundabout/calibrations/migrations/0008_auto_20200323_1940.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-23 19:40 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0007_auto_20200323_1900'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='coefficientname', - name='unique_name', - ), - migrations.AddConstraint( - model_name='coefficientname', - constraint=models.UniqueConstraint(fields=('part',), name='unique_names_per_part'), - ), - ] diff --git a/roundabout/calibrations/migrations/0009_auto_20200323_1951.py b/roundabout/calibrations/migrations/0009_auto_20200323_1951.py deleted file mode 100644 index d47c954ae..000000000 --- a/roundabout/calibrations/migrations/0009_auto_20200323_1951.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-23 19:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0008_auto_20200323_1940'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='coefficientname', - name='unique_names_per_part', - ), - migrations.AddConstraint( - model_name='coefficientname', - constraint=models.UniqueConstraint(fields=('part', 'calibration_name'), name='unique_names_per_part'), - ), - ] diff --git a/roundabout/calibrations/migrations/0010_auto_20200330_1937.py b/roundabout/calibrations/migrations/0010_auto_20200330_1937.py deleted file mode 100644 index 6a6d43040..000000000 --- a/roundabout/calibrations/migrations/0010_auto_20200330_1937.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-03-30 19:37 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0009_auto_20200323_1951'), - ] - - operations = [ - migrations.AlterField( - model_name='coefficientvalue', - name='value', - field=models.CharField(max_length=20, validators=[django.core.validators.DecimalValidator(12, 12), django.core.validators.MaxValueValidator(1), django.core.validators.MinValueValidator(0)]), - ), - ] diff --git a/roundabout/calibrations/migrations/0011_auto_20200401_1846.py b/roundabout/calibrations/migrations/0011_auto_20200401_1846.py deleted file mode 100644 index 1d4873a40..000000000 --- a/roundabout/calibrations/migrations/0011_auto_20200401_1846.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-04-01 18:46 - -import django.core.validators -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0010_auto_20200330_1937'), - ] - - operations = [ - migrations.AlterField( - model_name='coefficientvalue', - name='value', - field=models.CharField(max_length=20, validators=[django.core.validators.RegexValidator(code='numbers_only', message='Numbers only', regex='^([\\s\\d]+)$')]), - ), - ] diff --git a/roundabout/calibrations/migrations/0012_auto_20200401_1853.py b/roundabout/calibrations/migrations/0012_auto_20200401_1853.py deleted file mode 100644 index dafe37618..000000000 --- a/roundabout/calibrations/migrations/0012_auto_20200401_1853.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-04-01 18:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0011_auto_20200401_1846'), - ] - - operations = [ - migrations.AlterField( - model_name='coefficientvalue', - name='value', - field=models.CharField(max_length=20), - ), - ] diff --git a/roundabout/calibrations/migrations/0013_auto_20200401_1930.py b/roundabout/calibrations/migrations/0013_auto_20200401_1930.py deleted file mode 100644 index 615b81ce6..000000000 --- a/roundabout/calibrations/migrations/0013_auto_20200401_1930.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.9 on 2020-04-01 19:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0012_auto_20200401_1853'), - ] - - operations = [ - migrations.AlterModelOptions( - name='calibrationevent', - options={'ordering': ['-calibration_date']}, - ), - ] diff --git a/roundabout/calibrations/migrations/0014_auto_20200403_1650.py b/roundabout/calibrations/migrations/0014_auto_20200403_1650.py deleted file mode 100644 index c1dd35a96..000000000 --- a/roundabout/calibrations/migrations/0014_auto_20200403_1650.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-04-03 16:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0013_auto_20200401_1930'), - ] - - operations = [ - migrations.AlterField( - model_name='coefficientname', - name='calibration_name', - field=models.CharField(db_index=True, max_length=255, unique=True), - ), - ] diff --git a/roundabout/calibrations/migrations/0015_auto_20200403_1714.py b/roundabout/calibrations/migrations/0015_auto_20200403_1714.py deleted file mode 100644 index e46d89038..000000000 --- a/roundabout/calibrations/migrations/0015_auto_20200403_1714.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.9 on 2020-04-03 17:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0014_auto_20200403_1650'), - ] - - operations = [ - migrations.RemoveConstraint( - model_name='coefficientname', - name='unique_names_per_part', - ), - migrations.AddConstraint( - model_name='coefficientname', - constraint=models.UniqueConstraint(fields=('calibration_name', 'part'), name='unique_names_per_part'), - ), - ] diff --git a/roundabout/calibrations/migrations/0016_auto_20200406_1347.py b/roundabout/calibrations/migrations/0016_auto_20200406_1347.py deleted file mode 100644 index 2f2963f92..000000000 --- a/roundabout/calibrations/migrations/0016_auto_20200406_1347.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-04-06 13:47 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('calibrations', '0015_auto_20200403_1714'), - ] - - operations = [ - migrations.AlterField( - model_name='coefficientname', - name='calibration_name', - field=models.CharField(db_index=True, max_length=255), - ), - ] diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index 12d0869c3..7c15618a6 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -10,17 +10,12 @@ class CoefficientName(models.Model): calibration_name = models.CharField(max_length=255, unique=False, db_index=True) part = models.ForeignKey(Part, related_name='coefficient_names', on_delete=models.CASCADE, null=True) - def __str__(self): return self.calibration_name - def get_object_type(self): return 'coefficient_name' - class Meta: - constraints = [ - models.UniqueConstraint(fields=['calibration_name','part'], name='unique_names_per_part'), - ] + ordering = ['calibration_name'] class CalibrationEvent(models.Model): @@ -35,13 +30,10 @@ class CalibrationEvent(models.Model): inventory = models.ForeignKey(Inventory, related_name='calibration_events', on_delete=models.CASCADE, null=False) deployment = models.ForeignKey(Deployment, related_name='calibration_events', on_delete=models.CASCADE, null=True) approved = models.BooleanField(choices=APPROVAL_STATUS, blank=False, default=False) - def __str__(self): return self.calibration_date - def get_object_type(self): return 'calibration_event' - class Meta: ordering = ['-calibration_date'] @@ -52,9 +44,7 @@ class CoefficientValue(models.Model): created_at = models.DateTimeField(default=timezone.now) coefficient_name = models.ForeignKey(CoefficientName, related_name='coefficient_values', on_delete=models.CASCADE, null=True) calibration_event = models.ForeignKey(CalibrationEvent, related_name='coefficient_values', on_delete=models.CASCADE, null=True) - def __str__(self): return self.notes - def get_object_type(self): return 'coefficient_value' diff --git a/roundabout/calibrations/urls.py b/roundabout/calibrations/urls.py index c77159ae1..5eea3025d 100644 --- a/roundabout/calibrations/urls.py +++ b/roundabout/calibrations/urls.py @@ -4,5 +4,6 @@ app_name = 'calibrations' urlpatterns = [ - path('ajax/add//', view=views.CalibrationsAddView.as_view(), name='calibrations_form') + path('ajax/add//', view=views.CalibrationsAddView.as_view(), name='calibrations_form'), + path('ajax/edit//', view=views.CalibrationsUpdateView.as_view(), name='event_form') ] \ No newline at end of file diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index 04f40083f..9f0b92235 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -1,14 +1,16 @@ from django.shortcuts import render from django.http import HttpResponse, HttpResponseRedirect, JsonResponse -from django.contrib.auth.mixins import LoginRequiredMixin -from django.views.generic import CreateView +from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin +from django.views.generic import CreateView, UpdateView from .models import CoefficientName, CalibrationEvent -from .forms import CalibrationAddForm, CoefficientFormset +from .forms import CalibrationAddForm, CoefficientFormset, CoefficientValueForm from common.util.mixins import AjaxFormMixin from django.urls import reverse, reverse_lazy from roundabout.parts.models import Part from roundabout.users.models import User from roundabout.inventory.models import Inventory +from django.core import validators +from sigfig import round # Calibrations landing page class CalibrationsAddView(LoginRequiredMixin, AjaxFormMixin, CreateView): @@ -38,14 +40,84 @@ def form_valid(self, form, coefficient_form): form.instance.inventory = inv_inst if form.cleaned_data['approved']: form.instance.user_approver = self.request.user + form.instance.user_draft = self.request.user + self.object = form.save() + coefficient_form.instance = self.object + for form in coefficient_form: + try: + form_coeff_val = form.cleaned_data['value'] + part_dec_places = inv_inst.part.cal_dec_places + sigfig_formatted_value = round(form_coeff_val, decimals = part_dec_places) + except: + raise validators.ValidationError( + ('Invalid value') + ) + form.instance.value = sigfig_formatted_value + coefficient_form.save() + response = HttpResponseRedirect(self.get_success_url()) + if self.request.is_ajax(): + data = { + 'message': "Successfully submitted form data.", + 'object_id': self.object.id, + 'object_type': self.object.get_object_type(), + 'detail_path': self.get_success_url(), + } + return JsonResponse(data) else: - form.instance.user_draft = self.request.user + return response + + def form_invalid(self, form, coefficient_form): + form_errors = coefficient_form.errors + if self.request.is_ajax(): + data = form.errors + return JsonResponse(data, status=400) + else: + return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form, form_errors=form_errors)) + + def get_success_url(self): + return reverse('inventory:ajax_inventory_detail', args=(self.kwargs['pk'], )) + + +class CalibrationsUpdateView(LoginRequiredMixin, PermissionRequiredMixin, AjaxFormMixin, UpdateView): + model = CalibrationEvent + form_class = CalibrationAddForm + context_object_name = 'event_template' + template_name='calibrations/calibrations_form.html' + permission_required = 'calibrations.add_calibration' + redirect_field_name = 'home' + + def get(self, request, *args, **kwargs): + self.object = self.get_object() + form_class = self.get_form_class() + form = self.get_form(form_class) + coefficient_form = CoefficientFormset(instance=self.object, form_kwargs={'inv_id': self.object.inventory.id}) + return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form)) + + def post(self, request, *args, **kwargs): + self.object = self.get_object() + form_class = self.get_form_class() + form = self.get_form(form_class) + coefficient_form = CoefficientFormset(self.request.POST, instance=self.object) + if (form.is_valid() and coefficient_form.is_valid()): + return self.form_valid(form, coefficient_form) + return self.form_invalid(form, coefficient_form) + + def form_valid(self, form, coefficient_form): + inv_inst = Inventory.objects.get(id=self.object.inventory.id) + form.instance.inventory = inv_inst + if form.cleaned_data['approved']: + form.instance.user_approver = self.request.user + form.instance.user_draft = self.request.user self.object = form.save() coefficient_form.instance = self.object + for form in coefficient_form: + form_coeff_val = form.cleaned_data.get('value') + part_dec_places = inv_inst.part.cal_dec_places + sigfig_formatted_value = round(form_coeff_val, decimals = part_dec_places) + form.instance.value = sigfig_formatted_value coefficient_form.save() response = HttpResponseRedirect(self.get_success_url()) if self.request.is_ajax(): - print(form.cleaned_data) data = { 'message': "Successfully submitted form data.", 'object_id': self.object.id, @@ -65,4 +137,4 @@ def form_invalid(self, form, coefficient_form): return self.render_to_response(self.get_context_data(form=form, coefficient_form=coefficient_form, form_errors=form_errors)) def get_success_url(self): - return reverse('inventory:ajax_inventory_detail', args=(self.kwargs['pk'], )) \ No newline at end of file + return reverse('inventory:ajax_inventory_detail', args=(self.object.inventory.id, )) \ No newline at end of file diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index e5db001e7..2400646b6 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -222,8 +222,28 @@ class PartsAjaxUpdateView(LoginRequiredMixin, PermissionRequiredMixin, AjaxFormM permission_required = 'parts.add_part' redirect_field_name = 'home' - def form_valid(self, form): + def get(self, request, *args, **kwargs): + self.object = self.get_object() + form_class = self.get_form_class() + form = self.get_form(form_class) + calibration_form = CalibrationFormset(instance=self.object) + return self.render_to_response(self.get_context_data(form=form, calibration_form=calibration_form)) + + def post(self, request, *args, **kwargs): + self.object = self.get_object() + form_class = self.get_form_class() + form = self.get_form(form_class) + calibration_form = CalibrationFormset( + self.request.POST, instance=self.object) + + if (form.is_valid() and calibration_form.is_valid()): + return self.form_valid(form, calibration_form) + return self.form_invalid(form, calibration_form) + + def form_valid(self, form, calibration_form): self.object = form.save() + calibration_form.instance = self.object + calibration_form.save() response = HttpResponseRedirect(self.get_success_url()) if self.request.is_ajax(): diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index d035336be..7a2921281 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -497,11 +497,19 @@
    {{ inventory_item.assembly_part.assembly }}
    Expand/Collapse Calibration {{ event.calibration_date }} +
    + Edit Coefficients +

    Approved: {{ event.approved }}

    Approved by: {{ event.user_approver.username }}

    -

    Drafted by: {{ event.user_draft.username }}

    +

    Last Updated by: {{ event.user_draft.username }}

    @@ -618,12 +630,10 @@
    {{ inventory_item.assembly_part.assembly }}
    {% regroup value_set.coefficient_values.all by row as row_sets %} {% for row in row_sets %} - {% for val in value_set.coefficient_values.all %} - {% if val.row == row.grouper %} - -
    {{ val }}
    - - {% endif %} + {% for val in row.list %} + +
    {{ val }}
    + {% endfor %} {% endfor %} @@ -677,7 +687,7 @@
    {{ inventory_item.assembly_part.assembly }}
    role="button" data-detail-url="{% url 'configs_constants:config_event_value_update' event.id %}" data-node-id="{{ event.id }}" - data-node-type="detail"> + data-node-type="{{ event.get_object_type }}"> Edit Values
    @@ -826,6 +836,7 @@
    {{ inventory_item.assembly_part.assembly }}
    let inv_part_type = '{{ inventory_item.part.part_type }}'; let deployment = '{{ inventory_item.build.current_deployment }}'; let part_has_cals = '{{ inventory_item.part.coefficient_names.exists }}'; + let user_id = '{{ user.id }}' if (inv_part_type == 'Instrument' && part_has_cals == 'True') { $('#add_coefficient_action').show(); $('#calibration-template-tab').show().css('display', ''); @@ -858,15 +869,24 @@
    {{ inventory_item.assembly_part.assembly }}
    }) } - // Remove User as Event Reviewer + // Swap Reviewers as Approvers $('#calibration-template').on('click', 'a[id^=expander]', function() { let url = $(this).attr('data-reviewer-url'); - let badge = $(this).next('span[id=review-badge]'); - if (badge.length) { + let review_badge = $(this).parent().find('#review-badge'); + let progress_badge = $(this).parent().find('#progress-badge'); + let reviewer = $(this).parent().find('#reviewer-' + user_id) + let approver_list = $(this).parent().find('#approvers'); + if (review_badge.length) { $.ajax({ url: url, success: function (data) { - badge.remove(); + if (data.approved) { + review_badge.after('Approved') + progress_badge.hide() + } + approver_list.append("{{ user.username }}") + review_badge.remove(); + reviewer.hide() } }); } From bfa44fcc8db2e153bb87d949581798f660ef373d Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Mon, 29 Jun 2020 14:39:17 -0400 Subject: [PATCH 46/53] moved approver logic to button within Event --- .../inventory/ajax_inventory_detail.html | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index df0e9d65e..8983a97e0 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -511,8 +511,6 @@
    {{ inventory_item.assembly_part.assembly }}
    href="#event-{{ event.id }}" aria-expanded="false" aria-controls="event-{{ event.id }}" - id='expander-date-{{event.id}}' - data-reviewer-url="{% url 'calibrations:event_review_delete' event.id user.id %}" > {{ event.calibration_date|date:"n/j/y" }} @@ -522,8 +520,6 @@
    {{ inventory_item.assembly_part.assembly }}
    aria-controls="event-{{ event.id }}" aria-expanded="false" role="button" - id='expander-{{event.id}}' - data-reviewer-url="{% url 'calibrations:event_review_delete' event.id user.id %}" > Expand/Collapse Calibration {{ event.calibration_date }} @@ -548,6 +544,11 @@
    {{ inventory_item.assembly_part.assembly }}
    + {% if user in event.user_draft.all %} + + {% endif %}
    {{ inventory_item.assembly_part.assembly }} Expand/Collapse Calibration {{ value_set.coefficient_name }} -
    - - Edit Coefficient Metadata - -
    + {% if value_set.coefficient_name.value_set_type != '2d' %} +
    + + Edit Coefficient Metadata + +
    + {% endif %}

    Notes: {{ value_set.notes }}

    @@ -870,23 +873,25 @@
    {{ inventory_item.assembly_part.assembly }}
    } // Swap Reviewers as Approvers - $('#calibration-template').on('click', 'a[id^=expander]', function() { + $('#calibration-template').on('click', 'button[id^=expander]', function(e) { + e.preventDefault(); let url = $(this).attr('data-reviewer-url'); - let review_badge = $(this).parent().find('#review-badge'); - let progress_badge = $(this).parent().find('#progress-badge'); - let reviewer = $(this).parent().find('#reviewer-' + user_id) - let approver_list = $(this).parent().find('#approvers'); + let review_badge = $(this).parent().parent().find('#review-badge'); + let progress_badge = $(this).parent().parent().find('#progress-badge'); + let reviewer = $(this).parent().parent().find('#reviewer-' + user_id) + let approver_list = $(this).parent().parent().find('#approvers'); if (review_badge.length) { $.ajax({ url: url, success: function (data) { if (data.approved) { - review_badge.after('Approved') - progress_badge.hide() + review_badge.after('Approved'); + progress_badge.hide(); } - approver_list.append("{{ user.username }}") + $(this).remove(); + approver_list.append("{{ user.username }}"); review_badge.remove(); - reviewer.hide() + reviewer.hide(); } }); } From 09f280cfe707945648bcd415f415c29d246d834e Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Wed, 1 Jul 2020 13:55:49 -0400 Subject: [PATCH 47/53] inventory-only users ommited from calibration reviewer selection, event coefficients initialized for each calibration name for a part --- roundabout/calibrations/forms.py | 21 ++++++++++++------- roundabout/calibrations/urls.py | 2 +- roundabout/calibrations/views.py | 15 ++++++++++++- .../templates/calibrations/event_delete.html | 2 +- .../calibrations/event_valueset_form.html | 5 ++++- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index 79a89c366..e88847bff 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -23,7 +23,7 @@ class Meta: widgets = { 'calibration_date': DatePickerInput( options={ - "format": "MM/DD/YYYY", # moment date-time format + "format": "MM/DD/YYYY", "showClose": True, "showClear": True, "showTodayButton": True, @@ -34,6 +34,7 @@ class Meta: def __init__(self, *args, **kwargs): super(CalibrationEventForm, self).__init__(*args, **kwargs) + self.fields['user_draft'].queryset = User.objects.all().exclude(groups__name__in=['inventory only']) def clean_user_draft(self): user_draft = self.cleaned_data.get('user_draft') @@ -59,6 +60,12 @@ class Meta: 'notes': 'Additional Notes' } widgets = { + 'coefficient_name': forms.Select( + attrs = { + 'readonly': True, + 'style': 'cursor: not-allowed; pointer-events: none; background-color: #d5dfed;' + } + ), 'value_set': forms.Textarea( attrs = { 'style': 'white-space: nowrap' @@ -72,7 +79,6 @@ def __init__(self, *args, **kwargs): super(CoefficientValueSetForm, self).__init__(*args, **kwargs) if hasattr(self, 'inv_id'): inv_inst = Inventory.objects.get(id = self.inv_id) - self.fields['coefficient_name'].queryset = CoefficientName.objects.filter(part = inv_inst.part).order_by('created_at') self.instance.cal_dec_places = inv_inst.part.cal_dec_places self.instance.part = inv_inst.part @@ -91,11 +97,10 @@ def clean_value_set(self): def save(self, commit = True): value_set = super(CoefficientValueSetForm, self).save(commit = False) - if self.has_changed(): - if commit: - value_set.save() - parse_valid_coeff_vals(value_set) - return value_set + if commit: + value_set.save() + parse_valid_coeff_vals(value_set) + return value_set # CalibrationName Form @@ -174,7 +179,7 @@ def save(self, commit = True): CoefficientValueSet, form=CoefficientValueSetForm, fields=('coefficient_name', 'value_set', 'notes'), - extra=1, + extra=0, can_delete=True ) diff --git a/roundabout/calibrations/urls.py b/roundabout/calibrations/urls.py index 2eaf0ebf3..905300d39 100644 --- a/roundabout/calibrations/urls.py +++ b/roundabout/calibrations/urls.py @@ -9,5 +9,5 @@ path('ajax/delete//', view=views.EventValueSetDelete.as_view(), name='event_valueset_delete'), path('ajax/value/edit//', view=views.ValueSetValueUpdate.as_view(), name='valueset_value_update'), path('ajax/calname/add//', view=views.PartCalNameAdd.as_view(), name='part_calname_add'), - path('ajax/eventreview/delete///', view=views.event_review_approve, name='event_review_delete'), + path('ajax/eventreview/delete///', view=views.event_review_approve, name='event_review_delete') ] \ No newline at end of file diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index e9bf0d565..f92d3b5e0 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -14,6 +14,7 @@ from sigfig import round from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ +from django.forms.models import inlineformset_factory, BaseInlineFormSet # Handles creation of Calibration Events, Names,and Coefficients class EventValueSetAdd(LoginRequiredMixin, AjaxFormMixin, CreateView): @@ -24,12 +25,24 @@ class EventValueSetAdd(LoginRequiredMixin, AjaxFormMixin, CreateView): def get(self, request, *args, **kwargs): self.object = None + inv_inst = Inventory.objects.get(id=self.kwargs['pk']) + cal_names = CoefficientName.objects.filter(part=inv_inst.part) form_class = self.get_form_class() form = self.get_form(form_class) - event_valueset_form = EventValueSetFormset( + EventValueSetAddFormset = inlineformset_factory( + CalibrationEvent, + CoefficientValueSet, + form=CoefficientValueSetForm, + fields=('coefficient_name', 'value_set', 'notes'), + extra=len(cal_names), + can_delete=True + ) + event_valueset_form = EventValueSetAddFormset( instance=self.object, form_kwargs={'inv_id': self.kwargs['pk']} ) + for idx,name in enumerate(cal_names): + event_valueset_form.forms[idx].initial = {'coefficient_name': name} return self.render_to_response( self.get_context_data( form=form, diff --git a/roundabout/templates/calibrations/event_delete.html b/roundabout/templates/calibrations/event_delete.html index f7044e008..5496f4b56 100644 --- a/roundabout/templates/calibrations/event_delete.html +++ b/roundabout/templates/calibrations/event_delete.html @@ -29,7 +29,7 @@

    Are you sure?

    - + diff --git a/roundabout/templates/calibrations/event_valueset_form.html b/roundabout/templates/calibrations/event_valueset_form.html index 6adcfd1f4..f1344584f 100644 --- a/roundabout/templates/calibrations/event_valueset_form.html +++ b/roundabout/templates/calibrations/event_valueset_form.html @@ -113,7 +113,10 @@
    Calibrations
    } }); - $('.delete-row').addClass('pull-right'); + $('.delete-row').addClass('pull-right') + $('.delete-row').hide() + $('.add-row').hide() + }) From b73fe3741368159e865cf73dc56b53dc041e04ec Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Tue, 7 Jul 2020 12:48:58 -0400 Subject: [PATCH 48/53] initialized calibration name copy functionality across parts --- roundabout/calibrations/forms.py | 58 +++++++++++++++++++ roundabout/calibrations/views.py | 32 +++++++--- .../calibrations/part_calname_form.html | 4 ++ .../templates/parts/ajax_part_detail.html | 12 +++- 4 files changed, 97 insertions(+), 9 deletions(-) diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index e88847bff..18c0732fd 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -173,6 +173,37 @@ def save(self, commit = True): coeff_val_inst.save() return coeff_val_inst + +# Calibration Copy Form +# Inputs: Part +class CalPartCopyForm(forms.Form): + part_select = forms.ModelChoiceField( + queryset = Part.objects.filter(part_type__name='Instrument'), + required=False, + label = 'Copy Calibrations from Part' + ) + + def __init__(self, *args, **kwargs): + self.part_id = kwargs.pop('part_id') + super(CalPartCopyForm, self).__init__(*args, **kwargs) + self.fields['part_select'].queryset = Part.objects.filter(part_type__name='Instrument').exclude(id__in=str(self.part_id)) + + def clean_part_select(self): + part_select = self.cleaned_data.get('part_select') + to_part = Part.objects.get(id=self.part_id) + if part_select is not None: + validate_part_select(to_part, part_select) + return part_select + + def save(self): + part_select = self.cleaned_data.get('part_select') + if self.has_changed(): + copy_to_id = self.part_id + copy_from_id = part_select.id + copy_calibrations(copy_to_id, copy_from_id) + return part_select + + # Coefficient ValueSet form instance generator for CalibrationEvents EventValueSetFormset = inlineformset_factory( CalibrationEvent, @@ -336,3 +367,30 @@ def parse_valid_coeff_vals(value_set_instance): CoefficientValue.objects.bulk_create(parsed_batch) return value_set_instance + +# Copy all CoefficientNames across Parts +def copy_calibrations(to_id, from_id): + to_part = Part.objects.get(id=to_id) + from_part = Part.objects.get(id=from_id) + if from_part.coefficient_names.exists(): + for name in from_part.coefficient_names.all(): + CoefficientName.objects.create( + calibration_name = name.calibration_name, + value_set_type = name.value_set_type, + sigfig_override = name.sigfig_override, + part = to_part + ) + +# Validator for Part Calibration Copy +# Checks for duplicate Coefficient Names between Parts +def validate_part_select(to_part, from_part): + to_names = [name.calibration_name for name in to_part.coefficient_names.all()] + from_names = [name.calibration_name for name in from_part.coefficient_names.all()] + try: + assert not any(from_name in to_names for from_name in from_names) + except: + raise ValidationError( + _('Duplicate Calibration Names exist between Parts. Please select Part with unique Calibration Names.') + ) + else: + pass \ No newline at end of file diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index f92d3b5e0..f9cacffae 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -3,7 +3,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin from django.views.generic import CreateView, UpdateView, DeleteView from .models import CoefficientName, CalibrationEvent, CoefficientValueSet -from .forms import CalibrationEventForm, EventValueSetFormset, CoefficientValueForm, CoefficientValueSetForm, ValueSetValueFormset, CoefficientNameForm, PartCalNameFormset +from .forms import CalibrationEventForm, EventValueSetFormset, CoefficientValueForm, CoefficientValueSetForm, ValueSetValueFormset, CoefficientNameForm, PartCalNameFormset, CalPartCopyForm from common.util.mixins import AjaxFormMixin from django.urls import reverse, reverse_lazy from roundabout.parts.models import Part @@ -311,9 +311,13 @@ def get(self, request, *args, **kwargs): part_calname_form = PartCalNameFormset( instance=self.object ) + part_cal_copy_form = CalPartCopyForm( + part_id = self.kwargs['pk'] + ) return self.render_to_response( self.get_context_data( - part_calname_form=part_calname_form + part_calname_form=part_calname_form, + part_cal_copy_form=part_cal_copy_form ) ) @@ -325,13 +329,18 @@ def post(self, request, *args, **kwargs): self.request.POST, instance=self.object ) - if (part_calname_form.is_valid()): - return self.form_valid(part_calname_form) - return self.form_invalid(part_calname_form) + part_cal_copy_form = CalPartCopyForm( + self.request.POST, + part_id = self.kwargs['pk'] + ) + if (part_calname_form.is_valid() and part_cal_copy_form.is_valid()): + return self.form_valid(part_calname_form, part_cal_copy_form) + return self.form_invalid(part_calname_form, part_cal_copy_form) - def form_valid(self, part_calname_form): + def form_valid(self, part_calname_form, part_cal_copy_form): part_calname_form.instance = self.object part_calname_form.save() + part_cal_copy_form.save() response = HttpResponseRedirect(self.get_success_url()) if self.request.is_ajax(): data = { @@ -344,8 +353,16 @@ def form_valid(self, part_calname_form): else: return response - def form_invalid(self, part_calname_form): + def form_invalid(self, part_calname_form, part_cal_copy_form): if self.request.is_ajax(): + if part_cal_copy_form.errors: + print('part_cal_copy_errors') + data = part_cal_copy_form.errors + return JsonResponse( + data, + status=400, + safe=False + ) if part_calname_form.errors: print('partcalnameupdate errors') data = part_calname_form.errors @@ -358,6 +375,7 @@ def form_invalid(self, part_calname_form): return self.render_to_response( self.get_context_data( part_calname_form=part_calname_form, + part_cal_copy_form=part_cal_copy_form, form_errors=form_errors ) ) diff --git a/roundabout/templates/calibrations/part_calname_form.html b/roundabout/templates/calibrations/part_calname_form.html index 8961da138..b279a7b94 100644 --- a/roundabout/templates/calibrations/part_calname_form.html +++ b/roundabout/templates/calibrations/part_calname_form.html @@ -48,6 +48,10 @@

    Add Calibration(s)

    {% csrf_token %}
    +
    + {{ part_cal_copy_form.management_form }} + {{ part_cal_copy_form | crispy }} +
    Calibration(s)
    diff --git a/roundabout/templates/parts/ajax_part_detail.html b/roundabout/templates/parts/ajax_part_detail.html index 28f90567d..dc3b4f581 100644 --- a/roundabout/templates/parts/ajax_part_detail.html +++ b/roundabout/templates/parts/ajax_part_detail.html @@ -217,7 +217,11 @@

    Custom Fields

    data-node-id="{{ part_template.id }}" data-node-type="detail" > - Add Calibration(s) + {% if part_template.coefficient_names.exists %} + Update Calibration(s) + {% else %} + Create Calibration(s) + {% endif %}

    Calibrations

    @@ -246,7 +250,11 @@

    Calibrations

    data-node-id="{{ part_template.id }}" data-node-type="detail" > - Add Configs/Constants + {% if part_template.config_names.exists %} + Update Configs/Constants + {% else %} + Create Configs/Constants + {% endif %}

    Configurations / Constants

    From fa47a278ddc489fa25d21e3fbe9739d8972939e8 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Wed, 15 Jul 2020 17:50:02 -0400 Subject: [PATCH 49/53] add and edit event buttons ommitted for inventory only users --- .../inventory/ajax_inventory_detail.html | 77 ++++++++++--------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 8983a97e0..4f993f150 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -143,22 +143,23 @@ data-location-id="{{ inventory_item.location.id}}" data-node-type="{{ node_type }}">Edit Inventory Details - - Add Calibration Coefficients - - Add Configuration/Constant Event + {% if not user|has_group:"inventory only" %} + Add Calibration Coefficients + + Add Configuration/Constant Event + {% endif %} @@ -532,16 +533,18 @@
    {{ inventory_item.assembly_part.assembly }}
    {% else %} In Progress {% endif %} -
    - - Edit Coefficient Values - -
    + {% if not user|has_group:"inventory only" %} +
    + + Edit Coefficient Values + +
    + {% endif %}
    {% if user in event.user_draft.all %} @@ -549,15 +552,17 @@
    {{ inventory_item.assembly_part.assembly }}
    Approve {% endif %} -
    - - Delete - -
    + {% if not user|has_group:"inventory only" %} +
    + + Delete + +
    + {% endif %}

    Approvers: {% for user in event.user_approver.all %} {{ user.username }} @@ -611,7 +616,7 @@

    {{ inventory_item.assembly_part.assembly }}
    Expand/Collapse Calibration {{ value_set.coefficient_name }} - {% if value_set.coefficient_name.value_set_type != '2d' %} + {% if value_set.coefficient_name.value_set_type != '2d' and not user|has_group:"inventory only" %}
    Date: Thu, 16 Jul 2020 15:26:56 -0400 Subject: [PATCH 50/53] inventory only users disabled from config event add, edit, and delete --- .../inventory/ajax_inventory_detail.html | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 4f993f150..10149e98a 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -689,27 +689,31 @@
    {{ inventory_item.assembly_part.assembly }}
    Expand/Collapse Configurations/Constants {{ event.configuration_date }}     -
    - - Edit Values - -
    + {% if not user|has_group:"inventory only" %} +
    + + Edit Values + +
    + {% endif %}
    -
    - + {% if not user|has_group:"inventory only" %} +
    + Delete - -
    + +
    + {% endif %}

    Approved: {{ event.approved }}

    Approved by: {{ event.user_approver.username }}

    Last Updated by: {{ event.user_draft.username }}

    From b172dde0156fa5b66e7980b2d8c51fc15005b473 Mon Sep 17 00:00:00 2001 From: Mario Carloni Date: Thu, 16 Jul 2020 18:31:57 -0400 Subject: [PATCH 51/53] modified description for part calibratiion duplication check, removed debug print statements from calibration and constant views, updated action description for adding constants --- roundabout/calibrations/forms.py | 2 +- roundabout/calibrations/views.py | 5 ----- roundabout/configs_constants/views.py | 3 --- roundabout/templates/inventory/ajax_inventory_detail.html | 2 +- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index 18c0732fd..2e13ec621 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -382,7 +382,7 @@ def copy_calibrations(to_id, from_id): ) # Validator for Part Calibration Copy -# Checks for duplicate Coefficient Names between Parts +# When a Part is selected, from which to copy Calibration Names into another Part, the function checks if duplicate Names exist between the two Parts in question. def validate_part_select(to_part, from_part): to_names = [name.calibration_name for name in to_part.coefficient_names.all()] from_names = [name.calibration_name for name in from_part.coefficient_names.all()] diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index f9cacffae..e45d3d468 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -92,7 +92,6 @@ def form_invalid(self, form, event_valueset_form): data = form.errors return JsonResponse(data, status=400) elif event_valueset_form.errors: - print('coeffcreateform errors') data = event_valueset_form.errors return JsonResponse(data, status=400, safe=False) else: @@ -178,7 +177,6 @@ def form_invalid(self, form, event_valueset_form): status=400 ) if event_valueset_form.errors: - print('coeffupdateform errors') data = event_valueset_form.errors return JsonResponse( data, @@ -276,7 +274,6 @@ def form_valid(self, valueset_value_form): def form_invalid(self, valueset_value_form): if self.request.is_ajax(): if valueset_value_form.errors: - print('coeffupdateform errors') data = valueset_value_form.errors return JsonResponse( data, @@ -356,7 +353,6 @@ def form_valid(self, part_calname_form, part_cal_copy_form): def form_invalid(self, part_calname_form, part_cal_copy_form): if self.request.is_ajax(): if part_cal_copy_form.errors: - print('part_cal_copy_errors') data = part_cal_copy_form.errors return JsonResponse( data, @@ -364,7 +360,6 @@ def form_invalid(self, part_calname_form, part_cal_copy_form): safe=False ) if part_calname_form.errors: - print('partcalnameupdate errors') data = part_calname_form.errors return JsonResponse( data, diff --git a/roundabout/configs_constants/views.py b/roundabout/configs_constants/views.py index eba2830f9..d960c45f8 100644 --- a/roundabout/configs_constants/views.py +++ b/roundabout/configs_constants/views.py @@ -78,7 +78,6 @@ def form_invalid(self, form, config_event_value_form): data = form.errors return JsonResponse(data, status=400) elif config_event_value_form.errors: - print('conf_const createform errors') data = config_event_value_form.errors return JsonResponse(data, status=400, safe=False) else: @@ -164,7 +163,6 @@ def form_invalid(self, form, config_event_value_form): status=400 ) if config_event_value_form.errors: - print('conf_const updateform errors') data = config_event_value_form.errors return JsonResponse( data, @@ -257,7 +255,6 @@ def form_valid(self, part_confname_form): def form_invalid(self, part_confname_form): if self.request.is_ajax(): if part_confname_form.errors: - print('partcalnameupdate errors') data = part_confname_form.errors return JsonResponse( data, diff --git a/roundabout/templates/inventory/ajax_inventory_detail.html b/roundabout/templates/inventory/ajax_inventory_detail.html index 10149e98a..b59dcad93 100644 --- a/roundabout/templates/inventory/ajax_inventory_detail.html +++ b/roundabout/templates/inventory/ajax_inventory_detail.html @@ -158,7 +158,7 @@ data-detail-url="{% url 'configs_constants:config_event_value_add' inventory_item.id %}" data-node-id="{{ inventory_item.id }}" data-location-id="{{ inventory_item.location.id}}" - data-node-type="config_event}">Add Configuration/Constant Event + data-node-type="config_event}">Add Configurations/Constants {% endif %} From 30d2ddcc27290008becdb866af43ddb56df6cc61 Mon Sep 17 00:00:00 2001 From: Stephanie Petillo Date: Thu, 16 Jul 2020 19:26:16 -0400 Subject: [PATCH 52/53] Ignore 'static' folder when adding headers --- scripts/update_copyright_headers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_copyright_headers.sh b/scripts/update_copyright_headers.sh index 8fbd87897..2b395c10e 100755 --- a/scripts/update_copyright_headers.sh +++ b/scripts/update_copyright_headers.sh @@ -70,7 +70,7 @@ do find $code_dir -regex $regex_match | while read -r file; do - if [[ "${file}" != *"__init__.py"* ]]; then # Ignore auto-generated __init__.py + if [[ "${file}" != *"__init__.py"* ]] && [[ "${file}" != *"/static/"* ]]; then # Ignore auto-generated __init__.py & "static" folder echo -e "$comment_start\n$(cat $header)" > /tmp/copyright_header_tmp From 3dad449c0fb6eb45f40b445c4b9b01216eec7542 Mon Sep 17 00:00:00 2001 From: Stephanie Petillo Date: Thu, 16 Jul 2020 19:27:52 -0400 Subject: [PATCH 53/53] Added headers to all files, except __init__.py & those in 'static' folder --- .circleci/config.yml | 2 +- config/settings/base.py | 2 +- config/settings/production.py | 2 +- local.yml | 2 +- production-demo-site.yml | 2 +- production-generic-site.yml | 2 +- production-rov-site.yml | 2 +- production-testing-site.yml | 2 +- production.yml | 2 +- roundabout/admintools/urls.py | 2 +- roundabout/admintools/views.py | 2 +- roundabout/assemblies/forms.py | 2 +- .../migrations/0005_assemblyrevision.py | 21 +++++++++++++++++++ .../migrations/0006_auto_20200218_1618.py | 21 +++++++++++++++++++ .../0007_assemblypart_assembly_revision.py | 21 +++++++++++++++++++ .../migrations/0008_auto_20200219_1611.py | 21 +++++++++++++++++++ .../migrations/0009_auto_20200325_1432.py | 21 +++++++++++++++++++ roundabout/assemblies/models.py | 2 +- roundabout/assemblies/urls.py | 2 +- roundabout/assemblies/utils.py | 2 +- roundabout/assemblies/views.py | 2 +- roundabout/builds/forms.py | 2 +- .../migrations/0008_auto_20200226_2042.py | 21 +++++++++++++++++++ .../migrations/0009_auto_20200227_1806.py | 21 +++++++++++++++++++ .../migrations/0010_auto_20200309_1557.py | 21 +++++++++++++++++++ .../migrations/0011_auto_20200309_1601.py | 21 +++++++++++++++++++ .../migrations/0012_auto_20200427_2056.py | 21 +++++++++++++++++++ .../migrations/0013_auto_20200430_1846.py | 21 +++++++++++++++++++ roundabout/builds/models.py | 2 +- roundabout/builds/urls.py | 2 +- roundabout/builds/views.py | 2 +- roundabout/builds/views_deployments.py | 2 +- roundabout/calibrations/admin.py | 21 +++++++++++++++++++ roundabout/calibrations/apps.py | 21 +++++++++++++++++++ roundabout/calibrations/forms.py | 21 +++++++++++++++++++ .../calibrations/migrations/0001_initial.py | 21 +++++++++++++++++++ .../migrations/0002_auto_20200521_1556.py | 21 +++++++++++++++++++ .../migrations/0003_auto_20200522_1351.py | 21 +++++++++++++++++++ .../migrations/0004_auto_20200522_1504.py | 21 +++++++++++++++++++ .../migrations/0005_auto_20200529_1344.py | 21 +++++++++++++++++++ .../0006_coefficientvalue_original_value.py | 21 +++++++++++++++++++ .../migrations/0007_auto_20200601_1450.py | 21 +++++++++++++++++++ .../migrations/0008_coefficientvalue_row.py | 21 +++++++++++++++++++ .../migrations/0009_auto_20200608_1808.py | 21 +++++++++++++++++++ .../migrations/0010_auto_20200610_1544.py | 21 +++++++++++++++++++ .../migrations/0011_auto_20200619_1752.py | 21 +++++++++++++++++++ .../migrations/0012_auto_20200622_1859.py | 21 +++++++++++++++++++ .../migrations/0013_auto_20200623_1851.py | 21 +++++++++++++++++++ .../migrations/0014_auto_20200625_1324.py | 21 +++++++++++++++++++ roundabout/calibrations/models.py | 21 +++++++++++++++++++ roundabout/calibrations/tests.py | 21 +++++++++++++++++++ roundabout/calibrations/urls.py | 21 +++++++++++++++++++ roundabout/calibrations/views.py | 21 +++++++++++++++++++ roundabout/configs_constants/admin.py | 21 +++++++++++++++++++ roundabout/configs_constants/apps.py | 21 +++++++++++++++++++ roundabout/configs_constants/forms.py | 21 +++++++++++++++++++ .../migrations/0001_initial.py | 21 +++++++++++++++++++ .../migrations/0002_auto_20200609_1918.py | 21 +++++++++++++++++++ .../migrations/0003_auto_20200612_1351.py | 21 +++++++++++++++++++ roundabout/configs_constants/models.py | 21 +++++++++++++++++++ roundabout/configs_constants/tests.py | 21 +++++++++++++++++++ roundabout/configs_constants/urls.py | 21 +++++++++++++++++++ roundabout/configs_constants/views.py | 21 +++++++++++++++++++ roundabout/context_processors.py | 2 +- roundabout/core/admin.py | 2 +- roundabout/core/apps.py | 2 +- roundabout/core/models.py | 2 +- roundabout/core/tests.py | 2 +- roundabout/core/utils.py | 2 +- roundabout/core/views.py | 2 +- roundabout/inventory/forms.py | 2 +- .../migrations/0004_auto_20200218_1527.py | 21 +++++++++++++++++++ .../migrations/0005_auto_20200302_1535.py | 21 +++++++++++++++++++ .../migrations/0006_auto_20200427_2056.py | 21 +++++++++++++++++++ .../migrations/0007_auto_20200430_1846.py | 21 +++++++++++++++++++ roundabout/inventory/models.py | 2 +- roundabout/inventory/urls.py | 2 +- roundabout/inventory/validators.py | 2 +- roundabout/inventory/views.py | 2 +- roundabout/locations/forms.py | 2 +- roundabout/locations/models.py | 2 +- roundabout/locations/urls.py | 2 +- roundabout/locations/views.py | 2 +- roundabout/parts/forms.py | 2 +- .../migrations/0005_auto_20200604_2019.py | 21 +++++++++++++++++++ .../migrations/0005_part_max_cal_sigdig.py | 21 +++++++++++++++++++ .../migrations/0006_auto_20200406_1347.py | 21 +++++++++++++++++++ .../migrations/0007_auto_20200420_1935.py | 21 +++++++++++++++++++ .../migrations/0008_merge_20200617_1450.py | 21 +++++++++++++++++++ roundabout/parts/models.py | 2 +- roundabout/parts/views.py | 2 +- roundabout/search/tables.py | 2 +- roundabout/search/urls.py | 2 +- roundabout/search/views.py | 2 +- .../import_inventory_upload_form.html | 2 +- .../templates/admintools/printer_form.html | 2 +- .../ajax_assembly_confirm_delete.html | 2 +- .../assemblies/ajax_assembly_detail.html | 2 +- .../assemblies/ajax_assembly_form.html | 2 +- .../assemblies/ajax_assembly_navtree.html | 2 +- ...ajax_assembly_revision_confirm_delete.html | 2 +- .../ajax_assembly_revision_detail.html | 2 +- .../ajax_assembly_revision_form.html | 2 +- .../assemblies/ajax_assembly_type_detail.html | 2 +- .../ajax_assemblypart_confirm_delete.html | 2 +- .../assemblies/ajax_assemblypart_detail.html | 2 +- .../assemblies/ajax_assemblypart_form.html | 2 +- .../templates/assemblies/assembly_detail.html | 2 +- .../templates/assemblies/assembly_list.html | 2 +- .../assemblies/assembly_revision_detail.html | 2 +- .../assemblies/assembly_type_detail.html | 2 +- .../assemblies/assembly_type_form.html | 2 +- .../assemblies/assembly_type_list.html | 2 +- .../assemblies/assemblypart_detail.html | 2 +- roundabout/templates/base.html | 2 +- .../templates/builds/ajax_build_detail.html | 2 +- .../templates/builds/ajax_build_form.html | 2 +- .../templates/builds/ajax_build_navtree.html | 2 +- .../builds/ajax_deployment_form.html | 2 +- .../ajax_inventory_photo_note_form.html | 2 +- .../templates/builds/ajax_snapshot_form.html | 2 +- roundabout/templates/builds/build_detail.html | 2 +- roundabout/templates/builds/build_list.html | 2 +- .../revisions_dropdown_list_options.html | 2 +- .../inventory/ajax_deployment_form.html | 2 +- .../ajax_inventory_add_subassembly.html | 2 +- .../ajax_inventory_add_to_build.html | 2 +- .../ajax_inventory_add_to_parent.html | 2 +- ...nventory_assemblypart_add_subassembly.html | 2 +- .../ajax_inventory_assign_destination.html | 2 +- ...inventory_destination_add_subassembly.html | 2 +- .../inventory/ajax_inventory_detail.html | 2 +- .../inventory/ajax_inventory_form.html | 2 +- .../ajax_inventory_photo_note_form.html | 2 +- .../inventory/ajax_snapshot_form.html | 2 +- .../templates/inventory/deployment_form.html | 2 +- .../templates/inventory/inventory_detail.html | 2 +- .../templates/inventory/inventory_list.html | 2 +- .../modal_inventory_udf_field_history.html | 2 +- .../ajax_location_confirm_delete.html | 2 +- .../locations/ajax_location_form.html | 2 +- .../templates/locations/location_detail.html | 2 +- .../templates/locations/location_list.html | 2 +- .../parts/ajax_part_custom_field_form.html | 2 +- .../templates/parts/ajax_part_detail.html | 2 +- .../templates/parts/ajax_part_form.html | 2 +- .../parts/ajax_part_revision_form.html | 2 +- .../parts/ajax_part_udf_field_form.html | 2 +- .../parts/ajax_part_udf_field_remove.html | 2 +- .../parts/ajax_part_udf_setvalue_form.html | 2 +- roundabout/templates/parts/part_detail.html | 2 +- roundabout/templates/parts/part_form.html | 2 +- roundabout/templates/parts/part_list.html | 2 +- .../templates/parts/part_type_form.html | 2 +- .../templates/reports/build_report.html | 2 +- roundabout/templates/search/_searchbar.html | 2 +- roundabout/templates/search/adv_search.html | 2 +- .../userdefinedfields/field_form.html | 2 +- .../templates/users/user_admin_form.html | 2 +- .../users/user_admin_password_form.html | 2 +- .../templates/users/user_confirm_delete.html | 2 +- roundabout/templates/users/user_form.html | 2 +- roundabout/userdefinedfields/forms.py | 2 +- .../migrations/0003_auto_20200325_1432.py | 21 +++++++++++++++++++ .../migrations/0004_auto_20200421_0056.py | 21 +++++++++++++++++++ .../migrations/0005_auto_20200517_1814.py | 21 +++++++++++++++++++ .../migrations/0006_auto_20200517_1822.py | 21 +++++++++++++++++++ roundabout/userdefinedfields/models.py | 2 +- 168 files changed, 1268 insertions(+), 113 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fea860338..d457ed6bb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/config/settings/base.py b/config/settings/base.py index 1c435f264..3efead33c 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/config/settings/production.py b/config/settings/production.py index c123f8e3f..6669ff7a5 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/local.yml b/local.yml index cc3d72f05..31ac56350 100644 --- a/local.yml +++ b/local.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/production-demo-site.yml b/production-demo-site.yml index 52d43a147..b2735e296 100644 --- a/production-demo-site.yml +++ b/production-demo-site.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/production-generic-site.yml b/production-generic-site.yml index a82a96a2c..3ca8e06c4 100644 --- a/production-generic-site.yml +++ b/production-generic-site.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/production-rov-site.yml b/production-rov-site.yml index d2d99ead2..9c8984245 100644 --- a/production-rov-site.yml +++ b/production-rov-site.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/production-testing-site.yml b/production-testing-site.yml index a5e4a150f..65edc2ef4 100644 --- a/production-testing-site.yml +++ b/production-testing-site.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/production.yml b/production.yml index b8df6920f..f1c0d722b 100644 --- a/production.yml +++ b/production.yml @@ -1,7 +1,7 @@ # # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/admintools/urls.py b/roundabout/admintools/urls.py index 194d6b5ac..a00546944 100644 --- a/roundabout/admintools/urls.py +++ b/roundabout/admintools/urls.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/admintools/views.py b/roundabout/admintools/views.py index f1cc79ec1..fe0701692 100644 --- a/roundabout/admintools/views.py +++ b/roundabout/admintools/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/assemblies/forms.py b/roundabout/assemblies/forms.py index 2fd0bfaf6..44eccb373 100644 --- a/roundabout/assemblies/forms.py +++ b/roundabout/assemblies/forms.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/assemblies/migrations/0005_assemblyrevision.py b/roundabout/assemblies/migrations/0005_assemblyrevision.py index cc5ccb7a9..1197fb8f5 100644 --- a/roundabout/assemblies/migrations/0005_assemblyrevision.py +++ b/roundabout/assemblies/migrations/0005_assemblyrevision.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-18 15:30 from django.db import migrations, models diff --git a/roundabout/assemblies/migrations/0006_auto_20200218_1618.py b/roundabout/assemblies/migrations/0006_auto_20200218_1618.py index 6e0412e6b..8db4550c6 100644 --- a/roundabout/assemblies/migrations/0006_auto_20200218_1618.py +++ b/roundabout/assemblies/migrations/0006_auto_20200218_1618.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-18 16:18 from django.db import migrations, models diff --git a/roundabout/assemblies/migrations/0007_assemblypart_assembly_revision.py b/roundabout/assemblies/migrations/0007_assemblypart_assembly_revision.py index cd6203408..9075ed55e 100644 --- a/roundabout/assemblies/migrations/0007_assemblypart_assembly_revision.py +++ b/roundabout/assemblies/migrations/0007_assemblypart_assembly_revision.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-19 15:39 from django.db import migrations, models diff --git a/roundabout/assemblies/migrations/0008_auto_20200219_1611.py b/roundabout/assemblies/migrations/0008_auto_20200219_1611.py index 434c6e783..52d321d88 100644 --- a/roundabout/assemblies/migrations/0008_auto_20200219_1611.py +++ b/roundabout/assemblies/migrations/0008_auto_20200219_1611.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-19 16:11 from django.db import migrations, models diff --git a/roundabout/assemblies/migrations/0009_auto_20200325_1432.py b/roundabout/assemblies/migrations/0009_auto_20200325_1432.py index d88e79da2..3d1c9a8be 100644 --- a/roundabout/assemblies/migrations/0009_auto_20200325_1432.py +++ b/roundabout/assemblies/migrations/0009_auto_20200325_1432.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-03-25 14:32 from django.db import migrations, models diff --git a/roundabout/assemblies/models.py b/roundabout/assemblies/models.py index 42e5df664..c639b60f7 100644 --- a/roundabout/assemblies/models.py +++ b/roundabout/assemblies/models.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/assemblies/urls.py b/roundabout/assemblies/urls.py index 666480b33..036d55fc3 100644 --- a/roundabout/assemblies/urls.py +++ b/roundabout/assemblies/urls.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/assemblies/utils.py b/roundabout/assemblies/utils.py index bcfe26aca..440bfadc7 100644 --- a/roundabout/assemblies/utils.py +++ b/roundabout/assemblies/utils.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/assemblies/views.py b/roundabout/assemblies/views.py index 70cec98d9..f697f16b3 100644 --- a/roundabout/assemblies/views.py +++ b/roundabout/assemblies/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/builds/forms.py b/roundabout/builds/forms.py index a30105850..c832331db 100644 --- a/roundabout/builds/forms.py +++ b/roundabout/builds/forms.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/builds/migrations/0008_auto_20200226_2042.py b/roundabout/builds/migrations/0008_auto_20200226_2042.py index 88d626535..71b227c4a 100644 --- a/roundabout/builds/migrations/0008_auto_20200226_2042.py +++ b/roundabout/builds/migrations/0008_auto_20200226_2042.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-26 20:42 from django.db import migrations, models diff --git a/roundabout/builds/migrations/0009_auto_20200227_1806.py b/roundabout/builds/migrations/0009_auto_20200227_1806.py index d34617486..66416af99 100644 --- a/roundabout/builds/migrations/0009_auto_20200227_1806.py +++ b/roundabout/builds/migrations/0009_auto_20200227_1806.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-27 18:06 from django.db import migrations, models diff --git a/roundabout/builds/migrations/0010_auto_20200309_1557.py b/roundabout/builds/migrations/0010_auto_20200309_1557.py index 58599abfc..2a971f575 100644 --- a/roundabout/builds/migrations/0010_auto_20200309_1557.py +++ b/roundabout/builds/migrations/0010_auto_20200309_1557.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-03-09 15:57 from django.db import migrations, models diff --git a/roundabout/builds/migrations/0011_auto_20200309_1601.py b/roundabout/builds/migrations/0011_auto_20200309_1601.py index 9bbd1d5fc..4089b7fe5 100644 --- a/roundabout/builds/migrations/0011_auto_20200309_1601.py +++ b/roundabout/builds/migrations/0011_auto_20200309_1601.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-03-09 16:01 from django.db import migrations diff --git a/roundabout/builds/migrations/0012_auto_20200427_2056.py b/roundabout/builds/migrations/0012_auto_20200427_2056.py index 273ae1fea..b79d3ed3c 100644 --- a/roundabout/builds/migrations/0012_auto_20200427_2056.py +++ b/roundabout/builds/migrations/0012_auto_20200427_2056.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-04-27 20:56 from django.db import migrations diff --git a/roundabout/builds/migrations/0013_auto_20200430_1846.py b/roundabout/builds/migrations/0013_auto_20200430_1846.py index f4b4d7a4d..d8767fbdb 100644 --- a/roundabout/builds/migrations/0013_auto_20200430_1846.py +++ b/roundabout/builds/migrations/0013_auto_20200430_1846.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-04-30 18:46 from django.conf import settings diff --git a/roundabout/builds/models.py b/roundabout/builds/models.py index b18a98601..1c6cc6836 100644 --- a/roundabout/builds/models.py +++ b/roundabout/builds/models.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/builds/urls.py b/roundabout/builds/urls.py index d2bcc812b..c9c7893ed 100644 --- a/roundabout/builds/urls.py +++ b/roundabout/builds/urls.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/builds/views.py b/roundabout/builds/views.py index c4a99a22c..11dd495e2 100644 --- a/roundabout/builds/views.py +++ b/roundabout/builds/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/builds/views_deployments.py b/roundabout/builds/views_deployments.py index 9fe6832d4..1a079e998 100644 --- a/roundabout/builds/views_deployments.py +++ b/roundabout/builds/views_deployments.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/calibrations/admin.py b/roundabout/calibrations/admin.py index 8c38f3f3d..a4611de86 100644 --- a/roundabout/calibrations/admin.py +++ b/roundabout/calibrations/admin.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.contrib import admin # Register your models here. diff --git a/roundabout/calibrations/apps.py b/roundabout/calibrations/apps.py index 68e2c2786..4a6359807 100644 --- a/roundabout/calibrations/apps.py +++ b/roundabout/calibrations/apps.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.apps import AppConfig diff --git a/roundabout/calibrations/forms.py b/roundabout/calibrations/forms.py index 2e13ec621..9747acfbf 100644 --- a/roundabout/calibrations/forms.py +++ b/roundabout/calibrations/forms.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django import forms from .models import CoefficientName, CoefficientValueSet, CalibrationEvent, CoefficientValue from roundabout.inventory.models import Inventory diff --git a/roundabout/calibrations/migrations/0001_initial.py b/roundabout/calibrations/migrations/0001_initial.py index 47bbfd1b4..eb6fb79b9 100644 --- a/roundabout/calibrations/migrations/0001_initial.py +++ b/roundabout/calibrations/migrations/0001_initial.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-05-19 19:39 from django.conf import settings diff --git a/roundabout/calibrations/migrations/0002_auto_20200521_1556.py b/roundabout/calibrations/migrations/0002_auto_20200521_1556.py index 9a9ce7b68..4d50fd608 100644 --- a/roundabout/calibrations/migrations/0002_auto_20200521_1556.py +++ b/roundabout/calibrations/migrations/0002_auto_20200521_1556.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-05-21 15:56 from django.db import migrations diff --git a/roundabout/calibrations/migrations/0003_auto_20200522_1351.py b/roundabout/calibrations/migrations/0003_auto_20200522_1351.py index 7bd3c8dc4..6092c6175 100644 --- a/roundabout/calibrations/migrations/0003_auto_20200522_1351.py +++ b/roundabout/calibrations/migrations/0003_auto_20200522_1351.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-05-22 13:51 from django.db import migrations diff --git a/roundabout/calibrations/migrations/0004_auto_20200522_1504.py b/roundabout/calibrations/migrations/0004_auto_20200522_1504.py index bc247afae..416a818d7 100644 --- a/roundabout/calibrations/migrations/0004_auto_20200522_1504.py +++ b/roundabout/calibrations/migrations/0004_auto_20200522_1504.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-05-22 15:04 from django.db import migrations, models diff --git a/roundabout/calibrations/migrations/0005_auto_20200529_1344.py b/roundabout/calibrations/migrations/0005_auto_20200529_1344.py index 88423db2d..6d8f07dbc 100644 --- a/roundabout/calibrations/migrations/0005_auto_20200529_1344.py +++ b/roundabout/calibrations/migrations/0005_auto_20200529_1344.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-05-29 13:44 import django.core.validators diff --git a/roundabout/calibrations/migrations/0006_coefficientvalue_original_value.py b/roundabout/calibrations/migrations/0006_coefficientvalue_original_value.py index 089ddf5aa..676444a7f 100644 --- a/roundabout/calibrations/migrations/0006_coefficientvalue_original_value.py +++ b/roundabout/calibrations/migrations/0006_coefficientvalue_original_value.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-05-29 16:13 from django.db import migrations, models diff --git a/roundabout/calibrations/migrations/0007_auto_20200601_1450.py b/roundabout/calibrations/migrations/0007_auto_20200601_1450.py index c983895eb..639835485 100644 --- a/roundabout/calibrations/migrations/0007_auto_20200601_1450.py +++ b/roundabout/calibrations/migrations/0007_auto_20200601_1450.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-01 14:50 from django.db import migrations, models diff --git a/roundabout/calibrations/migrations/0008_coefficientvalue_row.py b/roundabout/calibrations/migrations/0008_coefficientvalue_row.py index 34f15e147..cd41b58ac 100644 --- a/roundabout/calibrations/migrations/0008_coefficientvalue_row.py +++ b/roundabout/calibrations/migrations/0008_coefficientvalue_row.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-01 14:51 from django.db import migrations, models diff --git a/roundabout/calibrations/migrations/0009_auto_20200608_1808.py b/roundabout/calibrations/migrations/0009_auto_20200608_1808.py index 5d0ab354b..f6a0acd2a 100644 --- a/roundabout/calibrations/migrations/0009_auto_20200608_1808.py +++ b/roundabout/calibrations/migrations/0009_auto_20200608_1808.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-08 18:08 import django.core.validators diff --git a/roundabout/calibrations/migrations/0010_auto_20200610_1544.py b/roundabout/calibrations/migrations/0010_auto_20200610_1544.py index 65f7f5f39..3242d9b78 100644 --- a/roundabout/calibrations/migrations/0010_auto_20200610_1544.py +++ b/roundabout/calibrations/migrations/0010_auto_20200610_1544.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-10 15:44 import django.core.validators diff --git a/roundabout/calibrations/migrations/0011_auto_20200619_1752.py b/roundabout/calibrations/migrations/0011_auto_20200619_1752.py index b25034079..e4a2f0f9b 100644 --- a/roundabout/calibrations/migrations/0011_auto_20200619_1752.py +++ b/roundabout/calibrations/migrations/0011_auto_20200619_1752.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.13 on 2020-06-19 17:52 from django.conf import settings diff --git a/roundabout/calibrations/migrations/0012_auto_20200622_1859.py b/roundabout/calibrations/migrations/0012_auto_20200622_1859.py index 3e26bcefe..b4dfbb556 100644 --- a/roundabout/calibrations/migrations/0012_auto_20200622_1859.py +++ b/roundabout/calibrations/migrations/0012_auto_20200622_1859.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.13 on 2020-06-22 18:59 from django.conf import settings diff --git a/roundabout/calibrations/migrations/0013_auto_20200623_1851.py b/roundabout/calibrations/migrations/0013_auto_20200623_1851.py index fe8c9a0a4..4f5c90367 100644 --- a/roundabout/calibrations/migrations/0013_auto_20200623_1851.py +++ b/roundabout/calibrations/migrations/0013_auto_20200623_1851.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.13 on 2020-06-23 18:51 from django.conf import settings diff --git a/roundabout/calibrations/migrations/0014_auto_20200625_1324.py b/roundabout/calibrations/migrations/0014_auto_20200625_1324.py index c652d1732..bf6a2564c 100644 --- a/roundabout/calibrations/migrations/0014_auto_20200625_1324.py +++ b/roundabout/calibrations/migrations/0014_auto_20200625_1324.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.13 on 2020-06-25 13:24 from django.conf import settings diff --git a/roundabout/calibrations/models.py b/roundabout/calibrations/models.py index bcc36937d..411a16efa 100644 --- a/roundabout/calibrations/models.py +++ b/roundabout/calibrations/models.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.db import models from django.core.validators import MinValueValidator, DecimalValidator, MaxValueValidator, RegexValidator, MaxLengthValidator from django.utils import timezone diff --git a/roundabout/calibrations/tests.py b/roundabout/calibrations/tests.py index 7ce503c2d..7ab5046b9 100644 --- a/roundabout/calibrations/tests.py +++ b/roundabout/calibrations/tests.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.test import TestCase # Create your tests here. diff --git a/roundabout/calibrations/urls.py b/roundabout/calibrations/urls.py index 905300d39..0d4a301e1 100644 --- a/roundabout/calibrations/urls.py +++ b/roundabout/calibrations/urls.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.urls import path from . import views diff --git a/roundabout/calibrations/views.py b/roundabout/calibrations/views.py index e45d3d468..74a3f88bf 100644 --- a/roundabout/calibrations/views.py +++ b/roundabout/calibrations/views.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.shortcuts import render from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin diff --git a/roundabout/configs_constants/admin.py b/roundabout/configs_constants/admin.py index 8c38f3f3d..a4611de86 100644 --- a/roundabout/configs_constants/admin.py +++ b/roundabout/configs_constants/admin.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.contrib import admin # Register your models here. diff --git a/roundabout/configs_constants/apps.py b/roundabout/configs_constants/apps.py index 23fae8b71..ad954aa5c 100644 --- a/roundabout/configs_constants/apps.py +++ b/roundabout/configs_constants/apps.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.apps import AppConfig diff --git a/roundabout/configs_constants/forms.py b/roundabout/configs_constants/forms.py index d2864f0f5..9c7a1f269 100644 --- a/roundabout/configs_constants/forms.py +++ b/roundabout/configs_constants/forms.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django import forms from .models import ConfigEvent, ConfigName, ConfigValue from roundabout.inventory.models import Inventory, Deployment diff --git a/roundabout/configs_constants/migrations/0001_initial.py b/roundabout/configs_constants/migrations/0001_initial.py index 0c03ffec6..0a037b0a3 100644 --- a/roundabout/configs_constants/migrations/0001_initial.py +++ b/roundabout/configs_constants/migrations/0001_initial.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-09 19:11 from django.conf import settings diff --git a/roundabout/configs_constants/migrations/0002_auto_20200609_1918.py b/roundabout/configs_constants/migrations/0002_auto_20200609_1918.py index 4902ca220..9f26a0cb8 100644 --- a/roundabout/configs_constants/migrations/0002_auto_20200609_1918.py +++ b/roundabout/configs_constants/migrations/0002_auto_20200609_1918.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-09 19:18 from django.db import migrations, models diff --git a/roundabout/configs_constants/migrations/0003_auto_20200612_1351.py b/roundabout/configs_constants/migrations/0003_auto_20200612_1351.py index f8a276386..cc2593456 100644 --- a/roundabout/configs_constants/migrations/0003_auto_20200612_1351.py +++ b/roundabout/configs_constants/migrations/0003_auto_20200612_1351.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-12 13:51 from django.db import migrations diff --git a/roundabout/configs_constants/models.py b/roundabout/configs_constants/models.py index 0037b9b7e..9785eb7c1 100644 --- a/roundabout/configs_constants/models.py +++ b/roundabout/configs_constants/models.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.db import models from django.core.validators import MinValueValidator, DecimalValidator, MaxValueValidator, RegexValidator, MaxLengthValidator from django.utils import timezone diff --git a/roundabout/configs_constants/tests.py b/roundabout/configs_constants/tests.py index 7ce503c2d..7ab5046b9 100644 --- a/roundabout/configs_constants/tests.py +++ b/roundabout/configs_constants/tests.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.test import TestCase # Create your tests here. diff --git a/roundabout/configs_constants/urls.py b/roundabout/configs_constants/urls.py index f0d78a9a1..d80f49589 100644 --- a/roundabout/configs_constants/urls.py +++ b/roundabout/configs_constants/urls.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.urls import path from . import views diff --git a/roundabout/configs_constants/views.py b/roundabout/configs_constants/views.py index d960c45f8..1ba885808 100644 --- a/roundabout/configs_constants/views.py +++ b/roundabout/configs_constants/views.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + from django.shortcuts import render from django.http import HttpResponse, HttpResponseRedirect, JsonResponse from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin diff --git a/roundabout/context_processors.py b/roundabout/context_processors.py index 7c00dd277..e37811b0f 100644 --- a/roundabout/context_processors.py +++ b/roundabout/context_processors.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/core/admin.py b/roundabout/core/admin.py index a1cb59eee..a4611de86 100644 --- a/roundabout/core/admin.py +++ b/roundabout/core/admin.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/core/apps.py b/roundabout/core/apps.py index a330a7495..b264bc2e4 100644 --- a/roundabout/core/apps.py +++ b/roundabout/core/apps.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/core/models.py b/roundabout/core/models.py index 714cb92b2..aa8f2d276 100644 --- a/roundabout/core/models.py +++ b/roundabout/core/models.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/core/tests.py b/roundabout/core/tests.py index c225bccee..7ab5046b9 100644 --- a/roundabout/core/tests.py +++ b/roundabout/core/tests.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/core/utils.py b/roundabout/core/utils.py index fb8729625..5430454bc 100644 --- a/roundabout/core/utils.py +++ b/roundabout/core/utils.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/core/views.py b/roundabout/core/views.py index ad6803196..24eaad24a 100644 --- a/roundabout/core/views.py +++ b/roundabout/core/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/inventory/forms.py b/roundabout/inventory/forms.py index 0e8efe1eb..be532f4de 100644 --- a/roundabout/inventory/forms.py +++ b/roundabout/inventory/forms.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/inventory/migrations/0004_auto_20200218_1527.py b/roundabout/inventory/migrations/0004_auto_20200218_1527.py index da4ac47cc..27bd77a32 100644 --- a/roundabout/inventory/migrations/0004_auto_20200218_1527.py +++ b/roundabout/inventory/migrations/0004_auto_20200218_1527.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-02-18 15:27 from django.db import migrations, models diff --git a/roundabout/inventory/migrations/0005_auto_20200302_1535.py b/roundabout/inventory/migrations/0005_auto_20200302_1535.py index cfbaf4c08..68ae0441c 100644 --- a/roundabout/inventory/migrations/0005_auto_20200302_1535.py +++ b/roundabout/inventory/migrations/0005_auto_20200302_1535.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-03-02 15:35 from django.db import migrations, models diff --git a/roundabout/inventory/migrations/0006_auto_20200427_2056.py b/roundabout/inventory/migrations/0006_auto_20200427_2056.py index 1a2072c1a..7d85d79e8 100644 --- a/roundabout/inventory/migrations/0006_auto_20200427_2056.py +++ b/roundabout/inventory/migrations/0006_auto_20200427_2056.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-04-27 20:56 from django.db import migrations diff --git a/roundabout/inventory/migrations/0007_auto_20200430_1846.py b/roundabout/inventory/migrations/0007_auto_20200430_1846.py index 6cf67dfbf..d9c156a72 100644 --- a/roundabout/inventory/migrations/0007_auto_20200430_1846.py +++ b/roundabout/inventory/migrations/0007_auto_20200430_1846.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-04-30 18:46 from django.conf import settings diff --git a/roundabout/inventory/models.py b/roundabout/inventory/models.py index 47d6675e3..0b80f6f50 100644 --- a/roundabout/inventory/models.py +++ b/roundabout/inventory/models.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/inventory/urls.py b/roundabout/inventory/urls.py index 201985339..e272a5cf9 100644 --- a/roundabout/inventory/urls.py +++ b/roundabout/inventory/urls.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/inventory/validators.py b/roundabout/inventory/validators.py index 1a60291fc..a12a166ab 100644 --- a/roundabout/inventory/validators.py +++ b/roundabout/inventory/validators.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/inventory/views.py b/roundabout/inventory/views.py index bcbe07bb1..b3ae88d12 100644 --- a/roundabout/inventory/views.py +++ b/roundabout/inventory/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/locations/forms.py b/roundabout/locations/forms.py index aab51a646..ed6510274 100644 --- a/roundabout/locations/forms.py +++ b/roundabout/locations/forms.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/locations/models.py b/roundabout/locations/models.py index 33aaa80ef..30c986efb 100644 --- a/roundabout/locations/models.py +++ b/roundabout/locations/models.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/locations/urls.py b/roundabout/locations/urls.py index e8ab03103..5a4351668 100644 --- a/roundabout/locations/urls.py +++ b/roundabout/locations/urls.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/locations/views.py b/roundabout/locations/views.py index 764382a0f..d4dc2ebd0 100644 --- a/roundabout/locations/views.py +++ b/roundabout/locations/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/parts/forms.py b/roundabout/parts/forms.py index 9eb7ce7e1..92a4c8b20 100644 --- a/roundabout/parts/forms.py +++ b/roundabout/parts/forms.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/parts/migrations/0005_auto_20200604_2019.py b/roundabout/parts/migrations/0005_auto_20200604_2019.py index 912ec8aab..31e7faf9b 100644 --- a/roundabout/parts/migrations/0005_auto_20200604_2019.py +++ b/roundabout/parts/migrations/0005_auto_20200604_2019.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.10 on 2020-06-04 20:19 from django.db import migrations, models diff --git a/roundabout/parts/migrations/0005_part_max_cal_sigdig.py b/roundabout/parts/migrations/0005_part_max_cal_sigdig.py index 961f10fc6..d973f36e7 100644 --- a/roundabout/parts/migrations/0005_part_max_cal_sigdig.py +++ b/roundabout/parts/migrations/0005_part_max_cal_sigdig.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-04-03 16:17 from decimal import Decimal diff --git a/roundabout/parts/migrations/0006_auto_20200406_1347.py b/roundabout/parts/migrations/0006_auto_20200406_1347.py index bf787e348..5f74c38dd 100644 --- a/roundabout/parts/migrations/0006_auto_20200406_1347.py +++ b/roundabout/parts/migrations/0006_auto_20200406_1347.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-04-06 13:47 import django.core.validators diff --git a/roundabout/parts/migrations/0007_auto_20200420_1935.py b/roundabout/parts/migrations/0007_auto_20200420_1935.py index 79c46efcc..8788df2d5 100644 --- a/roundabout/parts/migrations/0007_auto_20200420_1935.py +++ b/roundabout/parts/migrations/0007_auto_20200420_1935.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.9 on 2020-04-20 19:35 import django.core.validators diff --git a/roundabout/parts/migrations/0008_merge_20200617_1450.py b/roundabout/parts/migrations/0008_merge_20200617_1450.py index 8cf2e6896..397fe61e0 100644 --- a/roundabout/parts/migrations/0008_merge_20200617_1450.py +++ b/roundabout/parts/migrations/0008_merge_20200617_1450.py @@ -1,3 +1,24 @@ +""" +# Copyright (C) 2019-2020 Woods Hole Oceanographic Institution +# +# This file is part of the Roundabout Database project ("RDB" or +# "ooicgsn-roundabout"). +# +# ooicgsn-roundabout is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# ooicgsn-roundabout is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ooicgsn-roundabout in the COPYING.md file at the project root. +# If not, see . +""" + # Generated by Django 2.2.13 on 2020-06-17 14:50 from django.db import migrations diff --git a/roundabout/parts/models.py b/roundabout/parts/models.py index d25b9da75..c2b257c27 100644 --- a/roundabout/parts/models.py +++ b/roundabout/parts/models.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/parts/views.py b/roundabout/parts/views.py index 4eebda166..2042247d3 100644 --- a/roundabout/parts/views.py +++ b/roundabout/parts/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/search/tables.py b/roundabout/search/tables.py index 07609d0cf..8236cd827 100644 --- a/roundabout/search/tables.py +++ b/roundabout/search/tables.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/search/urls.py b/roundabout/search/urls.py index 7c6ab9c34..96d6687f5 100644 --- a/roundabout/search/urls.py +++ b/roundabout/search/urls.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/search/views.py b/roundabout/search/views.py index 2d2b8bc91..92b9e5fd7 100644 --- a/roundabout/search/views.py +++ b/roundabout/search/views.py @@ -1,7 +1,7 @@ """ # Copyright (C) 2019-2020 Woods Hole Oceanographic Institution # -# This file is part of the Roundabout Database project ("RDB" or +# This file is part of the Roundabout Database project ("RDB" or # "ooicgsn-roundabout"). # # ooicgsn-roundabout is free software: you can redistribute it and/or modify diff --git a/roundabout/templates/admintools/import_inventory_upload_form.html b/roundabout/templates/admintools/import_inventory_upload_form.html index 16989339f..d8e0e0bff 100644 --- a/roundabout/templates/admintools/import_inventory_upload_form.html +++ b/roundabout/templates/admintools/import_inventory_upload_form.html @@ -1,7 +1,7 @@