-
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
|
-
+ |
|
-
+ |
- |
-
-
- |
-
-
+ v-model="aquiferParameter.specific_capacity"
+ :errors="getAquiferParametersError(index).specific_capacity"
+ :loaded="getFieldsLoaded(index).specific_capacity"/>
|
+ v-model="aquiferParameter.analytic_solution_type"
+ :errors="getAquiferParametersError(index).analytic_solution_type"
+ :loaded="getFieldsLoaded(index).analytic_solution_type"/>
|
-
-
+ :id="'aquiferParameter_comments_' + index"
+ type="text"
+ v-model="aquiferParameter.comments"
+ :errors="getAquiferParametersError(index).comments"
+ :loaded="getFieldsLoaded(index).comments"/>
|
Remove
@@ -203,15 +231,17 @@ export default {
},
emptyObject () {
return {
+ date_pumping_test: null,
+ testing_type: null,
+ testing_duration_hours: null,
+ boundary_effect: null,
storativity: null,
transmissivity: null,
hydraulic_conductivity: null,
specific_yield: null,
+ specific_capacity: null,
analytic_solution_type: null,
- testing_method: null,
- testing_duration: null,
- testing_comments: null,
- testing_date: null
+ comments: null
}
},
removeRowByIndex (index) {
@@ -291,5 +321,13 @@ export default {
diff --git a/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue b/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue
index d0e7da7e53..89d4af7716 100644
--- a/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue
+++ b/app/frontend/src/submissions/components/SubmissionPreview/SubmissionPreview.vue
@@ -254,9 +254,10 @@ Licensed under the Apache License, Version 2.0 (the "License");
bordered
:items="filterBlankRows(form.aquifer_parameters_set)"
:fields="[
- 'storativity', 'transmissivity', 'hydraulic_conductivity',
- 'specific_yield', 'analytic_solution_type', 'testing_method', 'testing_duration',
- 'testing_comments', 'testing_date'
+ 'testing_number', 'date_pumping_test', 'testing_type',
+ 'testing_duration_hours', 'boundary_effect', 'storativity', 'transmissivity',
+ 'hydraulic_conductivity', 'specific_yield', 'specific_capacity', 'analytic_solution_type',
+ 'comments'
]"
show-empty>
diff --git a/app/frontend/src/submissions/views/SubmissionsHome.vue b/app/frontend/src/submissions/views/SubmissionsHome.vue
index cc6663b0fd..97a5edd674 100644
--- a/app/frontend/src/submissions/views/SubmissionsHome.vue
+++ b/app/frontend/src/submissions/views/SubmissionsHome.vue
@@ -951,6 +951,9 @@ function initialState () {
.input-width-medium {
max-width: 6rem;
}
+ .input-width-large {
+ max-width: 8rem;
+ }
.loader {
border: 5px solid #f3f3f3;
border-top: 5px solid #5b7b9c;
diff --git a/app/frontend/src/wells/views/WellDetail.vue b/app/frontend/src/wells/views/WellDetail.vue
index fd6f8dfb07..95d56bb1c0 100644
--- a/app/frontend/src/wells/views/WellDetail.vue
+++ b/app/frontend/src/wells/views/WellDetail.vue
@@ -346,9 +346,10 @@ Licensed under the Apache License, Version 2.0 (the "License");
bordered
:items="well.aquifer_parameters_set"
:fields="[
- 'storativity', 'transmissivity', 'hydraulic_conductivity',
- 'specific_yield', 'analytic_solution_type', 'testing_method', 'testing_duration',
- 'testing_comments', 'testing_date'
+ 'testing_number', 'date_pumping_test', 'testing_type',
+ 'testing_duration_hours', 'boundary_effect', 'storativity', 'transmissivity',
+ 'hydraulic_conductivity', 'specific_yield', 'specific_capacity', 'analytic_solution_type',
+ 'comments'
]"
show-empty>
diff --git a/openshift/ocp4/postgresql.dc.yml b/openshift/ocp4/postgresql.dc.yml
index 1d438cbe3a..3e5b7be730 100644
--- a/openshift/ocp4/postgresql.dc.yml
+++ b/openshift/ocp4/postgresql.dc.yml
@@ -89,6 +89,7 @@ objects:
create extension pg_stat_statements;
create extension pgaudit;
create extension plr;
+ create extension "uuid-ossp";
alter user postgres password 'PG_ROOT_PASSWORD'; -- these values are automatically replaced by secrets
@@ -115,6 +116,7 @@ objects:
create extension pg_stat_statements;
create extension pgaudit;
create extension plr;
+ create extension "uuid-ossp";
\c "PG_DATABASE" "PG_USER";
diff --git a/openshift/postgresql.dc.yml b/openshift/postgresql.dc.yml
index 2ec9bde79f..95c2158468 100644
--- a/openshift/postgresql.dc.yml
+++ b/openshift/postgresql.dc.yml
@@ -85,6 +85,7 @@ objects:
create extension pg_stat_statements;
create extension pgaudit;
create extension plr;
+ create extension "uuid-ossp";
alter user postgres password 'PG_ROOT_PASSWORD'; -- these values are automatically replaced by secrets
@@ -109,6 +110,7 @@ objects:
create extension pg_stat_statements;
create extension pgaudit;
create extension plr;
+ create extension "uuid-ossp";
\c "PG_DATABASE" "PG_USER";
From 52e4b196c066887cf961e7956ffd9beb1ce82eea Mon Sep 17 00:00:00 2001
From: AlexZorkin
Date: Tue, 4 Apr 2023 22:58:56 -0700
Subject: [PATCH 179/693] feat: updated columns names to match new requirements
---
app/backend/submissions/serializers.py | 8 ++--
app/backend/submissions/views.py | 10 ++---
app/backend/wells/data_migrations.py | 12 +++---
app/backend/wells/filters.py | 12 +++---
.../migrations/0139_add_aquifer_parameters.py | 26 ++++++-------
...odes.json => pumping_test_type_codes.json} | 10 ++---
app/backend/wells/models.py | 20 +++++-----
app/backend/wells/serializers.py | 16 +++++---
app/backend/wells/stack.py | 2 +-
.../SubmissionForm/ActivitySubmissionForm.vue | 2 +-
.../SubmissionForm/AquiferParameters.vue | 25 ++++++------
.../SubmissionPreview/SubmissionPreview.vue | 38 +++++++++----------
app/frontend/src/wells/views/WellDetail.vue | 38 +++++++++----------
13 files changed, 111 insertions(+), 108 deletions(-)
rename app/backend/wells/migrations/{testing_type_codes.json => pumping_test_type_codes.json} (90%)
diff --git a/app/backend/submissions/serializers.py b/app/backend/submissions/serializers.py
index 8d5d536f2d..c9ee226b98 100644
--- a/app/backend/submissions/serializers.py
+++ b/app/backend/submissions/serializers.py
@@ -58,7 +58,7 @@
WellDisinfectedCode,
WellOrientationCode,
BoundaryEffectCode,
- TestingTypeCode,
+ PumpingTestTypeCode,
DriveShoeCode,
FilterPackMaterialCode,
FilterPackMaterialSizeCode,
@@ -854,12 +854,12 @@ class Meta:
fields = ('boundary_effect_code', 'description')
-class TestingTypeCodeSerializer(serializers.ModelSerializer):
+class PumpingTestTypeCodeSerializer(serializers.ModelSerializer):
"""Serializes Aquifer Testing Type Codes/descriptions"""
class Meta:
- model = TestingTypeCode
- fields = ('testing_type_code', 'description')
+ model = PumpingTestTypeCode
+ fields = ('pumping_test_type_code', 'description')
class DriveShoeCodeSerializer(serializers.ModelSerializer):
diff --git a/app/backend/submissions/views.py b/app/backend/submissions/views.py
index 22c17821ea..a58cfe1771 100644
--- a/app/backend/submissions/views.py
+++ b/app/backend/submissions/views.py
@@ -50,7 +50,7 @@
WellDisinfectedCode,
WellOrientationCode,
BoundaryEffectCode,
- TestingTypeCode,
+ PumpingTestTypeCode,
DriveShoeCode,
FilterPackMaterialCode,
FilterPackMaterialSizeCode,
@@ -96,7 +96,7 @@
WellDisinfectedCodeSerializer,
WellOrientationCodeSerializer,
BoundaryEffectCodeSerializer,
- TestingTypeCodeSerializer,
+ PumpingTestTypeCodeSerializer,
DriveShoeCodeSerializer,
FilterPackMaterialCodeSerializer,
FilterPackMaterialSizeCodeSerializer,
@@ -421,8 +421,8 @@ def get(self, request, **kwargs):
instance=WellOrientationCode.objects.all(), many=True)
boundary_effect_codes = BoundaryEffectCodeSerializer(
instance=BoundaryEffectCode.objects.all(), many=True)
- testing_type_codes = TestingTypeCodeSerializer(
- instance=TestingTypeCode.objects.all(), many=True)
+ pumping_test_type_codes = PumpingTestTypeCodeSerializer(
+ instance=PumpingTestTypeCode.objects.all(), many=True)
drive_shoe_codes = DriveShoeCodeSerializer(
instance=DriveShoeCode.objects.all(), many=True)
filter_pack_material = FilterPackMaterialCodeSerializer(
@@ -501,7 +501,7 @@ def get(self, request, **kwargs):
options["well_disinfected_codes"] = well_disinfected_codes.data
options["well_orientation_codes"] = well_orientation_codes.data
options["boundary_effect_codes"] = boundary_effect_codes.data
- options["testing_type_codes"] = testing_type_codes.data
+ options["pumping_test_type_codes"] = pumping_test_type_codes.data
options["drive_shoe_codes"] = drive_shoe_codes.data
options["filter_pack_material"] = filter_pack_material.data
options["filter_pack_material_size"] = filter_pack_material_size.data
diff --git a/app/backend/wells/data_migrations.py b/app/backend/wells/data_migrations.py
index 465176cbf5..5dff9027af 100644
--- a/app/backend/wells/data_migrations.py
+++ b/app/backend/wells/data_migrations.py
@@ -222,19 +222,19 @@ def unload_boundary_effect_codes(apps, schema_editor):
return boundary_effect_code_fixture().unload_fixture(apps, schema_editor)
-def testing_type_codes_fixture():
- fixture = 'migrations/testing_type_codes.json'
+def pumping_test_type_codes_fixture():
+ fixture = 'migrations/pumping_test_type_codes.json'
fixture_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), fixture)
return CodeFixture(fixture_path)
-def load_testing_type_codes(apps, schema_editor):
- return testing_type_codes_fixture().load_fixture(apps, schema_editor)
+def load_pumping_test_type_codes(apps, schema_editor):
+ return pumping_test_type_codes_fixture().load_fixture(apps, schema_editor)
-def unload_testing_type_codes(apps, schema_editor):
- return testing_type_codes_fixture().unload_fixture(apps, schema_editor)
+def unload_pumping_test_type_codes(apps, schema_editor):
+ return pumping_test_type_codes_fixture().unload_fixture(apps, schema_editor)
def drive_shoe_code_fixture():
diff --git a/app/backend/wells/filters.py b/app/backend/wells/filters.py
index 3551e95ee7..de6d90c3c5 100644
--- a/app/backend/wells/filters.py
+++ b/app/backend/wells/filters.py
@@ -37,7 +37,7 @@
WellOrientationCode,
WaterQualityCharacteristic,
Well,
- TestingTypeCode,
+ PumpingTestTypeCode,
BoundaryEffectCode
)
@@ -282,8 +282,8 @@ class WellListFilter(AnyOrAllFilterSet):
testing_number = filters.RangeFilter(field_name='aquifer_parameters_set__testing_number')
date_pumping_test = filters.DateFromToRangeFilter(label='Pumping Test Date',
field_name='aquifer_parameters_set__date_pumping_test')
- testing_type = filters.ModelChoiceFilter(
- queryset=TestingTypeCode.objects.all(), field_name='aquifer_parameters_set__testing_type')
+ pumping_test_type = filters.ModelChoiceFilter(
+ queryset=PumpingTestTypeCode.objects.all(), field_name='aquifer_parameters_set__pumping_test_type')
testing_duration_hours = filters.RangeFilter(field_name='aquifer_parameters_set__testing_duration')
boundary_effect = filters.ModelChoiceFilter(
queryset=BoundaryEffectCode.objects.all(), field_name='aquifer_parameters_set__boundary_effect')
@@ -293,8 +293,8 @@ class WellListFilter(AnyOrAllFilterSet):
field_name='aquifer_parameters_set__hydraulic_conductivity')
specific_yield = filters.RangeFilter(field_name='aquifer_parameters_set__specific_yield')
specific_capacity = filters.RangeFilter(field_name='aquifer_parameters_set__specific_capacity')
- analytic_solution_type = filters.CharFilter(lookup_expr='icontains',
- field_name='aquifer_parameters_set__analytic_solution_type')
+ analysis_type = filters.CharFilter(lookup_expr='icontains',
+ field_name='aquifer_parameters_set__analysis_type')
comments = filters.CharFilter(lookup_expr='icontains',
field_name='aquifer_parameters_set__comments')
final_casing_stick_up = filters.RangeFilter()
@@ -362,7 +362,7 @@ class Meta:
'bcgs_id',
'bedrock_depth',
'boundary_effect',
- 'testing_type',
+ 'pumping_test_type',
'city',
'comments',
'construction_end_date',
diff --git a/app/backend/wells/migrations/0139_add_aquifer_parameters.py b/app/backend/wells/migrations/0139_add_aquifer_parameters.py
index df21300885..84ba6b0aae 100644
--- a/app/backend/wells/migrations/0139_add_aquifer_parameters.py
+++ b/app/backend/wells/migrations/0139_add_aquifer_parameters.py
@@ -17,7 +17,7 @@
transmissivity,
hydraulic_conductivity,
specific_yield,
- analytic_solution_type,
+ analysis_type,
testing_duration_hours,
comments,
create_user,
@@ -32,7 +32,7 @@
w.transmissivity,
w.hydraulic_conductivity,
w.specific_yield,
- CAST(w.analytic_solution_type AS varchar) AS analytic_solution_type,
+ CAST(w.analytic_solution_type AS varchar) AS analysis_type,
w.testing_duration,
w.testing_method,
'WELLS',
@@ -53,7 +53,7 @@
REVERSE_MIGRATE_HYDRAULIC_TABLE_INFO = """
DROP TABLE aquifer_parameters;
- DROP TABLE testing_type_code;
+ DROP TABLE pumping_test_type_code;
"""
CREATE_EXPORT_AQUIFER_PARAMETERS_VIEW_V1_SQL = """
@@ -63,7 +63,7 @@
ap.well_tag_number,
ap.testing_number,
ap.date_pumping_test,
- tt.description AS testing_type,
+ tt.description AS pumping_test_type,
ap.testing_duration_hours,
be.description AS boundary_effect,
ap.storativity,
@@ -71,12 +71,12 @@
ap.hydraulic_conductivity,
ap.specific_yield,
ap.specific_capacity,
- ap.analytic_solution_type,
+ ap.analysis_type,
ap.comments
FROM
aquifer_parameters AS ap
LEFT JOIN
- testing_type_code AS tt ON ap.testing_type_code = tt.testing_type_code
+ pumping_test_type_code AS tt ON ap.pumping_test_type_code = tt.pumping_test_type_code
LEFT JOIN
boundary_effect_code AS be ON ap.boundary_effect_code = be.boundary_effect_code
INNER JOIN
@@ -99,7 +99,7 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
- name='TestingTypeCode',
+ name='PumpingTestTypeCode',
fields=[
('create_user', models.CharField(max_length=60)),
('create_date', models.DateTimeField(default=django.utils.timezone.now)),
@@ -108,11 +108,11 @@ class Migration(migrations.Migration):
('display_order', models.PositiveIntegerField()),
('effective_date', models.DateTimeField(default=django.utils.timezone.now)),
('expiry_date', models.DateTimeField(default=datetime.datetime(9999, 12, 31, 23, 59, 59, 999999, tzinfo=utc))),
- ('testing_type_code', models.CharField(db_column='testing_type_code', editable=False, max_length=50, primary_key=True, serialize=False)),
+ ('pumping_test_type_code', models.CharField(db_column='pumping_test_type_code', editable=False, max_length=50, primary_key=True, serialize=False)),
('description', models.CharField(max_length=100)),
],
options={
- 'db_table': 'testing_type_code',
+ 'db_table': 'pumping_test_type_code',
'ordering': ['display_order', 'description'],
},
bases=(models.Model, gwells.db_comments.model_mixins.DBComments),
@@ -125,7 +125,7 @@ class Migration(migrations.Migration):
('activity_submission', models.ForeignKey(blank=True, db_column='filing_number', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='aquifer_parameters_set', to='wells.ActivitySubmission')),
('well', models.ForeignKey(blank=True, db_column='well_tag_number', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='aquifer_parameters_set', to='wells.Well')),
('date_pumping_test', models.DateField(null=True, verbose_name='Date of test')),
- ('testing_type', models.ForeignKey(blank=True, db_column='testing_type_code', null='True', on_delete=django.db.models.deletion.PROTECT, to='wells.TestingTypeCode', verbose_name='Testing Type')),
+ ('pumping_test_type', models.ForeignKey(blank=True, db_column='pumping_test_type_code', null='True', on_delete=django.db.models.deletion.PROTECT, to='wells.PumpingTestTypeCode', verbose_name='Testing Type')),
('testing_duration_hours', models.PositiveIntegerField(blank=True, null=True)),
('boundary_effect', models.ForeignKey(blank=True, db_column='boundary_effect_code', null=True, on_delete=django.db.models.deletion.PROTECT, to='wells.BoundaryEffectCode', verbose_name='Boundary Effect')),
('storativity', models.DecimalField(blank=True, decimal_places=7, max_digits=8, null=True, verbose_name='Storativity')),
@@ -133,7 +133,7 @@ class Migration(migrations.Migration):
('hydraulic_conductivity', models.TextField(blank=True, max_length=100, null=True, verbose_name='Hydraulic Conductivity')),
('specific_yield', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Specific Yield')),
('specific_capacity', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Specific Yield')),
- ('analytic_solution_type', models.TextField(blank=True, max_length=100, null=True, verbose_name='Analytic Solution Type')),
+ ('analysis_type', models.TextField(blank=True, max_length=100, null=True, verbose_name='Analysis Type')),
('comments', models.TextField(blank=True, max_length=350, null=True, verbose_name='Testing Comments')),
('create_user', models.CharField(max_length=60)),
('create_date', models.DateTimeField(default=django.utils.timezone.now)),
@@ -156,8 +156,8 @@ class Migration(migrations.Migration):
REVERSE_MIGRATE_HYDRAULIC_TABLE_INFO
),
migrations.RunPython(
- code=wells.data_migrations.load_testing_type_codes,
- reverse_code=wells.data_migrations.unload_testing_type_codes
+ code=wells.data_migrations.load_pumping_test_type_codes,
+ reverse_code=wells.data_migrations.unload_pumping_test_type_codes
),
migrations.RunSQL(
CREATE_EXPORT_AQUIFER_PARAMETERS_VIEW_V1_SQL,
diff --git a/app/backend/wells/migrations/testing_type_codes.json b/app/backend/wells/migrations/pumping_test_type_codes.json
similarity index 90%
rename from app/backend/wells/migrations/testing_type_codes.json
rename to app/backend/wells/migrations/pumping_test_type_codes.json
index ee3b0729da..ca74147aa8 100644
--- a/app/backend/wells/migrations/testing_type_codes.json
+++ b/app/backend/wells/migrations/pumping_test_type_codes.json
@@ -1,5 +1,5 @@
[{
- "model": "wells.testingtypecode",
+ "model": "wells.PumpingTestTypeCode",
"pk": "ST",
"fields": {
"create_user": "DATALOAD_USER",
@@ -13,7 +13,7 @@
}
},
{
- "model": "wells.testingtypecode",
+ "model": "wells.PumpingTestTypeCode",
"pk": "PTPW",
"fields": {
"create_user": "DATALOAD_USER",
@@ -27,7 +27,7 @@
}
},
{
- "model": "wells.testingtypecode",
+ "model": "wells.PumpingTestTypeCode",
"pk": "PTOW",
"fields": {
"create_user": "DATALOAD_USER",
@@ -41,7 +41,7 @@
}
},
{
- "model": "wells.testingtypecode",
+ "model": "wells.PumpingTestTypeCode",
"pk": "RT",
"fields": {
"create_user": "DATALOAD_USER",
@@ -55,7 +55,7 @@
}
},
{
- "model": "wells.testingtypecode",
+ "model": "wells.PumpingTestTypeCode",
"pk": "OTHER",
"fields": {
"create_user": "DATALOAD_USER",
diff --git a/app/backend/wells/models.py b/app/backend/wells/models.py
index 83430e6565..4fa6df8aa1 100644
--- a/app/backend/wells/models.py
+++ b/app/backend/wells/models.py
@@ -198,15 +198,15 @@ def __str__(self):
return self.description
-class TestingTypeCode(CodeTableModel):
+class PumpingTestTypeCode(CodeTableModel):
"""
The pumping test method type in aquifer pumping tests.
"""
- testing_type_code = models.CharField(primary_key=True, max_length=10, editable=False)
+ pumping_test_type_code = models.CharField(primary_key=True, max_length=10, editable=False)
description = models.CharField(max_length=100)
class Meta:
- db_table = 'testing_type_code'
+ db_table = 'pumping_test_type_code'
ordering = ['display_order', 'description']
db_table_comment = ('Type of the pumping test method used for aquifer pumping tests.')
@@ -2478,7 +2478,7 @@ class AquiferParameters(AuditModel):
null=True, verbose_name='Date of pumping test',
db_comment='The date when the analysis tooke place.')
- testing_type = models.ForeignKey(TestingTypeCode, db_column='testing_type_code',
+ pumping_test_type = models.ForeignKey(PumpingTestTypeCode, db_column='pumping_test_type_code',
on_delete=models.PROTECT, blank=True, null=True,
verbose_name='Testing Type',
db_comment='Valid codes for the testing types used in '
@@ -2510,11 +2510,11 @@ class AquiferParameters(AuditModel):
specific_capacity = models.DecimalField(
max_digits=5, decimal_places=2, blank=True, null=True, verbose_name='Specific Yield')
- analytic_solution_type = models.TextField(
+ analysis_type = models.TextField(
max_length=100,
blank=True,
null=True,
- verbose_name='Analytic Solution Type',
+ verbose_name='Analysis Type',
db_comment='Mathematical formulation used to estimate hydraulic parameters.')
comments = models.TextField(
@@ -2534,7 +2534,7 @@ class Meta:
"aquifer_parameters_guid":"System generated unique guid assigned to each pumping test record.",
"well_tag_number":"System generated sequential number assigned to each well. It is widely used by groundwater staff as it is the only consistent unique identifier for each well. It is different from a well ID plate number.",
"date_pumping_test":"Date of the pumping test.",
- "testing_type_code":"Identification of the testing method (e.g.basic pumping test, pumping test with monitoring wells, single-well-response/slug test, constant head).",
+ "pumping_test_type_code":"Identification of the testing method (e.g.basic pumping test, pumping test with monitoring wells, single-well-response/slug test, constant head).",
"testing_duration_hours":"The duration of the hydraulic testing period. For consistency, do not include the recovery period.",
"boundary_effect_code":"Valid codes for the boundaries observed in pumping test analysis. i.e. CH, NF.",
"storativity":"Storativity estimated from hydraulic testing (dimensionless).",
@@ -2542,7 +2542,7 @@ class Meta:
"hydraulic_conductivity":"Hydraulic conductivity estimated from hydraulic testing in metres per second.",
"specific_yield":"Specific Yield estimated from hydraulic testing (dimensionless).",
"specific_capacity":"Specific Capacity.",
- "analytic_solution_type":"The mathematical solution to the groundwater flow equation used to fit the observational data and estimate hydraulic parameters e.g. Theis 1935",
+ "analysis_type":"The mathematical solution to the groundwater flow equation used to fit the observational data and estimate hydraulic parameters e.g. Theis 1935",
"comments":"Any additional comments about the pumping test.",
}
@@ -2558,13 +2558,13 @@ def as_dict(self):
"aquifer_parameters_guid": self.aquifer_parameters_guid,
"well_tag_number": self.well,
"date_pumping_test": self.date_pumping_test,
- "testing_type_code": self.testing_type,
+ "pumping_test_type_code": self.pumping_test_type,
"testing_duration_hours": self.testing_duration_hours,
"storativity": self.storativity,
"transmissivity": self.transmissivity,
"hydraulic_conductivity": self.hydraulic_conductivity,
"specific_yield": self.specific_yield,
"specific_capacity": self.specific_capacity,
- "analytic_solution_type": self.analytic_solution_type,
+ "analysis_type": self.analysis_type,
"comments": self.comments
}
diff --git a/app/backend/wells/serializers.py b/app/backend/wells/serializers.py
index 56a030fcd2..fb81a60810 100644
--- a/app/backend/wells/serializers.py
+++ b/app/backend/wells/serializers.py
@@ -188,13 +188,15 @@ class Meta:
class AquiferParametersSerializer(serializers.ModelSerializer):
"""Serializes aquifer parameters for well"""
+ pumping_test_type = serializers.ReadOnlyField(source='pumping_test_type_code.description')
+
class Meta:
model = AquiferParameters
fields = (
'testing_number',
'well',
'date_pumping_test',
- 'testing_type',
+ 'pumping_test_type',
'testing_duration_hours',
'boundary_effect',
'storativity',
@@ -202,7 +204,7 @@ class Meta:
'hydraulic_conductivity',
'specific_yield',
'specific_capacity',
- 'analytic_solution_type',
+ 'analysis_type',
'comments'
)
@@ -210,13 +212,15 @@ class Meta:
class AquiferParametersSummarySerializer(serializers.ModelSerializer):
"""Serializes aquifer parameters for well summary"""
+ pumping_test_type = serializers.ReadOnlyField(source='pumping_test_type_code.description')
+
class Meta:
model = AquiferParameters
fields = (
'testing_number',
'well',
'date_pumping_test',
- 'testing_type',
+ 'pumping_test_type',
'testing_duration_hours',
'boundary_effect',
'storativity',
@@ -224,7 +228,7 @@ class Meta:
'hydraulic_conductivity',
'specific_yield',
'specific_capacity',
- 'analytic_solution_type',
+ 'analysis_type',
'comments'
)
@@ -235,7 +239,7 @@ class Meta:
'testing_number',
'well',
'date_pumping_test',
- 'testing_type',
+ 'pumping_test_type',
'testing_duration_hours',
'boundary_effect',
'storativity',
@@ -243,7 +247,7 @@ class Meta:
'hydraulic_conductivity',
'specific_yield',
'specific_capacity',
- 'analytic_solution_type',
+ 'analysis_type',
'comments',
'create_user',
'update_user'
diff --git a/app/backend/wells/stack.py b/app/backend/wells/stack.py
index 99c1bbcbd8..a9375dcc90 100644
--- a/app/backend/wells/stack.py
+++ b/app/backend/wells/stack.py
@@ -100,7 +100,7 @@
KEY_VALUE_LOOKUP = {
'well_publication_status': 'well_publication_status_code',
'boundary_effect': 'boundary_effect_code',
- 'testing_type': 'testing_type_code',
+ 'pumping_test_type': 'pumping_test_type_code',
'well_disinfected_status': 'well_disinfected_code',
'well_orientation_status': 'well_orientation_code',
'drive_shoe_status': 'drive_shoe_code',
diff --git a/app/frontend/src/submissions/components/SubmissionForm/ActivitySubmissionForm.vue b/app/frontend/src/submissions/components/SubmissionForm/ActivitySubmissionForm.vue
index ff35e24cff..843341d31c 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/ActivitySubmissionForm.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/ActivitySubmissionForm.vue
@@ -667,7 +667,7 @@ export default {
'closureDescription': 'Decommission description',
'lithology': 'Lithology',
'casings': 'Casing details',
- 'aquiferParameters': 'Aquifer parameters details',
+ 'aquiferParameters': 'Pumping Test Information and Aquifer Parameters',
'backfill': 'Surface seal and backfill information',
'liner': 'Liner information',
'screens': 'Screen information',
diff --git a/app/frontend/src/submissions/components/SubmissionForm/AquiferParameters.vue b/app/frontend/src/submissions/components/SubmissionForm/AquiferParameters.vue
index abda563bc2..04cd9a187b 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/AquiferParameters.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/AquiferParameters.vue
@@ -32,12 +32,12 @@ Licensed under the Apache License, Version 2.0 (the "License");
Testing Type |
Testing Duration (hours) |
Boundary Effect |
- Analytical Solution Type |
Storativity |
Transmissivity (m²/s) |
Hydraulic Conductivity (m/s) |
Specific Yield |
Specific Capacity |
+ Analysis Type |
Comments |
|
|
@@ -59,13 +59,13 @@ Licensed under the Apache License, Version 2.0 (the "License");
id="testingType"
group-class="mt-1 mb-0"
select
- v-model="aquiferParameter.testing_type"
- :options="codes.testing_type_codes"
+ v-model="aquiferParameter.pumping_test_type"
+ :options="codes.pumping_test_type_codes"
placeholder="Select Testing Type"
text-field="description"
- value-field="testing_type_code"
- :errors="errors['testing_type']"
- :loaded="fieldsLoaded['testing_type']"/>
+ value-field="pumping_test_type_code"
+ :errors="errors['pumping_test_type']"
+ :loaded="fieldsLoaded['pumping_test_type']"/>