From f39dca28ad76b35c6438b9e42daac0edc62512fa Mon Sep 17 00:00:00 2001 From: munnsmunns Date: Tue, 6 Feb 2024 08:23:08 -0500 Subject: [PATCH 01/17] add pre-commit hook --- pre-commit-config.yaml | 6 ++++++ requirements/dev.txt | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 pre-commit-config.yaml diff --git a/pre-commit-config.yaml b/pre-commit-config.yaml new file mode 100644 index 0000000000..b57898db25 --- /dev/null +++ b/pre-commit-config.yaml @@ -0,0 +1,6 @@ +repos: + - repo: https://github.com/rtts/djhtml + rev: 3.0.6 + hooks: + - id: djhtml + entry: djhtml --tabwidth 2 diff --git a/requirements/dev.txt b/requirements/dev.txt index 709c591bfe..6313f64714 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -6,6 +6,8 @@ flit==3.9.0 # lint and formatting tools ruff==0.1.3 +djhtml==3.0.6 +pre-commit==3.6.0 # django development django-debug-toolbar==4.2.0 From fd8d9b9e5bb162b9b630ffd9989c3bb123fd7ae6 Mon Sep 17 00:00:00 2001 From: munnsmunns Date: Tue, 6 Feb 2024 08:25:16 -0500 Subject: [PATCH 02/17] indent files --- .../templates/animal/animalgroup_detail.html | 38 +- .../templates/animal/animalgroup_form.html | 200 +++++----- .../templates/animal/dosingregime_form.html | 16 +- .../templates/animal/endpoint_detail.html | 36 +- .../templates/animal/endpoint_form.html | 52 +-- .../templates/animal/endpoint_list.html | 74 ++-- .../templates/animal/endpoint_list_v2.html | 6 +- .../templates/animal/experiment_detail.html | 32 +- .../templates/animal/experiment_form.html | 40 +- .../assessment/_assessment_form_js.html | 30 +- .../templates/assessment/_dataset_list.html | 52 +-- .../templates/assessment/_logs_note.html | 2 +- .../assessment/assessment_detail.html | 316 ++++++++-------- .../assessment/assessment_downloads.html | 320 ++++++++-------- .../templates/assessment/assessment_list.html | 10 +- .../assessment/assessment_log_list.html | 122 +++--- .../assessment/assessmentdetail_form.html | 2 +- .../assessment/assessmentvalue_detail.html | 100 ++--- .../assessment/assessmentvalue_form.html | 54 +-- .../assessment/baseendpoint_list.html | 208 +++++------ .../assessment/clean_extracted_data.html | 2 +- .../assessment/clean_study_rob_scores.html | 8 +- .../templates/assessment/content_types.html | 38 +- .../assessment/dataset_confirm_delete.html | 4 +- .../templates/assessment/dataset_detail.html | 140 +++---- .../templates/assessment/dataset_form.html | 28 +- .../fragments/assessment_list_public.html | 36 +- .../fragments/assessment_list_team.html | 40 +- .../fragments/assessmentdetail_table.html | 4 +- .../fragments/assessmentvalue_list.html | 50 +-- .../fragments/attachment_edit_row.html | 46 +-- .../assessment/fragments/attachment_list.html | 54 +-- .../assessment/fragments/attachment_row.html | 62 +-- .../fragments/downloads_select.html | 26 +- .../fragments/downloads_select_js.html | 6 +- .../assessment/fragments/publish_item_td.html | 2 +- .../templates/assessment/log_detail.html | 92 ++--- .../templates/assessment/log_object_list.html | 92 ++--- .../preferred_dose_units_widget.html | 56 +-- .../templates/assessment/published_items.html | 262 ++++++------- .../bmd/_read_only_session_alert.html | 6 +- hawc/apps/bmd/templates/bmd/session_form.html | 6 +- hawc/apps/bmd/templates/bmd/session_list.html | 48 +-- .../templates/common/analytics_plot.html | 10 +- .../common/crispy_layout_filter_field.html | 82 ++-- .../apps/common/templates/common/heatmap.html | 4 +- .../templates/common/helptext_popup.html | 4 +- .../templates/common/helptext_popup_js.html | 14 +- .../common/templates/common/info_popover.html | 4 +- .../templates/common/inline_filter_form.html | 2 +- .../templates/common/modal_template.html | 48 +-- .../templates/common/select_other_widget.html | 28 +- .../templates/common/unpublished_badge.html | 2 +- .../common/templates/common/widgets/btn.html | 10 +- hawc/apps/docs/templates/docs/base.html | 26 +- .../docs/templates/docs/blocks/alert.html | 4 +- .../docs/blocks/table_of_contents.html | 18 +- .../docs/components/sidebar_docs_tree.html | 28 +- .../apps/eco/templates/eco/design_detail.html | 100 ++--- .../apps/eco/templates/eco/design_update.html | 124 +++--- .../templates/eco/fragments/_create_card.html | 2 +- .../templates/eco/fragments/_create_one.html | 6 +- .../templates/eco/fragments/_delete_rows.html | 8 +- .../eco/fragments/_design_table.html | 38 +- .../eco/fragments/_object_edit_row.html | 48 +-- .../templates/eco/fragments/_object_row.html | 28 +- .../templates/eco/fragments/cause_row.html | 16 +- .../templates/eco/fragments/effect_row.html | 16 +- .../templates/eco/fragments/result_row.html | 26 +- .../eco/templates/eco/nestedterm_list.html | 32 +- hawc/apps/eco/templates/eco/result_list.html | 50 +-- .../templates/epi/comparisonset_detail.html | 22 +- .../epi/templates/epi/exposure_detail.html | 22 +- .../apps/epi/templates/epi/exposure_form.html | 18 +- hawc/apps/epi/templates/epi/group_detail.html | 20 +- hawc/apps/epi/templates/epi/group_form.html | 8 +- .../epi/templates/epi/outcome_detail.html | 40 +- hawc/apps/epi/templates/epi/outcome_list.html | 72 ++-- .../apps/epi/templates/epi/result_detail.html | 22 +- hawc/apps/epi/templates/epi/result_form.html | 60 +-- .../templates/epi/studypopulation_detail.html | 50 +-- .../templates/epimeta/metaresult_form.html | 2 +- .../templates/epimeta/metaresult_list.html | 88 ++--- .../epiv2/templates/epiv2/design_detail.html | 178 ++++----- .../epiv2/templates/epiv2/design_update.html | 244 ++++++------ .../epiv2/fragments/_create_card.html | 2 +- .../epiv2/fragments/_create_one.html | 6 +- .../epiv2/fragments/_delete_rows.html | 8 +- .../epiv2/fragments/_design_table.html | 90 ++--- .../epiv2/fragments/_object_edit_row.html | 48 +-- .../epiv2/fragments/_object_row.html | 28 +- .../fragments/adjustment_factor_row.html | 20 +- .../epiv2/fragments/chemical_row.html | 8 +- .../epiv2/fragments/data_extraction_row.html | 22 +- .../epiv2/fragments/exposure_row.html | 26 +- .../epiv2/fragments/exposurelevel_row.html | 14 +- .../epiv2/fragments/outcome_row.html | 12 +- .../epiv2/templates/epiv2/outcome_list.html | 36 +- .../hawc_admin/templates/admin/dashboard.html | 26 +- .../admin/fragments/assessment_growth.html | 2 +- .../admin/fragments/assessment_profile.html | 16 +- .../admin/fragments/assessment_size.html | 6 +- .../templates/admin/fragments/changes.html | 16 +- .../templates/admin/fragments/growth.html | 12 +- .../templates/admin/media_preview.html | 68 ++-- .../hawc_admin/templates/admin/swagger.html | 32 +- .../invitro/ivcelltype_confirm_delete.html | 4 +- .../templates/invitro/ivcelltype_detail.html | 18 +- .../invitro/ivchemical_confirm_delete.html | 4 +- .../templates/invitro/ivchemical_detail.html | 18 +- .../templates/invitro/ivchemical_form.html | 4 +- .../invitro/ivendpoint_confirm_delete.html | 4 +- .../templates/invitro/ivendpoint_detail.html | 18 +- .../templates/invitro/ivendpoint_form.html | 78 ++-- .../templates/invitro/ivendpoint_list.html | 84 ++--- .../invitro/ivendpointecategory_form.html | 4 +- .../invitro/ivexperiment_confirm_delete.html | 4 +- .../invitro/ivexperiment_detail.html | 18 +- .../templates/lit/_delete_search_warning.html | 6 +- .../templates/lit/_pubmedqueries_list.html | 74 ++-- .../templates/lit/_reference_with_tags.html | 200 +++++----- hawc/apps/lit/templates/lit/_search_list.html | 12 +- .../lit/components/bulk_merge_modal.html | 26 +- .../components/bulk_merge_modal_content.html | 112 +++--- .../templates/lit/conflict_resolution.html | 28 +- .../lit/fragments/workflow_edit_row.html | 104 +++--- .../lit/fragments/workflow_list.html | 10 +- .../templates/lit/fragments/workflow_row.html | 166 ++++----- .../lit/literatureassessment_form.html | 2 +- hawc/apps/lit/templates/lit/overview.html | 150 ++++---- .../templates/lit/reference_extract_list.html | 108 +++--- .../lit/templates/lit/reference_form.html | 2 +- .../lit/templates/lit/reference_list.html | 6 +- .../lit/templates/lit/reference_search.html | 18 +- .../templates/lit/reference_tag_status.html | 2 +- .../templates/lit/reference_upload_excel.html | 2 +- .../templates/lit/reference_user_tags.html | 22 +- .../apps/lit/templates/lit/search_detail.html | 28 +- hawc/apps/lit/templates/lit/search_form.html | 18 +- hawc/apps/lit/templates/lit/tags_copy.html | 12 +- hawc/apps/lit/templates/lit/tags_update.html | 8 +- hawc/apps/lit/templates/lit/workflows.html | 24 +- hawc/apps/mgmt/templates/mgmt/analytics.html | 68 ++-- .../templates/mgmt/analytics/overview.html | 132 +++---- .../templates/mgmt/analytics/time_series.html | 8 +- .../templates/mgmt/analytics/time_spent.html | 18 +- .../templates/mgmt/assessment_dashboard.html | 56 +-- .../templates/mgmt/assessment_details.html | 80 ++-- .../templates/mgmt/fragments/rob_reviews.html | 6 +- .../mgmt/user_assessment_task_list.html | 40 +- .../mgmt/templates/mgmt/user_task_list.html | 48 +-- .../templates/myuser/accept_license.html | 8 +- .../templates/myuser/hawcuser_form.html | 4 +- .../myuser/templates/myuser/set_password.html | 4 +- .../templates/myuser/userprofile_detail.html | 54 +-- .../templates/myuser/userprofile_form.html | 14 +- .../templates/myuser/welcome_email.html | 12 +- .../riskofbias/_arob_none_alert.html | 12 +- .../templates/riskofbias/arob_copy.html | 36 +- .../templates/riskofbias/arob_detail.html | 118 +++--- .../templates/riskofbias/arob_edit.html | 38 +- .../riskofbias/arob_load_approach.html | 22 +- .../templates/riskofbias/arob_text_form.html | 2 +- .../riskofbias/component/domain_list.html | 22 +- .../templates/riskofbias/reviewers_form.html | 4 +- .../riskofbias/riskofbiasdomain_form.html | 10 +- .../riskofbias/riskofbiasmetric_form.html | 22 +- .../riskofbias/rob_assignment_list.html | 20 +- .../riskofbias/rob_assignment_update.html | 20 +- .../templates/riskofbias/rob_detail.html | 10 +- .../templates/riskofbias/rob_detail_all.html | 12 +- .../templates/riskofbias/rob_edit.html | 40 +- .../templates/study/attachment_form.html | 2 +- .../study/templates/study/study_detail.html | 150 ++++---- .../study/templates/study/study_form.html | 36 +- .../study/templates/study/study_list.html | 84 ++--- .../templates/summary/_smartTagEditModal.html | 12 +- .../templates/summary/datapivot_detail.html | 30 +- .../templates/summary/datapivot_form.html | 18 +- .../summary/datapivot_type_selector.html | 30 +- .../summary/datapivot_update_settings.html | 44 +-- .../summary/dataset_interactivity.html | 18 +- .../summary/summarytable_detail.html | 16 +- .../templates/summary/summarytable_form.html | 4 +- .../templates/summary/summarytable_list.html | 108 +++--- .../templates/summary/summarytext_form.html | 12 +- .../templates/summary/visual_detail.html | 2 +- .../summary/visual_detail_image.html | 34 +- .../summary/visual_detail_plotly.html | 30 +- .../templates/summary/visual_form.html | 82 ++-- .../templates/summary/visual_form_django.html | 28 +- .../templates/summary/visual_list.html | 42 +-- .../templates/summary/visual_selector.html | 352 +++++++++--------- .../templates/udf/modelbinding_detail.html | 74 ++-- .../udf/templates/udf/modelbinding_form.html | 2 +- .../udf/templates/udf/modelbinding_list.html | 40 +- .../udf/templates/udf/schema_preview.html | 4 +- .../udf/templates/udf/tagbinding_detail.html | 74 ++-- .../udf/templates/udf/tagbinding_form.html | 2 +- hawc/apps/udf/templates/udf/udf_detail.html | 30 +- hawc/apps/udf/templates/udf/udf_form.html | 2 +- hawc/apps/udf/templates/udf/udf_list.html | 36 +- .../vocab/templates/vocab/ehv_browse.html | 24 +- hawc/templates/401.html | 8 +- hawc/templates/403.html | 26 +- hawc/templates/404.html | 8 +- hawc/templates/admin/base.html | 18 +- hawc/templates/admin/base_site.html | 6 +- hawc/templates/admin/index.html | 58 +-- hawc/templates/assessment-rooted.html | 6 +- hawc/templates/base.html | 34 +- hawc/templates/bootstrap4/field.html | 150 ++++---- .../bootstrap4/field_create_new_button.html | 152 ++++---- .../layout/help_text_and_errors.html | 8 +- hawc/templates/crumbless.html | 4 +- hawc/templates/hawc/_delete_block.html | 26 +- .../hawc/_formset_table_template.html | 8 +- hawc/templates/hawc/about.html | 2 +- hawc/templates/hawc/close_window.html | 10 +- hawc/templates/hawc/home.html | 4 +- hawc/templates/hawc/resources.html | 2 +- .../templates/includes/_navigation_links.html | 70 ++-- .../includes/admin_environment_banner.html | 20 +- hawc/templates/includes/base/footer.html | 10 +- hawc/templates/includes/breadcrumbs.html | 14 +- hawc/templates/includes/epa/footer.html | 160 ++++---- hawc/templates/includes/hero_access.html | 8 +- hawc/templates/includes/messages.html | 12 +- hawc/templates/includes/navigation.html | 40 +- hawc/templates/includes/paginator.html | 36 +- hawc/templates/includes/sidebar.html | 124 +++--- .../templates/includes/sidebar_container.html | 36 +- hawc/templates/includes/title.html | 2 +- .../includes/unsupported_browser.html | 18 +- hawc/templates/rasterize.html | 18 +- hawc/templates/registration/login.html | 4 +- .../registration/password_reset_confirm.html | 20 +- .../registration/password_reset_email.html | 16 +- .../registration/password_reset_sent.html | 22 +- hawc/templates/rest_framework/base.html | 6 +- 240 files changed, 4933 insertions(+), 4933 deletions(-) diff --git a/hawc/apps/animal/templates/animal/animalgroup_detail.html b/hawc/apps/animal/templates/animal/animalgroup_detail.html index b1f22aaf72..5d6a713c79 100644 --- a/hawc/apps/animal/templates/animal/animalgroup_detail.html +++ b/hawc/apps/animal/templates/animal/animalgroup_detail.html @@ -11,10 +11,10 @@

{{object}}

Delete {% if object.dosing_regime and object == object.dosing_regime.dosed_animals %} - - Dose Regime Editing - Update - View change logs + + Dose Regime Editing + Update + View change logs {% endif %} @@ -26,7 +26,7 @@

{{object}}

{% if crud == "Read" %} -
+
{% endif %} {% endblock %} @@ -34,19 +34,19 @@

{{object}}

{% block extrajs %} -{{ config|json_script:"config" }} - + {% endblock %} diff --git a/hawc/apps/animal/templates/animal/animalgroup_form.html b/hawc/apps/animal/templates/animal/animalgroup_form.html index 1e64751281..42dec29099 100644 --- a/hawc/apps/animal/templates/animal/animalgroup_form.html +++ b/hawc/apps/animal/templates/animal/animalgroup_form.html @@ -14,8 +14,8 @@ Dose-groups - Add new representation - + + Add new representation + + {% if dose_groups_errors %} @@ -31,114 +31,114 @@ {% endblock %} {% block extrajs %} - + drc.prepend(drf.children()); + drc.insertBefore(drcInsertLocation); + drf.remove(); + + {% if dose_groups_json %} + dose_values = {{dose_groups_json|safe}}; + {% endif %} + + genInput + .change(onGenerationChange) + .trigger('change'); + + drInput + .change(onDosingRegimeChange) + .trigger('change'); + + window.app.startup("animalStartup", function(animal){ + new animal.DosingRegimeForm( + $("#animal_group"), dose_types, dose_values); + }) + } + + animalGroupSetup(); + {% if crud == "Create" %} + dosingRegimeSetup(); + {% endif %} + $('#id_name').focus(); + }); + {% endblock extrajs %} diff --git a/hawc/apps/animal/templates/animal/dosingregime_form.html b/hawc/apps/animal/templates/animal/dosingregime_form.html index 1402d9909e..ce18d5e5c8 100644 --- a/hawc/apps/animal/templates/animal/dosingregime_form.html +++ b/hawc/apps/animal/templates/animal/dosingregime_form.html @@ -22,15 +22,15 @@ {% block extrajs %} {% endblock extrajs %} diff --git a/hawc/apps/animal/templates/animal/endpoint_detail.html b/hawc/apps/animal/templates/animal/endpoint_detail.html index 923a42fb5f..abc361e949 100644 --- a/hawc/apps/animal/templates/animal/endpoint_detail.html +++ b/hawc/apps/animal/templates/animal/endpoint_detail.html @@ -3,10 +3,10 @@ {% block content %} {% if crud == "Read" %} -
-

{{object}}

- {% if obj_perms.edit %} - {% actions %} +
+

{{object}}

+ {% if obj_perms.edit %} + {% actions %} Endpoint Editing Update endpoint View change logs @@ -23,15 +23,15 @@

{{object}}

{% endif %} {% endif %} {% endif %} - {% endactions %} - {% elif assessment.enable_bmd and object.bmd_modeling_possible and bmd_session %} - {% actions %} + {% endactions %} + {% elif assessment.enable_bmd and object.bmd_modeling_possible and bmd_session %} + {% actions %} BMD Modeling Latest session All sessions - {% endactions %} - {% endif %} -
+ {% endactions %} + {% endif %} +
{% endif %} @@ -55,13 +55,13 @@

Plot

{% block extrajs %} {% endblock %} diff --git a/hawc/apps/animal/templates/animal/endpoint_form.html b/hawc/apps/animal/templates/animal/endpoint_form.html index 9b0a9fc2cf..7ed7387968 100644 --- a/hawc/apps/animal/templates/animal/endpoint_form.html +++ b/hawc/apps/animal/templates/animal/endpoint_form.html @@ -99,40 +99,40 @@ "litterEffectRequired": {{form.instance.litter_effect_required|lower}}, "doses": {{animal_group.get_doses_json|safe}}, {% if form.instance.id %} - "endpoint_data": {{form.instance.get_json|safe}} + "endpoint_data": {{form.instance.get_json|safe}} {% else %} - "endpoint_data": { - "animal_group": {{animal_group.get_json|safe}}, - "groups": [], - "noel_names": {{form.noel_names|safe}}, - "NOEL": {{form.NOEL.value|default_if_none:"-999"}}, - "LOEL": {{form.LOEL.value|default_if_none:"-999"}}, - "FEL": {{form.FEL.value|default_if_none:"-999"}} - } + "endpoint_data": { + "animal_group": {{animal_group.get_json|safe}}, + "groups": [], + "noel_names": {{form.noel_names|safe}}, + "NOEL": {{form.NOEL.value|default_if_none:"-999"}}, + "LOEL": {{form.LOEL.value|default_if_none:"-999"}}, + "FEL": {{form.FEL.value|default_if_none:"-999"}} + } {% endif %} } {% include "common/helptext_popup_js.html" %} {% endblock %} diff --git a/hawc/apps/animal/templates/animal/endpoint_list.html b/hawc/apps/animal/templates/animal/endpoint_list.html index 252fbd4d49..1426140003 100644 --- a/hawc/apps/animal/templates/animal/endpoint_list.html +++ b/hawc/apps/animal/templates/animal/endpoint_list.html @@ -1,60 +1,60 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

Assessment endpoints ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} - + + {% include 'common/inline_filter_form.html' %} +
{% bs4_colgroup '12,14,15,24,7,7,7,7,7' %} {% bs4_thead header_names %} - {% for object in object_list %} + {% for object in object_list %} - - - - - - - - - + + + + + + + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
- {{object.animal_group.experiment.study.short_citation}}{% debug_badge object.animal_group.experiment.study_id %} - - {{object.animal_group.experiment.name}}{% debug_badge object.animal_group.experiment_id %} - - {{object.animal_group.name}}{% debug_badge object.animal_group_id %} - - - {{object.name}}{% debug_badge object.id %} - {{object.units_name|default:"-"}}{{object.noel_value|default:"-"}}{{object.loel_value|default:"-"}}{{object.bmd|default:"-"}}{{object.bmdl|default:"-"}} + {{object.animal_group.experiment.study.short_citation}}{% debug_badge object.animal_group.experiment.study_id %} + + {{object.animal_group.experiment.name}}{% debug_badge object.animal_group.experiment_id %} + + {{object.animal_group.name}}{% debug_badge object.animal_group_id %} + + + {{object.name}}{% debug_badge object.id %} + {{object.units_name|default:"-"}}{{object.noel_value|default:"-"}}{{object.loel_value|default:"-"}}{{object.bmd|default:"-"}}{{object.bmdl|default:"-"}}
- No endpoints available - + No endpoints available +
+ -{% include "includes/paginator.html" with plural_object_name="endpoints" %} + {% include "includes/paginator.html" with plural_object_name="endpoints" %} {% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/animal/templates/animal/endpoint_list_v2.html b/hawc/apps/animal/templates/animal/endpoint_list_v2.html index 9fbc25b46f..d8755ddd52 100644 --- a/hawc/apps/animal/templates/animal/endpoint_list_v2.html +++ b/hawc/apps/animal/templates/animal/endpoint_list_v2.html @@ -1,10 +1,10 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Assessment endpoints v2

-
+

Assessment endpoints v2

+
{% endblock %} {% block extrajs %} - {{ config|json_script:"config" }} + {{ config|json_script:"config" }} {% endblock extrajs %} diff --git a/hawc/apps/animal/templates/animal/experiment_detail.html b/hawc/apps/animal/templates/animal/experiment_detail.html index 97cc82233f..d01cd22e95 100644 --- a/hawc/apps/animal/templates/animal/experiment_detail.html +++ b/hawc/apps/animal/templates/animal/experiment_detail.html @@ -1,22 +1,22 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object}}

- {% if obj_perms.edit %} - {% actions %} - Experiment Editing - Update - View change logs - Delete - - Animal Group Editing - Create new - Copy from existing - {% endactions %} - {% endif %} -
-
+
+

{{object}}

+ {% if obj_perms.edit %} + {% actions %} + Experiment Editing + Update + View change logs + Delete + + Animal Group Editing + Create new + Copy from existing + {% endactions %} + {% endif %} +
+
{% if crud == "Read" %}

Available animal groups

diff --git a/hawc/apps/animal/templates/animal/experiment_form.html b/hawc/apps/animal/templates/animal/experiment_form.html index 6f80b67b3e..9ba2fc4386 100644 --- a/hawc/apps/animal/templates/animal/experiment_form.html +++ b/hawc/apps/animal/templates/animal/experiment_form.html @@ -10,27 +10,27 @@ $('#id_name').focus(); var pa = $('#id_purity_available'), addBlankOption = function(setAsBlank){ - var sel = $('#id_purity_qualifier'), - blank = sel.find('option[value=""]'); - if(setAsBlank){ - if(blank.length===0) blank = $('').appendTo(sel); - blank.prop('selected', true); - } else { - blank.remove(); - } - }, + var sel = $('#id_purity_qualifier'), + blank = sel.find('option[value=""]'); + if(setAsBlank){ + if(blank.length===0) blank = $('').appendTo(sel); + blank.prop('selected', true); + } else { + blank.remove(); + } + }, showPurity = function(){ - if (pa.prop('checked')){ - $('#div_id_purity').show(); - $('#div_id_purity_qualifier').show(); - addBlankOption(false); - } else { - $('#div_id_purity_qualifier').hide(); - $('#div_id_purity').hide(); - $('#id_purity').val(""); - addBlankOption(true); - } - }; + if (pa.prop('checked')){ + $('#div_id_purity').show(); + $('#div_id_purity_qualifier').show(); + addBlankOption(false); + } else { + $('#div_id_purity_qualifier').hide(); + $('#div_id_purity').hide(); + $('#id_purity').val(""); + addBlankOption(true); + } + }; pa.on('change', showPurity).trigger('change'); // by default, reproductive/developmental experiments are multi-generational; other types are not. diff --git a/hawc/apps/assessment/templates/assessment/_assessment_form_js.html b/hawc/apps/assessment/templates/assessment/_assessment_form_js.html index 4049f52d00..9d989e0677 100644 --- a/hawc/apps/assessment/templates/assessment/_assessment_form_js.html +++ b/hawc/apps/assessment/templates/assessment/_assessment_form_js.html @@ -1,22 +1,22 @@ diff --git a/hawc/apps/assessment/templates/assessment/_dataset_list.html b/hawc/apps/assessment/templates/assessment/_dataset_list.html index 5c88627890..01d8080207 100644 --- a/hawc/apps/assessment/templates/assessment/_dataset_list.html +++ b/hawc/apps/assessment/templates/assessment/_dataset_list.html @@ -1,36 +1,36 @@ {% if object_list.count > 0 %} -

Datasets

- +

Datasets

+
- - - + + + - - - - - + + + + + - {% for object in object_list %} + {% for object in object_list %} - - - + + + - {% endfor %} + {% endfor %} -
DatasetDescriptionDownload
DatasetDescriptionDownload
{{object.name}} - {% if obj_perms.edit and not object.published %} - - {% endif %} - {{object.description|safe}} - - - - - - {{object.name}} + {% if obj_perms.edit and not object.published %} + + {% endif %} + {{object.description|safe}} + + + + + +
+ {% endif %} diff --git a/hawc/apps/assessment/templates/assessment/_logs_note.html b/hawc/apps/assessment/templates/assessment/_logs_note.html index 881bad46be..bde6a57c78 100644 --- a/hawc/apps/assessment/templates/assessment/_logs_note.html +++ b/hawc/apps/assessment/templates/assessment/_logs_note.html @@ -1,3 +1,3 @@

- HAWC maintains a robust list of changes tracked in our database, but this is our initial effort at exposing these logs to assessment members for their use on assessments. We hope to expand the data in the future to include historical data, as well as more detailed differences of what exactly changed when modifying objects. If you are making changes to objects and they are not being displayed in the logs, please contact us and let us know; we want to make sure this functionality is as helpful as it can be. + HAWC maintains a robust list of changes tracked in our database, but this is our initial effort at exposing these logs to assessment members for their use on assessments. We hope to expand the data in the future to include historical data, as well as more detailed differences of what exactly changed when modifying objects. If you are making changes to objects and they are not being displayed in the logs, please contact us and let us know; we want to make sure this functionality is as helpful as it can be.

diff --git a/hawc/apps/assessment/templates/assessment/assessment_detail.html b/hawc/apps/assessment/templates/assessment/assessment_detail.html index c0fc4539c0..a4998d6ca3 100644 --- a/hawc/apps/assessment/templates/assessment/assessment_detail.html +++ b/hawc/apps/assessment/templates/assessment/assessment_detail.html @@ -6,58 +6,58 @@

{{object}}{% debug_badge object.id %}

{% if crud == "Read" %} {% actions %} - {% if obj_perms.edit %} - Assessment Editing - {% if obj_perms.edit_assessment %} + {% if obj_perms.edit %} + Assessment Editing + {% if obj_perms.edit_assessment %} Update assessment Update modules Update additional details Delete assessment - {% endif %} - {% if feature_flags.ENABLE_UDF %} + {% endif %} + {% if feature_flags.ENABLE_UDF %} User defined models - {% endif %} - Clear assessment cache - View change logs - Add an attachment - Add a dataset - Add a value - - {% else %} - {% if obj_perms.edit_assessment %} + {% endif %} + Clear assessment cache + View change logs + Add an attachment + Add a dataset + Add a value + + {% else %} + {% if obj_perms.edit_assessment %} {% comment "User has permission but assessment is locked" %}{% endcomment %} - Assessment Editing - Update assessment - - {% endif %} + Assessment Editing + Update assessment + {% endif %} + {% endif %} - Application settings - {% if assessment.enable_risk_of_bias %} + Application settings + {% if assessment.enable_risk_of_bias %} {{object.get_rob_name_display}} settings - {% endif %} + {% endif %} - {% if assessment.enable_bmd %} + {% if assessment.enable_bmd %} Benchmark dose settings - {% endif %} + {% endif %} - {% if assessment.enable_data_extraction and obj_perms.edit_assessment %} + {% if assessment.enable_data_extraction and obj_perms.edit_assessment %} In vitro endpoint categories - {% endif%} + {% endif%} - {% if assessment.enable_data_extraction and obj_perms.edit_assessment or assessment.enable_risk_of_bias and obj_perms.edit_assessment %} + {% if assessment.enable_data_extraction and obj_perms.edit_assessment or assessment.enable_risk_of_bias and obj_perms.edit_assessment %} Data cleanup views - {% if assessment.enable_data_extraction %} - Clean extracted data - {% endif%} - {% if assessment.enable_risk_of_bias %} - Clean {{object.get_rob_name_display|lower}} responses - {% endif %} - Publish items + {% if assessment.enable_data_extraction %} + Clean extracted data + {% endif%} + {% if assessment.enable_risk_of_bias %} + Clean {{object.get_rob_name_display|lower}} responses {% endif %} + Publish items + {% endif %} {% endactions %} {% endif %}
@@ -79,10 +79,10 @@

{{object}}{% debug_badge object.id %}

{% endif %} {% if object.dtxsids.count > 0 %} - - DSSTox substance identifiers (DTXSID) - - + + DSSTox substance identifiers (DTXSID) + + {% endif %} @@ -96,31 +96,31 @@

{{object}}{% debug_badge object.id %}

{% if object.assessment_objective %} - - Objective - {{object.assessment_objective|safe}} - + + Objective + {{object.assessment_objective|safe}} + {% endif %} {% if object.authors %} - - Authors - {{object.authors|safe}} - + + Authors + {{object.authors|safe}} + {% endif %} {% if object.conflicts_of_interest %} - - Conflicts of interest - {{object.conflicts_of_interest|safe}} - + + Conflicts of interest + {{object.conflicts_of_interest|safe}} + {% endif %} {% if object.funding_source %} - - Funding source - {{object.funding_source|safe}} - + + Funding source + {{object.funding_source|safe}} + {% endif %} {% if object.details %} @@ -128,102 +128,102 @@

{{object}}{% debug_badge object.id %}

{% endif %} {% if object.vocabulary %} - - Vocabulary - {{object.get_vocabulary_display}} - + + Vocabulary + {{object.get_vocabulary_display}} + {% endif %} {% if obj_perms.edit %} -

Assessment details for team members*

- - {% bs4_colgroup '25,25,25,25' %} - - - - - - - +

Assessment details for team members*

+
Assessment team -

Project manager{{ object.project_manager.all|pluralize }}

-
    - {% for m in object.project_manager.active %} -
  • {{ m.get_full_name }}
  • - {% endfor %} -
-
-

Team member{{ object.team_members.all|pluralize }}

-
    - {% for m in object.team_members.active %} -
  • {{ m.get_full_name }}
  • - {% empty %} -
  • None assigned
  • - {% endfor %} -
-
-

Reviewer{{ object.reviewers.all|pluralize }}

-
    - {% for m in object.reviewers.active %} -
  • {{ m.get_full_name }}
  • - {% empty %} -
  • None assigned
  • - {% endfor %} -
-
+ {% bs4_colgroup '25,25,25,25' %} + + + + + + + - - - - + + + + - - - - + + + + - {% if object.public_on %} - - - - - {% endif %} + {% if object.public_on %} + + + + + {% endif %} - - - - + + + + - {% if object.details and object.details.qa_id %} - {% url_or_span object.details.qa_id object.details.qa_url as qa_identifier %} - - - - - {% endif %} + {% if object.details and object.details.qa_id %} + {% url_or_span object.details.qa_id object.details.qa_url as qa_identifier %} + + + + + {% endif %} - {% if internal_communications|hastext %} - - - - - {% endif %} - - - - - - -
Assessment team +

Project manager{{ object.project_manager.all|pluralize }}

+
    + {% for m in object.project_manager.active %} +
  • {{ m.get_full_name }}
  • + {% endfor %} +
+
+

Team member{{ object.team_members.all|pluralize }}

+
    + {% for m in object.team_members.active %} +
  • {{ m.get_full_name }}
  • + {% empty %} +
  • None assigned
  • + {% endfor %} +
+
+

Reviewer{{ object.reviewers.all|pluralize }}

+
    + {% for m in object.reviewers.active %} +
  • {{ m.get_full_name }}
  • + {% empty %} +
  • None assigned
  • + {% endfor %} +
+
Editable{{object.editable|yesno:"Yes,No"}}
Editable{{object.editable|yesno:"Yes,No"}}
Public - {% if object.public_on %} - Yes; published on {{object.public_on|date:"DATE_FORMAT"}} - {% else %} - No; this assessment is currently private - {% endif %} -
Public + {% if object.public_on %} + Yes; published on {{object.public_on|date:"DATE_FORMAT"}} + {% else %} + No; this assessment is currently private + {% endif %} +
Hidden from public assessments page?{{object.hide_from_public_page|yesno:"Yes; available if you have the link but hidden from the list page,No; it's available via searching or browsing"|safe}}
Hidden from public assessments page?{{object.hide_from_public_page|yesno:"Yes; available if you have the link but hidden from the list page,No; it's available via searching or browsing"|safe}}
Date createdCreated by {{object.creator}} on {{object.created|date:"DATE_FORMAT"}}
Date createdCreated by {{object.creator}} on {{object.created|date:"DATE_FORMAT"}}
QA Identifier{{ qa_identifier }}
QA Identifier{{ qa_identifier }}
Internal communications{{ internal_communications|safe }}
- * These fields are only shown to assessment team members, even if the assessment is made public. -
+ {% if internal_communications|hastext %} + + Internal communications + {{ internal_communications|safe }} + + {% endif %} + + + + + * These fields are only shown to assessment team members, even if the assessment is made public. + + + + {% endif %} {% if crud == "Read" %} @@ -235,25 +235,25 @@

Assessment details for team members*

{% endblock content %} {% block extrajs %} -{% if crud == "Read" and object.dtxsids.first %} - -{% endif %} - + {% endif %} + -{% include "common/helptext_popup_js.html" %} + const form = $(target).find('.attachment-form'); + if (form) { + form.find("#id_title").focus(); + } + }); + + {% include "common/helptext_popup_js.html" %} {% endblock extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/assessment_downloads.html b/hawc/apps/assessment/templates/assessment/assessment_downloads.html index e255d4775f..07c1360a96 100644 --- a/hawc/apps/assessment/templates/assessment/assessment_downloads.html +++ b/hawc/apps/assessment/templates/assessment/assessment_downloads.html @@ -1,189 +1,189 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

{{object}} downloads

+

{{object}} downloads

-

- All data in HAWC are exportable into Excel. Data-scientist and developer friendly exports are also available. Visualizations can be exported into SVG and PNG formats; download visuals on each visualization page. Please contact us for more information regarding export capabilities. -

+

+ All data in HAWC are exportable into Excel. Data-scientist and developer friendly exports are also available. Visualizations can be exported into SVG and PNG formats; download visuals on each visualization page. Please contact us for more information regarding export capabilities. +

-
-
-
-

Literature Review

-
-
    - {% if not assessment.has_lit_data %} -
  • -

    No data available.

    -
  • - {% else %} -
  • - {% url 'lit:api:assessment-reference-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='references' button_text="Reference Export" help_text="All references and tags." allow_unpublished=False %} -
  • - {% if obj_perms.edit and assessment.literature_settings.conflict_resolution %} -
  • - {% url 'lit:api:assessment-user-tag-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='references-usertags' button_text='User Tag Reference Export' help_text="All references and tags, including user tags. Team members only." allow_unpublished=False %} -
  • - {% endif %} - {% endif %} -
+
+
+
+

Literature Review

+
+
    + {% if not assessment.has_lit_data %} +
  • +

    No data available.

    +
  • + {% else %} +
  • + {% url 'lit:api:assessment-reference-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='references' button_text="Reference Export" help_text="All references and tags." allow_unpublished=False %} +
  • + {% if obj_perms.edit and assessment.literature_settings.conflict_resolution %} +
  • + {% url 'lit:api:assessment-user-tag-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='references-usertags' button_text='User Tag Reference Export' help_text="All references and tags, including user tags. Team members only." allow_unpublished=False %} +
  • + {% endif %} + {% endif %} +
+
-
-
-
-

{{assessment.get_rob_name_display}}

-
-
    - {% if not assessment.has_rob_data %} -
  • -

    No data available.

    -
  • - {% else %} -
  • - {% url 'riskofbias:api:assessment-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-final' button_text=assessment.get_rob_name_display|title|add:' Export' help_text="All final reviews." %} -
  • - {% if obj_perms.edit %} -
  • - {% url 'riskofbias:api:assessment-full-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-all' button_text='Complete '|add:assessment.get_rob_name_display|title|add:' Export' help_text="All reviews, including individual reviews. Team members only." %} -
  • - {% endif %} - {% endif %} -
+
+
+

{{assessment.get_rob_name_display}}

+
+
    + {% if not assessment.has_rob_data %} +
  • +

    No data available.

    +
  • + {% else %} +
  • + {% url 'riskofbias:api:assessment-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-final' button_text=assessment.get_rob_name_display|title|add:' Export' help_text="All final reviews." %} +
  • + {% if obj_perms.edit %} +
  • + {% url 'riskofbias:api:assessment-full-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='rob-all' button_text='Complete '|add:assessment.get_rob_name_display|title|add:' Export' help_text="All reviews, including individual reviews. Team members only." %} +
  • + {% endif %} + {% endif %} +
+
-
-
-
-

Animal Bioassay

-
-
    - {% if not assessment.has_animal_data %} -
  • -

    No data available.

    -
  • - {% else %} -
  • - {% url 'animal:api:assessment-full-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-data' button_text='Complete Export' help_text="Complete animal bioassay data export, where each row is a endpoint-group for all data extracted." %} -
  • -
  • - {% url 'animal:api:assessment-study-heatmap' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-study-summary' button_text='Study Summary' help_text="Study-level summary of animal bioassy data, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %} -
  • -
  • - {% url 'animal:api:assessment-endpoint-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-summary' button_text='Endpoint Summary' help_text="Endpoint summary animal bioassay data, where each row is an extracted endpoint." %} -
  • - {% endif %} -
+
+
+

Animal Bioassay

+
+
    + {% if not assessment.has_animal_data %} +
  • +

    No data available.

    +
  • + {% else %} +
  • + {% url 'animal:api:assessment-full-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-data' button_text='Complete Export' help_text="Complete animal bioassay data export, where each row is a endpoint-group for all data extracted." %} +
  • +
  • + {% url 'animal:api:assessment-study-heatmap' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-study-summary' button_text='Study Summary' help_text="Study-level summary of animal bioassy data, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %} +
  • +
  • + {% url 'animal:api:assessment-endpoint-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='animal-summary' button_text='Endpoint Summary' help_text="Endpoint summary animal bioassay data, where each row is an extracted endpoint." %} +
  • + {% endif %} +
+
-
-
-
-
-

Epidemiology

-
-
    - {% if not assessment.has_epi_data %} -
  • -

    No data available.

    -
  • - {% else %} - {% if assessment.epi_version == EpiVersion.V1 %} -
  • - {% url 'epi:api:assessment-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="Complete epidemiology export, where each row is an individual result associated with a health outcome." %} -
  • -
  • - {% url 'epi:api:assessment-study-heatmap' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Summary' help_text="Epidemiology study summary, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %} -
  • - {% elif assessment.epi_version == EpiVersion.V2 %} -
  • - {% url 'epiv2:api:assessment-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="Complete epidemiology export, where each row is an individual result associated with a health outcome." %} -
  • -
  • - {% url 'epiv2:api:assessment-study-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Summary' help_text="Epidemiology study summary, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %} -
  • - {% endif %} - {% endif %} -
-
-
-
-
-
-

Epidemiology Meta-Analysis

-
-
    -
  • - {% if not assessment.has_epimeta_data %} -

    No data available.

    +
    +
    +
    +

    Epidemiology

    +
    +
      + {% if not assessment.has_epi_data %} +
    • +

      No data available.

      +
    • {% else %} - {% url 'meta:api:assessment-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epimeta-data' button_text='Complete Export' help_text="All epidemiology meta-analysis data." %} + {% if assessment.epi_version == EpiVersion.V1 %} +
    • + {% url 'epi:api:assessment-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="Complete epidemiology export, where each row is an individual result associated with a health outcome." %} +
    • +
    • + {% url 'epi:api:assessment-study-heatmap' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Summary' help_text="Epidemiology study summary, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %} +
    • + {% elif assessment.epi_version == EpiVersion.V2 %} +
    • + {% url 'epiv2:api:assessment-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-data' button_text='Complete Export' help_text="Complete epidemiology export, where each row is an individual result associated with a health outcome." %} +
    • +
    • + {% url 'epiv2:api:assessment-study-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epi-study-design' button_text='Study Summary' help_text="Epidemiology study summary, where each row is a study. Columns with multiple values are pipe \"|\" delimited." %} +
    • + {% endif %} {% endif %} - -
    +
+
-
-
-
-

In-vitro

-
-
    -
  • - {% if not assessment.has_invitro_data %} -

    No data available.

    - {% else %} - {% url 'invitro:api:assessment-full-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='invitro-data' button_text='Complete Export' help_text="All in-vitro data." %} - {% endif %} -
  • -
+
+
+

Epidemiology Meta-Analysis

+
+
    +
  • + {% if not assessment.has_epimeta_data %} +

    No data available.

    + {% else %} + {% url 'meta:api:assessment-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='epimeta-data' button_text='Complete Export' help_text="All epidemiology meta-analysis data." %} + {% endif %} +
  • +
+
+
+
+
+
+

In-vitro

+
+
    +
  • + {% if not assessment.has_invitro_data %} +

    No data available.

    + {% else %} + {% url 'invitro:api:assessment-full-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='invitro-data' button_text='Complete Export' help_text="All in-vitro data." %} + {% endif %} +
  • +
+
-
-
-
-
-

Ecological

-
-
    - {% if not assessment.has_eco_data %} -
  • -

    No data available.

    -
  • - {% else %} -
  • - {% url 'eco:api:assessment-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='eco-data' button_text='Complete Export' help_text="All ecological data." %} -
  • -
  • - {% url 'eco:api:assessment-study-export' assessment.pk as the_url %} - {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='eco-study-summary' button_text='Study Summary' help_text="Ecology study summary data." %} -
  • - {% endif %} +
    +
    +
    +

    Ecological

    +
    +
      + {% if not assessment.has_eco_data %} +
    • +

      No data available.

      +
    • + {% else %} +
    • + {% url 'eco:api:assessment-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='eco-data' button_text='Complete Export' help_text="All ecological data." %} +
    • +
    • + {% url 'eco:api:assessment-study-export' assessment.pk as the_url %} + {% include "assessment/fragments/downloads_select.html" with link=the_url format="xlsx" name='eco-study-summary' button_text='Study Summary' help_text="Ecology study summary data." %} +
    • + {% endif %}
    -
    +
{% endblock %} {% block extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/assessment_list.html b/hawc/apps/assessment/templates/assessment/assessment_list.html index 04613f2263..2eb5dff876 100644 --- a/hawc/apps/assessment/templates/assessment/assessment_list.html +++ b/hawc/apps/assessment/templates/assessment/assessment_list.html @@ -9,9 +9,9 @@

{{title}}

{% endblock content %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/assessment_log_list.html b/hawc/apps/assessment/templates/assessment/assessment_log_list.html index e863d390dc..fe8fb7b061 100644 --- a/hawc/apps/assessment/templates/assessment/assessment_log_list.html +++ b/hawc/apps/assessment/templates/assessment/assessment_log_list.html @@ -1,83 +1,83 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

{{assessment}} Logs

{% actions %} - Download Logs - Assessment - Risk of bias - Animal - Epidemiology + Download Logs + Assessment + Risk of bias + Animal + Epidemiology {% endactions %} -
+
-{% include 'common/inline_filter_form.html' %} + {% include 'common/inline_filter_form.html' %} -{% url_replace page=None as params%} + {% url_replace page=None as params%} - +
- - - - - + + + + + - - - - - - - + + + + + + + - {% for log in object_list %} + {% for log in object_list %} - - + - - - + {% endwith %} + {% elif log.object_id %} + {{log.get_generic_object_name}} <deleted> + {% else %} + — + {% endif %} + + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
LogItemMessageUserTimestamp
LogItemMessageUserTimestamp
- View - - {% if log.object_id %} - {% if not request.GET.content_type or not request.GET.object_id %} - {% url_replace page=None content_type=log.content_type.id object_id=log.object_id as params %} - - - - {% endif %} - {% endif %} - {% if log.content_object %} - {% with log.content_object.get_absolute_url as absolute_url %} - {% if absolute_url %} - {{log.content_object}} - {% else %} - {{log.content_object}} - {% endif %} - {% endwith %} - {% elif log.object_id %} - {{log.get_generic_object_name}} <deleted> + + View + + {% if log.object_id %} + {% if not request.GET.content_type or not request.GET.object_id %} + {% url_replace page=None content_type=log.content_type.id object_id=log.object_id as params %} + + + + {% endif %} + {% endif %} + {% if log.content_object %} + {% with log.content_object.get_absolute_url as absolute_url %} + {% if absolute_url %} + {{log.content_object}} {% else %} - — + {{log.content_object}} {% endif %} - {{log.message|truncatechars:100}} - {% if log.user %} - {{log.user}} - {% else %}-{% endif %} - {{log.created}}{{log.message|truncatechars:100}} + {% if log.user %} + {{log.user}} + {% else %}-{% endif %} + {{log.created}}
No logs available.No logs available.
-{% include "includes/paginator.html" with plural_object_name="logs" %} -{% include 'assessment/_logs_note.html' %} + + {% include "includes/paginator.html" with plural_object_name="logs" %} + {% include 'assessment/_logs_note.html' %} {% endblock content %} diff --git a/hawc/apps/assessment/templates/assessment/assessmentdetail_form.html b/hawc/apps/assessment/templates/assessment/assessmentdetail_form.html index 7824258dcf..d53b9bb1e8 100644 --- a/hawc/apps/assessment/templates/assessment/assessmentdetail_form.html +++ b/hawc/apps/assessment/templates/assessment/assessmentdetail_form.html @@ -1,5 +1,5 @@ {% extends 'assessment-rooted.html' %} {% block content %} -{% crispy form %} + {% crispy form %} {% endblock %} diff --git a/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html b/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html index 6d6647c505..c47cf5dbc7 100644 --- a/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html +++ b/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html @@ -1,72 +1,72 @@ {% extends 'assessment-rooted.html' %} {% block content %} -{% if crud == "Read" %} -
-

Assessment Value for {{object.assessment}}

- {% if obj_perms.edit %} - {% actions %} - Update - Delete - {% endactions %} - {% endif %} -
-{% endif %} - + {% if crud == "Read" %} +
+

Assessment Value for {{object.assessment}}

+ {% if obj_perms.edit %} + {% actions %} + Update + Delete + {% endactions %} + {% endif %} +
+ {% endif %} +
- - + + - {% optional_table_row "Evaluation type" object.get_evaluation_type_display %} - {% optional_table_row "System or health effect basis" object.system %} - {% optional_table_row "Value type" object.get_value_type_display %} + {% optional_table_row "Evaluation type" object.get_evaluation_type_display %} + {% optional_table_row "System or health effect basis" object.system %} + {% optional_table_row "Value type" object.get_value_type_display %} + + + + + {% if object.confidence %} - - + + - {% if object.confidence %} + {% endif %} + {% optional_table_row "Value duration" object.duration %} + {% optional_table_row "Basis" object.basis %} + {% optional_table_row "POD type" object.pod_type %} + {% if object.pod_value %} - - + + - {% endif %} - {% optional_table_row "Value duration" object.duration %} - {% optional_table_row "Basis" object.basis %} - {% optional_table_row "POD type" object.pod_type %} - {% if object.pod_value %} - - - - - {% endif %} - {% if object.show_noncancer_fields %} + {% endif %} + {% if object.show_noncancer_fields %} {% optional_table_row "Composite uncertainty factor" object.get_uncertainty_display %} - {% endif %} - {% optional_table_row "Species and strain" object.species_studied|default:"" %} - {% if object.study %} + {% endif %} + {% optional_table_row "Species and strain" object.species_studied|default:"" %} + {% if object.study %} - - + + - {% endif %} - {% if object.show_cancer_fields %} + {% endif %} + {% if object.show_cancer_fields %} {% optional_table_row "Tumor type" object.tumor_type %} {% optional_table_row "Extrapolation method" object.extrapolation_method %} - {% endif %} - {% optional_table_row "Evidence characterization" object.evidence %} - {% optional_table_row "Comments" object.comments %} - {% for key, value in object.extra.items %} + {% endif %} + {% optional_table_row "Evidence characterization" object.evidence %} + {% optional_table_row "Comments" object.comments %} + {% for key, value in object.extra.items %} - - + + - {% empty %} - {% endfor %} + {% empty %} + {% endfor %} -
Value{% if object.adaf %}{% include "common/info_popover.html" with text=adaf_footnote %}{% endif %}{{object.value}} {{object.value_unit|default:""}}
Value{% if object.adaf %}{% include "common/info_popover.html" with text=adaf_footnote %}{% endif %}{{object.value}} {{object.value_unit|default:""}}Confidence{% include "common/info_popover.html" with text="Confidence in the toxicity value." %}{{object.confidence}}
Confidence{% include "common/info_popover.html" with text="Confidence in the toxicity value." %}{{object.confidence}}POD Value{{object.pod_value|default:""}} {{object.pod_unit|default:""}}
POD Value{{object.pod_value|default:""}} {{object.pod_unit|default:""}}
Key Study{{object.study}}Key Study{{object.study}}
{{key}}{{value}}{{key}}{{value}}
+ {% endblock %} {% block extrajs %} -{% if object.adaf %}{% include "common/helptext_popup_js.html" %}{% endif %} + {% if object.adaf %}{% include "common/helptext_popup_js.html" %}{% endif %} {% endblock %} diff --git a/hawc/apps/assessment/templates/assessment/assessmentvalue_form.html b/hawc/apps/assessment/templates/assessment/assessmentvalue_form.html index 54903a43d5..b0253b8473 100644 --- a/hawc/apps/assessment/templates/assessment/assessmentvalue_form.html +++ b/hawc/apps/assessment/templates/assessment/assessmentvalue_form.html @@ -1,38 +1,38 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% include "common/scientific_pulldown.html" %} -
-{% crispy form %} +
+ {% crispy form %} {% endblock %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/baseendpoint_list.html b/hawc/apps/assessment/templates/assessment/baseendpoint_list.html index f60464d166..823041dde8 100644 --- a/hawc/apps/assessment/templates/assessment/baseendpoint_list.html +++ b/hawc/apps/assessment/templates/assessment/baseendpoint_list.html @@ -2,133 +2,133 @@ {% block content %} -

Assessment endpoints

- - {% if total_endpoints > 0 %} + {% if total_endpoints > 0 %}

Dataset overview dashboards

- {% bs4_colgroup '40,20,20,20' %} - {% bs4_thead 'Data type,Study summary,Outcome/Results,Outcome/Results + Doses' %} - - {% if endpoints > 0 %} - - - - - - - {% if obj_perms.edit %} - - - - - - - {% endif %} - {% endif %} - {% if outcomes > 0 %} - - - - - - - {% if obj_perms.edit %} - - - - - - - {% endif %} - {% endif %} - {% if eco_designs > 0 %} + {% bs4_colgroup '40,20,20,20' %} + {% bs4_thead 'Data type,Study summary,Outcome/Results,Outcome/Results + Doses' %} + + {% if endpoints > 0 %} + + + + + + + {% if obj_perms.edit %} - - - - + + + + - {% if obj_perms.edit %} + {% endif %} + {% endif %} + {% if outcomes > 0 %} + + + + + + + {% if obj_perms.edit %} - - - - + + + + - {% endif %} - {% endif %} - {% if epiv2_outcomes > 0 %} + {% endif %} + {% endif %} + {% if eco_designs > 0 %} + + + + + + + {% if obj_perms.edit %} - - - - + + + + - {% if obj_perms.edit %} + {% endif %} + {% endif %} + {% if epiv2_outcomes > 0 %} + + + + + + + {% if obj_perms.edit %} - - - - + + + + - {% endif %} - {% endif %} - + {% endif %} + {% endif %} +
BioassayStudy summaryEndpointsEndpoints + Doses
Bioassay (including unpublished HAWC data) -   - - Study summaryEndpointsEndpoints + Doses
EpidemiologyStudy summaryResultsN/A
Epidemiology (including unpublished HAWC data) -   - - Study summaryResultsN/A
BioassayStudy summaryEndpointsEndpoints + Doses
EcologyStudy summaryResultsN/ABioassay (including unpublished HAWC data) +   + + Study summaryEndpointsEndpoints + Doses
EpidemiologyStudy summaryResultsN/A
Ecology (including unpublished HAWC data) -   - - Study summaryResultsN/AEpidemiology (including unpublished HAWC data) +   + + Study summaryResultsN/A
EcologyStudy summaryResultsN/A
EpidemiologyStudy designStudy resultsN/AEcology (including unpublished HAWC data) +   + + Study summaryResultsN/A
EpidemiologyStudy designStudy resultsN/A
Epidemiology (including unpublished HAWC data) -   - - Study designStudy resultsN/AEpidemiology (including unpublished HAWC data) +   + + Study designStudy resultsN/A
- {% endif %} + {% endif %} - {% if user.is_beta_tester %} + {% if user.is_beta_tester %}

Critical effects by dose

WIP

WIP (unpublished)

- {% endif %} + {% endif %} {% endblock %} diff --git a/hawc/apps/assessment/templates/assessment/clean_extracted_data.html b/hawc/apps/assessment/templates/assessment/clean_extracted_data.html index 61c5a4a0f2..28b248d12d 100644 --- a/hawc/apps/assessment/templates/assessment/clean_extracted_data.html +++ b/hawc/apps/assessment/templates/assessment/clean_extracted_data.html @@ -1,7 +1,7 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/clean_study_rob_scores.html b/hawc/apps/assessment/templates/assessment/clean_study_rob_scores.html index 85277e52b2..b401b8128d 100644 --- a/hawc/apps/assessment/templates/assessment/clean_study_rob_scores.html +++ b/hawc/apps/assessment/templates/assessment/clean_study_rob_scores.html @@ -1,11 +1,11 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Clean {{assessment}} metrics

-

Clean and standardize the {{assessment.get_rob_name_display|lower}} metric reviews across studies assessment-wide. Both judgment and text are editable.

-
+

Clean {{assessment}} metrics

+

Clean and standardize the {{assessment.get_rob_name_display|lower}} metric reviews across studies assessment-wide. Both judgment and text are editable.

+
{% endblock %} {% block extrajs %} - {{ config|json_script:"config" }} + {{ config|json_script:"config" }} {% endblock extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/content_types.html b/hawc/apps/assessment/templates/assessment/content_types.html index 67ed3968d2..109ef93858 100644 --- a/hawc/apps/assessment/templates/assessment/content_types.html +++ b/hawc/apps/assessment/templates/assessment/content_types.html @@ -4,34 +4,34 @@ {% block content %} -

Content Types

-

+

Content Types

+

Each type of data in HAWC is assigned an integer based content type ID. Generally these IDs are used on the backend for various operations and configurations, but in some cases, knowing the content type for a particular class of data can be useful for filtering or sorting purposes. The labels for the applications are the machine-readable version of the tables, but hopefully they're named reasonably close to the human-readable forms. -

-

Selected values for key data in HAWC are shown below:

- +

+

Selected values for key data in HAWC are shown below:

+
- - - + + + - - - - - + + + + + - {% for ct in content_types %} + {% for ct in content_types %} - - - + + + - {% endfor %} + {% endfor %} -
DomainDatasetID
DomainDatasetID
{{ct.app_label}}{{ct.model}}{{ct.id}}{{ct.app_label}}{{ct.model}}{{ct.id}}
+ {% endblock content %} diff --git a/hawc/apps/assessment/templates/assessment/dataset_confirm_delete.html b/hawc/apps/assessment/templates/assessment/dataset_confirm_delete.html index fd0007934d..19687f1bd1 100644 --- a/hawc/apps/assessment/templates/assessment/dataset_confirm_delete.html +++ b/hawc/apps/assessment/templates/assessment/dataset_confirm_delete.html @@ -1,6 +1,6 @@ {% extends 'assessment/dataset_detail.html' %} {% block content %} -{{ block.super }} -{% include "hawc/_delete_block.html" with name="dataset" notes="This will delete all associated data, and may break any visualizations that were created using this dataset." %} + {{ block.super }} + {% include "hawc/_delete_block.html" with name="dataset" notes="This will delete all associated data, and may break any visualizations that were created using this dataset." %} {% endblock content %} diff --git a/hawc/apps/assessment/templates/assessment/dataset_detail.html b/hawc/apps/assessment/templates/assessment/dataset_detail.html index 2fa2ae89f8..a4cda07a6a 100644 --- a/hawc/apps/assessment/templates/assessment/dataset_detail.html +++ b/hawc/apps/assessment/templates/assessment/dataset_detail.html @@ -1,109 +1,109 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

{{object}}

{% if crud == "Read" and obj_perms.edit %} - {% actions %} + {% actions %} Dataset Editing Update dataset Delete dataset - {% endactions %} + {% endactions %} {% endif %} -
+
- +
- - + + - - - - - {% if object.revisions.count > 0 %} + + + + + {% if object.revisions.count > 0 %} {% with revision=object.get_latest_revision %} - + - - + + - + {% endwith %} - {% endif %} + {% endif %} - - - - - - - - + + + + + + + + -
Description{{object.description|safe}}
Description{{object.description|safe}}
Download - - -  CSV - -  Excel + + +  CSV + +  Excel
Metadata -
    -
  • Current version: {{revision.version}}
  • -
  • Filename: {{revision.metadata.filename}}
  • -
  • Rows: {{revision.metadata.num_rows}}
  • -
  • Columns: {{revision.metadata.num_columns}}
  • -
  • Revision notes: {{revision.notes|safe}}
  • -
+
    +
  • Current version: {{revision.version}}
  • +
  • Filename: {{revision.metadata.filename}}
  • +
  • Rows: {{revision.metadata.num_rows}}
  • +
  • Columns: {{revision.metadata.num_columns}}
  • +
  • Revision notes: {{revision.notes|safe}}
  • +
Created{{object.created}}
Last updated{{object.last_updated}}
Created{{object.created}}
Last updated{{object.last_updated}}
+ -{% if crud == "Read" and obj_perms.edit and object.revisions.count > 0 %} -

Dataset revisions

- - + {% if crud == "Read" and obj_perms.edit and object.revisions.count > 0 %} +

Dataset revisions

+
+ - - + + - - - - + + + + - - -{% for revision in object.revisions.all %} - + + + {% for revision in object.revisions.all %} + - -{% endfor %} - -
VersionMetadataDownloadCreated/Last updatedVersionMetadataDownloadCreated/Last updated
{{revision.version}} -
    -
  • Filename: {{revision.metadata.filename}}
  • -
  • Rows: {{revision.metadata.num_rows}}
  • -
  • Columns: {{revision.metadata.num_columns}}
  • -
  • Revision notes: {{revision.notes|safe}}
  • -
+
    +
  • Filename: {{revision.metadata.filename}}
  • +
  • Rows: {{revision.metadata.num_rows}}
  • +
  • Columns: {{revision.metadata.num_columns}}
  • +
  • Revision notes: {{revision.notes|safe}}
  • +
- - - - - + + + + + - Created: {{revision.created}}
- Last updated: {{revision.last_updated}} + Created: {{revision.created}}
+ Last updated: {{revision.last_updated}}
-{% endif %} + + {% endfor %} + + + {% endif %} {% endblock content %} diff --git a/hawc/apps/assessment/templates/assessment/dataset_form.html b/hawc/apps/assessment/templates/assessment/dataset_form.html index 3ea7973bf0..98d29ccd4a 100644 --- a/hawc/apps/assessment/templates/assessment/dataset_form.html +++ b/hawc/apps/assessment/templates/assessment/dataset_form.html @@ -1,31 +1,31 @@ {% extends 'assessment-rooted.html' %} {% block content %} -{% crispy form %} + {% crispy form %} {% endblock content %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/assessment_list_public.html b/hawc/apps/assessment/templates/assessment/fragments/assessment_list_public.html index 34e26e01a7..867c62f70f 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/assessment_list_public.html +++ b/hawc/apps/assessment/templates/assessment/fragments/assessment_list_public.html @@ -1,23 +1,23 @@ {% if object_list %} - - {% bs4_colgroup '60,15,25' %} - {% bs4_thead 'Name,Year,Last Updated' %} - - {% for object in object_list %} - - - - - - {% endfor %} - -
-

{{object.name}}

- {% if object.assessment_objective %} -
{{object.assessment_objective|striptags|truncatewords:30|safe}}
- {% endif %} -
{{object.year}}{{object.last_updated|date:"Y-m-d"}}
+ + {% bs4_colgroup '60,15,25' %} + {% bs4_thead 'Name,Year,Last Updated' %} + + {% for object in object_list %} + + + + + + {% endfor %} + +
+

{{object.name}}

+ {% if object.assessment_objective %} +
{{object.assessment_objective|striptags|truncatewords:30|safe}}
+ {% endif %} +
{{object.year}}{{object.last_updated|date:"Y-m-d"}}
{% else %} {% alert info %}No assessments found.{% endalert %} {% endif %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/assessment_list_team.html b/hawc/apps/assessment/templates/assessment/fragments/assessment_list_team.html index c37bd35420..2cde3dc47b 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/assessment_list_team.html +++ b/hawc/apps/assessment/templates/assessment/fragments/assessment_list_team.html @@ -1,24 +1,24 @@ {% if object_list %} - - {% bs4_colgroup '40,10,20,15,15' %} - {% bs4_thead 'Name,Year,Role,Published,Last Updated' %} - - {% for object in object_list %} - - - - - - - - {% endfor %} - -
-

{{object.name}}

- {% if object.assessment_objective %} -
{{object.assessment_objective|striptags|truncatewords:30|safe}}
- {% endif %} -
{{object.year}}{{object.user_role}}{{object.published}}{{object.last_updated|date:"Y-m-d"}}
+ + {% bs4_colgroup '40,10,20,15,15' %} + {% bs4_thead 'Name,Year,Role,Published,Last Updated' %} + + {% for object in object_list %} + + + + + + + + {% endfor %} + +
+

{{object.name}}

+ {% if object.assessment_objective %} +
{{object.assessment_objective|striptags|truncatewords:30|safe}}
+ {% endif %} +
{{object.year}}{{object.user_role}}{{object.published}}{{object.last_updated|date:"Y-m-d"}}
{% else %} {% alert info %}No assessments found.{% endalert %} {% endif %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/assessmentdetail_table.html b/hawc/apps/assessment/templates/assessment/fragments/assessmentdetail_table.html index 8c5e3d4f93..d0c19af549 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/assessmentdetail_table.html +++ b/hawc/apps/assessment/templates/assessment/fragments/assessmentdetail_table.html @@ -7,8 +7,8 @@ {% optional_table_row "Report identifier" content %} {% optional_table_row "Peer review status" object.get_peer_review_status_display %} {% for key, value in object.extra.items %} - + {{key}} {{value}} - + {% endfor %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/assessmentvalue_list.html b/hawc/apps/assessment/templates/assessment/fragments/assessmentvalue_list.html index 55516944e5..1aaa0929ee 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/assessmentvalue_list.html +++ b/hawc/apps/assessment/templates/assessment/fragments/assessmentvalue_list.html @@ -1,35 +1,35 @@ {% if object_list.count > 0 %} -

Assessment Values

- +

Assessment Values

+
{% bs4_colgroup '10,10,10,10,15,10,15,10,10' %} - - - - - - - - - - - + + + + + + + + + + + - {% for object in object_list %} + {% for object in object_list %} - - - - - - - - - + + + + + + + + + - {% endfor %} + {% endfor %} -
Evaluation typeSystem or health effect basisValue typeValue durationValuePOD typePoint of departureComposite uncertainty factorConfidence{% include "common/info_popover.html" with text="Confidence in the toxicity value." %}
Evaluation typeSystem or health effect basisValue typeValue durationValuePOD typePoint of departureComposite uncertainty factorConfidence{% include "common/info_popover.html" with text="Confidence in the toxicity value." %}
{{object.get_evaluation_type_display}}{{object.system}}{{object.get_value_type_display}}{{object.duration}}{{object.value}} {{object.value_unit|default:""}}{% if object.adaf %}{% include "common/info_popover.html" with text=adaf_footnote %}{% endif %}{{object.pod_type|default:"-"}}{{object.pod_value|default:"-"}} {{object.pod_unit|default:""}}{{object.uncertainty|default:"-"}}{{object.confidence}}{{object.get_evaluation_type_display}}{{object.system}}{{object.get_value_type_display}}{{object.duration}}{{object.value}} {{object.value_unit|default:""}}{% if object.adaf %}{% include "common/info_popover.html" with text=adaf_footnote %}{% endif %}{{object.pod_type|default:"-"}}{{object.pod_value|default:"-"}} {{object.pod_unit|default:""}}{{object.uncertainty|default:"-"}}{{object.confidence}}
+ {% endif %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/attachment_edit_row.html b/hawc/apps/assessment/templates/assessment/fragments/attachment_edit_row.html index dca037d20f..fb97db07df 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/attachment_edit_row.html +++ b/hawc/apps/assessment/templates/assessment/fragments/attachment_edit_row.html @@ -1,36 +1,36 @@ - {% if form %} + {% if form %} -
- {% crispy form %} -
- {% if form.instance.id %} - - + - {% else %} - - + - {% endif %} -
-
+ Cancel + + {% endif %} +
+ {{ form.media }} - {% endif %} + {% endif %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/attachment_list.html b/hawc/apps/assessment/templates/assessment/fragments/attachment_list.html index 75ee35764a..d51e2576b5 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/attachment_list.html +++ b/hawc/apps/assessment/templates/assessment/fragments/attachment_list.html @@ -1,32 +1,32 @@
- {% if object_list or action == 'create' %} + {% if object_list or action == 'create' %}

Attachments

- - {% if canEdit or permissions.edit %} - - - - {% else %} - - - {% endif %} - - - - - - {% if canEdit or permissions.edit %} - - {% endif %} - - - - {% for object in object_list %} - {% include "assessment/fragments/attachment_row.html" %} - {% endfor %} - {% include "assessment/fragments/attachment_edit_row.html" %} - + + {% if canEdit or permissions.edit %} + + + + {% else %} + + + {% endif %} + + + + + + {% if canEdit or permissions.edit %} + + {% endif %} + + + + {% for object in object_list %} + {% include "assessment/fragments/attachment_row.html" %} + {% endfor %} + {% include "assessment/fragments/attachment_edit_row.html" %} +
AttachmentDescriptionEditing
AttachmentDescriptionEditing
- {% endif %} + {% endif %}
diff --git a/hawc/apps/assessment/templates/assessment/fragments/attachment_row.html b/hawc/apps/assessment/templates/assessment/fragments/attachment_row.html index fcb94576c2..b6e580d191 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/attachment_row.html +++ b/hawc/apps/assessment/templates/assessment/fragments/attachment_row.html @@ -1,37 +1,37 @@ + + {{object.title}} + {% if canEdit or permissions.edit %} + {% if not object.publicly_available %} + + {% endif %} + {% endif %} + + {{object.description|safe}} + {% if action == 'delete' %} - {{object.title}} - {% if canEdit or permissions.edit %} - {% if not object.publicly_available %} - - {% endif %} - {% endif %} - - {{object.description|safe}} - {% if action == 'delete' %} - -
- {% csrf_token %} -  Are you sure you want to delete? -
- - -
-
+
+ {% csrf_token %} +  Are you sure you want to delete? +
+ + +
+
- {% elif canEdit or permissions.edit %} + {% elif canEdit or permissions.edit %} - - + + - {% endif %} + {% endif %} diff --git a/hawc/apps/assessment/templates/assessment/fragments/downloads_select.html b/hawc/apps/assessment/templates/assessment/fragments/downloads_select.html index 3834da2a8f..185bbc5395 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/downloads_select.html +++ b/hawc/apps/assessment/templates/assessment/fragments/downloads_select.html @@ -1,22 +1,22 @@
- - + +
{% if allow_unpublished %} -
+
-
+
{% endif %}

{{help_text}}

Excel Spreadsheet

diff --git a/hawc/apps/assessment/templates/assessment/fragments/downloads_select_js.html b/hawc/apps/assessment/templates/assessment/fragments/downloads_select_js.html index 123658d6a7..1609382260 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/downloads_select_js.html +++ b/hawc/apps/assessment/templates/assessment/fragments/downloads_select_js.html @@ -2,10 +2,10 @@ $(document).ready(function () { $('{{name_list}}').on('change', function () { var format = $(this).val(), - url = $(`#${this.id}-url`).attr("href"); + url = $(`#${this.id}-url`).attr("href"); if (format && url) { var format_idx = url.indexOf("format="), - help_text = format === "xlsx" ? "Excel Spreadsheet" : `${format.toUpperCase()} file`; + help_text = format === "xlsx" ? "Excel Spreadsheet" : `${format.toUpperCase()} file`; $(`#${this.id}-url`).attr("href", url.replace(/format=(\w+)/, `format=${format}`)); $(`#${this.id}-fmt-text`).text(help_text) } @@ -13,7 +13,7 @@ }); $(`.unpublished-checkbox`).on('change', function () { var unpublished = $(this).prop('checked'), - url = $(`#${this.dataset.url}`).attr("href"); + url = $(`#${this.dataset.url}`).attr("href"); if (url) { $(`#${this.dataset.url}`).attr( "href", url.replace(/unpublished=(\w+)/, `unpublished=${unpublished}` diff --git a/hawc/apps/assessment/templates/assessment/fragments/publish_item_td.html b/hawc/apps/assessment/templates/assessment/fragments/publish_item_td.html index ef0302401a..fa825c0857 100644 --- a/hawc/apps/assessment/templates/assessment/fragments/publish_item_td.html +++ b/hawc/apps/assessment/templates/assessment/fragments/publish_item_td.html @@ -2,7 +2,7 @@
{% csrf_token %}
+ hx-trigger="click" {% if object.published or object.publicly_available %}checked{% endif %} />
diff --git a/hawc/apps/assessment/templates/assessment/log_detail.html b/hawc/apps/assessment/templates/assessment/log_detail.html index c6715b0fcf..33d82c77cb 100644 --- a/hawc/apps/assessment/templates/assessment/log_detail.html +++ b/hawc/apps/assessment/templates/assessment/log_detail.html @@ -2,62 +2,62 @@ {% block content %} -
+

{{object}}

{% if object.get_object_name %} - {% actions %} + {% actions %} View all logs for object - {% endactions %} + {% endactions %} {% endif %} -
+
- +
- - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
Object - {% with object.content_object.get_absolute_url as absolute_url %} - {% if absolute_url %} - {{object.get_object_name}} - {% else %} - {{object.get_object_name}} - {% endif %} - {% endwith %} -
Object type{{object.content_type}}
Assessment{{object.assessment}}
Message{{object.message}}
User{{object.user}}
Timestamp{{object.created}}
Object + {% with object.content_object.get_absolute_url as absolute_url %} + {% if absolute_url %} + {{object.get_object_name}} + {% else %} + {{object.get_object_name}} + {% endif %} + {% endwith %} +
Object type{{object.content_type}}
Assessment{{object.assessment}}
Message{{object.message}}
User{{object.user}}
Timestamp{{object.created}}
-{% include 'assessment/_logs_note.html' %} + + {% include 'assessment/_logs_note.html' %} {% endblock content %} diff --git a/hawc/apps/assessment/templates/assessment/log_object_list.html b/hawc/apps/assessment/templates/assessment/log_object_list.html index f3029a0706..58ca1ba73d 100644 --- a/hawc/apps/assessment/templates/assessment/log_object_list.html +++ b/hawc/apps/assessment/templates/assessment/log_object_list.html @@ -2,72 +2,72 @@ {% block content %} -

{{first_log}}s

+

{{first_log}}s

- +
- - + + - - - - + + + + - - - - + + + + - - - - + + + + -
Item - {% with first_log.content_object.get_absolute_url as absolute_url %} - {% if absolute_url %} - {{first_log.get_object_name}} - {% else %} - {{first_log.get_object_name}} - {% endif %} - {% endwith %} -
Item + {% with first_log.content_object.get_absolute_url as absolute_url %} + {% if absolute_url %} + {{first_log.get_object_name}} + {% else %} + {{first_log.get_object_name}} + {% endif %} + {% endwith %} +
Data type{{first_log.content_type}}
Data type{{first_log.content_type}}
Assessment{{first_log.assessment}}
Assessment{{first_log.assessment}}
+ -

Logs

+

Logs

- +
- - - + + + - - - - - + + + + + - {% for event in object_list %} + {% for event in object_list %} - - - + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
TimestampUserMessage
TimestampUserMessage
{{event.created}}{{event.user}}{% if event.message %}

{{event.message}}

{% endif %}{{event.snapshot}}
{{event.created}}{{event.user}}{% if event.message %}

{{event.message}}

{% endif %}{{event.snapshot}}
- No logs available; see details below. - + No logs available; see details below. +
+ -{% include 'assessment/_logs_note.html' %} + {% include 'assessment/_logs_note.html' %} {% endblock content %} diff --git a/hawc/apps/assessment/templates/assessment/preferred_dose_units_widget.html b/hawc/apps/assessment/templates/assessment/preferred_dose_units_widget.html index e52aa55f4a..31ae4b2e95 100644 --- a/hawc/apps/assessment/templates/assessment/preferred_dose_units_widget.html +++ b/hawc/apps/assessment/templates/assessment/preferred_dose_units_widget.html @@ -1,30 +1,30 @@ diff --git a/hawc/apps/assessment/templates/assessment/published_items.html b/hawc/apps/assessment/templates/assessment/published_items.html index 828729af5f..fb67e42eb0 100644 --- a/hawc/apps/assessment/templates/assessment/published_items.html +++ b/hawc/apps/assessment/templates/assessment/published_items.html @@ -1,154 +1,154 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Modify published items

-

+

Modify published items

+

Publish or unpublish multiple items for public visibility in the current assessment. If an item is made published, then if your assessment is public, anyone in the general public can view it. If the item is unpublished, but it cannot be browsed to by viewing content on the site. In some cases, unpublished content may be visible with a direct link, but not always. Reviewers are treated in a similar way as the general public with regards to published content. -

-
+

+
-

Studies

-

View all studies.

- - - - - - - - - {% for study in studies %} +

Studies

+

View all studies.

+
PublishedStudy
+ + + + + + + + {% for study in studies %} - {% include 'assessment/fragments/publish_item_td.html' with name="study" object=study %} - + {% include 'assessment/fragments/publish_item_td.html' with name="study" object=study %} + - {% empty %} + {% empty %} - + - {% endfor %} - -
PublishedStudy
{{study}}{{study}}
No studies exist.No studies exist.
+ {% endfor %} + +
-

Visuals

-

View all visuals.

- - - - - - - - - {% for dp in datapivots %} - {% if forloop.first %} - - - - {% endif %} - - {% include 'assessment/fragments/publish_item_td.html' with name="datapivot" object=dp %} - - - {% empty %} - - - - {% endfor %} - {% for visual in visuals %} - {% ifchanged visual.visual_type %} - - - - {% endifchanged %} - - {% include 'assessment/fragments/publish_item_td.html' with name="visual" object=visual %} - - - {% empty %} - - - - {% endfor %} - -
PublishedVisual
Data Pivots
{{dp}}
No data pivots exist.
{{visual.get_visual_type_display}}
{{visual}}
No visuals exist.
+

Visuals

+

View all visuals.

+ + + + + + + + + {% for dp in datapivots %} + {% if forloop.first %} + + + + {% endif %} + + {% include 'assessment/fragments/publish_item_td.html' with name="datapivot" object=dp %} + + + {% empty %} + + + + {% endfor %} + {% for visual in visuals %} + {% ifchanged visual.visual_type %} + + + + {% endifchanged %} + + {% include 'assessment/fragments/publish_item_td.html' with name="visual" object=visual %} + + + {% empty %} + + + + {% endfor %} + +
PublishedVisual
Data Pivots
{{dp}}
No data pivots exist.
{{visual.get_visual_type_display}}
{{visual}}
No visuals exist.
-

Summary tables

-

View all tables.

- - - - - - - - - {% for table in summarytables %} - - {% include 'assessment/fragments/publish_item_td.html' with name="summarytable" object=table %} - - - {% empty %} - - - - {% endfor %} - -
PublishedSummary tables
{{table}}
No summary tables exist.
+

Summary tables

+

View all tables.

+ + + + + + + + + {% for table in summarytables %} + + {% include 'assessment/fragments/publish_item_td.html' with name="summarytable" object=table %} + + + {% empty %} + + + + {% endfor %} + +
PublishedSummary tables
{{table}}
No summary tables exist.
-

Datasets

-

View all datasets.

- - - - - - - - - {% for dataset in datasets %} - - {% include 'assessment/fragments/publish_item_td.html' with name="dataset" object=dataset %} - - - {% empty %} - - - - {% endfor %} - -
PublishedDataset
{{dataset}}
No datasets exist.
+

Datasets

+

View all datasets.

+ + + + + + + + + {% for dataset in datasets %} + + {% include 'assessment/fragments/publish_item_td.html' with name="dataset" object=dataset %} + + + {% empty %} + + + + {% endfor %} + +
PublishedDataset
{{dataset}}
No datasets exist.
-

Attachments

-

View all attachments.

- - - - - - - - - {% for attachment in attachments %} - - {% include 'assessment/fragments/publish_item_td.html' with name="attachment" object=attachment %} - - - {% empty %} - - - - {% endfor %} - -
PublishedAssessment Attachments
{{attachment}}
No attachments exist.
+

Attachments

+

View all attachments.

+ + + + + + + + + {% for attachment in attachments %} + + {% include 'assessment/fragments/publish_item_td.html' with name="attachment" object=attachment %} + + + {% empty %} + + + + {% endfor %} + +
PublishedAssessment Attachments
{{attachment}}
No attachments exist.
-
+
{% endblock content %} diff --git a/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html b/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html index 0626317b50..76106a2d40 100644 --- a/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html +++ b/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html @@ -1,5 +1,5 @@ diff --git a/hawc/apps/bmd/templates/bmd/session_form.html b/hawc/apps/bmd/templates/bmd/session_form.html index c5020349bc..e108b30d2e 100644 --- a/hawc/apps/bmd/templates/bmd/session_form.html +++ b/hawc/apps/bmd/templates/bmd/session_form.html @@ -1,7 +1,7 @@ {% extends 'assessment-rooted.html' %} {% block content %} - Cancel -

{{object}}

-
+ Cancel +

{{object}}

+
{% endblock %} diff --git a/hawc/apps/bmd/templates/bmd/session_list.html b/hawc/apps/bmd/templates/bmd/session_list.html index f6d0e417f0..d180087fae 100644 --- a/hawc/apps/bmd/templates/bmd/session_list.html +++ b/hawc/apps/bmd/templates/bmd/session_list.html @@ -1,32 +1,32 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

BMD sessions

- {% if obj_perms.edit and crud == "Read" and assessment.bmd_settings.can_create_sessions %} - {% actions %} - BMD editing - Create new - {% endactions %} - {% endif %} -
- {% if not assessment.bmd_settings.can_create_sessions %} +
+

BMD sessions

+ {% if obj_perms.edit and crud == "Read" and assessment.bmd_settings.can_create_sessions %} + {% actions %} + BMD editing + Create new + {% endactions %} + {% endif %} +
+ {% if not assessment.bmd_settings.can_create_sessions %} - {% endif %} - - - - - - - - - - - + {% endif %} +
SessionBMDS versionDose unitsCreatedLast updated
+ + + + + + + + + + {% for o in object_list %} {% endfor %} - -
SessionBMDS versionDose unitsCreatedLast updated
@@ -42,6 +42,6 @@

BMD sessions

No BMD modeling sessions available.

+ + {% endblock %} diff --git a/hawc/apps/common/templates/common/analytics_plot.html b/hawc/apps/common/templates/common/analytics_plot.html index f9fcb89f5a..39bdfe95b9 100644 --- a/hawc/apps/common/templates/common/analytics_plot.html +++ b/hawc/apps/common/templates/common/analytics_plot.html @@ -1,7 +1,7 @@
-
-

{{ title }}

-
{% plotly plot event="htmx" resizable="True" %}
-

{{ caption }}

-
+
+

{{ title }}

+
{% plotly plot event="htmx" resizable="True" %}
+

{{ caption }}

+
diff --git a/hawc/apps/common/templates/common/crispy_layout_filter_field.html b/hawc/apps/common/templates/common/crispy_layout_filter_field.html index 2aa7008fcc..64a5378b21 100644 --- a/hawc/apps/common/templates/common/crispy_layout_filter_field.html +++ b/hawc/apps/common/templates/common/crispy_layout_filter_field.html @@ -2,52 +2,52 @@ {% load crispy_forms_filters %} {% comment %} Adapted from https://github.com/django-crispy-forms/crispy-bootstrap4/blob/main/crispy_bootstrap4/templates/bootstrap4/field.html {% endcomment %}
-
- {% if expandable %} -
- -
+
+ {% if expandable %} +
+ +
+ {% endif %} + {% if field|is_select %} + {% crispy_field field 'class' 'custom-select' %} + {% else %} + + {% endif %} +
+ {% for field in appended_fields %} + {% if field|is_checkbox %} +
+
+ {% crispy_field field 'class' 'custom-control-input' %} + +
+ {% if field.field.hover_help %} + {% include 'common/helptext_popup.html' with text=field.field.help_text %} + {% endif %} +
+ {% elif field|is_select and use_custom_control %} +
+ {{field.widget}} + {% if field.errors %} + {% crispy_field field 'class' 'custom-select form-sm-field is-invalid' %} + {% else %} + {% crispy_field field 'class' 'custom-select form-sm-field' %} + {% endif %} +
{% endif %} - {% if field|is_select %} - {% crispy_field field 'class' 'custom-select' %} - {% else %} - - {% endif %} -
- {% for field in appended_fields %} - {% if field|is_checkbox %} -
-
- {% crispy_field field 'class' 'custom-control-input' %} - -
- {% if field.field.hover_help %} - {% include 'common/helptext_popup.html' with text=field.field.help_text %} - {% endif %} -
- {% elif field|is_select and use_custom_control %} -
- {{field.widget}} - {% if field.errors %} - {% crispy_field field 'class' 'custom-select form-sm-field is-invalid' %} - {% else %} - {% crispy_field field 'class' 'custom-select form-sm-field' %} - {% endif %} -
- {% endif %} - {% endfor %} - - -
+ {% endfor %} + +
+
{% if expandable %} - + {% endif %} diff --git a/hawc/apps/common/templates/common/heatmap.html b/hawc/apps/common/templates/common/heatmap.html index ccfb505be5..5cade5e382 100644 --- a/hawc/apps/common/templates/common/heatmap.html +++ b/hawc/apps/common/templates/common/heatmap.html @@ -1,9 +1,9 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock content %} {% block extrajs %} - {{ config|json_script:"config" }} + {{ config|json_script:"config" }} {% endblock extrajs %} diff --git a/hawc/apps/common/templates/common/helptext_popup.html b/hawc/apps/common/templates/common/helptext_popup.html index 1f5c4d449b..9a12eb9a61 100644 --- a/hawc/apps/common/templates/common/helptext_popup.html +++ b/hawc/apps/common/templates/common/helptext_popup.html @@ -1,3 +1,3 @@ + aria-hidden="true" data-html="true" data-toggle="popover" + title="{{title}}" data-content="{{text}}"> diff --git a/hawc/apps/common/templates/common/helptext_popup_js.html b/hawc/apps/common/templates/common/helptext_popup_js.html index 7e745e0460..7819408c3e 100644 --- a/hawc/apps/common/templates/common/helptext_popup_js.html +++ b/hawc/apps/common/templates/common/helptext_popup_js.html @@ -1,9 +1,9 @@ diff --git a/hawc/apps/common/templates/common/info_popover.html b/hawc/apps/common/templates/common/info_popover.html index 01a2960909..bce087a67c 100644 --- a/hawc/apps/common/templates/common/info_popover.html +++ b/hawc/apps/common/templates/common/info_popover.html @@ -1,3 +1,3 @@ + aria-hidden="true" data-html="true" data-toggle="popover" + title="{{title}}" data-content="{{text}}"> diff --git a/hawc/apps/common/templates/common/inline_filter_form.html b/hawc/apps/common/templates/common/inline_filter_form.html index 88d55eb43f..9f6115f77e 100644 --- a/hawc/apps/common/templates/common/inline_filter_form.html +++ b/hawc/apps/common/templates/common/inline_filter_form.html @@ -1,3 +1,3 @@
- {% crispy form %} + {% crispy form %}
diff --git a/hawc/apps/common/templates/common/modal_template.html b/hawc/apps/common/templates/common/modal_template.html index 435f833e8e..2e0b0d3f13 100644 --- a/hawc/apps/common/templates/common/modal_template.html +++ b/hawc/apps/common/templates/common/modal_template.html @@ -1,27 +1,27 @@ + - {% endif %} + {% endif %} diff --git a/hawc/apps/eco/templates/eco/fragments/_object_row.html b/hawc/apps/eco/templates/eco/fragments/_object_row.html index b9ccb98f7d..e8e23446bf 100644 --- a/hawc/apps/eco/templates/eco/fragments/_object_row.html +++ b/hawc/apps/eco/templates/eco/fragments/_object_row.html @@ -1,24 +1,24 @@ {% if action == 'delete' %} - +
- {% csrf_token %} - Are you sure you want to delete? -
- - -
+
- + {% elif permissions.edit or obj_perms.edit and crud == "Update" %} - + + + - + hx-target="#{{model}}-empty-row" hx-swap="outerHTML"> + + {% endif %} diff --git a/hawc/apps/eco/templates/eco/fragments/cause_row.html b/hawc/apps/eco/templates/eco/fragments/cause_row.html index aa7f386661..b20b91c084 100644 --- a/hawc/apps/eco/templates/eco/fragments/cause_row.html +++ b/hawc/apps/eco/templates/eco/fragments/cause_row.html @@ -1,12 +1,12 @@ - {{object.name}} - {{object.term.name}} - {{object.species }} - {{object.level }} - {{object.level_units }} - {{object.comments }} - {% include "eco/fragments/_object_row.html" with model="cause" %} + {{object.name}} + {{object.term.name}} + {{object.species }} + {{object.level }} + {{object.level_units }} + {{object.comments }} + {% include "eco/fragments/_object_row.html" with model="cause" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/eco/templates/eco/fragments/effect_row.html b/hawc/apps/eco/templates/eco/fragments/effect_row.html index 04018db903..4767b8de83 100644 --- a/hawc/apps/eco/templates/eco/fragments/effect_row.html +++ b/hawc/apps/eco/templates/eco/fragments/effect_row.html @@ -1,12 +1,12 @@ - {{object.name}} - {{object.term.name}} - {{object.species }} - {{object.units }} - {{object.as_reported }} - {{object.comments }} - {% include "eco/fragments/_object_row.html" with model="effect" %} + {{object.name}} + {{object.term.name}} + {{object.species }} + {{object.units }} + {{object.as_reported }} + {{object.comments }} + {% include "eco/fragments/_object_row.html" with model="effect" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/eco/templates/eco/fragments/result_row.html b/hawc/apps/eco/templates/eco/fragments/result_row.html index 66a27729a1..826bd91c44 100644 --- a/hawc/apps/eco/templates/eco/fragments/result_row.html +++ b/hawc/apps/eco/templates/eco/fragments/result_row.html @@ -1,17 +1,17 @@ - {{object.name}} - {{object.cause.name}} - {{object.effect.name }} - {{object.get_relationship_direction_display}} - - {% split object.modifying_factors as factors %} - {% for factor in factors %} - {{factor}} - {% endfor %} - - {{object.derived_value }} - {% include "eco/fragments/_object_row.html" with model="result" %} + {{object.name}} + {{object.cause.name}} + {{object.effect.name }} + {{object.get_relationship_direction_display}} + + {% split object.modifying_factors as factors %} + {% for factor in factors %} + {{factor}} + {% endfor %} + + {{object.derived_value }} + {% include "eco/fragments/_object_row.html" with model="result" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/eco/templates/eco/nestedterm_list.html b/hawc/apps/eco/templates/eco/nestedterm_list.html index 392e82eccd..fbfefee933 100644 --- a/hawc/apps/eco/templates/eco/nestedterm_list.html +++ b/hawc/apps/eco/templates/eco/nestedterm_list.html @@ -3,22 +3,22 @@ {% load cache %} {% block content %} -Download -

Ecological cause/effect term list

-{% include 'common/inline_filter_form.html' %} -

-Show matched terms, as well as the matched term's ancestors and descendants. If you find a term you'd like to use in data entry, on the data entry page, you can enter either the name of the term, or the Term ID (the grey number beside the text). -

-
    -{% for object in object_list %} -
  • - Depth {{ object.depth}} {{object.nested_text}} {{object.id}} -
  • -{% empty %} -
  • No terms found!
  • -{% endfor %} -
+ Download +

Ecological cause/effect term list

+ {% include 'common/inline_filter_form.html' %} +

+ Show matched terms, as well as the matched term's ancestors and descendants. If you find a term you'd like to use in data entry, on the data entry page, you can enter either the name of the term, or the Term ID (the grey number beside the text). +

+
    + {% for object in object_list %} +
  • + Depth {{ object.depth}} {{object.nested_text}} {{object.id}} +
  • + {% empty %} +
  • No terms found!
  • + {% endfor %} +
-{% include "includes/paginator.html" with plural_object_name="terms" %} + {% include "includes/paginator.html" with plural_object_name="terms" %} {% endblock content %} diff --git a/hawc/apps/eco/templates/eco/result_list.html b/hawc/apps/eco/templates/eco/result_list.html index 850f4d0f37..c369eb7d44 100644 --- a/hawc/apps/eco/templates/eco/result_list.html +++ b/hawc/apps/eco/templates/eco/result_list.html @@ -1,39 +1,39 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

Results ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} - + + {% include 'common/inline_filter_form.html' %} +
{% bs4_colgroup '15,10,10,10,15,15,10,15' %} {% bs4_thead 'Study,Design,Cause,Effect,Result,Modifying Factors,Derived Value,Comments' %} - {% for object in result_list %} + {% for object in result_list %} - - - - - - - - + + + + + + + + - {% empty %} - {% bs4_fullrow 'No results available.' %} - {% endfor %} + {% empty %} + {% bs4_fullrow 'No results available.' %} + {% endfor %} -
{{object.design.study.short_citation}}{% debug_badge object.design.study_id %}{{object.design.name}}{% debug_badge object.design_id %}{{object.cause.name}}{% debug_badge object.cause.id %}{{object.effect.name }}{% debug_badge object.effect.id %}{{object.name}}{% debug_badge object.id %} - {% split object.modifying_factors as factors %} - {% for factor in factors %} - {{factor}} - {% endfor %} - {{object.derived_value|floatformat:3 }}{{object.comments}}{{object.design.study.short_citation}}{% debug_badge object.design.study_id %}{{object.design.name}}{% debug_badge object.design_id %}{{object.cause.name}}{% debug_badge object.cause.id %}{{object.effect.name }}{% debug_badge object.effect.id %}{{object.name}}{% debug_badge object.id %} + {% split object.modifying_factors as factors %} + {% for factor in factors %} + {{factor}} + {% endfor %} + {{object.derived_value|floatformat:3 }}{{object.comments}}
-{% include "includes/paginator.html" with plural_object_name="results" %} + + {% include "includes/paginator.html" with plural_object_name="results" %} {% endblock content %} diff --git a/hawc/apps/epi/templates/epi/comparisonset_detail.html b/hawc/apps/epi/templates/epi/comparisonset_detail.html index e46900c4fa..c8fcf14089 100644 --- a/hawc/apps/epi/templates/epi/comparisonset_detail.html +++ b/hawc/apps/epi/templates/epi/comparisonset_detail.html @@ -1,17 +1,17 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object.name}}

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - Comparison group editing - Update - Delete - {% endactions %} - {% endif %} -
-
+
+

{{object.name}}

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + Comparison group editing + Update + Delete + {% endactions %} + {% endif %} +
+
{% endblock %} diff --git a/hawc/apps/epi/templates/epi/exposure_detail.html b/hawc/apps/epi/templates/epi/exposure_detail.html index f70418161a..c673a36350 100644 --- a/hawc/apps/epi/templates/epi/exposure_detail.html +++ b/hawc/apps/epi/templates/epi/exposure_detail.html @@ -1,17 +1,17 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object.name}}

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - Exposure editing - Update - Delete - {% endactions %} - {% endif %} -
-
+
+

{{object.name}}

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + Exposure editing + Update + Delete + {% endactions %} + {% endif %} +
+
{% endblock %} diff --git a/hawc/apps/epi/templates/epi/exposure_form.html b/hawc/apps/epi/templates/epi/exposure_form.html index 232aec5399..e6cc40061f 100644 --- a/hawc/apps/epi/templates/epi/exposure_form.html +++ b/hawc/apps/epi/templates/epi/exposure_form.html @@ -1,16 +1,16 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
- {% crispy form %} -
+
+ {% crispy form %} +
-
- Central Tendencies - - - {% include "hawc/_formset_table_template.html" with showDeleteRow=True %} -
+
+ Central Tendencies + + + {% include "hawc/_formset_table_template.html" with showDeleteRow=True %} +
{% endblock %} {% block extrajs %} diff --git a/hawc/apps/epi/templates/epi/group_detail.html b/hawc/apps/epi/templates/epi/group_detail.html index 62d57619fd..4571feba33 100644 --- a/hawc/apps/epi/templates/epi/group_detail.html +++ b/hawc/apps/epi/templates/epi/group_detail.html @@ -1,16 +1,16 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object.name}}

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - Group editing - Update - {% endactions %} - {% endif %} -
-
+
+

{{object.name}}

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + Group editing + Update + {% endactions %} + {% endif %} +
+
{% endblock %} diff --git a/hawc/apps/epi/templates/epi/group_form.html b/hawc/apps/epi/templates/epi/group_form.html index fe909ab0bf..2916b95e92 100644 --- a/hawc/apps/epi/templates/epi/group_form.html +++ b/hawc/apps/epi/templates/epi/group_form.html @@ -7,10 +7,10 @@
Numerical group descriptions - + {% if crud == "Create" %}

diff --git a/hawc/apps/epi/templates/epi/outcome_detail.html b/hawc/apps/epi/templates/epi/outcome_detail.html index f11ca76036..44337f93a2 100644 --- a/hawc/apps/epi/templates/epi/outcome_detail.html +++ b/hawc/apps/epi/templates/epi/outcome_detail.html @@ -1,28 +1,28 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

-

{{object.name}}

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - Outcome editing - Update - Delete +
+

{{object.name}}

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + Outcome editing + Update + Delete + + Results + Create + Copy as new + {% if object.can_create_sets %} - Results - Create - Copy as new - {% if object.can_create_sets %} - - Comparison sets - Create - Copy from existing - {% endif %} - {% endactions %} - {% endif %} -
-
+ Comparison sets + Create + Copy from existing + {% endif %} + {% endactions %} + {% endif %} +
+
{% endblock %} diff --git a/hawc/apps/epi/templates/epi/outcome_list.html b/hawc/apps/epi/templates/epi/outcome_list.html index 63ed1b73f5..815313ed98 100644 --- a/hawc/apps/epi/templates/epi/outcome_list.html +++ b/hawc/apps/epi/templates/epi/outcome_list.html @@ -1,59 +1,59 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

Outcomes ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} - + + {% include 'common/inline_filter_form.html' %} +
{% bs4_colgroup '17,20,17,18,14,14' %} {% bs4_thead 'Study,Study population,Outcome,System,Effect,Diagnostic' %} - {% for object in object_list %} + {% for object in object_list %} - - - - - - + + + + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
- {{object.study_population.study.short_citation}}{% debug_badge object.study_population.study_id %} - - {{object.study_population.name}}{% debug_badge object.study_population_id %} - - - {{object.name}}{% debug_badge object.id %} - - {{object.system|default:"--"}} - - {{object.effect|default:"--"}} - - {{object.get_diagnostic_display|default:"--"}} - + {{object.study_population.study.short_citation}}{% debug_badge object.study_population.study_id %} + + {{object.study_population.name}}{% debug_badge object.study_population_id %} + + + {{object.name}}{% debug_badge object.id %} + + {{object.system|default:"--"}} + + {{object.effect|default:"--"}} + + {{object.get_diagnostic_display|default:"--"}} +
- No outcomes available - + No outcomes available +
+ -{% include "includes/paginator.html" with plural_object_name="outcomes" %} + {% include "includes/paginator.html" with plural_object_name="outcomes" %} {% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/epi/templates/epi/result_detail.html b/hawc/apps/epi/templates/epi/result_detail.html index 257eee83ff..51785691d9 100644 --- a/hawc/apps/epi/templates/epi/result_detail.html +++ b/hawc/apps/epi/templates/epi/result_detail.html @@ -1,17 +1,17 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object}}

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - Result editing - Update - Delete - {% endactions %} - {% endif %} -
-
+
+

{{object}}

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + Result editing + Update + Delete + {% endactions %} + {% endif %} +
+
{% endblock %} diff --git a/hawc/apps/epi/templates/epi/result_form.html b/hawc/apps/epi/templates/epi/result_form.html index 2128bdf853..72849ac088 100644 --- a/hawc/apps/epi/templates/epi/result_form.html +++ b/hawc/apps/epi/templates/epi/result_form.html @@ -27,48 +27,48 @@ fs = new window.app.DynamicFormset(elFormset, 'form', {oneFormRequired: true}), comparison_set_id = {{ form.comparison_set.value|default:"null" }}, updateFormset = function(d){ - var n; + var n; - if (_.isUndefined(d)) return elFormset.hide(); + if (_.isUndefined(d)) return elFormset.hide(); // update formset name - $("#formsetName").text(d.name); + $("#formsetName").text(d.name); // remove all but first row - fs.$el.find('tbody tr:gt(0)').remove(); + fs.$el.find('tbody tr:gt(0)').remove(); // reset first-row values - fs.clearForm(fs.$el.find('tbody tr').slice(0, 1)); + fs.clearForm(fs.$el.find('tbody tr').slice(0, 1)); // add rows based on number of groups in collection - _(d.groups.length-1).times(fs.addForm.bind(fs)); + _(d.groups.length-1).times(fs.addForm.bind(fs)); // bind each row to a different group-id - fs.$el.find('tbody tr').each(function(i, v){ - $(v).find('.groupField').val(d.groups[i].id); - n = d.groups[i].participant_n; - if (_.isNumber(n)) $(v).find('.nField').val(n); - }); - updateLabels(); - - elFormset.show(); - }, updateLabels = function(){ - fs.$el.find('tbody tr').each(function(i, tr){ - var tr = $(tr); - tr.find('.groupFieldLabel').text(tr.find('.groupField option:selected').text()); - }); - }, showOrHideMetricUnits = function () { - var metricsThatRequireUnits = ["mean", "mean change", "regression coefficient", "other"]; - var selectedMetricText = $("#id_metric option:selected").text(); - var showMetricUnits = metricsThatRequireUnits.indexOf(selectedMetricText) != -1; - var metricUnitsWrapper = $("div#div_id_metric_units"); - if (showMetricUnits) { - metricUnitsWrapper.show(); - } else { - metricUnitsWrapper.find("textarea").val(""); - metricUnitsWrapper.hide(); - } + fs.$el.find('tbody tr').each(function(i, v){ + $(v).find('.groupField').val(d.groups[i].id); + n = d.groups[i].participant_n; + if (_.isNumber(n)) $(v).find('.nField').val(n); + }); + updateLabels(); + + elFormset.show(); + }, updateLabels = function(){ + fs.$el.find('tbody tr').each(function(i, tr){ + var tr = $(tr); + tr.find('.groupFieldLabel').text(tr.find('.groupField option:selected').text()); + }); + }, showOrHideMetricUnits = function () { + var metricsThatRequireUnits = ["mean", "mean change", "regression coefficient", "other"]; + var selectedMetricText = $("#id_metric option:selected").text(); + var showMetricUnits = metricsThatRequireUnits.indexOf(selectedMetricText) != -1; + var metricUnitsWrapper = $("div#div_id_metric_units"); + if (showMetricUnits) { + metricUnitsWrapper.show(); + } else { + metricUnitsWrapper.find("textarea").val(""); + metricUnitsWrapper.hide(); } + } // add group labels $(".groupField").each(function(i,v){ diff --git a/hawc/apps/epi/templates/epi/studypopulation_detail.html b/hawc/apps/epi/templates/epi/studypopulation_detail.html index 6ceb63cada..b730b7a1ac 100644 --- a/hawc/apps/epi/templates/epi/studypopulation_detail.html +++ b/hawc/apps/epi/templates/epi/studypopulation_detail.html @@ -1,31 +1,31 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object.name}}

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - Study population editing - Update - Delete - - Exposure measurements - Create - Copy from existing - {% if object.can_create_sets %} - - Comparison sets - Create - Copy from existing - {% endif %} - - Outcomes - Create - Copy from existing - {% endactions %} - {% endif %} -
-
+
+

{{object.name}}

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + Study population editing + Update + Delete + + Exposure measurements + Create + Copy from existing + {% if object.can_create_sets %} + + Comparison sets + Create + Copy from existing + {% endif %} + + Outcomes + Create + Copy from existing + {% endactions %} + {% endif %} +
+
{% endblock %} diff --git a/hawc/apps/epimeta/templates/epimeta/metaresult_form.html b/hawc/apps/epimeta/templates/epimeta/metaresult_form.html index 8d11c6f1d7..79652743e7 100644 --- a/hawc/apps/epimeta/templates/epimeta/metaresult_form.html +++ b/hawc/apps/epimeta/templates/epimeta/metaresult_form.html @@ -15,7 +15,7 @@ Results can be associated with data already present in HAWC, or can be manually-entered with key findings. Hover-over field-titles for more help-text. If you choose to not include-any individual results, - delete all rows from this table before submitting. + delete all rows from this table before submitting.

{% include "hawc/_formset_table_template.html" with showDeleteRow=True %}
diff --git a/hawc/apps/epimeta/templates/epimeta/metaresult_list.html b/hawc/apps/epimeta/templates/epimeta/metaresult_list.html index f2f799ea69..2da35e79cd 100644 --- a/hawc/apps/epimeta/templates/epimeta/metaresult_list.html +++ b/hawc/apps/epimeta/templates/epimeta/metaresult_list.html @@ -1,67 +1,67 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

Meta-analysis/pooled results ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} - + + {% include 'common/inline_filter_form.html' %} +
{% bs4_colgroup '13,17,19,14,13,12,12' %} {% bs4_thead 'Study,Meta result,Protocol,Health outcome,Exposure,Confidence interval,Estimate' %} - {% for object in object_list %} + {% for object in object_list %} - - - - - - - + + + + + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
- {{object.protocol.study.short_citation}}{% debug_badge object.protocol.study_id %} - - - {{object.label}}{% debug_badge object.id %} - - {{object.protocol.name}}{% debug_badge object.protocol_id %} - - {{object.health_outcome|default:"--"}} - - {{object.exposure_name|default:"--"}} - - {% if object.ci_units_percentage is not None %} - {{object.ci_units_percentage}}% - {% else %} - -- - {% endif %} - - {{object.estimate_formatted|default:"--"}} - + {{object.protocol.study.short_citation}}{% debug_badge object.protocol.study_id %} + + + {{object.label}}{% debug_badge object.id %} + + {{object.protocol.name}}{% debug_badge object.protocol_id %} + + {{object.health_outcome|default:"--"}} + + {{object.exposure_name|default:"--"}} + + {% if object.ci_units_percentage is not None %} + {{object.ci_units_percentage}}% + {% else %} + -- + {% endif %} + + {{object.estimate_formatted|default:"--"}} +
- No results available - + No results available +
+ -{% include "includes/paginator.html" with plural_object_name="results" %} + {% include "includes/paginator.html" with plural_object_name="results" %} {% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/epiv2/templates/epiv2/design_detail.html b/hawc/apps/epiv2/templates/epiv2/design_detail.html index 62f848e76a..d49c905d32 100644 --- a/hawc/apps/epiv2/templates/epiv2/design_detail.html +++ b/hawc/apps/epiv2/templates/epiv2/design_detail.html @@ -1,117 +1,117 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

{{object.summary}}

{% if obj_perms.edit and crud == "Read" %} - {% actions %} + {% actions %} Study design editing Update Delete - {% endactions %} + {% endactions %} {% endif %} -
+
-{% include "epiv2/fragments/_design_table.html" %} + {% include "epiv2/fragments/_design_table.html" %} -
+
-

Chemicals

- - {% bs4_colgroup '50,50' %} - {% bs4_thead 'Name,DTXSID' %} - - {% for object in object.chemicals.all %} - {% include "epiv2/fragments/chemical_row.html" %} - {% empty %} - {% bs4_fullrow 'No chemicals available.' %} - {% endfor %} - -
+

Chemicals

+ + {% bs4_colgroup '50,50' %} + {% bs4_thead 'Name,DTXSID' %} + + {% for object in object.chemicals.all %} + {% include "epiv2/fragments/chemical_row.html" %} + {% empty %} + {% bs4_fullrow 'No chemicals available.' %} + {% endfor %} + +
-
-
+
+
-

Exposure Measurements

- - {% bs4_colgroup '33,33,34' %} - {% bs4_thead 'Name,Measurement Type,Measurement Timing' %} - - {% for object in object.exposures.all %} - {% include "epiv2/fragments/exposure_row.html" %} - {% empty %} - {% bs4_fullrow 'No exposure measurements available.' %} - {% endfor %} - -
+

Exposure Measurements

+ + {% bs4_colgroup '33,33,34' %} + {% bs4_thead 'Name,Measurement Type,Measurement Timing' %} + + {% for object in object.exposures.all %} + {% include "epiv2/fragments/exposure_row.html" %} + {% empty %} + {% bs4_fullrow 'No exposure measurements available.' %} + {% endfor %} + +
-
+
-
+
-

Exposure Levels

- - {% bs4_colgroup '20,20,20,20,20' %} - {% bs4_thead 'Name,Chemical,Exposure,Level,Comments' %} - - {% for object in object.exposure_levels.all %} - {% include "epiv2/fragments/exposurelevel_row.html" %} - {% empty %} - {% bs4_fullrow 'No exposure levels available.' %} - {% endfor %} - -
+

Exposure Levels

+ + {% bs4_colgroup '20,20,20,20,20' %} + {% bs4_thead 'Name,Chemical,Exposure,Level,Comments' %} + + {% for object in object.exposure_levels.all %} + {% include "epiv2/fragments/exposurelevel_row.html" %} + {% empty %} + {% bs4_fullrow 'No exposure levels available.' %} + {% endfor %} + +
-
+
-
+
-

Outcomes

- - {% bs4_colgroup '25,25,25,25' %} - {% bs4_thead 'System,Effect,Effect Detail,Endpoint/Outcome' %} - - {% for object in object.outcomes.all %} - {% include "epiv2/fragments/outcome_row.html" %} - {% empty %} - {% bs4_fullrow 'No outcomes available.' %} - {% endfor %} - -
+

Outcomes

+ + {% bs4_colgroup '25,25,25,25' %} + {% bs4_thead 'System,Effect,Effect Detail,Endpoint/Outcome' %} + + {% for object in object.outcomes.all %} + {% include "epiv2/fragments/outcome_row.html" %} + {% empty %} + {% bs4_fullrow 'No outcomes available.' %} + {% endfor %} + +
-
+
-
+
-

Adjustment Factors

- - {% bs4_colgroup '25,40,35' %} - {% bs4_thead 'Name,Description,Comments' %} - - {% for object in object.adjustment_factors.all %} - {% include "epiv2/fragments/adjustment_factor_row.html" %} - {% empty %} - {% bs4_fullrow 'No adjustment factors available.' %} - {% endfor %} - -
+

Adjustment Factors

+ + {% bs4_colgroup '25,40,35' %} + {% bs4_thead 'Name,Description,Comments' %} + + {% for object in object.adjustment_factors.all %} + {% include "epiv2/fragments/adjustment_factor_row.html" %} + {% empty %} + {% bs4_fullrow 'No adjustment factors available.' %} + {% endfor %} + +
-
+
-
+
-

Data Extractions

- - {% bs4_colgroup '12,12,12,12,11,5,11,12,13' %} - {% bs4_thead 'Group,Outcome,Exposure
Level,Timing,Estimate
Type,N,Value,Confidence,Comments' %} - - {% for object in object.data_extractions.all %} - {% include "epiv2/fragments/data_extraction_row.html" %} - {% empty %} - {% bs4_fullrow 'No data extractions available.' %} - {% endfor %} - -
+

Data Extractions

+ + {% bs4_colgroup '12,12,12,12,11,5,11,12,13' %} + {% bs4_thead 'Group,Outcome,Exposure
Level,Timing,Estimate
Type,N,Value,Confidence,Comments' %} + + {% for object in object.data_extractions.all %} + {% include "epiv2/fragments/data_extraction_row.html" %} + {% empty %} + {% bs4_fullrow 'No data extractions available.' %} + {% endfor %} + +
-
+
{% endblock %} diff --git a/hawc/apps/epiv2/templates/epiv2/design_update.html b/hawc/apps/epiv2/templates/epiv2/design_update.html index d842a8bf67..993b14cad2 100644 --- a/hawc/apps/epiv2/templates/epiv2/design_update.html +++ b/hawc/apps/epiv2/templates/epiv2/design_update.html @@ -1,152 +1,152 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Update {{object.summary}}

-
+

Update {{object.summary}}

+ + hx-get="{% url 'epiv2:design-update' object.pk %}" hx-target="#design-table" hx-swap="outerHTML"> +  Update design +
-{% include "epiv2/fragments/_design_table.html" %} + {% include "epiv2/fragments/_design_table.html" %} -
+
- {% url 'epiv2:chemical-create' object.pk as chemical_create %} - {% include "epiv2/fragments/_create_card.html" with title="Chemicals" hx_get=chemical_create hx_target="#chemical-empty-row" %} - - {% bs4_colgroup '43,42,15' %} - {% bs4_thead 'Name,DTXSID,Edit' %} - - {% if object.chemicals.all %} - {% for object in object.chemicals.all %} - {% include "epiv2/fragments/chemical_row.html" %} - {% endfor %} - {% include "epiv2/fragments/_create_one.html" with id="chemical-empty-row" text="" %} - {% else %} - {% include "epiv2/fragments/_create_one.html" with id="chemical-empty-row" text="chemicals" %} - {% endif %} - -
+ {% url 'epiv2:chemical-create' object.pk as chemical_create %} + {% include "epiv2/fragments/_create_card.html" with title="Chemicals" hx_get=chemical_create hx_target="#chemical-empty-row" %} + + {% bs4_colgroup '43,42,15' %} + {% bs4_thead 'Name,DTXSID,Edit' %} + + {% if object.chemicals.all %} + {% for object in object.chemicals.all %} + {% include "epiv2/fragments/chemical_row.html" %} + {% endfor %} + {% include "epiv2/fragments/_create_one.html" with id="chemical-empty-row" text="" %} + {% else %} + {% include "epiv2/fragments/_create_one.html" with id="chemical-empty-row" text="chemicals" %} + {% endif %} + +
-
+
-
+
- {% url 'epiv2:exposure-create' object.pk as exposure_create %} - {% include "epiv2/fragments/_create_card.html" with title="Exposure Measurements" hx_get=exposure_create hx_target="#exposure-empty-row" %} - - {% bs4_colgroup '29,28,28,15' %} - {% bs4_thead 'Name,Measurement Type, Measurement Timing,Edit' %} - - {% if object.exposures.all %} - {% for object in object.exposures.all %} - {% include "epiv2/fragments/exposure_row.html" %} - {% endfor %} - {% include "epiv2/fragments/_create_one.html" with id="exposure-empty-row" text="" %} - {% else %} - {% include "epiv2/fragments/_create_one.html" with id="exposure-empty-row" text="exposure measurements" %} - {% endif %} - -
+ {% url 'epiv2:exposure-create' object.pk as exposure_create %} + {% include "epiv2/fragments/_create_card.html" with title="Exposure Measurements" hx_get=exposure_create hx_target="#exposure-empty-row" %} + + {% bs4_colgroup '29,28,28,15' %} + {% bs4_thead 'Name,Measurement Type, Measurement Timing,Edit' %} + + {% if object.exposures.all %} + {% for object in object.exposures.all %} + {% include "epiv2/fragments/exposure_row.html" %} + {% endfor %} + {% include "epiv2/fragments/_create_one.html" with id="exposure-empty-row" text="" %} + {% else %} + {% include "epiv2/fragments/_create_one.html" with id="exposure-empty-row" text="exposure measurements" %} + {% endif %} + +
-
+
-
+
- {% url 'epiv2:exposurelevel-create' object.pk as exposurelevel_create %} - {% include "epiv2/fragments/_create_card.html" with title="Exposure Levels" hx_get=exposurelevel_create hx_target="#exposurelevel-empty-row" %} - - {% bs4_colgroup '17,17,17,17,17,15' %} - {% bs4_thead 'Name,Chemical,Exposure,Central Tendency,Comments,Edit' %} - - {% if object.exposure_levels.all %} - {% for object in object.exposure_levels.all %} - {% include "epiv2/fragments/exposurelevel_row.html" %} - {% endfor %} - {% include "epiv2/fragments/_create_one.html" with id="exposurelevel-empty-row" text="" %} - {% else %} - {% include "epiv2/fragments/_create_one.html" with id="exposurelevel-empty-row" text="exposure levels" %} - {% endif %} - -
+ {% url 'epiv2:exposurelevel-create' object.pk as exposurelevel_create %} + {% include "epiv2/fragments/_create_card.html" with title="Exposure Levels" hx_get=exposurelevel_create hx_target="#exposurelevel-empty-row" %} + + {% bs4_colgroup '17,17,17,17,17,15' %} + {% bs4_thead 'Name,Chemical,Exposure,Central Tendency,Comments,Edit' %} + + {% if object.exposure_levels.all %} + {% for object in object.exposure_levels.all %} + {% include "epiv2/fragments/exposurelevel_row.html" %} + {% endfor %} + {% include "epiv2/fragments/_create_one.html" with id="exposurelevel-empty-row" text="" %} + {% else %} + {% include "epiv2/fragments/_create_one.html" with id="exposurelevel-empty-row" text="exposure levels" %} + {% endif %} + +
-
+
-
+
- {% url 'epiv2:outcome-create' object.pk as outcome_create %} - {% include "epiv2/fragments/_create_card.html" with title="Outcomes" hx_get=outcome_create hx_target="#outcome-empty-row" %} - - {% bs4_colgroup '22,21,21,21,15' %} - {% bs4_thead 'System,Effect,Effect Detail,Endpoint/Outcome,Edit' %} - - {% if object.outcomes.all %} - {% for object in object.outcomes.all %} - {% include "epiv2/fragments/outcome_row.html" %} - {% endfor %} - {% include "epiv2/fragments/_create_one.html" with id="outcome-empty-row" text="" %} - {% else %} - {% include "epiv2/fragments/_create_one.html" with id="outcome-empty-row" text="outcomes" %} - {% endif %} - -
+ {% url 'epiv2:outcome-create' object.pk as outcome_create %} + {% include "epiv2/fragments/_create_card.html" with title="Outcomes" hx_get=outcome_create hx_target="#outcome-empty-row" %} + + {% bs4_colgroup '22,21,21,21,15' %} + {% bs4_thead 'System,Effect,Effect Detail,Endpoint/Outcome,Edit' %} + + {% if object.outcomes.all %} + {% for object in object.outcomes.all %} + {% include "epiv2/fragments/outcome_row.html" %} + {% endfor %} + {% include "epiv2/fragments/_create_one.html" with id="outcome-empty-row" text="" %} + {% else %} + {% include "epiv2/fragments/_create_one.html" with id="outcome-empty-row" text="outcomes" %} + {% endif %} + +
-
+
-
+
- {% url 'epiv2:adjustmentfactor-create' object.pk as adjustmentfactor_create %} - {% include "epiv2/fragments/_create_card.html" with title="Adjustment Factors" hx_get=adjustmentfactor_create hx_target="#adjustmentfactor-empty-row" %} - - {% bs4_colgroup '20,40,25,15' %} - {% bs4_thead 'Name,Description,Comments,Edit' %} - - {% if object.adjustment_factors.all %} - {% for object in object.adjustment_factors.all %} - {% include "epiv2/fragments/adjustment_factor_row.html" %} - {% endfor %} - {% include "epiv2/fragments/_create_one.html" with id="adjustmentfactor-empty-row" text="" %} - {% else %} - {% include "epiv2/fragments/_create_one.html" with id="adjustmentfactor-empty-row" text="adjustment factors" %} - {% endif %} - -
+ {% url 'epiv2:adjustmentfactor-create' object.pk as adjustmentfactor_create %} + {% include "epiv2/fragments/_create_card.html" with title="Adjustment Factors" hx_get=adjustmentfactor_create hx_target="#adjustmentfactor-empty-row" %} + + {% bs4_colgroup '20,40,25,15' %} + {% bs4_thead 'Name,Description,Comments,Edit' %} + + {% if object.adjustment_factors.all %} + {% for object in object.adjustment_factors.all %} + {% include "epiv2/fragments/adjustment_factor_row.html" %} + {% endfor %} + {% include "epiv2/fragments/_create_one.html" with id="adjustmentfactor-empty-row" text="" %} + {% else %} + {% include "epiv2/fragments/_create_one.html" with id="adjustmentfactor-empty-row" text="adjustment factors" %} + {% endif %} + +
-
+
-
+
- {% url 'epiv2:dataextraction-create' object.pk as dataextraction_create %} - {% include "epiv2/fragments/_create_card.html" with title="Data Extractions" hx_get=dataextraction_create hx_target="#dataextraction-empty-row" %} - - {% bs4_colgroup '12,12,12,12,6,6,6,12,12,10' %} - {% bs4_thead 'Group,Outcome,Exposure
Level,Timing,Estimate
Type,N,Value,Confidence,Comments,Edit' %} - - {% if object.data_extractions.all %} - {% for object in object.data_extractions.all %} - {% include "epiv2/fragments/data_extraction_row.html" %} - {% endfor %} - {% include "epiv2/fragments/_create_one.html" with id="dataextraction-empty-row" text="" %} - {% else %} - {% include "epiv2/fragments/_create_one.html" with id="dataextraction-empty-row" text="extractions" %} - {% endif %} - -
+ {% url 'epiv2:dataextraction-create' object.pk as dataextraction_create %} + {% include "epiv2/fragments/_create_card.html" with title="Data Extractions" hx_get=dataextraction_create hx_target="#dataextraction-empty-row" %} + + {% bs4_colgroup '12,12,12,12,6,6,6,12,12,10' %} + {% bs4_thead 'Group,Outcome,Exposure
Level,Timing,Estimate
Type,N,Value,Confidence,Comments,Edit' %} + + {% if object.data_extractions.all %} + {% for object in object.data_extractions.all %} + {% include "epiv2/fragments/data_extraction_row.html" %} + {% endfor %} + {% include "epiv2/fragments/_create_one.html" with id="dataextraction-empty-row" text="" %} + {% else %} + {% include "epiv2/fragments/_create_one.html" with id="dataextraction-empty-row" text="extractions" %} + {% endif %} + +
-
+
-
+ +
{% endblock %} {% block extrajs %} -{% include "common/htmx_autocomplete.html" %} - + {% include "common/htmx_autocomplete.html" %} + {% endblock %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_create_card.html b/hawc/apps/epiv2/templates/epiv2/fragments/_create_card.html index 320979c380..4e13683f12 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_create_card.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_create_card.html @@ -1,3 +1,3 @@

{{title}} - +

diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_create_one.html b/hawc/apps/epiv2/templates/epiv2/fragments/_create_one.html index e0aa85feb6..4edfd1ac4f 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_create_one.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_create_one.html @@ -1,7 +1,7 @@ - {% if text %} + {% if text %} -

No {{text}} to display. Click "Add Row" to create one.

+

No {{text}} to display. Click "Add Row" to create one.

- {% endif %} + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_delete_rows.html b/hawc/apps/epiv2/templates/epiv2/fragments/_delete_rows.html index 7f978c1abd..63284b10e2 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_delete_rows.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_delete_rows.html @@ -1,6 +1,6 @@ diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html b/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html index 77c42101df..b2d8e2e5f6 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html @@ -1,49 +1,49 @@ - - - - - - {% optional_table_row "Study design" object.get_study_design_display %} - {% optional_table_row "Study population N" object.participant_n %} - {% optional_table_row "Source" object.get_source_display %} - {% optional_table_row "Population age category" object.get_age_profile_display %} - {% optional_table_row "Population age details" object.age_description %} - {% optional_table_row "Sex" object.get_sex_display %} - {% optional_table_row "Population race/ethnicity" object.race %} - {% optional_table_row "Population summary" object.summary %} - {% optional_table_row "Study (cohort) name" object.study_name %} - {% optional_table_row "Year(s) of enrollment" object.years_enrolled %} - {% optional_table_row "Year(s) or length of follow-up" object.years_followup %} - {% with object.countries.all as countries %} - {% if countries %} + + + + + + {% optional_table_row "Study design" object.get_study_design_display %} + {% optional_table_row "Study population N" object.participant_n %} + {% optional_table_row "Source" object.get_source_display %} + {% optional_table_row "Population age category" object.get_age_profile_display %} + {% optional_table_row "Population age details" object.age_description %} + {% optional_table_row "Sex" object.get_sex_display %} + {% optional_table_row "Population race/ethnicity" object.race %} + {% optional_table_row "Population summary" object.summary %} + {% optional_table_row "Study (cohort) name" object.study_name %} + {% optional_table_row "Year(s) of enrollment" object.years_enrolled %} + {% optional_table_row "Year(s) or length of follow-up" object.years_followup %} + {% with object.countries.all as countries %} + {% if countries %} - - + + - {% endif %} - {% endwith %} - {% optional_table_row "Other geographic information" object.region %} - {% if object.criteria|hastext %} - - - - - {% endif %} - {% if object.susceptibility|hastext %} - - - - - {% endif %} - {% if object.comments|hastext %} - - - - - {% endif %} - + {% endif %} + {% endwith %} + {% optional_table_row "Other geographic information" object.region %} + {% if object.criteria|hastext %} + + + + + {% endif %} + {% if object.susceptibility|hastext %} + + + + + {% endif %} + {% if object.comments|hastext %} + + + + + {% endif %} +
Countries{% for object in object.countries.all %} - {{object.name}} - {% endfor %} - Countries{% for object in object.countries.all %} + {{object.name}} + {% endfor %} +
Inclusion/Exclusion Criteria{{object.criteria|safe}}
Susceptibility{{object.susceptibility|safe}}
Comments{{object.comments|safe}}
Inclusion/Exclusion Criteria{{object.criteria|safe}}
Susceptibility{{object.susceptibility|safe}}
Comments{{object.comments|safe}}
diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_object_edit_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/_object_edit_row.html index 2c03dbd637..b0a918e6c1 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_object_edit_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_object_edit_row.html @@ -1,29 +1,29 @@ - {% if form %} + {% if form %} -
-
- {% include "common/scientific_pulldown.html" %} -
- {% crispy form %} -
- {% if form.instance.id %} - - - {% else %} - - + + {% else %} + + - {% endif %} -
-
+ class="fa fa-fw fa-times mr-1"> + Cancel + {% endif %} +
+ - {% endif %} + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_object_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/_object_row.html index 4aac3d30b1..c8511e5ee0 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_object_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_object_row.html @@ -1,24 +1,24 @@ {% if action == 'delete' %} - +
- {% csrf_token %} - Are you sure you want to delete? -
- - -
+
- + {% elif permissions.edit or obj_perms.edit and crud == "Update" %} - + + + - + hx-target="#{{model}}-empty-row" hx-swap="outerHTML"> + + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/adjustment_factor_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/adjustment_factor_row.html index 709484e270..cbe00e2b67 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/adjustment_factor_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/adjustment_factor_row.html @@ -1,14 +1,14 @@ - {{object.name}} - - {% split object.description as descriptions %} - {% for desc in descriptions %} - {{desc}} - {% endfor %} - - {{object.comments|default:"-"}} - {% include "epiv2/fragments/_object_row.html" with model="adjustmentfactor" %} + {{object.name}} + + {% split object.description as descriptions %} + {% for desc in descriptions %} + {{desc}} + {% endfor %} + + {{object.comments|default:"-"}} + {% include "epiv2/fragments/_object_row.html" with model="adjustmentfactor" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/chemical_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/chemical_row.html index 396c954a36..41becaf417 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/chemical_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/chemical_row.html @@ -1,8 +1,8 @@ - {{object.name}} - {{object.dsstox.verbose_link|safe|default:"-" }} - {% include "epiv2/fragments/_object_row.html" with model="chemical" %} + {{object.name}} + {{object.dsstox.verbose_link|safe|default:"-" }} + {% include "epiv2/fragments/_object_row.html" with model="chemical" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/data_extraction_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/data_extraction_row.html index 5da40f594f..78e7112432 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/data_extraction_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/data_extraction_row.html @@ -1,15 +1,15 @@ - {{object.group|default:"-"}} - {{object.outcome}} - {{object.exposure_level}} - {{object.outcome_measurement_timing|default:"-"}} - {{object.effect_estimate_type}} - {{object.n|default_if_none:"-"}} - {{object.get_estimate_value}} - {{object.confidence|default:"-"}} - {{object.comments|default:"-"}} - {% include "epiv2/fragments/_object_row.html" with model="dataextraction" %} + {{object.group|default:"-"}} + {{object.outcome}} + {{object.exposure_level}} + {{object.outcome_measurement_timing|default:"-"}} + {{object.effect_estimate_type}} + {{object.n|default_if_none:"-"}} + {{object.get_estimate_value}} + {{object.confidence|default:"-"}} + {{object.comments|default:"-"}} + {% include "epiv2/fragments/_object_row.html" with model="dataextraction" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/exposure_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/exposure_row.html index 5633ea9e23..fedf6ff217 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/exposure_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/exposure_row.html @@ -1,17 +1,17 @@ - {{object.name}} - - {% if object.measurement_type %} -
    - {% for mt in object.measurement_type %} -
  • {{mt}}
  • - {% endfor %} -
- {% else %}-{% endif %} - - {{object.measurement_timing|default:"-"}} - {% include "epiv2/fragments/_object_row.html" with model="exposure" %} + {{object.name}} + + {% if object.measurement_type %} +
    + {% for mt in object.measurement_type %} +
  • {{mt}}
  • + {% endfor %} +
+ {% else %}-{% endif %} + + {{object.measurement_timing|default:"-"}} + {% include "epiv2/fragments/_object_row.html" with model="exposure" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/exposurelevel_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/exposurelevel_row.html index cb358bdf8f..58f9a523c1 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/exposurelevel_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/exposurelevel_row.html @@ -1,11 +1,11 @@ - {{object.name}} - {{object.chemical}} - {{object.exposure_measurement}} - {{object.exposure_html}} - {{object.comments|default:"-"}} - {% include "epiv2/fragments/_object_row.html" with model="exposurelevel" %} + {{object.name}} + {{object.chemical}} + {{object.exposure_measurement}} + {{object.exposure_html}} + {{object.comments|default:"-"}} + {% include "epiv2/fragments/_object_row.html" with model="exposurelevel" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/outcome_row.html b/hawc/apps/epiv2/templates/epiv2/fragments/outcome_row.html index 4411414a7a..29d571611d 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/outcome_row.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/outcome_row.html @@ -1,10 +1,10 @@ - {{object.get_system_display}} - {{object.effect}} - {{object.effect_detail}} - {{object.endpoint}} - {% include "epiv2/fragments/_object_row.html" with model="outcome" %} + {{object.get_system_display}} + {{object.effect}} + {{object.effect_detail}} + {{object.endpoint}} + {% include "epiv2/fragments/_object_row.html" with model="outcome" %} {% if action == 'create' or action == 'clone' %} - + {% endif %} diff --git a/hawc/apps/epiv2/templates/epiv2/outcome_list.html b/hawc/apps/epiv2/templates/epiv2/outcome_list.html index d4eb69e20b..6daa053c9d 100644 --- a/hawc/apps/epiv2/templates/epiv2/outcome_list.html +++ b/hawc/apps/epiv2/templates/epiv2/outcome_list.html @@ -1,36 +1,36 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

Outcomes ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} - + + {% include 'common/inline_filter_form.html' %} +
{% bs4_colgroup '25,25,25,25' %} {% bs4_thead 'Study,Study Population,Design,Outcome' %} - {% for object in object_list %} + {% for object in object_list %} - - - - + + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
{{object.design.study.short_citation}}{% debug_badge object.design.study_id %}{{object.design}}{% debug_badge object.design_id %}{{object.design.get_study_design_display}}{{object}}{% debug_badge object.id %}{{object.design.study.short_citation}}{% debug_badge object.design.study_id %}{{object.design}}{% debug_badge object.design_id %}{{object.design.get_study_design_display}}{{object}}{% debug_badge object.id %}
- No outcomes available - + No outcomes available +
+ -{% include "includes/paginator.html" with plural_object_name="endpoints" %} + {% include "includes/paginator.html" with plural_object_name="endpoints" %} {% endblock %} diff --git a/hawc/apps/hawc_admin/templates/admin/dashboard.html b/hawc/apps/hawc_admin/templates/admin/dashboard.html index c99c301ffb..ddb44faf13 100644 --- a/hawc/apps/hawc_admin/templates/admin/dashboard.html +++ b/hawc/apps/hawc_admin/templates/admin/dashboard.html @@ -3,25 +3,25 @@ {% load render_bundle from webpack_loader %} {% block breadcrumbs %} - {% endblock %} {% block content %} -
- - - - - -
+
+ + + + + +
-
-

Select an item above.

-
+
+

Select an item above.

+
- {% render_bundle "main" %} + {% render_bundle "main" %} {% endblock content %} diff --git a/hawc/apps/hawc_admin/templates/admin/fragments/assessment_growth.html b/hawc/apps/hawc_admin/templates/admin/fragments/assessment_growth.html index 5bcf43ac87..e2748e6557 100644 --- a/hawc/apps/hawc_admin/templates/admin/fragments/assessment_growth.html +++ b/hawc/apps/hawc_admin/templates/admin/fragments/assessment_growth.html @@ -3,5 +3,5 @@

Top assessments

{% if matrix %}{{matrix|safe}}{% else %}

Matrix cannot be generated - an error occurred.

{% endif %}
-{% include 'admin/fragments/assessment_profile.html' %} + {% include 'admin/fragments/assessment_profile.html' %}
diff --git a/hawc/apps/hawc_admin/templates/admin/fragments/assessment_profile.html b/hawc/apps/hawc_admin/templates/admin/fragments/assessment_profile.html index 038b90a698..32c6adff56 100644 --- a/hawc/apps/hawc_admin/templates/admin/fragments/assessment_profile.html +++ b/hawc/apps/hawc_admin/templates/admin/fragments/assessment_profile.html @@ -1,12 +1,12 @@
-

Assessment profile

-
- {{ form.as_p }} - {% csrf_token %} -
- {% if fig %} +

Assessment profile

+
+ {{ form.as_p }} + {% csrf_token %} +
+ {% if fig %}
{% plotly fig event="htmx" resizable=True %}
- {% else %} + {% else %}

No selected assessment or invalid assessment id.

- {% endif %} + {% endif %}
diff --git a/hawc/apps/hawc_admin/templates/admin/fragments/assessment_size.html b/hawc/apps/hawc_admin/templates/admin/fragments/assessment_size.html index b8832f3295..3e36d72c73 100644 --- a/hawc/apps/hawc_admin/templates/admin/fragments/assessment_size.html +++ b/hawc/apps/hawc_admin/templates/admin/fragments/assessment_size.html @@ -1,7 +1,7 @@

Overall assessment size

{{table|safe}} diff --git a/hawc/apps/hawc_admin/templates/admin/fragments/changes.html b/hawc/apps/hawc_admin/templates/admin/fragments/changes.html index 0f396622ed..3ef52de46e 100644 --- a/hawc/apps/hawc_admin/templates/admin/fragments/changes.html +++ b/hawc/apps/hawc_admin/templates/admin/fragments/changes.html @@ -1,19 +1,19 @@
-

Punch card

- {{punchcard.to_html|safe}} +

Punch card

+ {{punchcard.to_html|safe}} -

 

+

 

- {% if lines %} + {% if lines %} {% plotly lines event="htmx" resizable=True %} {{lines_data.to_html|safe}} - {% endif %} + {% endif %} -

 

+

 

- {% if boxplot %} + {% if boxplot %} {% plotly boxplot event="htmx" resizable=True %} {{boxplot_data.to_html|safe}} - {% endif %} + {% endif %}
diff --git a/hawc/apps/hawc_admin/templates/admin/fragments/growth.html b/hawc/apps/hawc_admin/templates/admin/fragments/growth.html index 24293a0ed2..d6d574dbf8 100644 --- a/hawc/apps/hawc_admin/templates/admin/fragments/growth.html +++ b/hawc/apps/hawc_admin/templates/admin/fragments/growth.html @@ -1,8 +1,8 @@
-
- {{ form.as_p }} - {% csrf_token %} -
- {% if fig %}{% plotly fig event="htmx" resizable=True %}{% endif %} - {% if df is not None %}{{ df.to_html|safe }}{% endif %} +
+ {{ form.as_p }} + {% csrf_token %} +
+ {% if fig %}{% plotly fig event="htmx" resizable=True %}{% endif %} + {% if df is not None %}{{ df.to_html|safe }}{% endif %}
diff --git a/hawc/apps/hawc_admin/templates/admin/media_preview.html b/hawc/apps/hawc_admin/templates/admin/media_preview.html index ce8691511b..a7495a97dd 100644 --- a/hawc/apps/hawc_admin/templates/admin/media_preview.html +++ b/hawc/apps/hawc_admin/templates/admin/media_preview.html @@ -5,32 +5,32 @@ {% block title %}Media preview | HAWC Admin{% endblock %} {% block breadcrumbs %} - {% endblock %} {% block content %} -
+

Media preview:

Preview a user-uploaded file in the admin. Download list

-
- - -
- +
+ + +
+
{% if not has_object %} -

Object not found. Please pass an item to your request.

-

The item currently passed: "{{object_name}}"

+

Object not found. Please pass an item to your request.

+

The item currently passed: "{{object_name}}"

{% else %} -

Download: {{object_name}}

+

Download: {{object_name}}

{% endif %} {% if object_text %} @@ -38,36 +38,36 @@

Media preview:

{% endif %} {% if object_html %} - {{object_html|safe}} + {{object_html|safe}} {% endif %} {% if object_image %} - Media preview image + Media preview image {% endif %} {% if object_pdf %} - - - - - + + + + -
- - -     - Page: / -
- +
+ + +     + Page: / +
+ {% endif %} -
+
{% endblock content %} diff --git a/hawc/apps/hawc_admin/templates/admin/swagger.html b/hawc/apps/hawc_admin/templates/admin/swagger.html index c2b39220b9..7e7e217572 100644 --- a/hawc/apps/hawc_admin/templates/admin/swagger.html +++ b/hawc/apps/hawc_admin/templates/admin/swagger.html @@ -3,28 +3,28 @@ {% block title %}{{block.super}} | Swagger UI{% endblock title %} {% block extrahead %} - - + + {% endblock extrahead %} {% block content_row_outer %} -
+
{% endblock content_row_outer %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/invitro/templates/invitro/ivcelltype_confirm_delete.html b/hawc/apps/invitro/templates/invitro/ivcelltype_confirm_delete.html index 1da1c8c494..808bf85290 100644 --- a/hawc/apps/invitro/templates/invitro/ivcelltype_confirm_delete.html +++ b/hawc/apps/invitro/templates/invitro/ivcelltype_confirm_delete.html @@ -1,6 +1,6 @@ {% extends 'invitro/ivexperiment_detail.html' %} {% block content %} - {{ block.super }} - {% include "hawc/_delete_block.html" with name="cell type" notes="This will remove all content associated with this cell type." %} + {{ block.super }} + {% include "hawc/_delete_block.html" with name="cell type" notes="This will remove all content associated with this cell type." %} {% endblock content %} diff --git a/hawc/apps/invitro/templates/invitro/ivcelltype_detail.html b/hawc/apps/invitro/templates/invitro/ivcelltype_detail.html index 8235c55fb1..6559e6ec0d 100644 --- a/hawc/apps/invitro/templates/invitro/ivcelltype_detail.html +++ b/hawc/apps/invitro/templates/invitro/ivcelltype_detail.html @@ -1,16 +1,16 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/invitro/templates/invitro/ivchemical_confirm_delete.html b/hawc/apps/invitro/templates/invitro/ivchemical_confirm_delete.html index ef2c98019f..232ceee10e 100644 --- a/hawc/apps/invitro/templates/invitro/ivchemical_confirm_delete.html +++ b/hawc/apps/invitro/templates/invitro/ivchemical_confirm_delete.html @@ -1,6 +1,6 @@ {% extends 'invitro/ivchemical_detail.html' %} {% block content %} - {{ block.super }} - {% include "hawc/_delete_block.html" with name="chemical" notes="This will remove all content associated with this chemical." %} + {{ block.super }} + {% include "hawc/_delete_block.html" with name="chemical" notes="This will remove all content associated with this chemical." %} {% endblock content %} diff --git a/hawc/apps/invitro/templates/invitro/ivchemical_detail.html b/hawc/apps/invitro/templates/invitro/ivchemical_detail.html index 8bbbee5350..c0be18ba51 100644 --- a/hawc/apps/invitro/templates/invitro/ivchemical_detail.html +++ b/hawc/apps/invitro/templates/invitro/ivchemical_detail.html @@ -1,16 +1,16 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/invitro/templates/invitro/ivchemical_form.html b/hawc/apps/invitro/templates/invitro/ivchemical_form.html index c490d337e4..b02f8d4d96 100644 --- a/hawc/apps/invitro/templates/invitro/ivchemical_form.html +++ b/hawc/apps/invitro/templates/invitro/ivchemical_form.html @@ -13,7 +13,7 @@ // if `dtxsid` is selected, change casrn/chemical_name $('select[name=dtxsid]').on('select2:select', function (event) { let casrn = event.params.data.casrn, - chemical_name = event.params.data.chemical_name; + chemical_name = event.params.data.chemical_name; if (casrn) { $('#id_cas').val(casrn); } @@ -31,4 +31,4 @@ }); - {% endblock extrajs %} +{% endblock extrajs %} diff --git a/hawc/apps/invitro/templates/invitro/ivendpoint_confirm_delete.html b/hawc/apps/invitro/templates/invitro/ivendpoint_confirm_delete.html index 08087a5d75..f2385d0354 100644 --- a/hawc/apps/invitro/templates/invitro/ivendpoint_confirm_delete.html +++ b/hawc/apps/invitro/templates/invitro/ivendpoint_confirm_delete.html @@ -1,6 +1,6 @@ {% extends 'invitro/ivendpoint_detail.html' %} {% block content %} - {{ block.super }} - {% include "hawc/_delete_block.html" with name="endpoint" notes="This will remove all content associated with this endpoint." %} + {{ block.super }} + {% include "hawc/_delete_block.html" with name="endpoint" notes="This will remove all content associated with this endpoint." %} {% endblock content %} diff --git a/hawc/apps/invitro/templates/invitro/ivendpoint_detail.html b/hawc/apps/invitro/templates/invitro/ivendpoint_detail.html index 5e12814d50..d36ca8c763 100644 --- a/hawc/apps/invitro/templates/invitro/ivendpoint_detail.html +++ b/hawc/apps/invitro/templates/invitro/ivendpoint_detail.html @@ -1,16 +1,16 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/invitro/templates/invitro/ivendpoint_form.html b/hawc/apps/invitro/templates/invitro/ivendpoint_form.html index a23a8e33b8..baf49d24d3 100644 --- a/hawc/apps/invitro/templates/invitro/ivendpoint_form.html +++ b/hawc/apps/invitro/templates/invitro/ivendpoint_form.html @@ -1,57 +1,57 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
- {% crispy form %} -
+
+ {% crispy form %} +
-
- Endpoint groups - - - {% include "hawc/_formset_table_template.html" with showDeleteRow=True %} -
+
+ Endpoint groups + + + {% include "hawc/_formset_table_template.html" with showDeleteRow=True %} +
-
- Benchmark values - {% include "hawc/_formset_table_template.html" with showDeleteRow=False formset=benchmark_formset %} -
+
+ Benchmark values + {% include "hawc/_formset_table_template.html" with showDeleteRow=False formset=benchmark_formset %} +
{% endblock %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/invitro/templates/invitro/ivendpoint_list.html b/hawc/apps/invitro/templates/invitro/ivendpoint_list.html index 478f930734..773372918a 100644 --- a/hawc/apps/invitro/templates/invitro/ivendpoint_list.html +++ b/hawc/apps/invitro/templates/invitro/ivendpoint_list.html @@ -1,65 +1,65 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

In vitro endpoints ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} - + + {% include 'common/inline_filter_form.html' %} +
{% bs4_colgroup '10,13,12,20,16,13,8,8' %} {% bs4_thead 'Study,Experiment,Chemical,Endpoint,Effect Category,Effects,Dose Units,Response Units' %} - {% for object in object_list %} + {% for object in object_list %} - - - - - - - - + + + + + + + + - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
- {{object.experiment.study.short_citation}}{% debug_badge object.experiment.study_id %} - - {{object.experiment.name}}{% debug_badge object.experiment_id %} - - {{object.chemical.name}}{% debug_badge object.chemical_id %} - - - {{object.name}}{% debug_badge object.id %} - - {{object.effect|default:"--"}} - - {{object.effects.all|join:", "|default:"--"}} - - {{object.experiment.dose_units.name|default:"--"}} - - {{object.response_units|default:"--"}} - + {{object.experiment.study.short_citation}}{% debug_badge object.experiment.study_id %} + + {{object.experiment.name}}{% debug_badge object.experiment_id %} + + {{object.chemical.name}}{% debug_badge object.chemical_id %} + + + {{object.name}}{% debug_badge object.id %} + + {{object.effect|default:"--"}} + + {{object.effects.all|join:", "|default:"--"}} + + {{object.experiment.dose_units.name|default:"--"}} + + {{object.response_units|default:"--"}} +
- No endpoints available - + No endpoints available +
+ -{% include "includes/paginator.html" with plural_object_name="endpoints" %} + {% include "includes/paginator.html" with plural_object_name="endpoints" %} {% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/invitro/templates/invitro/ivendpointecategory_form.html b/hawc/apps/invitro/templates/invitro/ivendpointecategory_form.html index a8653d76c1..2ecbac8416 100644 --- a/hawc/apps/invitro/templates/invitro/ivendpointecategory_form.html +++ b/hawc/apps/invitro/templates/invitro/ivendpointecategory_form.html @@ -1,9 +1,9 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} - {{ config|json_script:"config" }} + {{ config|json_script:"config" }} {% endblock extrajs %} diff --git a/hawc/apps/invitro/templates/invitro/ivexperiment_confirm_delete.html b/hawc/apps/invitro/templates/invitro/ivexperiment_confirm_delete.html index 76679105e0..4c4e2ab716 100644 --- a/hawc/apps/invitro/templates/invitro/ivexperiment_confirm_delete.html +++ b/hawc/apps/invitro/templates/invitro/ivexperiment_confirm_delete.html @@ -1,6 +1,6 @@ {% extends 'invitro/ivexperiment_detail.html' %} {% block content %} - {{ block.super }} - {% include "hawc/_delete_block.html" with name="experiment" notes="This will remove all content associated with this experiment." %} + {{ block.super }} + {% include "hawc/_delete_block.html" with name="experiment" notes="This will remove all content associated with this experiment." %} {% endblock content %} diff --git a/hawc/apps/invitro/templates/invitro/ivexperiment_detail.html b/hawc/apps/invitro/templates/invitro/ivexperiment_detail.html index 10d96992b9..ebfffc5122 100644 --- a/hawc/apps/invitro/templates/invitro/ivexperiment_detail.html +++ b/hawc/apps/invitro/templates/invitro/ivexperiment_detail.html @@ -1,16 +1,16 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/lit/templates/lit/_delete_search_warning.html b/hawc/apps/lit/templates/lit/_delete_search_warning.html index 1cb7632f4a..d331585c02 100644 --- a/hawc/apps/lit/templates/lit/_delete_search_warning.html +++ b/hawc/apps/lit/templates/lit/_delete_search_warning.html @@ -1,10 +1,10 @@ All references and studies that were exclusively included from this search/import will also be removed.

{% with studies=object.sole_studies %} -{{studies|length}} studies—including their extracted content and/or study evaluations—will be deleted. -{% if studies|length > 0 %} + {{studies|length}} studies—including their extracted content and/or study evaluations—will be deleted. + {% if studies|length > 0 %} The following studies will be removed: {% for study in studies %}{{study}}{% if not forloop.last %}; {% endif %}{% endfor %}. This will also impact any tables or visualizations using these studies. -{% endif %} + {% endif %} {% endwith %}

{{object.sole_references.count}} references ({{object.sole_references.tagged.count}} with tags) will also be deleted. diff --git a/hawc/apps/lit/templates/lit/_pubmedqueries_list.html b/hawc/apps/lit/templates/lit/_pubmedqueries_list.html index cf7a3e73d3..99e6fb493c 100644 --- a/hawc/apps/lit/templates/lit/_pubmedqueries_list.html +++ b/hawc/apps/lit/templates/lit/_pubmedqueries_list.html @@ -1,47 +1,47 @@ {% load static %} {% with queries=object.get_pubmed_queries %} -

Results from queries

-{% if queries %} - - - - - - - - - - - {% for query in queries %} +

Results from queries

+ {% if queries %} +
Date last executedTotal references foundReferences addedReferences removed
+ - - - - + + + + - {% endfor %} - -
{{query.query_date}}{{query.total_count}}{{query.total_added}}{{query.total_removed}}Date last executedTotal references foundReferences addedReferences removed
-{% else %} -

The search has not yet been executed for import into HAWC.

-{% endif %} + + + {% for query in queries %} + + {{query.query_date}} + {{query.total_count}} + {{query.total_added}} + {{query.total_removed}} + + {% endfor %} + + + {% else %} +

The search has not yet been executed for import into HAWC.

+ {% endif %} -{% if obj_perms.edit %} -
+ {% if obj_perms.edit %} +
- {% if queries %} - Tag literature - Rerun search - {% else %} - Run search - {% endif %} + {% if queries %} + Tag literature + Rerun search + {% else %} + Run search + {% endif %} - + -
-{% endif %} +
+ {% endif %} {% endwith %} diff --git a/hawc/apps/lit/templates/lit/_reference_with_tags.html b/hawc/apps/lit/templates/lit/_reference_with_tags.html index 2c96327592..bd1e304782 100644 --- a/hawc/apps/lit/templates/lit/_reference_with_tags.html +++ b/hawc/apps/lit/templates/lit/_reference_with_tags.html @@ -1,116 +1,116 @@
- {% if show_actions %} + {% if show_actions %} + {% endif %} +
+
{{ref.authors}} {{ref.year}}
+
{{ref.title}}
+

{{ref.journal}}

+
+ {% for id in ref.identifiers.all %} + {% if id.get_url %} +
+ {{id.get_database_display}} + {{id.unique_id}} +
+ {% endif %} + {% endfor %} +
+  HAWC + {{ref.id}} + {% if ref.has_study %} +  Study + {% endif %} +
+ {% if ref.abstract and not hide_abstract %} +

{{ref.abstract|safe}}

{% endif %} -
-
{{ref.authors}} {{ref.year}}
-
{{ref.title}}
-

{{ref.journal}}

-
- {% for id in ref.identifiers.all %} - {% if id.get_url %} -
- {{id.get_database_display}} - {{id.unique_id}} -
- {% endif %} - {% endfor %} -
-  HAWC - {{ref.id}} - {% if ref.has_study %} -  Study - {% endif %} -
+
+
+
+ {% with ref.tags.all as tags %}{% if tags or show_consensus_tag_after %} +
+ {% if show_user_tags %}

Consensus tags:

{% endif %} + {% for tag in tags %}{% include 'lit/_nested_tag.html' with tag=tag extra_classes=extra_tag_classes %}{% endfor %}
- {% if ref.abstract and not hide_abstract %} -

{{ref.abstract|safe}}

+ {% endif %} + {% if show_consensus_tag_after %} +
+

Consensus tags after merge:

+ {% for tag in tags %}{% include 'lit/_nested_tag.html' with tag=tag extra_classes=extra_tag_classes %}{% endfor %} + {% for tag in ref.bulk_merge_tag_names %}{% if tag not in tags %}{% include 'lit/_nested_tag.html' with tag=tag extra_classes=extra_tag_classes %}{% endif %}{% endfor %} +
{% endif %} + {% endwith %}
-
-
- {% with ref.tags.all as tags %}{% if tags or show_consensus_tag_after %} -
- {% if show_user_tags %}

Consensus tags:

{% endif %} - {% for tag in tags %}{% include 'lit/_nested_tag.html' with tag=tag extra_classes=extra_tag_classes %}{% endfor %} -
- {% endif %} - {% if show_consensus_tag_after %} -
-

Consensus tags after merge:

- {% for tag in tags %}{% include 'lit/_nested_tag.html' with tag=tag extra_classes=extra_tag_classes %}{% endfor %} - {% for tag in ref.bulk_merge_tag_names %}{% if tag not in tags %}{% include 'lit/_nested_tag.html' with tag=tag extra_classes=extra_tag_classes %}{% endif %}{% endfor %} -
- {% endif %} - {% endwith %} -
- {% if conflict_resolution %} -
-
+ {% if conflict_resolution %} +
+ + + +
+ {% endif %} + {% if show_user_tags %}{% for user_tag in ref.user_tags.all %} +
+
+
+ {% if conflict_resolution %} +
-
-
- {% endif %} - {% if show_user_tags %}{% for user_tag in ref.user_tags.all %} -
-
-
- {% if conflict_resolution %} -
- - -
- {% endif %} - {{user_tag.user.get_full_name}}{% debug_badge user_tag.id %} {{user_tag.last_updated}} -
- {% if show_resolved_badge %} - {{user_tag.is_resolved|yesno:"Resolved,Unresolved"}} - {% endif %} -
- {% with user_tag.consensus_diff as diff %} - {% for tag in ref.tags.all %} - {% if tag in diff.intersection %} - {% if conflict_resolution %} - {% include 'lit/_nested_tag.html' with tag=tag extra_classes='' %} - {% else %} - {% include 'lit/_nested_tag.html' with tag=tag extra_classes='refUserTag' %} - {% endif %} - {% else %} - {% if tag.id in user_tag.deleted_tags %} - {% include 'lit/_nested_tag.html' with tag=tag extra_classes='refUserTagRemove' %} - {% endif %} - {% endif %} - {% endfor %} - {% for tag in diff.difference %} - {% include 'lit/_nested_tag.html' with tag=tag extra_classes='refUserTag' %} - {% endfor %} - {% if diff.intersection|length == 0 and diff.difference|length == 0 and user_tag.deleted_tags|length == 0 %} -

No tags selected

- {% endif %} - {% endwith %} + + + {% endif %} + {{user_tag.user.get_full_name}}{% debug_badge user_tag.id %} {{user_tag.last_updated}} +
+ {% if show_resolved_badge %} + {{user_tag.is_resolved|yesno:"Resolved,Unresolved"}} + {% endif %}
- {% endfor %}{% endif %} -
+ {% with user_tag.consensus_diff as diff %} + {% for tag in ref.tags.all %} + {% if tag in diff.intersection %} + {% if conflict_resolution %} + {% include 'lit/_nested_tag.html' with tag=tag extra_classes='' %} + {% else %} + {% include 'lit/_nested_tag.html' with tag=tag extra_classes='refUserTag' %} + {% endif %} + {% else %} + {% if tag.id in user_tag.deleted_tags %} + {% include 'lit/_nested_tag.html' with tag=tag extra_classes='refUserTagRemove' %} + {% endif %} + {% endif %} + {% endfor %} + {% for tag in diff.difference %} + {% include 'lit/_nested_tag.html' with tag=tag extra_classes='refUserTag' %} + {% endfor %} + {% if diff.intersection|length == 0 and diff.difference|length == 0 and user_tag.deleted_tags|length == 0 %} +

No tags selected

+ {% endif %} + {% endwith %} +
+ {% endfor %}{% endif %} +
diff --git a/hawc/apps/lit/templates/lit/_search_list.html b/hawc/apps/lit/templates/lit/_search_list.html index d10fc86ff4..404d4f669a 100644 --- a/hawc/apps/lit/templates/lit/_search_list.html +++ b/hawc/apps/lit/templates/lit/_search_list.html @@ -25,12 +25,12 @@ {{object.get_search_type_display}}: {{object.get_source_display}} {{object.references.count}}
- {% with object.fraction_tagged|default:0 as tagged %} - {{tagged|percentage}} tagged - {% endwith %} - {{object.created}} - {{object.date_last_run}} - + {% with object.fraction_tagged|default:0 as tagged %} + {{tagged|percentage}} tagged + {% endwith %} + {{object.created}} + {{object.date_last_run}} + {% endfor %} diff --git a/hawc/apps/lit/templates/lit/components/bulk_merge_modal.html b/hawc/apps/lit/templates/lit/components/bulk_merge_modal.html index 6938648ffa..cfbbff5416 100644 --- a/hawc/apps/lit/templates/lit/components/bulk_merge_modal.html +++ b/hawc/apps/lit/templates/lit/components/bulk_merge_modal.html @@ -1,20 +1,20 @@ {% extends 'common/modal_template.html' %} {% block modal_content_wrapper %} -
+ -
+ {% endblock modal_content_wrapper %} diff --git a/hawc/apps/lit/templates/lit/components/bulk_merge_modal_content.html b/hawc/apps/lit/templates/lit/components/bulk_merge_modal_content.html index 50a7a28d33..cb985d52e9 100644 --- a/hawc/apps/lit/templates/lit/components/bulk_merge_modal_content.html +++ b/hawc/apps/lit/templates/lit/components/bulk_merge_modal_content.html @@ -1,89 +1,89 @@ diff --git a/hawc/apps/lit/templates/lit/conflict_resolution.html b/hawc/apps/lit/templates/lit/conflict_resolution.html index b895b6edcd..127e3ab6f0 100644 --- a/hawc/apps/lit/templates/lit/conflict_resolution.html +++ b/hawc/apps/lit/templates/lit/conflict_resolution.html @@ -2,29 +2,29 @@ {% load bs4 %} {% block content %} -
+

Resolve Tag Conflicts

{% actions %} - Bulk Merge Conflicts + Bulk Merge Conflicts {% endactions %} -
-{% include 'common/inline_filter_form.html' %} -
    +
+ {% include 'common/inline_filter_form.html' %} +
    {% for ref in object_list %} -
  • +
  • {% include 'lit/_reference_with_tags.html' with conflict_resolution=True show_actions=True show_user_tags=True %} -
  • + {% empty %} -
  • +
  • {% alert warning %}{% icon "fa-exclamation-triangle" %}No conflicts found.{% endalert %} -
  • + {% endfor %} -
-{% include "includes/paginator.html" with plural_object_name="conflicts" %} -{% include "lit/components/bulk_merge_modal.html" with modal_id="bulk-merge-modal"%} + + {% include "includes/paginator.html" with plural_object_name="conflicts" %} + {% include "lit/components/bulk_merge_modal.html" with modal_id="bulk-merge-modal"%} {% endblock content %} {% block extrajs %} -{% include "common/helptext_popup_js.html" %} + {% include "common/helptext_popup_js.html" %} {% endblock extrajs %} diff --git a/hawc/apps/lit/templates/lit/fragments/workflow_edit_row.html b/hawc/apps/lit/templates/lit/fragments/workflow_edit_row.html index d8e59fdd81..03efc77cbb 100644 --- a/hawc/apps/lit/templates/lit/fragments/workflow_edit_row.html +++ b/hawc/apps/lit/templates/lit/fragments/workflow_edit_row.html @@ -1,80 +1,80 @@
- {% if form %} + {% if form %}
-
- {% if form.instance.id %} -
-

Update Workflow

- {% if action == 'delete' %} - {% csrf_token %} -
-  Are you sure you want to delete? -
- - -
-
- - {% else %} - + +
+
+ + {% else %} + - {% endif %} -
- {% else %} -

Create Workflow

{% endif %} - {% crispy form %} -
- - {% if form.instance.id %} - - + - {% else %} - - + - {% endif %} -
- - {% endif %} -
+ Cancel + + {% endif %} +
+ + {% endif %} +
{% if form %} - -{% include "common/helptext_popup_js.html" %} + + {% include "common/helptext_popup_js.html" %} {% endif %} diff --git a/hawc/apps/lit/templates/lit/fragments/workflow_list.html b/hawc/apps/lit/templates/lit/fragments/workflow_list.html index 5b055f48f0..73c167d774 100644 --- a/hawc/apps/lit/templates/lit/fragments/workflow_list.html +++ b/hawc/apps/lit/templates/lit/fragments/workflow_list.html @@ -1,10 +1,10 @@
- {% for object in object_list %} + {% for object in object_list %} {% include "lit/fragments/workflow_row.html" %} - {% empty %} + {% empty %} {% if not form %} -
No Workflows created yet.
+
No Workflows created yet.
{% endif %} - {% endfor %} - {% include "lit/fragments/workflow_edit_row.html" %} + {% endfor %} + {% include "lit/fragments/workflow_edit_row.html" %}
diff --git a/hawc/apps/lit/templates/lit/fragments/workflow_row.html b/hawc/apps/lit/templates/lit/fragments/workflow_row.html index 2bbe364d7b..68146f61d2 100644 --- a/hawc/apps/lit/templates/lit/fragments/workflow_row.html +++ b/hawc/apps/lit/templates/lit/fragments/workflow_row.html @@ -1,94 +1,94 @@
-
-

{{object.title}} 

-
- {% if object.link_conflict_resolution %} -   Conflict Resolution linked on Literature Review - {% endif %} - {% if object.link_tagging %} + {% endif %} + style="width: fit-content;"> +
+

{{object.title}} 

+
+ {% if object.link_conflict_resolution %} +   Conflict Resolution linked on Literature Review + {% endif %} + {% if object.link_tagging %}   Tagging linked on Literature Review - {% endif %} -
+ {% endif %}
-
-
-
-

Admission Criteria

-
- {% if object.admission_tags.exists %} - Tagged with - {% for tag in object.admission_tags.all %} - {% include 'lit/_nested_tag.html' with tag=tag extra_classes='px-1 py-0 my-1 mx-1' %} - {% list_punctuation forloop "or" %} - {% endfor %} - {% if object.admission_tags_descendants %} - (including descendant tags) - {% endif %} - - {% endif %} - {% if object.admission_source.exists %} - {% if object.admission_tags.exists %} - - and - - {% endif %} - - Sourced from - {% for source in object.admission_source.all %} -  {{source}} - {% list_punctuation forloop "or" %} - {% endfor %} - - {% endif %} - {% if not object.admission_tags.exists and not object.admission_source.exists %} -   No admission criteria selected. All references will be admitted to this workflow. - {% endif %} -
-
-
-

Removal Criteria

-
- {% if object.removal_tags.exists %} - Tagged with - {% for tag in object.removal_tags.all %} - {% include 'lit/_nested_tag.html' with tag=tag extra_classes='px-1 py-0 my-1 mx-1' %} - {% list_punctuation forloop "or" %} - {% endfor %} - {% if object.removal_tags_descendants %} - (including descendant tags) - {% endif %} - - {% endif %} - {% if object.removal_source.exists %} - {% if object.removal_tags.exists %} - - or - - {% endif %} - Sourced from - {% for source in object.removal_source.all %} -  {{source}} - {% list_punctuation forloop "or" %} - {% endfor %} - - {% endif %} - {% if not object.removal_tags.exists and not object.removal_source.exists %} -   No removal criteria selected. No references will be removed from this workflow. - {% endif %} -
-
+
+
+
+
+

Admission Criteria

+
+ {% if object.admission_tags.exists %} + Tagged with + {% for tag in object.admission_tags.all %} + {% include 'lit/_nested_tag.html' with tag=tag extra_classes='px-1 py-0 my-1 mx-1' %} + {% list_punctuation forloop "or" %} + {% endfor %} + {% if object.admission_tags_descendants %} + (including descendant tags) + {% endif %} + + {% endif %} + {% if object.admission_source.exists %} + {% if object.admission_tags.exists %} + + and + + {% endif %} + + Sourced from + {% for source in object.admission_source.all %} +  {{source}} + {% list_punctuation forloop "or" %} + {% endfor %} + + {% endif %} + {% if not object.admission_tags.exists and not object.admission_source.exists %} +   No admission criteria selected. All references will be admitted to this workflow. + {% endif %}
+
+
+

Removal Criteria

+
+ {% if object.removal_tags.exists %} + Tagged with + {% for tag in object.removal_tags.all %} + {% include 'lit/_nested_tag.html' with tag=tag extra_classes='px-1 py-0 my-1 mx-1' %} + {% list_punctuation forloop "or" %} + {% endfor %} + {% if object.removal_tags_descendants %} + (including descendant tags) + {% endif %} + + {% endif %} + {% if object.removal_source.exists %} + {% if object.removal_tags.exists %} + + or + + {% endif %} + Sourced from + {% for source in object.removal_source.all %} +  {{source}} + {% list_punctuation forloop "or" %} + {% endfor %} + + {% endif %} + {% if not object.removal_tags.exists and not object.removal_source.exists %} +   No removal criteria selected. No references will be removed from this workflow. + {% endif %} +
+
-
- {{object.description}} -
+
+
+ {{object.description}} +
diff --git a/hawc/apps/lit/templates/lit/literatureassessment_form.html b/hawc/apps/lit/templates/lit/literatureassessment_form.html index ab440455c8..d53b9bb1e8 100644 --- a/hawc/apps/lit/templates/lit/literatureassessment_form.html +++ b/hawc/apps/lit/templates/lit/literatureassessment_form.html @@ -1,5 +1,5 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% crispy form %} + {% crispy form %} {% endblock %} diff --git a/hawc/apps/lit/templates/lit/overview.html b/hawc/apps/lit/templates/lit/overview.html index 74d1aa7b42..dae29e29d1 100644 --- a/hawc/apps/lit/templates/lit/overview.html +++ b/hawc/apps/lit/templates/lit/overview.html @@ -32,7 +32,7 @@

Literature Review

Download all references {% endactions %} {% endif %} -
+
@@ -72,9 +72,9 @@

Literature Review

{% if obj_perms.edit %} {% if assessment.literature_settings.conflict_resolution %} - Tag + Tag {% else %} - Tag + Tag {% endif %} {% endif %} Browse @@ -82,53 +82,53 @@

Literature Review

Visualize
{% if overview.total_references > 10 %} -
-

References by year:

-
+
+

References by year:

+
+
-
{% endif %} {% if assessment.literature_settings.conflict_resolution and obj_perms.edit %} - - {% comment %} row #3 {% endcomment %} - -
-

{{overview.total_reviews}} reviews done by {{overview.total_users}} user{{ overview.total_users|pluralize }}

+
-
- -
- - {% if overview.my_reviews > 0 %} - + {% comment %} row #3 {% endcomment %} +
-

{{overview.my_reviews}}

-

reviews done by you

+

{{overview.total_reviews}} reviews done by {{overview.total_users}} user{{ overview.total_users|pluralize }}

- +
- {% endif %} + {% if overview.my_reviews > 0 %} + +
+

{{overview.my_reviews}}

+

reviews done by you

+
+
+ +
+
+ {% endif %} {% endif %} {% if obj_perms.edit %} {% for workflow in workflows %} @@ -136,14 +136,14 @@

Literature Review

{% if show_conflicts and show_tags %}
- -
-

{{workflow.needs_tagging}}

-
-
-

need{{ workflow.needs_tagging|pluralize:"s," }} tagging 

-
+ +
+

{{workflow.needs_tagging}}

+
+
+

need{{ workflow.needs_tagging|pluralize:"s," }} tagging 

+
-
-
-

in {{workflow}}

- - {% include "common/helptext_popup.html" with text=workflow.get_description title=workflow %} - -
+
+
+

in {{workflow}}

+ + {% include "common/helptext_popup.html" with text=workflow.get_description title=workflow %} + +
{% elif show_tags %} + href="{{workflow.tag_url}}{% if assessment.literature_settings.conflict_resolution %}&needs_tagging=on&my_tags=untagged{% endif %}"> {% endif %}

Literature searches & imports

@@ -233,23 +233,23 @@

Manually added references

{% endblock %} {% block extrajs %} -{{ config|json_script:"config" }} - -{% include "common/helptext_popup_js.html" %} + const histo = document.getElementById("referenceYearHistogram"); + if (histo){ + window.app.renderPlotlyFromApi(histo, config.referenceYearHistogramUrl); + } + + {% include "common/helptext_popup_js.html" %} {% endblock extrajs %} diff --git a/hawc/apps/lit/templates/lit/reference_extract_list.html b/hawc/apps/lit/templates/lit/reference_extract_list.html index 9905589f7b..745e0463ed 100644 --- a/hawc/apps/lit/templates/lit/reference_extract_list.html +++ b/hawc/apps/lit/templates/lit/reference_extract_list.html @@ -1,61 +1,61 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Included references in literature search/import

-

The following references were selected for inclusion and are therefore ready for {{assessment.get_rob_name_display|lower}} and/or data-extraction. You can individually convert each reference to a study that allows you to continue with extraction/review, or you can select multiple references via the checkbox and bulk-convert at the bottom of the form.

-

Select one or more references from the list below:

- {% if object_list.count > 0 %} -
-
    - {% for object in object_list %} -
  • -
    - -
    -
    - {% include 'lit/_reference_with_tags.html' with ref=object hide_abstract=True extra_tag_classes='smaller' %} -
    -
    - Convert -
    -
  • - {% endfor %} -
+

Included references in literature search/import

+

The following references were selected for inclusion and are therefore ready for {{assessment.get_rob_name_display|lower}} and/or data-extraction. You can individually convert each reference to a study that allows you to continue with extraction/review, or you can select multiple references via the checkbox and bulk-convert at the bottom of the form.

+

Select one or more references from the list below:

+ {% if object_list.count > 0 %} + +
    + {% for object in object_list %} +
  • +
    + +
    +
    + {% include 'lit/_reference_with_tags.html' with ref=object hide_abstract=True extra_tag_classes='smaller' %} +
    -

    Create studies from selected references

    -

    Select one more references from the list above, and a study - type to apply to these references. These references will be bulk-converted to - studies. -

    -
    -
    - - {% if form.study_type.errors %} -
    {{form.study_type.errors}}
    - {% endif %} -
    - {% for checkbox in form.study_type %} -
    - -
    - {% endfor %} -
    -

    Selected study types will be applied to all created studies.

    -
    - {% csrf_token %} - {% if form.references.errors %} -
    {{form.references.errors}}
    - {% endif %} -
    - -
    + Convert
    -
  • - {% else %} -
    - - Nothing to be done!
    -

    No references have been marked for inclusion which aren't studies already.

    + + {% endfor %} +
+
+

Create studies from selected references

+

Select one more references from the list above, and a study + type to apply to these references. These references will be bulk-converted to + studies. +

+
+
+ + {% if form.study_type.errors %} +
{{form.study_type.errors}}
+ {% endif %} +
+ {% for checkbox in form.study_type %} +
+ +
+ {% endfor %} +
+

Selected study types will be applied to all created studies.

+
+ {% csrf_token %} + {% if form.references.errors %} +
{{form.references.errors}}
+ {% endif %} +
+
- {% endif %} +
+ + {% else %} +
+ + Nothing to be done!
+

No references have been marked for inclusion which aren't studies already.

+
+ {% endif %} {% endblock %} diff --git a/hawc/apps/lit/templates/lit/reference_form.html b/hawc/apps/lit/templates/lit/reference_form.html index ab440455c8..d53b9bb1e8 100644 --- a/hawc/apps/lit/templates/lit/reference_form.html +++ b/hawc/apps/lit/templates/lit/reference_form.html @@ -1,5 +1,5 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% crispy form %} + {% crispy form %} {% endblock %} diff --git a/hawc/apps/lit/templates/lit/reference_list.html b/hawc/apps/lit/templates/lit/reference_list.html index 55d6617398..e3583a4475 100644 --- a/hawc/apps/lit/templates/lit/reference_list.html +++ b/hawc/apps/lit/templates/lit/reference_list.html @@ -1,9 +1,9 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Loading, please wait... 

-
+
+

Loading, please wait... 

+
{% endblock %} {% block extrajs %} diff --git a/hawc/apps/lit/templates/lit/reference_search.html b/hawc/apps/lit/templates/lit/reference_search.html index d990834a14..871952347c 100644 --- a/hawc/apps/lit/templates/lit/reference_search.html +++ b/hawc/apps/lit/templates/lit/reference_search.html @@ -1,20 +1,20 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

References ({{page_obj.paginator.count}} found)

{% if feature_flags.ENABLE_FILTER_DOWNLOADS and page_obj.paginator.count > 0 %} - {% actions %} + {% actions %} Download (xlsx) - {% endactions %} + {% endactions %} {% endif %} -
-{% include 'common/inline_filter_form.html' %} -
-{% include 'includes/paginator.html' with plural_object_name='references' %} +
+ {% include 'common/inline_filter_form.html' %} +
+ {% include 'includes/paginator.html' with plural_object_name='references' %} {% endblock %} {% block extrajs %} -{{ config|json_script:"config" }} -{% include "common/helptext_popup_js.html" %} + {{ config|json_script:"config" }} + {% include "common/helptext_popup_js.html" %} {% endblock extrajs %} diff --git a/hawc/apps/lit/templates/lit/reference_tag_status.html b/hawc/apps/lit/templates/lit/reference_tag_status.html index 9c0bd6e682..366dcc0e78 100644 --- a/hawc/apps/lit/templates/lit/reference_tag_status.html +++ b/hawc/apps/lit/templates/lit/reference_tag_status.html @@ -2,5 +2,5 @@ {% block content %} -{% include 'lit/_reference_with_tags.html' with ref=object show_user_tags=True %} + {% include 'lit/_reference_with_tags.html' with ref=object show_user_tags=True %} {% endblock %} diff --git a/hawc/apps/lit/templates/lit/reference_upload_excel.html b/hawc/apps/lit/templates/lit/reference_upload_excel.html index 82a4d4c8fb..fcca9ec93f 100644 --- a/hawc/apps/lit/templates/lit/reference_upload_excel.html +++ b/hawc/apps/lit/templates/lit/reference_upload_excel.html @@ -1,7 +1,7 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% crispy form %} + {% crispy form %} {% endblock %} {% block extrajs %} diff --git a/hawc/apps/lit/templates/lit/reference_user_tags.html b/hawc/apps/lit/templates/lit/reference_user_tags.html index 10f00b5283..9171623a2f 100644 --- a/hawc/apps/lit/templates/lit/reference_user_tags.html +++ b/hawc/apps/lit/templates/lit/reference_user_tags.html @@ -1,24 +1,24 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Reference User Tags

-{% include 'common/inline_filter_form.html' %} -
    +

    Reference User Tags

    + {% include 'common/inline_filter_form.html' %} +
      {% for ref in object_list %} -
    • +
    • {% include 'lit/_reference_with_tags.html' with conflict_resolution=False show_actions=False show_user_tags=True %} -
    • + {% empty %} -
    • +
    • -  No reference user tags found. +  No reference user tags found.
      -
    • + {% endfor %} -
    -{% include "includes/paginator.html" with plural_object_name="references" %} +
+ {% include "includes/paginator.html" with plural_object_name="references" %} {% endblock content %} {% block extrajs %} -{% include "common/helptext_popup_js.html" %} + {% include "common/helptext_popup_js.html" %} {% endblock extrajs %} diff --git a/hawc/apps/lit/templates/lit/search_detail.html b/hawc/apps/lit/templates/lit/search_detail.html index 240ff4e08d..7bd67ea9dd 100644 --- a/hawc/apps/lit/templates/lit/search_detail.html +++ b/hawc/apps/lit/templates/lit/search_detail.html @@ -27,16 +27,16 @@

{{object}}

Search type{{object.get_search_type_display}} Search database{{object.get_source_display}} {% if object.search_string %} - - {{object.get_search_type_display}} text - {{object.search_string|safe}} - + + {{object.get_search_type_display}} text + {{object.search_string|safe}} + {% endif %} {% if obj_perms.edit and object.import_file %} - - Import file - {{object.import_file.name}} - + + Import file + {{object.import_file.name}} + {% endif %} Created{{object.created}} Last updated{{object.last_updated}} @@ -84,12 +84,12 @@

Literature Tagging Statistics

{% endblock %} {% block extrajs %} - + }); + {% endblock %} diff --git a/hawc/apps/lit/templates/lit/search_form.html b/hawc/apps/lit/templates/lit/search_form.html index 838a1cc606..d4326a29a0 100644 --- a/hawc/apps/lit/templates/lit/search_form.html +++ b/hawc/apps/lit/templates/lit/search_form.html @@ -7,17 +7,17 @@ {% block extrajs %} {% endblock extrajs %} diff --git a/hawc/apps/lit/templates/lit/tags_copy.html b/hawc/apps/lit/templates/lit/tags_copy.html index 553eb4350c..e9a767b073 100644 --- a/hawc/apps/lit/templates/lit/tags_copy.html +++ b/hawc/apps/lit/templates/lit/tags_copy.html @@ -18,10 +18,10 @@ ×

Warning!

Copying tags from another assessment will remove ALL existing tags, and will - also remove any tags from existing literature for this assessment, even if the tag-names - are identical between an existing tag and a new tag copied from another assessment.

- It is therefore recommended to only complete this procedure if literature have not yet been - tagged for the current assessment.

+ also remove any tags from existing literature for this assessment, even if the tag-names + are identical between an existing tag and a new tag copied from another assessment.

+ It is therefore recommended to only complete this procedure if literature have not yet been + tagged for the current assessment.

Tags for selected assessment: @@ -47,10 +47,10 @@

Warning!

$('#tag-copy-content').insertAfter($('#div_id_assessment')).removeClass('hidden'); const handleChange = function () { const assessment_id = $('#id_assessment').val(), - url = `/lit/api/assessment/${assessment_id}/tagtree/` + url = `/lit/api/assessment/${assessment_id}/tagtree/` $.get(url, function(data){ const tree = {data:{}, id:1, children: data.tree}, - tagtree = new lit.TagTree(tree) + tagtree = new lit.TagTree(tree) tagtree.render(document.getElementById('tags')); }); } diff --git a/hawc/apps/lit/templates/lit/tags_update.html b/hawc/apps/lit/templates/lit/tags_update.html index a299cfffe7..ec80a2e328 100644 --- a/hawc/apps/lit/templates/lit/tags_update.html +++ b/hawc/apps/lit/templates/lit/tags_update.html @@ -1,10 +1,10 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
- +
+ {% endblock %} {% block extrajs %} diff --git a/hawc/apps/lit/templates/lit/workflows.html b/hawc/apps/lit/templates/lit/workflows.html index 46e64c1d42..e73e54a5f5 100644 --- a/hawc/apps/lit/templates/lit/workflows.html +++ b/hawc/apps/lit/templates/lit/workflows.html @@ -1,19 +1,19 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Workflows

- {% if obj_perms.edit_assessment %} - Create new workflow - {% endif %} -
-

- Literature workflows define groups of references in a specific state of tagging. References must match all admission criteria and none of the removal criteria to fit in a workflow. Workflows can filter references for various pages in HAWC; like the tagging, conflict resolution, and list views. Linked tiles to some of these workflow-filtered pages can be added to the Literature Review home page for quick access. -

-{% include "lit/fragments/workflow_list.html" %} +
+

Workflows

+ {% if obj_perms.edit_assessment %} + Create new workflow + {% endif %} +
+

+ Literature workflows define groups of references in a specific state of tagging. References must match all admission criteria and none of the removal criteria to fit in a workflow. Workflows can filter references for various pages in HAWC; like the tagging, conflict resolution, and list views. Linked tiles to some of these workflow-filtered pages can be added to the Literature Review home page for quick access. +

+ {% include "lit/fragments/workflow_list.html" %} {% endblock %} {% block extrajs %} -{% include "common/htmx_autocomplete.html" %} -{% include "common/helptext_popup_js.html" %} + {% include "common/htmx_autocomplete.html" %} + {% include "common/helptext_popup_js.html" %} {% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/analytics.html b/hawc/apps/mgmt/templates/mgmt/analytics.html index ce50338eaf..3b73b5990c 100644 --- a/hawc/apps/mgmt/templates/mgmt/analytics.html +++ b/hawc/apps/mgmt/templates/mgmt/analytics.html @@ -1,45 +1,45 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Assessment Analytics

-
- -
-
-
-
+
+

Assessment Analytics

+
+ +
+
+
+
-

Assessment analytics give a high level overview about the shape and composition of data within a HAWC assessment. They include generated tables, plots, and summary statistics for counts of data types within an assessment, as well as time series and estimates of total time spent working on an adding and changing content within an assessment.

+

Assessment analytics give a high level overview about the shape and composition of data within a HAWC assessment. They include generated tables, plots, and summary statistics for counts of data types within an assessment, as well as time series and estimates of total time spent working on an adding and changing content within an assessment.

- {% alert info %}This is a work in progress; we'd appreciate feedback on the current content, as well as recommendations for other approaches; please contact us with any feedback!{% endalert %} + {% alert info %}This is a work in progress; we'd appreciate feedback on the current content, as well as recommendations for other approaches; please contact us with any feedback!{% endalert %} -

Note: These tabs are expensive to calculate and therefore are cached; check back every few hours to see updates.

+

Note: These tabs are expensive to calculate and therefore are cached; check back every few hours to see updates.

+
+
+

Loading...

+
+
+

Loading...

+
+
+

Loading...

+
-
-

Loading...

-
-
-

Loading...

-
-
-

Loading...

-
-
{% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/analytics/overview.html b/hawc/apps/mgmt/templates/mgmt/analytics/overview.html index 693f19d17a..ecc53a4d8f 100644 --- a/hawc/apps/mgmt/templates/mgmt/analytics/overview.html +++ b/hawc/apps/mgmt/templates/mgmt/analytics/overview.html @@ -1,91 +1,91 @@ {% block content %} -
+

Literature Tagging & Screening

- {% analytics_card value=n label='total searches' %} -
-
-

Reference source types

-

{{ search_source.imports }}

-

Added from Imports (PubMed/HERO/RIS)

-

{{ search_source.pubmed_imports }} PubMed, {{ search_source.hero_imports }} HERO, {{ search_source.ris_imports }} RIS

-

{{ search_source.searches }}

-

Added from PubMed Keyword Searches

-
+ {% analytics_card value=n label='total searches' %} +
+
+

Reference source types

+

{{ search_source.imports }}

+

Added from Imports (PubMed/HERO/RIS)

+

{{ search_source.pubmed_imports }} PubMed, {{ search_source.hero_imports }} HERO, {{ search_source.ris_imports }} RIS

+

{{ search_source.searches }}

+

Added from PubMed Keyword Searches

- {% analytics_card value=total_n_refs label='total references' %} -
-
-

Reference tags breakdown

-

{{ ref_tags_breakdown.total_tags_applied }}

-

total tags applied

-

{{ ref_tags_breakdown.with_tags }}

-

references with tags

-

{{ ref_tags_breakdown.no_tags }}

-

references with no tags

-
+
+ {% analytics_card value=total_n_refs label='total references' %} +
+
+

Reference tags breakdown

+

{{ ref_tags_breakdown.total_tags_applied }}

+

total tags applied

+

{{ ref_tags_breakdown.with_tags }}

+

references with tags

+

{{ ref_tags_breakdown.no_tags }}

+

references with no tags

+
- {% include 'common/analytics_plot.html' with title='Number of references per import' plot=refs_per_import_plot caption='Box plot displaying the number of references per import' %} - {% include 'common/analytics_plot.html' with title='References by publication year' plot=refs_by_year_plot %} - {% include 'common/analytics_plot.html' with title='References and tags plot' plot=refs_tags_plot %} + {% include 'common/analytics_plot.html' with title='Number of references per import' plot=refs_per_import_plot caption='Box plot displaying the number of references per import' %} + {% include 'common/analytics_plot.html' with title='References by publication year' plot=refs_by_year_plot %} + {% include 'common/analytics_plot.html' with title='References and tags plot' plot=refs_tags_plot %}
-
+
-
+

Study

- {% analytics_card value=study_types.total label='total studies' %} -
-
-

Published breakdown

-

{{ study_types.published }}

-

published studies

-

{{ study_types.unpublished }}

-

unpublished studies

-
+ {% analytics_card value=study_types.total label='total studies' %} +
+
+

Published breakdown

+

{{ study_types.published }}

+

published studies

+

{{ study_types.unpublished }}

+

unpublished studies

-
-
-

Study type breakdown

-

{{ study_types.animal }}

-

animal studies

-

{{ study_types.epi }}

-

epi studies

-

{{ study_types.epiv2 }}

-

epiv2 studies

-

{{ study_types.rob }}

-

risk of bias studies

-
+
+
+
+

Study type breakdown

+

{{ study_types.animal }}

+

animal studies

+

{{ study_types.epi }}

+

epi studies

+

{{ study_types.epiv2 }}

+

epiv2 studies

+

{{ study_types.rob }}

+

risk of bias studies

+

-
+
-
+

Animal Bioassay

- {% analytics_card value=animal_counts.studies label='total studies' %} - {% analytics_card value=animal_counts.experiments label='total experiments' %} - {% analytics_card value=animal_counts.animal_groups label='total animal groups' %} - {% analytics_card value=animal_counts.endpoints label='total endpoints' %} - {% include 'common/analytics_plot.html' with title='Experiments by type' plot=experiment_type_plot %} - {% analytics_card value=n_endpoints_extracted label='endpoints with data extracted' %} - {% analytics_card value=n_endpoints_ehv label='endpoints using Environmental Health Vocabulary (EHV)' %} - {% analytics_card value=n_dose_res_groups label='total dose response groups' %} + {% analytics_card value=animal_counts.studies label='total studies' %} + {% analytics_card value=animal_counts.experiments label='total experiments' %} + {% analytics_card value=animal_counts.animal_groups label='total animal groups' %} + {% analytics_card value=animal_counts.endpoints label='total endpoints' %} + {% include 'common/analytics_plot.html' with title='Experiments by type' plot=experiment_type_plot %} + {% analytics_card value=n_endpoints_extracted label='endpoints with data extracted' %} + {% analytics_card value=n_endpoints_ehv label='endpoints using Environmental Health Vocabulary (EHV)' %} + {% analytics_card value=n_dose_res_groups label='total dose response groups' %}
-
+
-
+

Summary Tables and Visuals

- {% analytics_card value=summary_count.visual label='total visuals' %} - {% analytics_card value=summary_count.datapivot label='total data pivots' %} - {% analytics_card value=summary_count.table label='total tables' %} - {% include 'common/analytics_plot.html' with title='Visuals by type' plot=summary_count.visual_barchart %} - {% include 'common/analytics_plot.html' with title='Tables by type' plot=summary_count.table_barchart %} + {% analytics_card value=summary_count.visual label='total visuals' %} + {% analytics_card value=summary_count.datapivot label='total data pivots' %} + {% analytics_card value=summary_count.table label='total tables' %} + {% include 'common/analytics_plot.html' with title='Visuals by type' plot=summary_count.visual_barchart %} + {% include 'common/analytics_plot.html' with title='Tables by type' plot=summary_count.table_barchart %}
-
+
{% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/analytics/time_series.html b/hawc/apps/mgmt/templates/mgmt/analytics/time_series.html index 20647b89dc..3529d06519 100644 --- a/hawc/apps/mgmt/templates/mgmt/analytics/time_series.html +++ b/hawc/apps/mgmt/templates/mgmt/analytics/time_series.html @@ -1,12 +1,12 @@ {% block content %} -
+
{% include 'common/analytics_plot.html' with title='References created over time' plot=refs %} {% include 'common/analytics_plot.html' with title='Studies created over time' plot=studies %} {% include 'common/analytics_plot.html' with title='Risk Of Bias created over time' plot=robs %} -
-
+
+
{% include 'common/analytics_plot.html' with title='Data pivots created over time' plot=datapivots %} {% include 'common/analytics_plot.html' with title='Visuals created over time' plot=visuals %} {% include 'common/analytics_plot.html' with title='Total visuals and data pivots over time' plot=total_visuals %} -
+
{% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/analytics/time_spent.html b/hawc/apps/mgmt/templates/mgmt/analytics/time_spent.html index d074ce067c..1cea53a98e 100644 --- a/hawc/apps/mgmt/templates/mgmt/analytics/time_spent.html +++ b/hawc/apps/mgmt/templates/mgmt/analytics/time_spent.html @@ -1,14 +1,14 @@ {% block content %} -
- {% analytics_card value=total_time_spent label='spent on assessment' %} -
- {% include 'common/analytics_plot.html' with title='Time spent per content type' plot=time_spent_per_model_plot caption="Total time spent by content type for content objects within this assessment. This metric is imperfect; it is calculated by the total time the create and update forms are open for each content object. This may overestimate time if a form is open but a user is not actively using it; or underestimate time where users are reviewing data in the read-only form. If content is missing or data appears inaccurate, please let us know, we'd like to improve this metric!" %} +
+ {% analytics_card value=total_time_spent label='spent on assessment' %} +
+ {% include 'common/analytics_plot.html' with title='Time spent per content type' plot=time_spent_per_model_plot caption="Total time spent by content type for content objects within this assessment. This metric is imperfect; it is calculated by the total time the create and update forms are open for each content object. This may overestimate time if a form is open but a user is not actively using it; or underestimate time where users are reviewing data in the read-only form. If content is missing or data appears inaccurate, please let us know, we'd like to improve this metric!" %} -
-
-

Total time per content type

- {{time_spent_tbl|safe}} -
+
+
+

Total time per content type

+ {{time_spent_tbl|safe}}
+
{% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/assessment_dashboard.html b/hawc/apps/mgmt/templates/mgmt/assessment_dashboard.html index 308d876681..b6588e1c7f 100644 --- a/hawc/apps/mgmt/templates/mgmt/assessment_dashboard.html +++ b/hawc/apps/mgmt/templates/mgmt/assessment_dashboard.html @@ -1,34 +1,34 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Management dashboard

- {% actions %} - Task list - My assigned tasks - Analytics - {% endactions %} -
-{% if object_list %} -
-

All task summary

-
{% plotly all_tasks_plot %}
- -

Tasks by type

-
- {% for plot in type_plots %} -
{% plotly plot %}
- {% endfor %} +
+

Management dashboard

+ {% actions %} + Task list + My assigned tasks + Analytics + {% endactions %}
+ {% if object_list %} +
+

All task summary

+
{% plotly all_tasks_plot %}
-

Tasks by user

-
- {% for plot in user_plots %} -
{% plotly plot %}
- {% endfor %} -
-
-{% else %} -

No tasks have been assigned.

-{% endif %} +

Tasks by type

+
+ {% for plot in type_plots %} +
{% plotly plot %}
+ {% endfor %} +
+ +

Tasks by user

+
+ {% for plot in user_plots %} +
{% plotly plot %}
+ {% endfor %} +
+
+ {% else %} +

No tasks have been assigned.

+ {% endif %} {% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/assessment_details.html b/hawc/apps/mgmt/templates/mgmt/assessment_details.html index 2fdaca84be..35dd2a1def 100644 --- a/hawc/apps/mgmt/templates/mgmt/assessment_details.html +++ b/hawc/apps/mgmt/templates/mgmt/assessment_details.html @@ -1,48 +1,48 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Task assignments

- {% actions %} - My assigned tasks - {% endactions %} -
+
+

Task assignments

+ {% actions %} + My assigned tasks + {% endactions %} +
-{% include 'common/inline_filter_form.html' %} + {% include 'common/inline_filter_form.html' %} -{% if object_list %} - - {% bs4_colgroup "20,20,20,20,20" %} - - - - - - - - - - - {% regroup object_list by study as study_list %} - {% for study in study_list %} - - - {% for task in study.list %} - {% include "mgmt/fragments/task_cell.html" with object=task %} - {% endfor %} - - {% endfor %} - -
StudyData preparationData extractionQA/QCRisk of bias/study evaluation
- {{ study.grouper }} -
- Date created: - {{ study.grouper.created|date:"SHORT_DATE_FORMAT" }} -
-{% include "includes/paginator.html" with plural_object_name="tasks" %} -{% else %} -

No tasks available.

-{% endif %} + {% if object_list %} + + {% bs4_colgroup "20,20,20,20,20" %} + + + + + + + + + + + {% regroup object_list by study as study_list %} + {% for study in study_list %} + + + {% for task in study.list %} + {% include "mgmt/fragments/task_cell.html" with object=task %} + {% endfor %} + + {% endfor %} + +
StudyData preparationData extractionQA/QCRisk of bias/study evaluation
+ {{ study.grouper }} +
+ Date created: + {{ study.grouper.created|date:"SHORT_DATE_FORMAT" }} +
+ {% include "includes/paginator.html" with plural_object_name="tasks" %} + {% else %} +

No tasks available.

+ {% endif %} {% endblock %} {% block extrajs %} diff --git a/hawc/apps/mgmt/templates/mgmt/fragments/rob_reviews.html b/hawc/apps/mgmt/templates/mgmt/fragments/rob_reviews.html index e61258528c..ca03897a79 100644 --- a/hawc/apps/mgmt/templates/mgmt/fragments/rob_reviews.html +++ b/hawc/apps/mgmt/templates/mgmt/fragments/rob_reviews.html @@ -1,8 +1,8 @@

This lists shows all {{rob_name|lower}} reviews which are currently assigned to you that require completion.

- {% for review in rob_reviews %} + {% for review in rob_reviews %} {% icon 'fa-edit' %} {% if show_assessment %}{{review.study.assessment}} | {% endif %}{{review.study.short_citation}} ({{review.final|yesno:"final,individual"}} review) - {% empty %} + {% empty %}

You have no remaining reviews. - {% endfor %} + {% endfor %}

diff --git a/hawc/apps/mgmt/templates/mgmt/user_assessment_task_list.html b/hawc/apps/mgmt/templates/mgmt/user_assessment_task_list.html index e881e31159..8a943bc18d 100644 --- a/hawc/apps/mgmt/templates/mgmt/user_assessment_task_list.html +++ b/hawc/apps/mgmt/templates/mgmt/user_assessment_task_list.html @@ -1,33 +1,33 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

My assigned tasks

+

My assigned tasks

-{% include 'common/inline_filter_form.html' %} + {% include 'common/inline_filter_form.html' %} -{% if object_list %} - - {% bs4_colgroup "30,70" %} - {% bs4_thead "Study,Task" %} - + {% if object_list %} +
+ {% bs4_colgroup "30,70" %} + {% bs4_thead "Study,Task" %} + {% for task in object_list %} - + {% include "mgmt/fragments/task_cell.html" with object=task %} - + {% endfor %} - -
- {{ task.study.short_citation }} + {{ task.study.short_citation }}
-{% include "includes/paginator.html" with plural_object_name="tasks" %} -{% else %} -

There are no tasks available

-{% endif %} + + + {% include "includes/paginator.html" with plural_object_name="tasks" %} + {% else %} +

There are no tasks available

+ {% endif %} -{% with rob_name=assessment.get_rob_name_display %} -

Assigned {{rob_name|title}} Reviews

-{% include "mgmt/fragments/rob_reviews.html" with show_assessment=False %} -{% endwith %} + {% with rob_name=assessment.get_rob_name_display %} +

Assigned {{rob_name|title}} Reviews

+ {% include "mgmt/fragments/rob_reviews.html" with show_assessment=False %} + {% endwith %} {% endblock %} diff --git a/hawc/apps/mgmt/templates/mgmt/user_task_list.html b/hawc/apps/mgmt/templates/mgmt/user_task_list.html index c62e98670d..d5d7dfad8e 100644 --- a/hawc/apps/mgmt/templates/mgmt/user_task_list.html +++ b/hawc/apps/mgmt/templates/mgmt/user_task_list.html @@ -1,39 +1,39 @@ {% extends 'crumbless.html' %} {% block content %} -

My assigned tasks

+

My assigned tasks

-{% include 'common/inline_filter_form.html' %} + {% include 'common/inline_filter_form.html' %} -{% if object_list %} - - {% bs4_colgroup "30,30,40" %} - {% bs4_thead "Assessment,Study,Task" %} - + {% if object_list %} +
+ {% bs4_colgroup "30,30,40" %} + {% bs4_thead "Assessment,Study,Task" %} + {% for task in object_list %} - + {% include "mgmt/fragments/task_cell.html" with object=task %} - + {% endfor %} - -
{{ task.study.assessment }} - {{ task.study.short_citation }}
- {% if task.type == TaskType.ROB %} + {{ task.study.short_citation }}
+ {% if task.type == TaskType.ROB %} {% with study=studies|get:task.study_id %}{% for review in study.own_reviews %} -  Update {% if review.final %}final {% endif %}review - {% endfor %}{% endwith %} - {% endif %} +  Update {% if review.final %}final {% endif %}review + {% endfor %}{% endwith %} + {% endif %}
-{% include "includes/paginator.html" with plural_object_name="tasks" %} -{% else %} -

There are no tasks available

-{% endif %} + + + {% include "includes/paginator.html" with plural_object_name="tasks" %} + {% else %} +

There are no tasks available

+ {% endif %} -{% with rob_name=assessment.get_rob_name_display %} -

Assigned Study Evaluation/Risk of Bias Reviews

-{% include "mgmt/fragments/rob_reviews.html" with show_assessment=True %} -{% endwith %} + {% with rob_name=assessment.get_rob_name_display %} +

Assigned Study Evaluation/Risk of Bias Reviews

+ {% include "mgmt/fragments/rob_reviews.html" with show_assessment=True %} + {% endwith %} {% endblock %} diff --git a/hawc/apps/myuser/templates/myuser/accept_license.html b/hawc/apps/myuser/templates/myuser/accept_license.html index f5bd539582..7ad76f6b02 100644 --- a/hawc/apps/myuser/templates/myuser/accept_license.html +++ b/hawc/apps/myuser/templates/myuser/accept_license.html @@ -1,11 +1,11 @@ {% extends 'crumbless.html' %} {% block content %} -
+

Welcome, {{ user.get_full_name }}.

-
-
+
+
{% crispy form %} {% include "registration/license.html" with modal_id="license_modal"%} -
+
{% endblock content %} diff --git a/hawc/apps/myuser/templates/myuser/hawcuser_form.html b/hawc/apps/myuser/templates/myuser/hawcuser_form.html index b023d74e39..e4ab6727f0 100644 --- a/hawc/apps/myuser/templates/myuser/hawcuser_form.html +++ b/hawc/apps/myuser/templates/myuser/hawcuser_form.html @@ -3,6 +3,6 @@ {% block title %}Create account | HAWC{% endblock %} {% block content %} -{% crispy form %} -{% include "registration/license.html" with modal_id='license_modal'%} + {% crispy form %} + {% include "registration/license.html" with modal_id='license_modal'%} {% endblock content %} diff --git a/hawc/apps/myuser/templates/myuser/set_password.html b/hawc/apps/myuser/templates/myuser/set_password.html index f9f9682e33..ae95c4ab32 100644 --- a/hawc/apps/myuser/templates/myuser/set_password.html +++ b/hawc/apps/myuser/templates/myuser/set_password.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} {% block breadcrumbs %} - {% endblock %} diff --git a/hawc/apps/myuser/templates/myuser/userprofile_detail.html b/hawc/apps/myuser/templates/myuser/userprofile_detail.html index ce455cc9e1..1163f7123b 100644 --- a/hawc/apps/myuser/templates/myuser/userprofile_detail.html +++ b/hawc/apps/myuser/templates/myuser/userprofile_detail.html @@ -1,35 +1,35 @@ {% extends "crumbless.html" %} {% block content %} -
-

User Profile

- {% actions %} - Update profile - {% if user.has_usable_password %} - Change password - {% endif %} - {% endactions %} -
- - - - - - - {% optional_table_row "Name" user.get_full_name %} - {% optional_table_row "Email" user.email %} - {% optional_table_row "External ID" user.external_id %} - - - - - - +
+

User Profile

+ {% actions %} + Update profile + {% if user.has_usable_password %} + Change password + {% endif %} + {% endactions %} +
+
Can Create Assessments{{user.can_create_assessments}}
HERO website
+ + + + + + {% optional_table_row "Name" user.get_full_name %} + {% optional_table_row "Email" user.email %} + {% optional_table_row "External ID" user.external_id %} + + + + + + @@ -48,7 +48,7 @@

User Profile

-
Can Create Assessments{{user.can_create_assessments}}
HERO website {% if object.HERO_access %} https://heronet.epa.gov (authentication required) - {% else %} + {% else %} https://hero.epa.gov (no authentication required) - {% endif %} + {% endif %}

Website used to redirect HERO links.

+ {% endblock content %} {% block extrajs %} diff --git a/hawc/apps/myuser/templates/myuser/userprofile_form.html b/hawc/apps/myuser/templates/myuser/userprofile_form.html index d11c586154..17c3acca10 100644 --- a/hawc/apps/myuser/templates/myuser/userprofile_form.html +++ b/hawc/apps/myuser/templates/myuser/userprofile_form.html @@ -5,11 +5,11 @@ {% endblock content %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/myuser/templates/myuser/welcome_email.html b/hawc/apps/myuser/templates/myuser/welcome_email.html index 3dc45d72c2..f2e3758ee8 100644 --- a/hawc/apps/myuser/templates/myuser/welcome_email.html +++ b/hawc/apps/myuser/templates/myuser/welcome_email.html @@ -3,12 +3,12 @@ An account has just been created for you on {{domain}}!

{% if assessments.count > 0 %} -You have been assigned to the following projects: - + You have been assigned to the following projects: +
    + {% for assessment in assessments %} +
  • {{assessment}}
  • + {% endfor %} +
{% endif %} In order to use the site, you'll need to set your password. To set your diff --git a/hawc/apps/riskofbias/templates/riskofbias/_arob_none_alert.html b/hawc/apps/riskofbias/templates/riskofbias/_arob_none_alert.html index b9ef36b15d..5faafda29a 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/_arob_none_alert.html +++ b/hawc/apps/riskofbias/templates/riskofbias/_arob_none_alert.html @@ -1,11 +1,11 @@ {% alert info %}

No {{assessment.get_rob_name_display|lower}} requirements exist for this assessment.

{% if obj_perms.edit_assessment %} -

As a project manager, you have the following options:

-
    -
  • Load a predefined approach into your assessment
  • -
  • Copy an approach from another assessment
  • -
  • Disable {{assessment.get_rob_name_display|lower}} for this assessment
  • -
+

As a project manager, you have the following options:

+
    +
  • Load a predefined approach into your assessment
  • +
  • Copy an approach from another assessment
  • +
  • Disable {{assessment.get_rob_name_display|lower}} for this assessment
  • +
{% endif %} {% endalert %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/arob_copy.html b/hawc/apps/riskofbias/templates/riskofbias/arob_copy.html index e83674a001..b61938e43c 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/arob_copy.html +++ b/hawc/apps/riskofbias/templates/riskofbias/arob_copy.html @@ -1,33 +1,33 @@ {% extends 'assessment-rooted.html' %} {% block content %} -{% crispy form %} - {% endblock %} {% block extrajs %} - + $('#id_assessment').on('change', updateLink).trigger('change'); + }); + {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/arob_detail.html b/hawc/apps/riskofbias/templates/riskofbias/arob_detail.html index a02851840a..8ba0dab003 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/arob_detail.html +++ b/hawc/apps/riskofbias/templates/riskofbias/arob_detail.html @@ -1,67 +1,67 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{assessment.get_rob_name_display}} requirements

- {% if obj_perms.edit and crud == "Read" %} - {% actions %} - {% if obj_perms.edit_assessment %} - {{assessment.get_rob_name_display}} settings - Update requirements - - {% endif %} +
+

{{assessment.get_rob_name_display}} requirements

+ {% if obj_perms.edit and crud == "Read" %} + {% actions %} + {% if obj_perms.edit_assessment %} + {{assessment.get_rob_name_display}} settings + Update requirements + + {% endif %} - Study assignment - View assignments + Study assignment + View assignments - {% if obj_perms.edit_assessment %} - - Data cleanup - Clean {{assessment.get_rob_name_display|lower}} responses - {% endif %} - {% endactions %} - {% endif %} -
+ {% if obj_perms.edit_assessment %} + + Data cleanup + Clean {{assessment.get_rob_name_display|lower}} responses + {% endif %} + {% endactions %} + {% endif %} +
-{{assessment.rob_settings.help_text|safe}} + {{assessment.rob_settings.help_text|safe}} -{% if no_data %} -{% include 'riskofbias/_arob_none_alert.html' %} -{% else %} - - -{% endif %} + {% if no_data %} + {% include 'riskofbias/_arob_none_alert.html' %} + {% else %} + + + {% endif %} {% endblock %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/arob_edit.html b/hawc/apps/riskofbias/templates/riskofbias/arob_edit.html index dd2ad51868..4dd4e1343c 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/arob_edit.html +++ b/hawc/apps/riskofbias/templates/riskofbias/arob_edit.html @@ -1,29 +1,29 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Update {{assessment.get_rob_name_display|lower}} requirements

- {% actions %} - {{assessment.get_rob_name_display}} changes - Update instructions - Copy from existing - Load approach - - Domain changes - New domain - {% endactions %} -
- {{assessment.rob_settings.help_text|safe}} +
+

Update {{assessment.get_rob_name_display|lower}} requirements

+ {% actions %} + {{assessment.get_rob_name_display}} changes + Update instructions + Copy from existing + Load approach + + Domain changes + New domain + {% endactions %} +
+ {{assessment.rob_settings.help_text|safe}} - {% if no_data %} + {% if no_data %} {% include 'riskofbias/_arob_none_alert.html' %} - {% else %} + {% else %}
- {% endif %} + {% endif %} {% endblock %} {% block extrajs %} - {% if not no_data %} - {{ config|json_script:"config" }} - {% endif %} + {% if not no_data %} + {{ config|json_script:"config" }} + {% endif %} {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/arob_load_approach.html b/hawc/apps/riskofbias/templates/riskofbias/arob_load_approach.html index 94b32ca73c..3b4a7e6379 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/arob_load_approach.html +++ b/hawc/apps/riskofbias/templates/riskofbias/arob_load_approach.html @@ -23,17 +23,17 @@

Warning!

{% block extrajs %} - + window.app.HAWCUtils.onSelectChangeShowDetail( + document.getElementById("id_rob_type"), + document.getElementById("detail_display"), + document.getElementById("detail_library") + ); + }); + {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/arob_text_form.html b/hawc/apps/riskofbias/templates/riskofbias/arob_text_form.html index 6531f19785..eff6d7f009 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/arob_text_form.html +++ b/hawc/apps/riskofbias/templates/riskofbias/arob_text_form.html @@ -1,6 +1,6 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% crispy form %} + {% crispy form %} {% endblock %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/component/domain_list.html b/hawc/apps/riskofbias/templates/riskofbias/component/domain_list.html index a8db6c0452..4dbf946783 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/component/domain_list.html +++ b/hawc/apps/riskofbias/templates/riskofbias/component/domain_list.html @@ -1,16 +1,16 @@ {% for domain in qs %} - {% for metric in domain %} - {% if forloop.first %} -

{{metric.domain.name}}{% debug_badge metric.domain_id %}

-

{{metric.domain.description|safe}}

- {% endif %} -

{{metric.name}}{% debug_badge metric.id %}

-

{{metric.description|safe}}

- {% empty %} + {% for metric in domain %} + {% if forloop.first %} +

{{metric.domain.name}}{% debug_badge metric.domain_id %}

+

{{metric.domain.description|safe}}

+ {% endif %} +

{{metric.name}}{% debug_badge metric.id %}

+

{{metric.description|safe}}

+ {% empty %} {% alert info %}No evaluation metrics available for this domain.{% endalert %} - {% endfor %} -
+ {% endfor %} +
{% empty %} -{% alert info %}No evaluation domains available for this study type.{% endalert %} + {% alert info %}No evaluation domains available for this study type.{% endalert %} {% endfor %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/reviewers_form.html b/hawc/apps/riskofbias/templates/riskofbias/reviewers_form.html index 37ecb66bf7..8d6772cc0a 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/reviewers_form.html +++ b/hawc/apps/riskofbias/templates/riskofbias/reviewers_form.html @@ -1,6 +1,6 @@ {% extends 'assessment-rooted.html' %} {% block content %} -

Update number of reviewers

- {% crispy form %} +

Update number of reviewers

+ {% crispy form %} {% endblock %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/riskofbiasdomain_form.html b/hawc/apps/riskofbias/templates/riskofbias/riskofbiasdomain_form.html index b730541448..759dd6b5ce 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/riskofbiasdomain_form.html +++ b/hawc/apps/riskofbias/templates/riskofbias/riskofbiasdomain_form.html @@ -5,9 +5,9 @@ {% endblock %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/riskofbiasmetric_form.html b/hawc/apps/riskofbias/templates/riskofbias/riskofbiasmetric_form.html index b382ed58da..312054814d 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/riskofbiasmetric_form.html +++ b/hawc/apps/riskofbias/templates/riskofbias/riskofbiasmetric_form.html @@ -78,16 +78,16 @@ {% endblock %} {% block extrajs %} - + window.app.HAWCUtils.onSelectChangeShowDetail( + document.getElementById("id_responses"), + document.getElementById("detail_display"), + document.getElementById("detail_library") + ); + }); + {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_list.html b/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_list.html index d3ee38503a..92f8b546e4 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_list.html +++ b/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_list.html @@ -1,19 +1,19 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% if obj_perms.edit_assessment %} + {% if obj_perms.edit_assessment %}
-

{{assessment.get_rob_name_display}} assignments

- {% actions %} -  Update - {% endactions %} +

{{assessment.get_rob_name_display}} assignments

+ {% actions %} +  Update + {% endactions %}
- {% endif %} - {% include "common/inline_filter_form.html" %} -
- {% include "includes/paginator.html" with plural_object_name="assignments" %} + {% endif %} + {% include "common/inline_filter_form.html" %} +
+ {% include "includes/paginator.html" with plural_object_name="assignments" %} {% endblock %} {% block extrajs %} - {{config|json_script:"config"}} + {{config|json_script:"config"}} {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_update.html b/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_update.html index a76a3520d3..928ff7aeea 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_update.html +++ b/hawc/apps/riskofbias/templates/riskofbias/rob_assignment_update.html @@ -1,17 +1,17 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Update {{assessment.get_rob_name_display|lower}} assignments

- {% actions %} -  Update number of reviewers - {% endactions %} -
- {% include 'common/inline_filter_form.html' %} -
- {% include "includes/paginator.html" with plural_object_name="assignments" %} +
+

Update {{assessment.get_rob_name_display|lower}} assignments

+ {% actions %} +  Update number of reviewers + {% endactions %} +
+ {% include 'common/inline_filter_form.html' %} +
+ {% include "includes/paginator.html" with plural_object_name="assignments" %} {% endblock %} {% block extrajs %} - {{config|json_script:"config"}} + {{config|json_script:"config"}} {% endblock extrajs %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/rob_detail.html b/hawc/apps/riskofbias/templates/riskofbias/rob_detail.html index c6f4649e40..d58cc79a65 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/rob_detail.html +++ b/hawc/apps/riskofbias/templates/riskofbias/rob_detail.html @@ -5,11 +5,11 @@

{{object}}: {{assessment.get_rob_name_display}} review

{% if obj_perms.edit %} {% actions %} - {{assessment.get_rob_name_display}} - View all reviews - {% if obj_perms.edit_assessment %} - Edit final review - {% endif %} + {{assessment.get_rob_name_display}} + View all reviews + {% if obj_perms.edit_assessment %} + Edit final review + {% endif %} {% endactions %} {% endif %}
diff --git a/hawc/apps/riskofbias/templates/riskofbias/rob_detail_all.html b/hawc/apps/riskofbias/templates/riskofbias/rob_detail_all.html index 925d1e06d5..ee3da64c97 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/rob_detail_all.html +++ b/hawc/apps/riskofbias/templates/riskofbias/rob_detail_all.html @@ -2,12 +2,12 @@ {% block content %} {% if obj_perms.edit_assessment %} -
-

{{object}}: {{assessment.get_rob_name_display}} (all reviews)

- {% actions %} - Edit final review - {% endactions %} -
+
+

{{object}}: {{assessment.get_rob_name_display}} (all reviews)

+ {% actions %} + Edit final review + {% endactions %} +
{% endif %}
{% endblock %} diff --git a/hawc/apps/riskofbias/templates/riskofbias/rob_edit.html b/hawc/apps/riskofbias/templates/riskofbias/rob_edit.html index 35282cd8a5..8a3bae8b14 100644 --- a/hawc/apps/riskofbias/templates/riskofbias/rob_edit.html +++ b/hawc/apps/riskofbias/templates/riskofbias/rob_edit.html @@ -1,27 +1,27 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

{{object}} {% if object.final %}[final]{% else %}[individual review]{% endif %}

- {% actions %} - - {% endactions %} -
-
{{assessment.rob_settings.help_text|safe}}
- {% if not object.study.get_study_types %} - {% alert warning %} - This study currently has no type(s) selected. If you'd like to perform study evaluation for this study, you'll need to update the study and select at least one type (e.g., bioassay, epidemiology, etc.). - {% endalert %} - {% elif object.final and not object.study_reviews_complete %} - {% alert danger %} - All other {{assessment.get_rob_name_display|lower}} reviews for this study must be complete - in order to complete the final review. - {% endalert %} - {% else %} -
- {% endif %} +
+

{{object}} {% if object.final %}[final]{% else %}[individual review]{% endif %}

+ {% actions %} + + {% endactions %} +
+
{{assessment.rob_settings.help_text|safe}}
+ {% if not object.study.get_study_types %} + {% alert warning %} + This study currently has no type(s) selected. If you'd like to perform study evaluation for this study, you'll need to update the study and select at least one type (e.g., bioassay, epidemiology, etc.). + {% endalert %} + {% elif object.final and not object.study_reviews_complete %} + {% alert danger %} + All other {{assessment.get_rob_name_display|lower}} reviews for this study must be complete + in order to complete the final review. + {% endalert %} + {% else %} +
+ {% endif %} {% endblock %} {% block extrajs %} - {{ config|json_script:"config" }} + {{ config|json_script:"config" }} {% endblock extrajs %} diff --git a/hawc/apps/study/templates/study/attachment_form.html b/hawc/apps/study/templates/study/attachment_form.html index ab440455c8..d53b9bb1e8 100644 --- a/hawc/apps/study/templates/study/attachment_form.html +++ b/hawc/apps/study/templates/study/attachment_form.html @@ -1,5 +1,5 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% crispy form %} + {% crispy form %} {% endblock %} diff --git a/hawc/apps/study/templates/study/study_detail.html b/hawc/apps/study/templates/study/study_detail.html index 5351cb81fb..91a80de145 100644 --- a/hawc/apps/study/templates/study/study_detail.html +++ b/hawc/apps/study/templates/study/study_detail.html @@ -6,65 +6,65 @@

{{object}}

{% include "common/unpublished_badge.html" %} {% if obj_perms.edit %} {% actions %} - Study editing - {% if object.editable %} - Update study details - Update reference - {% endif %} - - {% if obj_perms.edit_assessment %} - {{ object.editable|yesno:"Lock study,Unlock study" }} - {% endif %} - - {% if object.editable %} - Delete study - Add an attachment - - {% if object.bioassay %} - - Animal bioassay editing - Create new experiment - Copy from existing - {% endif %} - - {% if object.in_vitro %} - - In-vitro analysis editing - Create new experiment - Create new chemical - Create new cell-type - {% endif %} - - {% if object.epi %} - - Epidemiology editing - {% if assessment.epi_version == 1 %} - Create new study population - Copy from existing - {% elif assessment.epi_version == 2 %} - Create new study population - {% endif %} - {% endif %} - - {% if object.epi_meta %} - - Epidemiology meta-analysis editing - Create new protocol - {% endif %} - - {% if object.eco %} - - Ecology editing - Create new study design - {% endif %} + Study editing + {% if object.editable %} + Update study details + Update reference + {% endif %} + + {% if obj_perms.edit_assessment %} + {{ object.editable|yesno:"Lock study,Unlock study" }} + {% endif %} + + {% if object.editable %} + Delete study + Add an attachment + + {% if object.bioassay %} + + Animal bioassay editing + Create new experiment + Copy from existing + {% endif %} + + {% if object.in_vitro %} + + In-vitro analysis editing + Create new experiment + Create new chemical + Create new cell-type + {% endif %} + + {% if object.epi %} + + Epidemiology editing + {% if assessment.epi_version == 1 %} + Create new study population + Copy from existing + {% elif assessment.epi_version == 2 %} + Create new study population {% endif %} + {% endif %} + + {% if object.epi_meta %} + + Epidemiology meta-analysis editing + Create new protocol + {% endif %} + + {% if object.eco %} + + Ecology editing + Create new study design + {% endif %} + {% endif %} {% endactions %} {% endif %}
{% if not object.get_study_types and obj_perms.edit %} {% alert warning %} - This study currently has no type(s) selected. If you'd like to perform data extraction or study evaluation for this study, you'll need to update the study and select at least one type (e.g., bioassay, epidemiology, etc.). + This study currently has no type(s) selected. If you'd like to perform data extraction or study evaluation for this study, you'll need to update the study and select at least one type (e.g., bioassay, epidemiology, etc.). {% endalert %} {% endif %} @@ -135,28 +135,28 @@

{{assessment.get_rob_name_display}}

{% endblock %} {% block extrajs %} -{{ config|json_script:"config" }} - + {% endblock extrajs %} diff --git a/hawc/apps/study/templates/study/study_form.html b/hawc/apps/study/templates/study/study_form.html index 511e8ef8b5..ae557d563d 100644 --- a/hawc/apps/study/templates/study/study_form.html +++ b/hawc/apps/study/templates/study/study_form.html @@ -1,25 +1,25 @@ {% extends 'assessment-rooted.html' %} {% block content %} -{% if manual_entry_warning %} -{% alert warning %} -

You can continue to manually enter a study if you wish. However, instead of manually -entering reference information, we recommend importing the reference from PubMed or HERO -using one of these approaches instead:

- -

This requires less work, and ensures that we have links to the reference throughout your assessment.

-{% endalert %} -{% endif %} -{% crispy form %} + {% if manual_entry_warning %} + {% alert warning %} +

You can continue to manually enter a study if you wish. However, instead of manually + entering reference information, we recommend importing the reference from PubMed or HERO + using one of these approaches instead:

+ +

This requires less work, and ensures that we have links to the reference throughout your assessment.

+ {% endalert %} + {% endif %} + {% crispy form %} {% endblock %} {% block extrajs %} - + {% endblock extrajs %} diff --git a/hawc/apps/study/templates/study/study_list.html b/hawc/apps/study/templates/study/study_list.html index b85335d2d8..7958d4ac4a 100644 --- a/hawc/apps/study/templates/study/study_list.html +++ b/hawc/apps/study/templates/study/study_list.html @@ -1,66 +1,66 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+

Available studies ({{page_obj.paginator.count}} found)

{% if obj_perms.edit and crud == "Read" %} - {% actions %} - Study editing - Create new - Create from identifier - {% if assessment.enable_risk_of_bias %} - - {{assessment.get_rob_name_display}} - View requirements - View assignments - {% endif %} - {% endactions %} + {% actions %} + Study editing + Create new + Create from identifier + {% if assessment.enable_risk_of_bias %} + + {{assessment.get_rob_name_display}} + View requirements + View assignments + {% endif %} + {% endactions %} {% endif %} -
+
-{% include 'common/inline_filter_form.html' %} + {% include 'common/inline_filter_form.html' %} - +
{% bs4_colgroup '25,40,7,7,7,7,7' %} {% bs4_thead 'Short citation,Full citation,Bioassay,Epidemiology,Epi. meta-analysis,In vitro,Ecology' %} - {% for object in object_list %} + {% for object in object_list %} - - + - {% for data_type in object.data_types %} + {% endwith %} + {% endfor %} + + {% for data_type in object.data_types %} - {% endfor %} + {% endfor %} - {% empty %} + {% empty %} - + - {% endfor %} + {% endfor %} -
- {{ object.short_citation }} - {% if not object.published %} - - {% endif %} - {% debug_badge object.id %} - - {{object.full_citation}} - {% for ident in object.identifiers.all %} - {% with url=ident.get_url %} + + {{ object.short_citation }} + {% if not object.published %} + + {% endif %} + {% debug_badge object.id %} + + {{object.full_citation}} + {% for ident in object.identifiers.all %} + {% with url=ident.get_url %} {% if url %} - + {{ident.get_database_display}} - + {% endif %} - {% endwith %} - {% endfor %} - - +
- No studies available - + No studies available +
+ -{% include 'includes/paginator.html' with plural_object_name='studies' %} + {% include 'includes/paginator.html' with plural_object_name='studies' %} {% endblock %} diff --git a/hawc/apps/summary/templates/summary/_smartTagEditModal.html b/hawc/apps/summary/templates/summary/_smartTagEditModal.html index e21309d4da..70443348cb 100644 --- a/hawc/apps/summary/templates/summary/_smartTagEditModal.html +++ b/hawc/apps/summary/templates/summary/_smartTagEditModal.html @@ -1,17 +1,17 @@ {% extends 'common/modal_template.html' %} {% block modal_title %} - Insert HAWC Smart-tag + Insert HAWC Smart-tag {% endblock %} {% block modal_body %} -
- {% crispy form %} -
+
+ {% crispy form %} +
{% endblock %} {% block modal_footer %} - - + + {% endblock %} diff --git a/hawc/apps/summary/templates/summary/datapivot_detail.html b/hawc/apps/summary/templates/summary/datapivot_detail.html index 352698d50c..5af2f76f73 100644 --- a/hawc/apps/summary/templates/summary/datapivot_detail.html +++ b/hawc/apps/summary/templates/summary/datapivot_detail.html @@ -3,23 +3,23 @@ {% load static %} {% block extrahead %} - + {% endblock %} {% block content %} -
-

{{object}}

- {% include "common/unpublished_badge.html" %} - {% actions %} - Download data file - {% if obj_perms.edit %} - - Edit display settings - Edit other settings - Delete Pivot - {% endif %} - {% endactions %} -
+
+

{{object}}

+ {% include "common/unpublished_badge.html" %} + {% actions %} + Download data file + {% if obj_perms.edit %} + + Edit display settings + Edit other settings + Delete Pivot + {% endif %} + {% endactions %} +
{% block dp_content %} @@ -44,7 +44,7 @@

{{object}}

}); }); window.app.startup("smartTagsStartup", function(smartTags){ - new smartTags.SmartTagContainer($('#caption'), {showOnStartup: true}); + new smartTags.SmartTagContainer($('#caption'), {showOnStartup: true}); }) }); diff --git a/hawc/apps/summary/templates/summary/datapivot_form.html b/hawc/apps/summary/templates/summary/datapivot_form.html index 780059018b..426bc42bb8 100644 --- a/hawc/apps/summary/templates/summary/datapivot_form.html +++ b/hawc/apps/summary/templates/summary/datapivot_form.html @@ -17,19 +17,19 @@ {% endif %} {% if form.fields.preferred_units %} - window.app.startup("assessmentStartup", function(app){ - new app.DoseUnitsWidget($('form'), { - choices: JSON.parse('{{form.fields.preferred_units.choices|safe}}'), - el: '#id_preferred_units', + window.app.startup("assessmentStartup", function(app){ + new app.DoseUnitsWidget($('form'), { + choices: JSON.parse('{{form.fields.preferred_units.choices|safe}}'), + el: '#id_preferred_units', + }); }); - }); {% endif %} window.app.startup("smartTagsStartup", function(smartTags){ - new smartTags.SmartTagEditor( - $('#id_caption'), - {submitEl: '#dataPivotForm', takeFocusEl: "#id_evidence_type"} - ); + new smartTags.SmartTagEditor( + $('#id_caption'), + {submitEl: '#dataPivotForm', takeFocusEl: "#id_evidence_type"} + ); }) $('input[data-pf]').each(window.app.HAWCUtils.bindCheckboxToPrefilter) diff --git a/hawc/apps/summary/templates/summary/datapivot_type_selector.html b/hawc/apps/summary/templates/summary/datapivot_type_selector.html index 39b50e2868..f4c74d2597 100644 --- a/hawc/apps/summary/templates/summary/datapivot_type_selector.html +++ b/hawc/apps/summary/templates/summary/datapivot_type_selector.html @@ -8,29 +8,29 @@

Create data pivot

Option #1 (Query-based)

Create a data-pivot based on querying information off the HAWC database for this assessment. Your settings will always be applied to this query; but it will contain the latest information from the database, so the visualization may change from time to time.

{% if assessment.has_animal_data %} - - {{evidence_type.BIOASSAY.label}} - + + {{evidence_type.BIOASSAY.label}} + {% endif %} {% if assessment.has_epi_data %} - - {{evidence_type.EPI.label}} - + + {{evidence_type.EPI.label}} + {% endif %} {% if assessment.has_epimeta_data %} - - {{evidence_type.EPI_META.label}} - + + {{evidence_type.EPI_META.label}} + {% endif %} {% if assessment.has_invitro_data %} - - {{evidence_type.IN_VITRO.label}} - + + {{evidence_type.IN_VITRO.label}} + {% endif %} {% if assessment.has_eco_data %} - - {{evidence_type.ECO.label}} - + + {{evidence_type.ECO.label}} + {% endif %}
diff --git a/hawc/apps/summary/templates/summary/datapivot_update_settings.html b/hawc/apps/summary/templates/summary/datapivot_update_settings.html index 9e2872f724..8d0f94389b 100644 --- a/hawc/apps/summary/templates/summary/datapivot_update_settings.html +++ b/hawc/apps/summary/templates/summary/datapivot_update_settings.html @@ -8,14 +8,14 @@ @@ -36,20 +36,20 @@ {% endblock dp_content %} {% block extrajs %} -{{ config|json_script:"dp-config" }} - + {{ config|json_script:"dp-config" }} + {% endblock extrajs %} diff --git a/hawc/apps/summary/templates/summary/dataset_interactivity.html b/hawc/apps/summary/templates/summary/dataset_interactivity.html index bc07027d9d..c8299ce97c 100644 --- a/hawc/apps/summary/templates/summary/dataset_interactivity.html +++ b/hawc/apps/summary/templates/summary/dataset_interactivity.html @@ -1,22 +1,22 @@ {% extends 'crumbless.html' %} {% block content %} -

HAWC Dataset Interactivity

-

Some visuals allow deeper interactivity by displaying modal or popup menus which link to extracted data in HAWC. When using data queries from HAWC, interactivity is built-in and can be configured when configuring the visualization. For user-uploaded Excel datasets, this interactivity can also be configured, but you'll need to use the correct column headers when uploading a dataset. In addition, the corresponding values used in the data rows must be valid identifiers in the current assessment. The following table shows which column headers can be used to allow enable interactivity:

- +

HAWC Dataset Interactivity

+

Some visuals allow deeper interactivity by displaying modal or popup menus which link to extracted data in HAWC. When using data queries from HAWC, interactivity is built-in and can be configured when configuring the visualization. For user-uploaded Excel datasets, this interactivity can also be configured, but you'll need to use the correct column headers when uploading a dataset. In addition, the corresponding values used in the data rows must be valid identifiers in the current assessment. The following table shows which column headers can be used to allow enable interactivity:

+
{% bs4_thead 'Input column header*,Available action(s)' %} - {% bs4_fullrow '* Column header names are case sensitive. User permissions are checked whenever a user attempts to access any resource in HAWC, so you must use the correct HAWC IDs to enable these interactive features.' %} + {% bs4_fullrow '* Column header names are case sensitive. User permissions are checked whenever a user attempts to access any resource in HAWC, so you must use the correct HAWC IDs to enable these interactive features.' %} -
+ {% endblock content %} {% block extrajs %} - + {% endblock %} diff --git a/hawc/apps/summary/templates/summary/summarytable_detail.html b/hawc/apps/summary/templates/summary/summarytable_detail.html index ced19ff118..09e2f955a3 100644 --- a/hawc/apps/summary/templates/summary/summarytable_detail.html +++ b/hawc/apps/summary/templates/summary/summarytable_detail.html @@ -11,14 +11,14 @@

{{object}}

 Download report {% if obj_perms.edit %} - - Edit settings - -  Update - - -  Delete - + + Edit settings + +  Update + + +  Delete + {% endif %} {% endactions %} {% endif %} diff --git a/hawc/apps/summary/templates/summary/summarytable_form.html b/hawc/apps/summary/templates/summary/summarytable_form.html index 8982402308..63a318219c 100644 --- a/hawc/apps/summary/templates/summary/summarytable_form.html +++ b/hawc/apps/summary/templates/summary/summarytable_form.html @@ -1,9 +1,9 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
+
{% endblock %} {% block extrajs %} - {{ config|json_script:"config" }} + {{ config|json_script:"config" }} {% endblock %} diff --git a/hawc/apps/summary/templates/summary/summarytable_list.html b/hawc/apps/summary/templates/summary/summarytable_list.html index c92cbb377b..b6881f9626 100644 --- a/hawc/apps/summary/templates/summary/summarytable_list.html +++ b/hawc/apps/summary/templates/summary/summarytable_list.html @@ -1,62 +1,62 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-

Available tables

- {% if obj_perms.edit %} - {% actions %} - -  Create new table - - -  Copy from existing - - {% endactions %} - {% endif %} -
+
+

Available tables

+ {% if obj_perms.edit %} + {% actions %} + +  Create new table + + +  Copy from existing + + {% endactions %} + {% endif %} +
-{% include 'common/inline_filter_form.html' %} + {% include 'common/inline_filter_form.html' %} -{% if object_list.exists %} - - - - - - - - - - - - {% if show_published %}{% endif %} - - - - - - {% for object in object_list %} - - - - {% if show_published %}{% endif %} - - - - {% endfor %} - -
TitleTable typePublishedCreatedModified
{{object.title}} - {% if obj_perms.edit and not object.published %} - - {% endif %} - {% debug_badge object.id %} - {{object.get_table_type_display}}{{object.published}}{{object.created|date:"Y-m-d" }}{{object.last_updated|date:"Y-m-d" }}
- {% include "includes/paginator.html" with plural_object_name="tables" %} -{% else %} - {% if obj_perms.edit %} -

No tables are available - create one!

+ {% if object_list.exists %} + + + + + + + + + + + + {% if show_published %}{% endif %} + + + + + + {% for object in object_list %} + + + + {% if show_published %}{% endif %} + + + + {% endfor %} + +
TitleTable typePublishedCreatedModified
{{object.title}} + {% if obj_perms.edit and not object.published %} + + {% endif %} + {% debug_badge object.id %} + {{object.get_table_type_display}}{{object.published}}{{object.created|date:"Y-m-d" }}{{object.last_updated|date:"Y-m-d" }}
+ {% include "includes/paginator.html" with plural_object_name="tables" %} {% else %} -

No tables are available.

+ {% if obj_perms.edit %} +

No tables are available - create one!

+ {% else %} +

No tables are available.

+ {% endif %} {% endif %} -{% endif %} {% endblock %} diff --git a/hawc/apps/summary/templates/summary/summarytext_form.html b/hawc/apps/summary/templates/summary/summarytext_form.html index 02b79cd472..03bb9e0919 100644 --- a/hawc/apps/summary/templates/summary/summarytext_form.html +++ b/hawc/apps/summary/templates/summary/summarytext_form.html @@ -1,13 +1,13 @@ {% extends 'assessment-rooted.html' %} {% block content %} -
-
-

Modify summary text

+
+
+

Modify summary text

+
+
-
-
-{% include "summary/_smartTagEditModal.html" with modal_id="smartTagModal" form=smart_tag_form only %} + {% include "summary/_smartTagEditModal.html" with modal_id="smartTagModal" form=smart_tag_form only %} {% endblock %} {% block extrajs %} diff --git a/hawc/apps/summary/templates/summary/visual_detail.html b/hawc/apps/summary/templates/summary/visual_detail.html index 267e7cc3cc..6c34a290b9 100644 --- a/hawc/apps/summary/templates/summary/visual_detail.html +++ b/hawc/apps/summary/templates/summary/visual_detail.html @@ -1,7 +1,7 @@ {% extends 'assessment-rooted.html' %} {% block extrahead %} - + {% endblock %} {% block content %} diff --git a/hawc/apps/summary/templates/summary/visual_detail_image.html b/hawc/apps/summary/templates/summary/visual_detail_image.html index e483b7fee8..9ec01f7148 100644 --- a/hawc/apps/summary/templates/summary/visual_detail_image.html +++ b/hawc/apps/summary/templates/summary/visual_detail_image.html @@ -2,25 +2,25 @@ {% load static %} {% block extrahead %} - + {% endblock %} {% block content %} -
-
-

{{object.title}}

- {% include "common/unpublished_badge.html" %} - {% if obj_perms.edit %} - {% actions %} - Visualization editing - Update - Delete - {% endactions %} - {% endif %} +
+
+

{{object.title}}

+ {% include "common/unpublished_badge.html" %} + {% if obj_perms.edit %} + {% actions %} + Visualization editing + Update + Delete + {% endactions %} + {% endif %} +
+
+ +
+

{{object.caption|safe}}

-
- -
-

{{object.caption|safe}}

-
{% endblock %} diff --git a/hawc/apps/summary/templates/summary/visual_detail_plotly.html b/hawc/apps/summary/templates/summary/visual_detail_plotly.html index 0e0d062242..72d78737e7 100644 --- a/hawc/apps/summary/templates/summary/visual_detail_plotly.html +++ b/hawc/apps/summary/templates/summary/visual_detail_plotly.html @@ -1,23 +1,23 @@ {% extends 'assessment-rooted.html' %} {% block extrahead %} - + {% endblock %} {% block content %} -
-
-

{{object.title}}

- {% include "common/unpublished_badge.html" %} - {% if obj_perms.edit %} - {% actions %} - Visualization editing - Update - Delete - {% endactions %} - {% endif %} +
+
+

{{object.title}}

+ {% include "common/unpublished_badge.html" %} + {% if obj_perms.edit %} + {% actions %} + Visualization editing + Update + Delete + {% endactions %} + {% endif %} +
+ {% plotly object.get_plotly_from_json %} +

{{object.caption|safe}}

- {% plotly object.get_plotly_from_json %} -

{{object.caption|safe}}

-
{% endblock %} diff --git a/hawc/apps/summary/templates/summary/visual_form.html b/hawc/apps/summary/templates/summary/visual_form.html index ce9eac5a29..d0c1a17c2a 100644 --- a/hawc/apps/summary/templates/summary/visual_form.html +++ b/hawc/apps/summary/templates/summary/visual_form.html @@ -1,57 +1,57 @@ {% extends 'assessment-rooted.html' %} {% block content %} -