Flip logic on publisherOrigin question

As suggested by @shevski. This does create an issue with the display of the question on the certificate. That text is currently being presented as: Heading (from the questions display field): (answer text) which in this case will result in: This data was: No, we created all the data ourselves which doesn’t suit the statement tone of the certificate page.
theodi · Jun 1, 2015 · 08c380e · 08c380e
1 parent b1e7c46
commit 08c380e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/prototype/jurisdictions/certificate.GB.xml b/prototype/jurisdictions/certificate.GB.xml
@@ -50,13 +50,13 @@
 			</if>
 			<if test="this.publisherRights() === 'yes' || this.publisherRights() === 'unsure'">
 				<question id="publisherOrigin" display="This data was">
-					<label>Was <em>all</em> this data originally created or gathered by you?</label>
-					<yesno required="required" yes="originally created or generated by its curator" />
+					<label>Is this dataset using any data from external sources?</label>
+					<yesno required="required" no="No, we created all the data ourselves" />
 					<help>If any part of this data was sourced outside your organisation by other individuals or organisations then you need to give extra information about your right to publish it.</help>
 				</question>
 			</if>
 			<if test="this.publisherRights() === 'unsure'">
-				<if test="this.publisherOrigin() === 'false'">
+				<if test="this.publisherOrigin() === 'true'">
 					<question id="thirdPartyOrigin">
 						<label>Was some of this data extracted or calculated from other data?</label>
 						<yesno required="required"/>
@@ -105,7 +105,7 @@
 					</if>
 				</if>
 			</if>
-			<if test="this.publisherOrigin() === 'false'">
+			<if test="this.publisherOrigin() === 'true'">
 				<question id="sourceDocumentationUrl" display="The sources of this data are described at">
 					<label>Where do you describe sources of this data?</label>
 					<input type="url" placeholder="Data Sources Documentation URL"/>

diff --git a/surveys/odc_questionnaire.UK.rb b/surveys/odc_questionnaire.UK.rb
@@ -132,7 +132,7 @@
     condition_A :q_publisherRights, '==', :a_complicated
     condition_B :q_rightsRiskAssessment, '==', {:string_value => '', :answer_reference => '1'}
 
-    q_publisherOrigin 'Was <em>all</em> this data originally created or gathered by you?',
+    q_publisherOrigin 'Is this dataset using any data from external sources?',
       :discussion_topic => :gb_publisherOrigin,
       :display_on_certificate => true,
       :text_as_statement => 'This data was',
@@ -143,9 +143,9 @@
     condition_A :q_publisherRights, '==', :a_yes
     condition_B :q_publisherRights, '==', :a_unsure
     a_false 'no',
-      :text_as_statement => ''
+      :text_as_statement => 'No, we created all the data ourselves'
     a_true 'yes',
-      :text_as_statement => 'originally created or generated by its curator'
+      :text_as_statement => ''
 
     q_thirdPartyOrigin 'Was some of this data extracted or calculated from other data?',
       :discussion_topic => :gb_thirdPartyOrigin,
@@ -154,7 +154,7 @@
       :required => :required
     dependency :rule => 'A and B'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     a_false 'no'
     a_true 'yes',
       :requirement => ['basic_3']
@@ -164,7 +164,7 @@
       :requirement => 'basic_3'
     dependency :rule => 'A and B and C and D'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_crowdsourced, '==', :a_false
     condition_D :q_thirdPartyOrigin, '!=', :a_true
 
@@ -177,7 +177,7 @@
       :required => :required
     dependency :rule => 'A and B and C'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_thirdPartyOrigin, '==', :a_true
     a_false 'no',
       :text_as_statement => ''
@@ -190,7 +190,7 @@
       :requirement => 'basic_4'
     dependency :rule => 'A and B and C and D and E'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_thirdPartyOrigin, '==', :a_true
     condition_D :q_thirdPartyOpen, '==', :a_false
     condition_E :q_thirdPartyOpen, '==', :a_false
@@ -204,7 +204,7 @@
       :required => :required
     dependency :rule => 'A and B'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     a_false 'no',
       :text_as_statement => ''
     a_true 'yes',
@@ -216,7 +216,7 @@
       :requirement => 'basic_5'
     dependency :rule => 'A and B and C and D'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_thirdPartyOrigin, '==', :a_false
     condition_D :q_crowdsourced, '!=', :a_true
 
@@ -227,7 +227,7 @@
       :required => :required
     dependency :rule => 'A and B and C'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_crowdsourced, '==', :a_true
     a_false 'no'
     a_true 'yes'
@@ -241,7 +241,7 @@
       :required => :required
     dependency :rule => 'A and B and C and D'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_crowdsourced, '==', :a_true
     condition_D :q_crowdsourcedContent, '==', :a_true
     a_1 'Contributor Licence Agreement URL',
@@ -257,7 +257,7 @@
       :required => :required
     dependency :rule => 'A and B and C and D'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_crowdsourced, '==', :a_true
     condition_D :q_crowdsourcedContent, '==', :a_true
     a_false 'no'
@@ -269,7 +269,7 @@
       :requirement => 'basic_6'
     dependency :rule => 'A and B and C and D and E'
     condition_A :q_publisherRights, '==', :a_unsure
-    condition_B :q_publisherOrigin, '==', :a_false
+    condition_B :q_publisherOrigin, '==', :a_true
     condition_C :q_crowdsourced, '==', :a_true
     condition_D :q_crowdsourcedContent, '==', :a_true
     condition_E :q_cldsRecorded, '==', :a_false
@@ -280,7 +280,7 @@
       :text_as_statement => 'The sources of this data are described at',
       :help_text => 'Give a URL that documents where the data was sourced from (its provenance) and the rights under which you publish the data. This helps people understand where the data comes from.'
     dependency :rule => 'A'
-    condition_A :q_publisherOrigin, '==', :a_false
+    condition_A :q_publisherOrigin, '==', :a_true
     a_1 'Data Sources Documentation URL',
       :text,
       :input_type => :url,
@@ -291,7 +291,7 @@
       :custom_renderer => '/partials/requirement_pilot',
       :requirement => 'pilot_3'
     dependency :rule => 'A and B'
-    condition_A :q_publisherOrigin, '==', :a_false
+    condition_A :q_publisherOrigin, '==', :a_true
     condition_B :q_sourceDocumentationUrl, '==', {:string_value => '', :answer_reference => '1'}
 
     q_sourceDocumentationMetadata 'Is documentation about the sources of this data also in machine-readable format?',
@@ -301,7 +301,7 @@
       :help_text => 'Information about data sources should be human-readable so people can understand it, as well as in a metadata format that computers can process. When everyone does this it helps other people find out how the same open data is being used and justify its ongoing publication.',
       :pick => :one
     dependency :rule => 'A and B'
-    condition_A :q_publisherOrigin, '==', :a_false
+    condition_A :q_publisherOrigin, '==', :a_true
     condition_B :q_sourceDocumentationUrl, '!=', {:string_value => '', :answer_reference => '1'}
     a_false 'no',
       :text_as_statement => ''
@@ -313,7 +313,7 @@
       :custom_renderer => '/partials/requirement_standard',
       :requirement => 'standard_2'
     dependency :rule => 'A and B and C'
-    condition_A :q_publisherOrigin, '==', :a_false
+    condition_A :q_publisherOrigin, '==', :a_true
     condition_B :q_sourceDocumentationUrl, '!=', {:string_value => '', :answer_reference => '1'}
     condition_C :q_sourceDocumentationMetadata, '==', :a_false
 

diff --git a/surveys/translations/odc.UK.en.yml b/surveys/translations/odc.UK.en.yml
@@ -83,16 +83,16 @@ questions:
       a_1:
         text: "Risk Documentation URL"
   publisherOrigin:
-    text: "Was <em>all</em> this data originally created or gathered by you?"
+    text: "Is this dataset using any data from external sources?"
     text_as_statement: "This data was"
     help_text: "If any part of this data was sourced outside your organisation by other individuals or organisations then you need to give extra information about your right to publish it."
     answers:
       a_false:
         text: no
-        text_as_statement: ""
+        text_as_statement: "No, we created all the data ourselves"
       a_true:
         text: yes
-        text_as_statement: "originally created or generated by its curator"
+        text_as_statement: ""
   thirdPartyOrigin:
     text: "Was some of this data extracted or calculated from other data?"
     help_text: "An extract or smaller part of someone else's data still means your rights to use it might be affected. There might also be legal issues if you analysed their data to produce new results from it."