diff --git a/services/web/app/static/js/donor/donor_consent_questionnaire.js b/services/web/app/static/js/donor/donor_consent_questionnaire.js index 55443b0d..27eb0775 100644 --- a/services/web/app/static/js/donor/donor_consent_questionnaire.js +++ b/services/web/app/static/js/donor/donor_consent_questionnaire.js @@ -1,5 +1,5 @@ /* -Copyright (C) 2020 Keiron O'Shea +Copyright (C) 2022 Keiron O'Shea This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,18 +17,16 @@ along with this program. If not, see . function view_study_protocol() { - if ($("#study_select").val()>0){ - $("#study-reference_id_div").show(); - $("#study-date_div").show(); - - - $("#study-comments_div").show(); - $("#study-undertaken_by_div").show(); + if ($("#study_select").val() > 0){ + $("#study_reference_id_div").show(); + $("#study_comments_div").show(); + $("#study_date_div").show(); + $("#study_undertaken_by_div").show(); } else { - $("#study-reference_id_div").hide(); - $("#study-date_div").hide(); - $("#study-comments_div").hide(); - $("#study-undertaken_by_div").hide(); + $("#study_reference_id_div").hide(); + $("#study_comments_div").hide(); + $("#study_date_div").hide(); + $("#study_undertaken_by_div").hide(); } } @@ -43,6 +41,7 @@ $(document).ready(function() { $("#study_select").on("change", function() { + console.log($("#study_select").val() ); view_study_protocol(); if ($("#study_select").val()>0) { $("#study-date").val($("#date").val()); diff --git a/services/web/app/static/js/sample/information/add/consent.js b/services/web/app/static/js/sample/information/add/consent.js index 96155592..f6fb0290 100644 --- a/services/web/app/static/js/sample/information/add/consent.js +++ b/services/web/app/static/js/sample/information/add/consent.js @@ -1,5 +1,5 @@ /* -Copyright (C) 2012 Keiron O'Shea +Copyright (C) 2022 Keiron O'Shea This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/services/web/app/templates/sample/add/step_two.html b/services/web/app/templates/sample/add/step_two.html index 6d5b8ff3..f0d292ec 100644 --- a/services/web/app/templates/sample/add/step_two.html +++ b/services/web/app/templates/sample/add/step_two.html @@ -56,30 +56,31 @@

Version: {{ consent_template.version }}

- - - -
-
+
{{ form_field(form.study_select) }}
-
+
- {{ form_field(form.study.comments) }}
-
+ +
+
+ -
+
-
+
+
{{ form_field(form.submit) }}