Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Made Donor Consent Form Consistent #153

Merged
merged 1 commit into from
Feb 5, 2022
Merged

Made Donor Consent Form Consistent #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions services/web/app/static/js/donor/donor_consent_questionnaire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2020 Keiron O'Shea <keo7@aber.ac.uk>
Copyright (C) 2022 Keiron O'Shea <keo7@aber.ac.uk>

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
Expand All @@ -17,18 +17,16 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.


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();

}
}
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion services/web/app/static/js/sample/information/add/consent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 2012 Keiron O'Shea <keo7@aber.ac.uk>
Copyright (C) 2022 Keiron O'Shea <keo7@aber.ac.uk>

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
Expand Down
21 changes: 11 additions & 10 deletions services/web/app/templates/sample/add/step_two.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,31 @@ <h3>Version: {{ consent_template.version }}</h3>
</div>
</div>

</div>
</div>

<div class="card">
<div class="row">
<div class="col-6">
<div class="col-12">
{{ form_field(form.study_select) }}
</div>
<div class="col-6">
<div class="col-12" id="study_reference_id_div" style="display: none;">
{{ form_field(form.study.reference_id)}}
</div>
</div>
{{ form_field(form.study.comments) }}
<div class="row">
<div class="col-6">
<div class="col-12" id="study_comments_div" style="display: none">
{{ form_field(form.study.comments) }}
</div>
</div>
<div class="row">
<div class="col-6" id="study_date_div" style="display: none;">
{{ form_field(form.study.date) }}

</div>
<div class="col-6">
<div class="col-6" id="study_undertaken_by_div" style="display: none;">
{{ form_field(form.study.undertaken_by) }}
</div>
</div>
</div>

</div>
</div>

{{ form_field(form.submit) }}

Expand Down