| Name/description |
+ Configs, Constants, and Calibrations Enabled |
|
@@ -47,6 +48,7 @@ Part Types
{% else %}
{{ part_type.name }} |
{% endif %}
+ {{ part_type.ccc_toggle }} |
Edit
Delete
diff --git a/roundabout/userdefinedfields/api/serializers.py b/roundabout/userdefinedfields/api/serializers.py
new file mode 100644
index 000000000..f70d76cf6
--- /dev/null
+++ b/roundabout/userdefinedfields/api/serializers.py
@@ -0,0 +1,45 @@
+"""
+# 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 rest_framework import serializers
+from rest_flex_fields import FlexFieldsModelSerializer
+
+from ..models import *
+from roundabout.parts.api.serializers import PartSerializer
+from roundabout.inventory.api.serializers import InventorySerializer
+
+
+class FieldSerializer(FlexFieldsModelSerializer):
+ class Meta:
+ model = Field
+ fields = '__all__'
+
+
+class FieldValueSerializer(FlexFieldsModelSerializer):
+ class Meta:
+ model = FieldValue
+ fields = '__all__'
+
+ expandable_fields = {
+ 'field': FieldSerializer,
+ 'part': PartSerializer,
+ 'inventory': (InventorySerializer, {'many': True})
+ }
diff --git a/roundabout/assemblies/api/urls.py b/roundabout/userdefinedfields/api/views.py
similarity index 61%
rename from roundabout/assemblies/api/urls.py
rename to roundabout/userdefinedfields/api/views.py
index 149dbd28a..5ac140f3d 100644
--- a/roundabout/assemblies/api/urls.py
+++ b/roundabout/userdefinedfields/api/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
@@ -19,14 +19,20 @@
# If not, see .
"""
-from django.urls import path, include
-from rest_framework.routers import DefaultRouter, SimpleRouter
-from .views import AssemblyViewSet
+from rest_framework import generics, filters, viewsets
+from rest_framework.permissions import IsAuthenticated
-# Create a router and register our viewsets with it.
-router = SimpleRouter()
-router.register(r'assemblies', AssemblyViewSet, 'assemblies' )
+from ..models import *
+from .serializers import FieldSerializer, FieldValueSerializer
-urlpatterns = [
- path('', include(router.urls) ),
-]
+
+class FieldViewSet(viewsets.ModelViewSet):
+ queryset = Field.objects.all()
+ serializer_class = FieldSerializer
+ permission_classes = (IsAuthenticated,)
+
+
+class FieldValueViewSet(viewsets.ModelViewSet):
+ queryset = FieldValue.objects.all()
+ serializer_class = FieldValueSerializer
+ permission_classes = (IsAuthenticated,)
diff --git a/roundabout/userdefinedfields/migrations/0006_auto_20200820_1325.py b/roundabout/userdefinedfields/migrations/0006_auto_20200820_1325.py
new file mode 100644
index 000000000..ecb4ed8d5
--- /dev/null
+++ b/roundabout/userdefinedfields/migrations/0006_auto_20200820_1325.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.2.13 on 2020-08-20 13:25
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('userdefinedfields', '0005_auto_20200517_1814_squashed_0006_auto_20200517_1822'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='field',
+ name='created_at',
+ field=models.DateTimeField(default=django.utils.timezone.now),
+ ),
+ migrations.AddField(
+ model_name='field',
+ name='updated_at',
+ field=models.DateTimeField(auto_now=True),
+ ),
+ ]
diff --git a/roundabout/userdefinedfields/migrations/0007_fieldvalue_updated_at.py b/roundabout/userdefinedfields/migrations/0007_fieldvalue_updated_at.py
new file mode 100644
index 000000000..327ef49e4
--- /dev/null
+++ b/roundabout/userdefinedfields/migrations/0007_fieldvalue_updated_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.13 on 2020-08-20 15:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('userdefinedfields', '0006_auto_20200820_1325'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='fieldvalue',
+ name='updated_at',
+ field=models.DateTimeField(auto_now=True),
+ ),
+ ]
diff --git a/roundabout/userdefinedfields/models.py b/roundabout/userdefinedfields/models.py
index 48267add3..d62b0b967 100644
--- a/roundabout/userdefinedfields/models.py
+++ b/roundabout/userdefinedfields/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
@@ -21,6 +21,7 @@
from dateutil import parser
from django.db import models
+from django.utils import timezone
from django.contrib.postgres.fields import JSONField
# Create your models here.
@@ -40,6 +41,8 @@ class Field(models.Model):
field_default_value = models.CharField(max_length=255, null=False, blank=True)
choice_field_options = JSONField(null=True, blank=True)
global_for_part_types = models.ManyToManyField('parts.PartType', blank=True, related_name='custom_fields')
+ created_at = models.DateTimeField(default=timezone.now)
+ updated_at = models.DateTimeField(auto_now=True)
class Meta:
ordering = ('field_name',)
@@ -57,6 +60,7 @@ class FieldValue(models.Model):
part = models.ForeignKey('parts.Part', related_name='fieldvalues',
on_delete=models.CASCADE, null=True)
created_at = models.DateTimeField(auto_now_add=True)
+ updated_at = models.DateTimeField(auto_now=True)
user = models.ForeignKey('users.User', related_name='fieldvalues',
on_delete=models.SET_NULL, null=True, blank=False)
is_current = models.BooleanField(default=False)
diff --git a/roundabout/users/migrations/0002_auto_20191022_1510.py b/roundabout/users/migrations/0002_auto_20191022_1510.py
index ba0519bc6..50bcb53b0 100644
--- a/roundabout/users/migrations/0002_auto_20191022_1510.py
+++ b/roundabout/users/migrations/0002_auto_20191022_1510.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
@@ -26,21 +26,27 @@
from django.apps import apps
from django.contrib.auth import get_user_model
from django.contrib.auth.management import create_permissions
+from django.contrib.auth.hashers import make_password
-User = get_user_model()
-Group = apps.get_model('auth','Group')
env = environ.Env()
def generate_superuser(apps, schema_editor):
+ User = apps.get_model('users', 'User')
+ Group = apps.get_model('auth','Group')
+
DJANGO_SU_NAME = env('DJANGO_SU_NAME')
DJANGO_SU_EMAIL = env('DJANGO_SU_EMAIL')
- DJANGO_SU_PASSWORD = env('DJANGO_SU_PASSWORD')
+ DJANGO_SU_PASSWORD = make_password(env('DJANGO_SU_PASSWORD'))
- superuser = User.objects.create_superuser(
+ superuser = User.objects.create(
username=DJANGO_SU_NAME,
email=DJANGO_SU_EMAIL,
- password=DJANGO_SU_PASSWORD)
+ password=DJANGO_SU_PASSWORD,
+ is_superuser=True,
+ is_staff=True,
+ is_active=True,
+ )
superuser.save()
diff --git a/roundabout/users/migrations/0004_user_is_infield.py b/roundabout/users/migrations/0004_user_is_infield.py
new file mode 100644
index 000000000..dc5358ce8
--- /dev/null
+++ b/roundabout/users/migrations/0004_user_is_infield.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.13 on 2020-07-31 19:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0003_auto_20191023_1506'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='is_infield',
+ field=models.BooleanField(default=False),
+ ),
+ ]
diff --git a/roundabout/users/migrations/0005_auto_20200819_1355.py b/roundabout/users/migrations/0005_auto_20200819_1355.py
new file mode 100644
index 000000000..6d70672f5
--- /dev/null
+++ b/roundabout/users/migrations/0005_auto_20200819_1355.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.2.13 on 2020-08-19 13:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0004_user_is_infield'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='user',
+ options={'ordering': ['username']},
+ ),
+ ]
diff --git a/roundabout/users/models.py b/roundabout/users/models.py
index ae9caff0a..361aa1f63 100644
--- a/roundabout/users/models.py
+++ b/roundabout/users/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
@@ -18,18 +18,20 @@
# along with ooicgsn-roundabout in the COPYING.md file at the project root.
# If not, see .
"""
-
+from django.db import models
from django.contrib.auth.models import AbstractUser
-from django.db.models import CharField
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
class User(AbstractUser):
-
# First Name and Last Name do not cover name patterns
# around the globe.
- name = CharField(_("Name of User"), blank=True, max_length=255)
+ name = models.CharField(_("Name of User"), blank=True, max_length=255)
+ is_infield = models.BooleanField(default=False)
+
+ class Meta:
+ ordering = ['username']
def __str__(self):
return self.username
|