Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update experiment label #904

Merged
merged 5 commits into from
Sep 27, 2023
Merged

Update experiment label #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7815bb6
updated animal experiment comments label
dannypeterson Sep 26, 2023
d2f771a
format
dannypeterson Sep 26, 2023
4b4db09
updated help text
dannypeterson Sep 26, 2023
fa28f29
make format
dannypeterson Sep 26, 2023
03c166d
Merge branch 'main' into update-experiment-label
shapiromatron Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/animal/Experiment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", this.data.description);

return tbl.get_tbl();
}
Expand Down
2 changes: 1 addition & 1 deletion hawc/apps/animal/migrations/0023_update_help_text.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
),
),
Expand Down
4 changes: 1 addition & 3 deletions hawc/apps/animal/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down