From 497f2ceb9848d2538b80de7a3e12aa891a873713 Mon Sep 17 00:00:00 2001
From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:35:02 +0100
Subject: [PATCH 1/6] merge the two question sets

---
 rdmorganiser/questions/rdmo.xml | 76 +++++++++------------------------
 1 file changed, 21 insertions(+), 55 deletions(-)

diff --git a/rdmorganiser/questions/rdmo.xml b/rdmorganiser/questions/rdmo.xml
index 613eafc5..a4235d20 100644
--- a/rdmorganiser/questions/rdmo.xml
+++ b/rdmorganiser/questions/rdmo.xml
@@ -673,44 +673,44 @@
 		<optionsets/>
 		<conditions/>
 	</question>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements-yesno">
+	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
-		<key>other-requirements-yesno</key>
-		<path>rdmo/general/other-requirements-yesno</path>
+		<key>other-requirements</key>
+		<path>rdmo/general/other-requirements</path>
 		<dc:comment/>
 		<attribute/>
 		<section dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general"/>
 		<is_collection>False</is_collection>
 		<order>50</order>
-		<title lang="en">Other requirements I</title>
+		<title lang="en">Other requirements</title>
 		<help lang="en"/>
 		<verbose_name lang="en"/>
 		<verbose_name_plural lang="en"/>
-		<title lang="de">Weitere Anforderungen I</title>
+		<title lang="de">Weitere Anforderungen</title>
 		<help lang="de"/>
 		<verbose_name lang="de"/>
 		<verbose_name_plural lang="de"/>
-		<title lang="es">Otros requisitos I</title>
+		<title lang="es">Otros requisitos</title>
 		<help lang="es"/>
 		<verbose_name lang="es"/>
 		<verbose_name_plural lang="es"/>
-		<title lang="fr">Autres exigences I</title>
+		<title lang="fr">Autres exigences</title>
 		<help lang="fr"/>
 		<verbose_name lang="fr"/>
 		<verbose_name_plural lang="fr"/>
-		<title lang="it">Ulteriori condizioni I</title>
+		<title lang="it">Ulteriori condizioni</title>
 		<help lang="it"/>
 		<verbose_name lang="it"/>
 		<verbose_name_plural lang="it"/>
 		<conditions/>
 	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements-yesno/yesno">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements/yesno">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>yesno</key>
-		<path>rdmo/general/other-requirements-yesno/yesno</path>
+		<path>rdmo/general/other-requirements/yesno</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/yesno"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements-yesno"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements"/>
 		<is_collection>False</is_collection>
 		<order>0</order>
 		<help lang="en">Examples of discipline-specific requirements:
@@ -751,59 +751,24 @@ Además las pautas específicas de la disciplina sobre el manejo de los datos de
 		<text lang="it">Esistono ulteriori condizioni sulla gestione dei dati di altra provenienza (per esempio dalla comunità accademica o scientifica)?</text>
 		<verbose_name lang="it"/>
 		<verbose_name_plural lang="it"/>
-		<widget_type>radio</widget_type>
+		<widget_type>yesno</widget_type>
 		<value_type>boolean</value_type>
 		<maximum/>
 		<minimum/>
 		<step/>
 		<unit/>
-		<optionsets>
-			<optionset dc:uri="https://rdmorganiser.github.io/terms/options/other_requirements_options"/>
-		</optionsets>
+		<optionsets/>
 		<conditions/>
 	</question>
-	<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements-requirements">
-		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
-		<key>other-requirements-requirements</key>
-		<path>rdmo/general/other-requirements-requirements</path>
-		<dc:comment/>
-		<attribute/>
-		<section dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general"/>
-		<is_collection>False</is_collection>
-		<order>51</order>
-		<title lang="en">Other requirements II</title>
-		<help lang="en"/>
-		<verbose_name lang="en"/>
-		<verbose_name_plural lang="en"/>
-		<title lang="de">Weitere Anforderungen II</title>
-		<help lang="de"/>
-		<verbose_name lang="de"/>
-		<verbose_name_plural lang="de"/>
-		<title lang="es">Otros requisitos II</title>
-		<help lang="es"/>
-		<verbose_name lang="es"/>
-		<verbose_name_plural lang="es"/>
-		<title lang="fr">Autres exigences II</title>
-		<help lang="fr"/>
-		<verbose_name lang="fr"/>
-		<verbose_name_plural lang="fr"/>
-		<title lang="it">Ulteriori condizioni II</title>
-		<help lang="it"/>
-		<verbose_name lang="it"/>
-		<verbose_name_plural lang="it"/>
-		<conditions>
-			<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/additional_rdm_policy"/>
-		</conditions>
-	</questionset>
-	<question dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements-requirements/requirements">
+	<question dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements/requirements">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>requirements</key>
-		<path>rdmo/general/other-requirements-requirements/requirements</path>
+		<path>rdmo/general/other-requirements/requirements</path>
 		<dc:comment/>
 		<attribute dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/requirements"/>
-		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements-requirements"/>
+		<questionset dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements"/>
 		<is_collection>False</is_collection>
-		<order>0</order>
+		<order>1</order>
 		<help lang="en">Please briefly outline them and refer to more detailed sources of information if necessary. Please also indicate, if the rules / guidelines are mandatory or optional.</help>
 		<text lang="en">Which are these additional requirements regarding data management?</text>
 		<verbose_name lang="en"/>
@@ -831,9 +796,10 @@ Además las pautas específicas de la disciplina sobre el manejo de los datos de
 		<step/>
 		<unit/>
 		<optionsets/>
-		<conditions/>
-	</question>
-	<section dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/content-classification">
+		<conditions>
+			<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/additional_rdm_policy"/>
+		</conditions>
+	</question>	<section dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/content-classification">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>content-classification</key>
 		<path>rdmo/content-classification</path>

From 11e3e147dfa7bd447a6a781bf51f4415b920fa98 Mon Sep 17 00:00:00 2001
From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:39:38 +0100
Subject: [PATCH 2/6] Update condition for boolean variable

---
 rdmorganiser/conditions/rdmo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmorganiser/conditions/rdmo.xml b/rdmorganiser/conditions/rdmo.xml
index 905b06ac..05e04a6d 100644
--- a/rdmorganiser/conditions/rdmo.xml
+++ b/rdmorganiser/conditions/rdmo.xml
@@ -7,7 +7,7 @@
 		<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/yesno"/>
 		<relation>eq</relation>
 		<target_text/>
-		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/other_requirements_options/146"/>
+		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/yes_with_text_no/yes"/>
 	</condition>
 	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/costs_relevant">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>

From 6f728da8abc11dd2c434a1e794eff5fdc96b33c6 Mon Sep 17 00:00:00 2001
From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:44:49 +0100
Subject: [PATCH 3/6] Remove additional text from option

---
 rdmorganiser/options/rdmo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmorganiser/options/rdmo.xml b/rdmorganiser/options/rdmo.xml
index faccabce..f683b0d7 100644
--- a/rdmorganiser/options/rdmo.xml
+++ b/rdmorganiser/options/rdmo.xml
@@ -2660,7 +2660,7 @@
 		<text lang="es">Sí</text>
 		<text lang="fr">Oui</text>
 		<text lang="it">Sì</text>
-		<additional_input>True</additional_input>
+		<additional_input>False</additional_input>
 	</option>
 	<option dc:uri="https://rdmorganiser.github.io/terms/options/other_requirements_options/144">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>

From d8e36e389c0d23468c2527923f6d86ea41d63bf8 Mon Sep 17 00:00:00 2001
From: Giacomo Lanza <lanza01@pad.ptb.de>
Date: Wed, 1 Nov 2023 15:47:27 +0100
Subject: [PATCH 4/6] Revert "Update condition for boolean variable"

This reverts commit 11e3e147dfa7bd447a6a781bf51f4415b920fa98.
---
 rdmorganiser/conditions/rdmo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdmorganiser/conditions/rdmo.xml b/rdmorganiser/conditions/rdmo.xml
index 05e04a6d..905b06ac 100644
--- a/rdmorganiser/conditions/rdmo.xml
+++ b/rdmorganiser/conditions/rdmo.xml
@@ -7,7 +7,7 @@
 		<source dc:uri="https://rdmorganiser.github.io/terms/domain/project/additional_rdm_policy/yesno"/>
 		<relation>eq</relation>
 		<target_text/>
-		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/yes_with_text_no/yes"/>
+		<target_option dc:uri="https://rdmorganiser.github.io/terms/options/other_requirements_options/146"/>
 	</condition>
 	<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/costs_relevant">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>

From 67e83fcf113cafbcf8e03118bbf3d200208dbd65 Mon Sep 17 00:00:00 2001
From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:49:48 +0100
Subject: [PATCH 5/6] Change variable type to text

---
 rdmorganiser/questions/rdmo.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rdmorganiser/questions/rdmo.xml b/rdmorganiser/questions/rdmo.xml
index a4235d20..311a1572 100644
--- a/rdmorganiser/questions/rdmo.xml
+++ b/rdmorganiser/questions/rdmo.xml
@@ -751,13 +751,15 @@ Además las pautas específicas de la disciplina sobre el manejo de los datos de
 		<text lang="it">Esistono ulteriori condizioni sulla gestione dei dati di altra provenienza (per esempio dalla comunità accademica o scientifica)?</text>
 		<verbose_name lang="it"/>
 		<verbose_name_plural lang="it"/>
-		<widget_type>yesno</widget_type>
-		<value_type>boolean</value_type>
+		<widget_type>radio</widget_type>
+		<value_type>text</value_type>
 		<maximum/>
 		<minimum/>
 		<step/>
 		<unit/>
-		<optionsets/>
+		<optionsets>
+			<optionset dc:uri="https://rdmorganiser.github.io/terms/options/other_requirements_options"/>
+		</optionsets>
 		<conditions/>
 	</question>
 	<question dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/general/other-requirements/requirements">

From 17e5865c0bc45612b41205a2ad4299e0069109d9 Mon Sep 17 00:00:00 2001
From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:50:52 +0100
Subject: [PATCH 6/6] Update rdmo.xml

---
 rdmorganiser/questions/rdmo.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rdmorganiser/questions/rdmo.xml b/rdmorganiser/questions/rdmo.xml
index 311a1572..16f28cc9 100644
--- a/rdmorganiser/questions/rdmo.xml
+++ b/rdmorganiser/questions/rdmo.xml
@@ -801,7 +801,8 @@ Además las pautas específicas de la disciplina sobre el manejo de los datos de
 		<conditions>
 			<condition dc:uri="https://rdmorganiser.github.io/terms/conditions/additional_rdm_policy"/>
 		</conditions>
-	</question>	<section dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/content-classification">
+	</question>
+	<section dc:uri="https://rdmorganiser.github.io/terms/questions/rdmo/content-classification">
 		<uri_prefix>https://rdmorganiser.github.io/terms</uri_prefix>
 		<key>content-classification</key>
 		<path>rdmo/content-classification</path>