From c2a7b790754b1583fffe47174277494f95f07fca Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Fri, 18 Aug 2023 16:43:26 -0600
Subject: [PATCH 01/12] Create ObjectMixin and beginning work on applying it

---
 usaon_vta_survey/forms.py                     | 16 +++----
 usaon_vta_survey/models/tables.py             | 30 +++++++++----
 .../templates/macros/forms/misc.j2            | 42 +++++++++----------
 3 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index 40a76e78..288c476d 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -62,14 +62,16 @@ def conv_String(self, field_args, **extra):
     ResponseObservingSystem: model_form(
         ResponseObservingSystem,
         only=[
-            'name',
-            'url',
-            'author_name',
-            'author_email',
+            'short_name',
+            'long_name',
+            'website_url',
+            'contact_name',
+            'contact_email',
             'funding_country',
-            'funding_agency',
-            'references_citations',
-            'notes',
+            'organization',
+            'tags',
+            'version',
+            'description',
         ],
     ),
     # TODO: Restrict "rating" values to correct range
diff --git a/usaon_vta_survey/models/tables.py b/usaon_vta_survey/models/tables.py
index fa913a86..d8fa7fe1 100644
--- a/usaon_vta_survey/models/tables.py
+++ b/usaon_vta_survey/models/tables.py
@@ -64,6 +64,26 @@ def __io__(cls) -> IORelationship:
         return io
 
 
+class ResponseObjectFieldMixin:
+    """Provide shared fields between all relationshio objects to reduce repition."""
+
+    short_name = Column(String(256), nullable=False)
+    full_name = Column(String(256), nullable=False)
+    organization = Column(String(256), nullable=False)
+    # should this be funding agency?
+    funder = Column(String(256), nullable=False)
+    funding_country = Column(String(256), nullable=False)
+    # clairify this
+    website_url = Column(String(256), nullable=True)
+    description = Column(String(512), nullable=True)
+    contact_name = Column(String(256), nullable=False)
+    contact_title = Column(String(256), nullable=True)
+    contact_email = Column(String(256), nullable=False)
+    # how do i make it a minimum of 3 tags?
+    tags = Column(String, nullable=False)
+    version = Column(String(64), nullable=True)
+
+
 class User(BaseModel, UserMixin):
     __tablename__ = 'user'
     id = Column(
@@ -185,7 +205,7 @@ class Response(BaseModel):
     )
 
 
-class ResponseObservingSystem(BaseModel, IORelationshipMixin):
+class ResponseObservingSystem(BaseModel, IORelationshipMixin, ResponseObjectFieldMixin):
     __tablename__ = 'response_observing_system'
     __table_args__ = (UniqueConstraint('name', 'response_id'),)
     id = Column(
@@ -213,14 +233,6 @@ class ResponseObservingSystem(BaseModel, IORelationshipMixin):
         'polymorphic_on': type,
     }
 
-    url = Column(String(256), nullable=False)
-    author_name = Column(String(256), nullable=False)
-    author_email = Column(String(256), nullable=False)
-    funding_country = Column(String(256), nullable=False)
-    funding_agency = Column(String(256), nullable=False)
-    references_citations = Column(String(512), nullable=False)
-    notes = Column(String(512), nullable=True)
-
     response = relationship(
         'Response',
         back_populates='observing_systems',
diff --git a/usaon_vta_survey/templates/macros/forms/misc.j2 b/usaon_vta_survey/templates/macros/forms/misc.j2
index 102ae122..94aa28a5 100644
--- a/usaon_vta_survey/templates/macros/forms/misc.j2
+++ b/usaon_vta_survey/templates/macros/forms/misc.j2
@@ -1,38 +1,38 @@
 {% macro observing_system_fields(form) -%}
-  {{form.name.label}} {{form.name(size=50)}}
-  {% if form.name.errors %}
+  {{form.short_name.label}} {{form.short_name(size=50)}}
+  {% if form.short_name.errors %}
     <ul class="errors">
-    {% for error in form.name.errors %}
+    {% for error in form.short_name.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.url.label}} {{form.url(size=50)}}
-  {% if form.url.errors %}
+  {{form.website_url.label}} {{form.website_url(size=50)}}
+  {% if form.website_url.errors %}
     <ul class="errors">
-    {% for error in form.url.errors %}
+    {% for error in form.website_url.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.author_name.label}} {{form.author_name(size=50)}}
-  {% if form.author_name.errors %}
+  {{form.contact_name.label}} {{form.contact_name(size=50)}}
+  {% if form.contact_name.errors %}
     <ul class="errors">
-    {% for error in form.author_name.errors %}
+    {% for error in form.contact_name.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.author_email.label}} {{form.author_email(size=50)}}
-  {% if form.author_email.errors %}
+  {{form.contact_email.label}} {{form.contact_email(size=50)}}
+  {% if form.contact_email.errors %}
     <ul class="errors">
-    {% for error in form.author_email.errors %}
+    {% for error in form.contact_email.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
@@ -49,30 +49,30 @@
   {% endif %}
   <br />
 
-  {{form.funding_agency.label}} {{form.funding_agency(size=50)}}
-  {% if form.funding_agency.errors %}
+  {{form.organization.label}} {{form.organization(size=50)}}
+  {% if form.organization.errors %}
     <ul class="errors">
-    {% for error in form.funding_agency.errors %}
+    {% for error in form.organization.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.references_citations.label}} {{form.references_citations(size=50)}}
-  {% if form.references_citations.errors %}
+  {{form.tags.label}} {{form.tags(size=50)}}
+  {% if form.tags.errors %}
     <ul class="errors">
-    {% for error in form.references_citations.errors %}
+    {% for error in form.tags.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.notes.label}} {{form.notes(size=50)}}
-  {% if form.notes.errors %}
+  {{form.description.label}} {{form.description(size=50)}}
+  {% if form.description.errors %}
     <ul class="errors">
-    {% for error in form.notes.errors %}
+    {% for error in form.description.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>

From f30a7cb2b11989de71e6d2513ed9e6403e3d490a Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 09:32:38 -0600
Subject: [PATCH 02/12] Update macro name

---
 usaon_vta_survey/models/tables.py                             | 1 +
 usaon_vta_survey/templates/macros/forms/misc.j2               | 2 +-
 usaon_vta_survey/templates/response/observing_systems.html    | 4 ++--
 .../response/relationships/observing_system_data_product.html | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/usaon_vta_survey/models/tables.py b/usaon_vta_survey/models/tables.py
index d8fa7fe1..c3783be1 100644
--- a/usaon_vta_survey/models/tables.py
+++ b/usaon_vta_survey/models/tables.py
@@ -274,6 +274,7 @@ class ResponseObservingSystemResearch(BaseModel):
     intermediate_product = Column(String(256), nullable=False)
 
 
+# ADD ResponseObjectFieldMixin
 class ResponseDataProduct(BaseModel, IORelationshipMixin):
     __tablename__ = 'response_data_product'
     __table_args__ = (UniqueConstraint('name', 'response_id'),)
diff --git a/usaon_vta_survey/templates/macros/forms/misc.j2 b/usaon_vta_survey/templates/macros/forms/misc.j2
index 94aa28a5..87170a25 100644
--- a/usaon_vta_survey/templates/macros/forms/misc.j2
+++ b/usaon_vta_survey/templates/macros/forms/misc.j2
@@ -1,4 +1,4 @@
-{% macro observing_system_fields(form) -%}
+{% macro response_object_fields(form) -%}
   {{form.short_name.label}} {{form.short_name(size=50)}}
   {% if form.short_name.errors %}
     <ul class="errors">
diff --git a/usaon_vta_survey/templates/response/observing_systems.html b/usaon_vta_survey/templates/response/observing_systems.html
index 531657ee..d682366d 100644
--- a/usaon_vta_survey/templates/response/observing_systems.html
+++ b/usaon_vta_survey/templates/response/observing_systems.html
@@ -1,5 +1,5 @@
 {% extends 'response/base.html' %}
-{% from 'macros/forms/misc.j2' import observing_system_fields %}
+{% from 'macros/forms/misc.j2' import response_object_fields %}
 
 
 {% block content %}
@@ -22,7 +22,7 @@ <h3>Observing systems</h3>
   <h3>Add observing system</h3>
   <form method="POST">
     {{form.csrf_token}}
-    {{observing_system_fields(form)}}
+    {{response_object_fields(form)}}
 
     <input type="submit" value="Create new observing system" />
   </form>
diff --git a/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html b/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
index 18bca7db..8b922938 100644
--- a/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
+++ b/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
@@ -1,6 +1,6 @@
 {% extends 'response/base.html' %}
 {% from 'macros/forms/misc.j2' import
-  observing_system_fields,
+  response_object_fields,
   application_fields
 %}
 {% from 'macros/forms/relationships/observingsystem_dataproduct.j2' import
@@ -61,7 +61,7 @@ <h4>Data Product</h4>
     <div class="two-columns">
       <div>
         {% if sqla_inspect(observing_system).transient %}
-          {{ observing_system_fields(form.observing_system.form) }}
+          {{ response_object_fields(form.observing_system.form) }}
         {% else %}
           <p>Name: {{observing_system.name}}</p>
         {% endif %}

From 5b4ea9dc4d6c12ac81f0a100702c6f533bbb6903 Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 09:44:25 -0600
Subject: [PATCH 03/12] WIP applying mixin to data product

---
 usaon_vta_survey/forms.py                     | 25 +++++++++++++++----
 usaon_vta_survey/models/tables.py             | 10 +-------
 .../templates/macros/forms/misc.j2            |  9 +++++++
 .../templates/response/data_products.html     |  5 ++--
 .../data_product_application.html             |  4 +--
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index 288c476d..12e36684 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -63,21 +63,36 @@ def conv_String(self, field_args, **extra):
         ResponseObservingSystem,
         only=[
             'short_name',
-            'long_name',
+            'full_name',
+            'organization',
+            'funder',
+            'funding_country',
             'website_url',
+            'description',
             'contact_name',
+            'contact_title',
             'contact_email',
-            'funding_country',
-            'organization',
             'tags',
             'version',
-            'description',
         ],
     ),
     # TODO: Restrict "rating" values to correct range
     ResponseDataProduct: model_form(
         ResponseDataProduct,
-        only=['name', 'performance_rating'],
+        only=[
+            'short_name',
+            'full_name',
+            'organization',
+            'funder',
+            'funding_country',
+            'website_url',
+            'description',
+            'contact_name',
+            'contact_title',
+            'contact_email',
+            'tags',
+            'version',
+        ],
     ),
     ResponseApplication: model_form(
         ResponseApplication,
diff --git a/usaon_vta_survey/models/tables.py b/usaon_vta_survey/models/tables.py
index c3783be1..a4b421b4 100644
--- a/usaon_vta_survey/models/tables.py
+++ b/usaon_vta_survey/models/tables.py
@@ -79,7 +79,6 @@ class ResponseObjectFieldMixin:
     contact_name = Column(String(256), nullable=False)
     contact_title = Column(String(256), nullable=True)
     contact_email = Column(String(256), nullable=False)
-    # how do i make it a minimum of 3 tags?
     tags = Column(String, nullable=False)
     version = Column(String(64), nullable=True)
 
@@ -274,8 +273,7 @@ class ResponseObservingSystemResearch(BaseModel):
     intermediate_product = Column(String(256), nullable=False)
 
 
-# ADD ResponseObjectFieldMixin
-class ResponseDataProduct(BaseModel, IORelationshipMixin):
+class ResponseDataProduct(BaseModel, IORelationshipMixin, ResponseObjectFieldMixin):
     __tablename__ = 'response_data_product'
     __table_args__ = (UniqueConstraint('name', 'response_id'),)
     id = Column(
@@ -293,12 +291,6 @@ class ResponseDataProduct(BaseModel, IORelationshipMixin):
         nullable=False,
     )
 
-    # TODO: Constrain to 0-100
-    performance_rating = Column(
-        SmallInteger,
-        nullable=False,
-    )
-
     response = relationship(
         'Response',
         back_populates='data_products',
diff --git a/usaon_vta_survey/templates/macros/forms/misc.j2 b/usaon_vta_survey/templates/macros/forms/misc.j2
index 87170a25..fee44bd9 100644
--- a/usaon_vta_survey/templates/macros/forms/misc.j2
+++ b/usaon_vta_survey/templates/macros/forms/misc.j2
@@ -9,6 +9,15 @@
   {% endif %}
   <br />
 
+  {{form.full_name.label}} {{form.full_name(size=50)}}
+  {% if form.full_name.errors %}
+    <ul class="errors">
+    {% for error in form.full_name.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
   {{form.website_url.label}} {{form.website_url(size=50)}}
   {% if form.website_url.errors %}
     <ul class="errors">
diff --git a/usaon_vta_survey/templates/response/data_products.html b/usaon_vta_survey/templates/response/data_products.html
index 1a4e1544..9a9705dc 100644
--- a/usaon_vta_survey/templates/response/data_products.html
+++ b/usaon_vta_survey/templates/response/data_products.html
@@ -1,6 +1,5 @@
 {% extends 'response/base.html' %}
-{% from 'macros/forms/misc.j2' import data_product_fields %}
-
+{% from 'macros/forms/misc.j2' import response_object_fields %}
 
 {% block content %}
 
@@ -46,7 +45,7 @@ <h3>Data products</h3>
   <h3>Add data product</h3>
   <form method="POST">
     {{form.csrf_token}}
-    {{data_product_fields(form)}}
+    {{response_object_fields(form)}}
 
     <input type="submit" value="Create new data product" />
   </form>
diff --git a/usaon_vta_survey/templates/response/relationships/data_product_application.html b/usaon_vta_survey/templates/response/relationships/data_product_application.html
index d998c4a1..b7f46126 100644
--- a/usaon_vta_survey/templates/response/relationships/data_product_application.html
+++ b/usaon_vta_survey/templates/response/relationships/data_product_application.html
@@ -1,7 +1,7 @@
 {% extends 'response/base.html' %}
 {% from 'macros/forms/misc.j2' import
   application_fields,
-  data_product_fields
+  response_object_fields
 %}
 {% from 'macros/forms/relationships/dataproduct_application.j2' import
   data_product_application_fields
@@ -61,7 +61,7 @@ <h4>Application</h4>
     <div class="two-columns">
       <div>
         {% if sqla_inspect(data_product).transient %}
-          {{ data_product_fields(form.data_product.form) }}
+          {{ response_object_fields(form.data_product.form) }}
         {% else %}
           <p>Name: {{data_product.name}}</p>
         {% endif %}

From 8aa1c263b799613ad5a04e1ebc0df62e8b0a0754 Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 10:25:48 -0600
Subject: [PATCH 04/12] WIP application fields update

---
 usaon_vta_survey/forms.py                     |  17 +-
 usaon_vta_survey/models/tables.py             |  10 +-
 .../templates/macros/forms/misc.j2            | 163 +++++++++++++++---
 .../templates/response/data_products.html     |   4 +-
 4 files changed, 167 insertions(+), 27 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index 12e36684..dc9c946d 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -96,7 +96,22 @@ def conv_String(self, field_args, **extra):
     ),
     ResponseApplication: model_form(
         ResponseApplication,
-        only=['name'],
+        only=[
+            'short_name',
+            'full_name',
+            'organization',
+            'funder',
+            'funding_country',
+            'website_url',
+            'description',
+            'contact_name',
+            'contact_title',
+            'contact_email',
+            'tags',
+            'version',
+            'performace_criteria',
+            'performance_rating',
+        ],
     ),
     ResponseSocietalBenefitArea: model_form(
         ResponseSocietalBenefitArea,
diff --git a/usaon_vta_survey/models/tables.py b/usaon_vta_survey/models/tables.py
index a4b421b4..e5a3217a 100644
--- a/usaon_vta_survey/models/tables.py
+++ b/usaon_vta_survey/models/tables.py
@@ -65,7 +65,7 @@ def __io__(cls) -> IORelationship:
 
 
 class ResponseObjectFieldMixin:
-    """Provide shared fields between all relationshio objects to reduce repition."""
+    """Provide shared fields between all relationship objects to reduce repition."""
 
     short_name = Column(String(256), nullable=False)
     full_name = Column(String(256), nullable=False)
@@ -305,7 +305,7 @@ class ResponseDataProduct(BaseModel, IORelationshipMixin, ResponseObjectFieldMix
     )
 
 
-class ResponseApplication(BaseModel, IORelationshipMixin):
+class ResponseApplication(BaseModel, IORelationshipMixin, ResponseObjectFieldMixin):
     __tablename__ = 'response_application'
     __table_args__ = (UniqueConstraint('name', 'response_id'),)
     id = Column(
@@ -323,6 +323,12 @@ class ResponseApplication(BaseModel, IORelationshipMixin):
         nullable=False,
     )
 
+    performance_criteria = Column(
+        String(256),
+    )
+    # limit 0-100
+    performance_rating = Column(Integer, nullable=False)
+
     response = relationship(
         'Response',
         back_populates='applications',
diff --git a/usaon_vta_survey/templates/macros/forms/misc.j2 b/usaon_vta_survey/templates/macros/forms/misc.j2
index fee44bd9..9afc1601 100644
--- a/usaon_vta_survey/templates/macros/forms/misc.j2
+++ b/usaon_vta_survey/templates/macros/forms/misc.j2
@@ -18,6 +18,37 @@
     </ul>
   {% endif %}
   <br />
+
+  {{form.organization.label}} {{form.organization(size=50)}}
+  {% if form.organization.errors %}
+    <ul class="errors">
+    {% for error in form.organization.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.funder.label}} {{form.funder(size=50)}}
+  {% if form.funder.errors %}
+    <ul class="errors">
+    {% for error in form.funder.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.funding_country.label}} {{form.funding_country(size=50)}}
+  {% if form.funding_country.errors %}
+    <ul class="errors">
+    {% for error in form.funding_country.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
   {{form.website_url.label}} {{form.website_url(size=50)}}
   {% if form.website_url.errors %}
     <ul class="errors">
@@ -38,6 +69,16 @@
   {% endif %}
   <br />
 
+  {{form.contact_title.label}} {{form.contact_title(size=50)}}
+  {% if form.contact_title.errors %}
+    <ul class="errors">
+    {% for error in form.contact_title.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
   {{form.contact_email.label}} {{form.contact_email(size=50)}}
   {% if form.contact_email.errors %}
     <ul class="errors">
@@ -48,10 +89,44 @@
   {% endif %}
   <br />
 
-  {{form.funding_country.label}} {{form.funding_country(size=50)}}
-  {% if form.funding_country.errors %}
+
+  {{form.tags.label}} {{form.tags(size=50)}}
+  {% if form.tags.errors %}
     <ul class="errors">
-    {% for error in form.funding_country.errors %}
+    {% for error in form.tags.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.description.label}} {{form.description(size=50)}}
+  {% if form.description.errors %}
+    <ul class="errors">
+    {% for error in form.description.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+
+{%- endmacro -%}
+
+
+{% macro application_fields(form) -%}
+  {{form.short_name.label}} {{form.short_name(size=50)}}
+  {% if form.short_name.errors %}
+    <ul class="errors">
+    {% for error in form.short_name.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.full_name.label}} {{form.full_name(size=50)}}
+  {% if form.full_name.errors %}
+    <ul class="errors">
+    {% for error in form.full_name.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
@@ -68,55 +143,99 @@
   {% endif %}
   <br />
 
-  {{form.tags.label}} {{form.tags(size=50)}}
-  {% if form.tags.errors %}
+  {{form.funder.label}} {{form.funder(size=50)}}
+  {% if form.funder.errors %}
     <ul class="errors">
-    {% for error in form.tags.errors %}
+    {% for error in form.funder.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.description.label}} {{form.description(size=50)}}
-  {% if form.description.errors %}
+  {{form.funding_country.label}} {{form.funding_country(size=50)}}
+  {% if form.funding_country.errors %}
     <ul class="errors">
-    {% for error in form.description.errors %}
+    {% for error in form.funding_country.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
+  <br />
 
-{%- endmacro -%}
+  {{form.website_url.label}} {{form.website_url(size=50)}}
+  {% if form.website_url.errors %}
+    <ul class="errors">
+    {% for error in form.website_url.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
 
+  {{form.contact_name.label}} {{form.contact_name(size=50)}}
+  {% if form.contact_name.errors %}
+    <ul class="errors">
+    {% for error in form.contact_name.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
 
-{% macro data_product_fields(form) -%}
-  {{form.name.label}} {{form.name(size=50)}}
-  {% if form.name.errors %}
+  {{form.contact_title.label}} {{form.contact_title(size=50)}}
+  {% if form.contact_title.errors %}
     <ul class="errors">
-    {% for error in form.name.errors %}
+    {% for error in form.contact_title.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.performance_rating.label}} {{form.performance_rating(size=5)}}
-  {% if form.performance_rating.errors %}
+  {{form.contact_email.label}} {{form.contact_email(size=50)}}
+  {% if form.contact_email.errors %}
     <ul class="errors">
-    {% for error in form.performance_rating.errors %}
+    {% for error in form.contact_email.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
-{%- endmacro -%}
+  <br />
 
 
-{% macro application_fields(form) -%}
-  {{form.name.label}} {{form.name(size=50)}}
-  {% if form.name.errors %}
+  {{form.tags.label}} {{form.tags(size=50)}}
+  {% if form.tags.errors %}
+    <ul class="errors">
+    {% for error in form.tags.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.description.label}} {{form.description(size=50)}}
+  {% if form.description.errors %}
+    <ul class="errors">
+    {% for error in form.description.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  {{form.performance_criteria.label}} {{form.performace_criteria(size=50)}}
+  {% if form.performace_criteria.errors %}
+    <ul class="errors">
+    {% for error in form.performace_criteria.errors %}
+      <li>{{ error }}</li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  <br />
+
+  {{form.performance_rating.label}} {{form.performace_rating(size=50)}}
+  {% if form.performace_rating.errors %}
     <ul class="errors">
-    {% for error in form.name.errors %}
+    {% for error in form.performace_rating.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
diff --git a/usaon_vta_survey/templates/response/data_products.html b/usaon_vta_survey/templates/response/data_products.html
index 9a9705dc..f44c826c 100644
--- a/usaon_vta_survey/templates/response/data_products.html
+++ b/usaon_vta_survey/templates/response/data_products.html
@@ -1,5 +1,5 @@
 {% extends 'response/base.html' %}
-{% from 'macros/forms/misc.j2' import response_object_fields %}
+{% from 'macros/forms/misc.j2' import data_product_fields %}
 
 {% block content %}
 
@@ -45,7 +45,7 @@ <h3>Data products</h3>
   <h3>Add data product</h3>
   <form method="POST">
     {{form.csrf_token}}
-    {{response_object_fields(form)}}
+    {{data_product_fields(form)}}
 
     <input type="submit" value="Create new data product" />
   </form>

From 2124e3053c65022fed67f8ef006be268e432248b Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 10:29:52 -0600
Subject: [PATCH 05/12] Fix spelling error

---
 usaon_vta_survey/forms.py                          |  2 +-
 usaon_vta_survey/templates/macros/forms/misc.j2    | 14 ++++++++------
 .../templates/response/data_products.html          |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index dc9c946d..83db4476 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -109,7 +109,7 @@ def conv_String(self, field_args, **extra):
             'contact_email',
             'tags',
             'version',
-            'performace_criteria',
+            'performance_criteria',
             'performance_rating',
         ],
     ),
diff --git a/usaon_vta_survey/templates/macros/forms/misc.j2 b/usaon_vta_survey/templates/macros/forms/misc.j2
index 9afc1601..cd5fbe85 100644
--- a/usaon_vta_survey/templates/macros/forms/misc.j2
+++ b/usaon_vta_survey/templates/macros/forms/misc.j2
@@ -222,20 +222,22 @@
     {% endfor %}
     </ul>
   {% endif %}
-  {{form.performance_criteria.label}} {{form.performace_criteria(size=50)}}
-  {% if form.performace_criteria.errors %}
+  <br />
+
+  {{form.performance_criteria.label}} {{form.performance_criteria(size=50)}}
+  {% if form.performance_criteria.errors %}
     <ul class="errors">
-    {% for error in form.performace_criteria.errors %}
+    {% for error in form.performance_criteria.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
   {% endif %}
   <br />
 
-  {{form.performance_rating.label}} {{form.performace_rating(size=50)}}
-  {% if form.performace_rating.errors %}
+  {{form.performance_rating.label}} {{form.performance_rating(size=50)}}
+  {% if form.performance_rating.errors %}
     <ul class="errors">
-    {% for error in form.performace_rating.errors %}
+    {% for error in form.performance_rating.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
diff --git a/usaon_vta_survey/templates/response/data_products.html b/usaon_vta_survey/templates/response/data_products.html
index f44c826c..9a9705dc 100644
--- a/usaon_vta_survey/templates/response/data_products.html
+++ b/usaon_vta_survey/templates/response/data_products.html
@@ -1,5 +1,5 @@
 {% extends 'response/base.html' %}
-{% from 'macros/forms/misc.j2' import data_product_fields %}
+{% from 'macros/forms/misc.j2' import response_object_fields %}
 
 {% block content %}
 
@@ -45,7 +45,7 @@ <h3>Data products</h3>
   <h3>Add data product</h3>
   <form method="POST">
     {{form.csrf_token}}
-    {{data_product_fields(form)}}
+    {{response_object_fields(form)}}
 
     <input type="submit" value="Create new data product" />
   </form>

From c0e32cd7a93a86bf7de106bdc3770e09ca6ed3df Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 10:37:58 -0600
Subject: [PATCH 06/12] Update role_id to role based on form change (bugfix)

---
 usaon_vta_survey/routes/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usaon_vta_survey/routes/user.py b/usaon_vta_survey/routes/user.py
index 02f834dc..6ca0c1b6 100644
--- a/usaon_vta_survey/routes/user.py
+++ b/usaon_vta_survey/routes/user.py
@@ -14,7 +14,7 @@ def load_user(user_id: str) -> User:
 
 
 def _validate_role_change(user: User, form) -> None:
-    if not form.data['role_id'] == user.role_id and not current_user.role_id == 'admin':
+    if not form.data['role'] == user.role_id and not current_user.role_id == 'admin':
         raise RuntimeError("Only admins can edit users roles.")
 
 

From 9cd0a45596c132938364245818b843fbcc136aab Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 14:58:19 -0600
Subject: [PATCH 07/12] Update website_url to just website

---
 usaon_vta_survey/forms.py                       |  6 +++---
 usaon_vta_survey/models/tables.py               |  4 +---
 usaon_vta_survey/templates/macros/forms/misc.j2 | 12 ++++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index 83db4476..e7d7000d 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -67,7 +67,7 @@ def conv_String(self, field_args, **extra):
             'organization',
             'funder',
             'funding_country',
-            'website_url',
+            'website',
             'description',
             'contact_name',
             'contact_title',
@@ -85,7 +85,7 @@ def conv_String(self, field_args, **extra):
             'organization',
             'funder',
             'funding_country',
-            'website_url',
+            'website',
             'description',
             'contact_name',
             'contact_title',
@@ -102,7 +102,7 @@ def conv_String(self, field_args, **extra):
             'organization',
             'funder',
             'funding_country',
-            'website_url',
+            'website',
             'description',
             'contact_name',
             'contact_title',
diff --git a/usaon_vta_survey/models/tables.py b/usaon_vta_survey/models/tables.py
index e5a3217a..52795280 100644
--- a/usaon_vta_survey/models/tables.py
+++ b/usaon_vta_survey/models/tables.py
@@ -70,11 +70,9 @@ class ResponseObjectFieldMixin:
     short_name = Column(String(256), nullable=False)
     full_name = Column(String(256), nullable=False)
     organization = Column(String(256), nullable=False)
-    # should this be funding agency?
     funder = Column(String(256), nullable=False)
     funding_country = Column(String(256), nullable=False)
-    # clairify this
-    website_url = Column(String(256), nullable=True)
+    website = Column(String(256), nullable=True)
     description = Column(String(512), nullable=True)
     contact_name = Column(String(256), nullable=False)
     contact_title = Column(String(256), nullable=True)
diff --git a/usaon_vta_survey/templates/macros/forms/misc.j2 b/usaon_vta_survey/templates/macros/forms/misc.j2
index cd5fbe85..9f17eb06 100644
--- a/usaon_vta_survey/templates/macros/forms/misc.j2
+++ b/usaon_vta_survey/templates/macros/forms/misc.j2
@@ -49,10 +49,10 @@
   {% endif %}
   <br />
 
-  {{form.website_url.label}} {{form.website_url(size=50)}}
-  {% if form.website_url.errors %}
+  {{form.website.label}} {{form.website(size=50)}}
+  {% if form.website.errors %}
     <ul class="errors">
-    {% for error in form.website_url.errors %}
+    {% for error in form.website.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>
@@ -163,10 +163,10 @@
   {% endif %}
   <br />
 
-  {{form.website_url.label}} {{form.website_url(size=50)}}
-  {% if form.website_url.errors %}
+  {{form.website.label}} {{form.website(size=50)}}
+  {% if form.website.errors %}
     <ul class="errors">
-    {% for error in form.website_url.errors %}
+    {% for error in form.website.errors %}
       <li>{{ error }}</li>
     {% endfor %}
     </ul>

From 7b510a8aaebdef127dcd3c04f0a9a208b7d3e37f Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Mon, 21 Aug 2023 17:26:38 -0600
Subject: [PATCH 08/12] Update name -> short_name

---
 usaon_vta_survey/models/tables.py             | 20 ++++---------------
 .../templates/response/applications.html      |  4 ++--
 .../templates/response/data_products.html     |  4 ++--
 .../templates/response/observing_systems.html |  2 +-
 .../data_product_application.html             |  8 ++++----
 .../observing_system_data_product.html        |  8 ++++----
 usaon_vta_survey/util/sankey.py               |  2 +-
 7 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/usaon_vta_survey/models/tables.py b/usaon_vta_survey/models/tables.py
index 52795280..2eaea5dd 100644
--- a/usaon_vta_survey/models/tables.py
+++ b/usaon_vta_survey/models/tables.py
@@ -68,7 +68,7 @@ class ResponseObjectFieldMixin:
     """Provide shared fields between all relationship objects to reduce repition."""
 
     short_name = Column(String(256), nullable=False)
-    full_name = Column(String(256), nullable=False)
+    full_name = Column(String(256), nullable=True)
     organization = Column(String(256), nullable=False)
     funder = Column(String(256), nullable=False)
     funding_country = Column(String(256), nullable=False)
@@ -204,16 +204,12 @@ class Response(BaseModel):
 
 class ResponseObservingSystem(BaseModel, IORelationshipMixin, ResponseObjectFieldMixin):
     __tablename__ = 'response_observing_system'
-    __table_args__ = (UniqueConstraint('name', 'response_id'),)
+    __table_args__ = (UniqueConstraint('short_name', 'response_id'),)
     id = Column(
         Integer,
         primary_key=True,
         autoincrement=True,
     )
-    name = Column(
-        String(256),
-        nullable=False,
-    )
     response_id = Column(
         Integer,
         ForeignKey('response.id'),
@@ -273,16 +269,12 @@ class ResponseObservingSystemResearch(BaseModel):
 
 class ResponseDataProduct(BaseModel, IORelationshipMixin, ResponseObjectFieldMixin):
     __tablename__ = 'response_data_product'
-    __table_args__ = (UniqueConstraint('name', 'response_id'),)
+    __table_args__ = (UniqueConstraint('short_name', 'response_id'),)
     id = Column(
         Integer,
         primary_key=True,
         autoincrement=True,
     )
-    name = Column(
-        String(256),
-        nullable=False,
-    )
     response_id = Column(
         Integer,
         ForeignKey('response.id'),
@@ -305,16 +297,12 @@ class ResponseDataProduct(BaseModel, IORelationshipMixin, ResponseObjectFieldMix
 
 class ResponseApplication(BaseModel, IORelationshipMixin, ResponseObjectFieldMixin):
     __tablename__ = 'response_application'
-    __table_args__ = (UniqueConstraint('name', 'response_id'),)
+    __table_args__ = (UniqueConstraint('short_name', 'response_id'),)
     id = Column(
         Integer,
         primary_key=True,
         autoincrement=True,
     )
-    name = Column(
-        String(256),
-        nullable=False,
-    )
     response_id = Column(
         Integer,
         ForeignKey('response.id'),
diff --git a/usaon_vta_survey/templates/response/applications.html b/usaon_vta_survey/templates/response/applications.html
index a7ccbe2a..c1c82aaf 100644
--- a/usaon_vta_survey/templates/response/applications.html
+++ b/usaon_vta_survey/templates/response/applications.html
@@ -18,7 +18,7 @@ <h3>Applications</h3>
         </tr>
         {% for application in response.applications %}
           <tr>
-            <td>{{application.name}}</td>
+            <td>{{application.short_name}}</td>
             <td>
               {% if not application.input_relationships %}
                 None
@@ -27,7 +27,7 @@ <h3>Applications</h3>
 
               {% for input_relationship in application.input_relationships %}
                 <ul>
-                  <li>{{input_relationship.data_product.name}}: {{input_relationship.performance_rating}}</li>
+                  <li>{{input_relationship.data_product.short_name}}: {{input_relationship.performance_rating}}</li>
                 </ul>
               {% endfor %}
 
diff --git a/usaon_vta_survey/templates/response/data_products.html b/usaon_vta_survey/templates/response/data_products.html
index 9a9705dc..1d2ffac1 100644
--- a/usaon_vta_survey/templates/response/data_products.html
+++ b/usaon_vta_survey/templates/response/data_products.html
@@ -16,7 +16,7 @@ <h3>Data products</h3>
         </tr>
         {% for data_product in response.data_products %}
           <tr>
-            <td>{{data_product.name}}</td>
+            <td>{{data_product.short_name}}</td>
             <td>
               {% if not data_product.input_relationships %}
                 None
@@ -24,7 +24,7 @@ <h3>Data products</h3>
               {% endif %}
               {% for input_relationship in data_product.input_relationships %}
                 <ul>
-                  <li>{{input_relationship.observing_system.name}}: {{input_relationship.performace_rating}}</li>
+                  <li>{{input_relationship.observing_system.short_name}}: {{input_relationship.performace_rating}}</li>
                 </ul>
               {% endfor %}
 
diff --git a/usaon_vta_survey/templates/response/observing_systems.html b/usaon_vta_survey/templates/response/observing_systems.html
index d682366d..808af313 100644
--- a/usaon_vta_survey/templates/response/observing_systems.html
+++ b/usaon_vta_survey/templates/response/observing_systems.html
@@ -14,7 +14,7 @@ <h3>Observing systems</h3>
     </tr>
     {% for observing_system in response.observing_systems %}
       <tr>
-        <td>{{observing_system.name}}</td>
+        <td>{{observing_system.short_name}}</td>
       </tr>
     {% endfor %}
   </table>
diff --git a/usaon_vta_survey/templates/response/relationships/data_product_application.html b/usaon_vta_survey/templates/response/relationships/data_product_application.html
index b7f46126..6b48d9e4 100644
--- a/usaon_vta_survey/templates/response/relationships/data_product_application.html
+++ b/usaon_vta_survey/templates/response/relationships/data_product_application.html
@@ -28,7 +28,7 @@ <h4>Data product</h4>
 
         {% for dp in data_products %}
           <option value="{{dp.id}}" {% if dp.id == data_product.id %}selected{% endif %}>
-            {{dp.name}}
+            {{dp.short_name}}
           </option>
         {% endfor %}
 
@@ -47,7 +47,7 @@ <h4>Application</h4>
 
         {% for app in applications %}
           <option value="{{app.id}}" {% if app.id == application.id %}selected{% endif %}>
-            {{app.name}}
+            {{app.short_name}}
           </option>
         {% endfor %}
 
@@ -63,7 +63,7 @@ <h4>Application</h4>
         {% if sqla_inspect(data_product).transient %}
           {{ response_object_fields(form.data_product.form) }}
         {% else %}
-          <p>Name: {{data_product.name}}</p>
+          <p>Name: {{data_product.short_name}}</p>
         {% endif %}
       </div>
 
@@ -71,7 +71,7 @@ <h4>Application</h4>
         {% if sqla_inspect(application).transient %}
           {{ application_fields(form.application.form) }}
         {% else %}
-          <p>Name: {{application.name}}</p>
+          <p>Name: {{application.short_name}}</p>
         {% endif %}
       </div>
     </div>
diff --git a/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html b/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
index 8b922938..576b029a 100644
--- a/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
+++ b/usaon_vta_survey/templates/response/relationships/observing_system_data_product.html
@@ -28,7 +28,7 @@ <h4>Obserivng Systems</h4>
 
         {% for os in observing_systems %}
           <option value="{{os.id}}" {% if os.id == observing_system.id %}selected{% endif %}>
-            {{os.name}}
+            {{os.short_name}}
           </option>
         {% endfor %}
 
@@ -47,7 +47,7 @@ <h4>Data Product</h4>
 
         {% for dp in data_products %}
           <option value="{{dp.id}}" {% if dp.id == data_product.id %}selected{% endif %}>
-            {{dp.name}}
+          {{dp.short_name}}
           </option>
         {% endfor %}
 
@@ -63,7 +63,7 @@ <h4>Data Product</h4>
         {% if sqla_inspect(observing_system).transient %}
           {{ response_object_fields(form.observing_system.form) }}
         {% else %}
-          <p>Name: {{observing_system.name}}</p>
+          <p>Name: {{observing_system.short_name}}</p>
         {% endif %}
       </div>
 
@@ -71,7 +71,7 @@ <h4>Data Product</h4>
         {% if sqla_inspect(data_product).transient %}
           {{ data_product_fields(form.data_product.form) }}
         {% else %}
-          <p>Name: {{data_product.name}}</p>
+          <p>Name: {{data_product.short_name}}</p>
         {% endif %}
       </div>
     </div>
diff --git a/usaon_vta_survey/util/sankey.py b/usaon_vta_survey/util/sankey.py
index f0e807d8..cbd46284 100644
--- a/usaon_vta_survey/util/sankey.py
+++ b/usaon_vta_survey/util/sankey.py
@@ -28,7 +28,7 @@ def _data_product_application_sankey_links(
     data_product: ResponseDataProduct,
 ) -> list[tuple[str, str, int]]:
     data = [
-        (data_product.name, r.application.name, r.performance_rating)
+        (data_product.short_name, r.application.short_name, r.performance_rating)
         for r in data_product.output_relationships
     ]
     return data

From 91c49938b648b4552cf93e57168b97e6071a7586 Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Tue, 22 Aug 2023 10:49:49 -0600
Subject: [PATCH 09/12] Create list for relatioship fields

---
 usaon_vta_survey/forms.py | 64 ++++++++++++---------------------------
 1 file changed, 20 insertions(+), 44 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index e7d7000d..9e9750a7 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -29,6 +29,21 @@
     User,
 )
 
+response_object_fields = [
+    'short_name',
+    'full_name',
+    'organization',
+    'funder',
+    'funding_country',
+    'website',
+    'description',
+    'contact_name',
+    'contact_title',
+    'contact_email',
+    'tags',
+    'version',
+]
+
 
 class CustomModelConverter(ModelConverter):
     @converts("String")
@@ -61,57 +76,18 @@ def conv_String(self, field_args, **extra):
     # Response entities ("nodes" from Sankey diagram perspective)
     ResponseObservingSystem: model_form(
         ResponseObservingSystem,
-        only=[
-            'short_name',
-            'full_name',
-            'organization',
-            'funder',
-            'funding_country',
-            'website',
-            'description',
-            'contact_name',
-            'contact_title',
-            'contact_email',
-            'tags',
-            'version',
-        ],
+        only=response_object_fields,
     ),
     # TODO: Restrict "rating" values to correct range
     ResponseDataProduct: model_form(
         ResponseDataProduct,
-        only=[
-            'short_name',
-            'full_name',
-            'organization',
-            'funder',
-            'funding_country',
-            'website',
-            'description',
-            'contact_name',
-            'contact_title',
-            'contact_email',
-            'tags',
-            'version',
-        ],
+        only=response_object_fields,
     ),
     ResponseApplication: model_form(
         ResponseApplication,
-        only=[
-            'short_name',
-            'full_name',
-            'organization',
-            'funder',
-            'funding_country',
-            'website',
-            'description',
-            'contact_name',
-            'contact_title',
-            'contact_email',
-            'tags',
-            'version',
-            'performance_criteria',
-            'performance_rating',
-        ],
+        only=response_object_fields.append(
+            ['performance_criteria', 'performance_rating']
+        ),
     ),
     ResponseSocietalBenefitArea: model_form(
         ResponseSocietalBenefitArea,

From e53c974b1b43059102b8e3bcd4242d296022b3ae Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Tue, 22 Aug 2023 11:08:21 -0600
Subject: [PATCH 10/12] Name -> short_name cont.

---
 .../relationships/application_societal_benefit_area.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usaon_vta_survey/templates/response/relationships/application_societal_benefit_area.html b/usaon_vta_survey/templates/response/relationships/application_societal_benefit_area.html
index 488bcff8..846afe65 100644
--- a/usaon_vta_survey/templates/response/relationships/application_societal_benefit_area.html
+++ b/usaon_vta_survey/templates/response/relationships/application_societal_benefit_area.html
@@ -24,7 +24,7 @@ <h4>Application</h4>
 
         {% for app in applications %}
           <option value="{{app.id}}" {% if app.id == application.id %}selected{% endif %}>
-            {{app.name}}
+            {{app.short_name}}
           </option>
         {% endfor %}
 

From 99dc8ec032c4396d4378c08bfef2efbbac8682a0 Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Tue, 22 Aug 2023 11:09:07 -0600
Subject: [PATCH 11/12] Final spot for name -> short_name

---
 usaon_vta_survey/templates/response/sbas.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usaon_vta_survey/templates/response/sbas.html b/usaon_vta_survey/templates/response/sbas.html
index 10c20546..878a59e0 100644
--- a/usaon_vta_survey/templates/response/sbas.html
+++ b/usaon_vta_survey/templates/response/sbas.html
@@ -32,7 +32,7 @@ <h3>Assign societal benefit area</h3>
 
           {% for input_relationship in societal_benefit_area.input_relationships %}
             <ul>
-              <li>{{input_relationship.application.name}}</li>
+              <li>{{input_relationship.application.short_name}}</li>
             </ul>
           {% endfor %}
 

From 69180f21596ca5f8dae03e170f55fa7afeee5986 Mon Sep 17 00:00:00 2001
From: Robyn Marowitz <robyn.marowitz@colorado.edu>
Date: Tue, 22 Aug 2023 12:41:16 -0600
Subject: [PATCH 12/12] Update list of fields

---
 usaon_vta_survey/forms.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/usaon_vta_survey/forms.py b/usaon_vta_survey/forms.py
index 9e9750a7..b2880905 100644
--- a/usaon_vta_survey/forms.py
+++ b/usaon_vta_survey/forms.py
@@ -29,7 +29,7 @@
     User,
 )
 
-response_object_fields = [
+common_response_object_fields = [
     'short_name',
     'full_name',
     'organization',
@@ -44,6 +44,12 @@
     'version',
 ]
 
+app_response_object_fields = [
+    *common_response_object_fields,
+    'performance_criteria',
+    'performance_rating',
+]
+
 
 class CustomModelConverter(ModelConverter):
     @converts("String")
@@ -76,18 +82,16 @@ def conv_String(self, field_args, **extra):
     # Response entities ("nodes" from Sankey diagram perspective)
     ResponseObservingSystem: model_form(
         ResponseObservingSystem,
-        only=response_object_fields,
+        only=common_response_object_fields,
     ),
     # TODO: Restrict "rating" values to correct range
     ResponseDataProduct: model_form(
         ResponseDataProduct,
-        only=response_object_fields,
+        only=common_response_object_fields,
     ),
     ResponseApplication: model_form(
         ResponseApplication,
-        only=response_object_fields.append(
-            ['performance_criteria', 'performance_rating']
-        ),
+        only=app_response_object_fields,
     ),
     ResponseSocietalBenefitArea: model_form(
         ResponseSocietalBenefitArea,