From 7815bb6cc1809128deacfdc9a8d121ee56ee7251 Mon Sep 17 00:00:00 2001 From: Danny Peterson Date: Tue, 26 Sep 2023 11:42:40 -0400 Subject: [PATCH 1/4] updated animal experiment comments label --- frontend/animal/Experiment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/animal/Experiment.js b/frontend/animal/Experiment.js index 79814c953a..98067d7629 100644 --- a/frontend/animal/Experiment.js +++ b/frontend/animal/Experiment.js @@ -69,7 +69,7 @@ class Experiment { .add_tbody_tr("Vehicle", this.data.vehicle) .add_tbody_tr("Animal diet", this.data.diet) .add_tbody_tr("Guideline compliance", this.data.guideline_compliance) - .add_tbody_tr("Description and animal husbandry", this.data.description); + .add_tbody_tr("Comments (eg. description, animal husbandry, etc.)", this.data.description); return tbl.get_tbl(); } From d2f771a80013719334afc4352dc6e14c99d18fb2 Mon Sep 17 00:00:00 2001 From: Danny Peterson Date: Tue, 26 Sep 2023 11:47:54 -0400 Subject: [PATCH 2/4] format --- frontend/animal/Experiment.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/animal/Experiment.js b/frontend/animal/Experiment.js index 98067d7629..34c4cfd6c0 100644 --- a/frontend/animal/Experiment.js +++ b/frontend/animal/Experiment.js @@ -69,7 +69,10 @@ class Experiment { .add_tbody_tr("Vehicle", this.data.vehicle) .add_tbody_tr("Animal diet", this.data.diet) .add_tbody_tr("Guideline compliance", this.data.guideline_compliance) - .add_tbody_tr("Comments (eg. description, animal husbandry, etc.)", this.data.description); + .add_tbody_tr( + "Comments (eg. description, animal husbandry, etc.)", + this.data.description + ); return tbl.get_tbl(); } From 4b4db09a8979333aa59873d21ea9e4e7bccf107b Mon Sep 17 00:00:00 2001 From: Danny Peterson Date: Tue, 26 Sep 2023 16:34:13 -0400 Subject: [PATCH 3/4] updated help text --- frontend/animal/Experiment.js | 2 +- hawc/apps/animal/migrations/0023_update_help_text.py | 2 +- hawc/apps/animal/models.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/frontend/animal/Experiment.js b/frontend/animal/Experiment.js index 34c4cfd6c0..230968da02 100644 --- a/frontend/animal/Experiment.js +++ b/frontend/animal/Experiment.js @@ -70,7 +70,7 @@ class Experiment { .add_tbody_tr("Animal diet", this.data.diet) .add_tbody_tr("Guideline compliance", this.data.guideline_compliance) .add_tbody_tr( - "Comments (eg. description, animal husbandry, etc.)", + "Comments", this.data.description ); diff --git a/hawc/apps/animal/migrations/0023_update_help_text.py b/hawc/apps/animal/migrations/0023_update_help_text.py index 180de629cf..e5d478a6e6 100644 --- a/hawc/apps/animal/migrations/0023_update_help_text.py +++ b/hawc/apps/animal/migrations/0023_update_help_text.py @@ -251,7 +251,7 @@ class Migration(migrations.Migration): name="description", field=models.TextField( blank=True, - help_text="Add additional comments. In most cases, this field will be blank. Note that dosing-regime information and animal details are captured in the Animal Group extraction module.", + help_text="Additional comments (eg., description, animal husbandry, etc.)", verbose_name="Comments", ), ), diff --git a/hawc/apps/animal/models.py b/hawc/apps/animal/models.py index e741493fe3..b79e03f58b 100644 --- a/hawc/apps/animal/models.py +++ b/hawc/apps/animal/models.py @@ -119,9 +119,7 @@ class Experiment(models.Model): description = models.TextField( blank=True, verbose_name="Comments", - help_text="Add additional comments. In most cases, this field will " - "be blank. Note that dosing-regime information and animal " - "details are captured in the Animal Group extraction module.", + help_text="Additional comments (eg., description, animal husbandry, etc.)", ) created = models.DateTimeField(auto_now_add=True) last_updated = models.DateTimeField(auto_now=True) From fa28f29604e2c9f4da3a0315d3ec0d7958be8552 Mon Sep 17 00:00:00 2001 From: Danny Peterson Date: Tue, 26 Sep 2023 16:37:03 -0400 Subject: [PATCH 4/4] make format --- frontend/animal/Experiment.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/animal/Experiment.js b/frontend/animal/Experiment.js index 230968da02..0e1cfcd9db 100644 --- a/frontend/animal/Experiment.js +++ b/frontend/animal/Experiment.js @@ -69,10 +69,7 @@ class Experiment { .add_tbody_tr("Vehicle", this.data.vehicle) .add_tbody_tr("Animal diet", this.data.diet) .add_tbody_tr("Guideline compliance", this.data.guideline_compliance) - .add_tbody_tr( - "Comments", - this.data.description - ); + .add_tbody_tr("Comments", this.data.description); return tbl.get_tbl(); }