Skip to content

Commit

Permalink
Merge branch 'major/4' into fix/submit_validation_bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@EdoStorm96
EdoStorm96 committed Jan 8, 2025
2 parents aded79e + 300591d commit e8b9e3a
Show file tree
Hide file tree
Showing 6 changed files with 171 additions and 95 deletions.
16 changes: 11 additions & 5 deletions main/templates/main/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,21 @@ <h3>{% trans 'Resources' %}</h3>
{# What should this be in dutch tho? #}
<ul>
<li>
{% trans "<a href='http://fetc-gw.wp.hum.uu.nl/' target='_blank'>FETC-GW website</a>" %}
{% blocktrans trimmed %}
<a href='http://fetc-gw.wp.hum.uu.nl/' target='_blank'>FETC-GW website</a>
{% endblocktrans %}
</li>
<li>
{% trans "<a href='https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/'
target='_blank'>Reglement van de FETC-GW</a>" %}
{% blocktrans trimmed %}
<a href='https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/'
target='_blank'>Reglement van de FETC-GW</a>
{% endblocktrans %}
</li>
<li>
{% trans "<a href='https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw'
target='_blank'>Voorbeelddocumenten</a>" %}
{% blocktrans trimmed %}
<a href='https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw'
target='_blank'>Voorbeelddocumenten</a>
{% endblocktrans %}
</li>
<li>
<a href="{% url 'faqs:list' %}">{% trans "Veelgestelde vragen m.b.t. dit portal" %}</a>
Expand Down
121 changes: 69 additions & 52 deletions proposals/fixtures/testing/test_proposals.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
"model": "proposals.proposal",
"pk": 1,
"fields": {
"reference_number": "23-003-01",
"reference_number": "24-009-01",
"reviewing_committee": 3,
"institution": 2,
"date_start": "2025-01-01",
"title": "Fixture proposal",
"summary": "asdf",
"institution": 4,
"date_start": "2024-12-27",
"title": "Normal test proposal",
"summary": "fsefsdfes",
"other_applicants": false,
"other_stakeholders": false,
"stakeholders": "",
"translated_forms": true,
"translated_forms_languages": "asdf",
"funding_details": "",
"funding_name": "",
"comments": "asdf",
"inform_local_staff": true,
"embargo": true,
"embargo_end_date": "2024-09-01",
"translated_forms": false,
"translated_forms_languages": null,
"funding_details": "fsefdsf",
"funding_name": "esfdegf",
"comments": "aaaaa",
"inform_local_staff": null,
"embargo": false,
"embargo_end_date": null,
"in_archive": false,
"is_pre_assessment": false,
"pre_assessment_pdf": "",
Expand All @@ -28,23 +28,28 @@
"pre_approval_pdf": "",
"in_course": false,
"is_exploration": false,
"pdf": "FETC-AK-23-003-01-Proposal.pdf",
"studies_similar": false,
"studies_number": 3,
"pdf": "",
"studies_similar": true,
"studies_number": 1,
"status": 1,
"status_review": null,
"dmp_file": "FETC-AK-23-003-01-DMP.pdf",
"privacy_officer": false,
"dmp_file": "",
"confirmation_comments": "",
"date_created": "2023-11-28T12:59:17.670Z",
"date_modified": "2023-11-28T13:36:55.297Z",
"date_created": "2024-12-19T14:52:13.624Z",
"date_modified": "2024-12-23T10:29:26.363Z",
"date_submitted_supervisor": null,
"date_reviewed_supervisor": null,
"date_submitted": "2023-11-28T13:36:55.296Z",
"date_submitted": null,
"date_reviewed": null,
"date_confirmed": null,
"has_minor_revision": false,
"minor_revision_description": null,
"self_assessment": "asdf",
"self_assessment": "gsdfges",
"knowledge_security": "N",
"knowledge_security_details": "",
"researcher_risk": "N",
"researcher_risk_details": "",
"relation": 5,
"student_program": "",
"student_context": null,
Expand All @@ -55,7 +60,7 @@
"parent": null,
"is_revision": false,
"funding": [
1
3
],
"applicants": [
5
Expand All @@ -66,23 +71,23 @@
"model": "proposals.proposal",
"pk": 2,
"fields": {
"reference_number": "23-004-01",
"reference_number": "24-010-01",
"reviewing_committee": 3,
"institution": 2,
"date_start": "2024-08-01",
"title": "Fixture Preassessment",
"institution": 4,
"date_start": "2042-12-25",
"title": "Preassessment test proposal",
"summary": "",
"other_applicants": false,
"other_stakeholders": true,
"stakeholders": "asdf",
"other_stakeholders": false,
"stakeholders": "",
"translated_forms": null,
"translated_forms_languages": null,
"funding_details": "",
"funding_name": "",
"comments": "asdf",
"funding_name": "aaaaa",
"comments": "asdfda",
"inform_local_staff": null,
"embargo": true,
"embargo_end_date": "2024-11-01",
"embargo": null,
"embargo_end_date": null,
"in_archive": false,
"is_pre_assessment": true,
"pre_assessment_pdf": "test_pdf.pdf",
Expand All @@ -91,23 +96,28 @@
"pre_approval_pdf": "",
"in_course": false,
"is_exploration": false,
"pdf": "FETC-AK-23-004-01-Proposal.pdf",
"pdf": "",
"studies_similar": null,
"studies_number": 1,
"status": 1,
"status_review": null,
"privacy_officer": null,
"dmp_file": "",
"confirmation_comments": "",
"date_created": "2023-11-28T14:10:12.708Z",
"date_modified": "2023-11-28T14:10:40.554Z",
"date_created": "2024-12-23T10:30:40.272Z",
"date_modified": "2024-12-23T10:35:22.000Z",
"date_submitted_supervisor": null,
"date_reviewed_supervisor": null,
"date_submitted": "2023-11-28T14:10:40.554Z",
"date_submitted": null,
"date_reviewed": null,
"date_confirmed": null,
"has_minor_revision": false,
"minor_revision_description": null,
"self_assessment": "asdf",
"knowledge_security": "",
"knowledge_security_details": "",
"researcher_risk": "",
"researcher_risk_details": "",
"relation": 5,
"student_program": "",
"student_context": null,
Expand All @@ -117,7 +127,9 @@
"supervisor": null,
"parent": null,
"is_revision": false,
"funding": [],
"funding": [
2
],
"applicants": [
5
]
Expand All @@ -127,48 +139,53 @@
"model": "proposals.proposal",
"pk": 3,
"fields": {
"reference_number": "23-005-01",
"reference_number": "24-011-01",
"reviewing_committee": 3,
"institution": 2,
"date_start": "2024-08-01",
"title": "Fixture Preapproval",
"summary": "asdf",
"institution": 4,
"date_start": "2046-12-21",
"title": "Preapproved test pdf",
"summary": "asd",
"other_applicants": false,
"other_stakeholders": false,
"stakeholders": "",
"translated_forms": null,
"translated_forms": false,
"translated_forms_languages": null,
"funding_details": "",
"funding_name": "",
"comments": "asdf",
"comments": "asd",
"inform_local_staff": null,
"embargo": true,
"embargo_end_date": "2025-01-10",
"embargo": false,
"embargo_end_date": null,
"in_archive": false,
"is_pre_assessment": false,
"pre_assessment_pdf": "",
"is_pre_approved": true,
"pre_approval_institute": "asdf",
"pre_approval_institute": "asd",
"pre_approval_pdf": "test_pdf.pdf",
"in_course": false,
"is_exploration": false,
"pdf": "FETC-AK-23-005-01-Proposal.pdf",
"pdf": "",
"studies_similar": null,
"studies_number": 1,
"status": 1,
"status_review": null,
"privacy_officer": true,
"dmp_file": "",
"confirmation_comments": "",
"date_created": "2023-11-28T14:28:19.045Z",
"date_modified": "2023-11-28T14:28:31.971Z",
"date_created": "2024-12-23T11:15:55.495Z",
"date_modified": "2024-12-23T11:17:02.358Z",
"date_submitted_supervisor": null,
"date_reviewed_supervisor": null,
"date_submitted": "2023-11-28T14:28:31.971Z",
"date_submitted": null,
"date_reviewed": null,
"date_confirmed": null,
"has_minor_revision": false,
"minor_revision_description": null,
"self_assessment": "asdf",
"self_assessment": "asd",
"knowledge_security": "",
"knowledge_security_details": "",
"researcher_risk": "",
"researcher_risk_details": "",
"relation": 5,
"student_program": "",
"student_context": null,
Expand Down
Loading

0 comments on commit e8b9e3a

Please sign in to comment.