Merge pull request #271 from peskk3am/issue_205

bbmri metadata edited. Fixes issue #205.
EUDAT-B2SHARE · Apr 19, 2014 · 57e2920 · 57e2920
2 parents 3780280 + c312d1f
commit 57e2920
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/simplestore/lib/simplestore_model/metadata/bbmri_metadata_config.py b/simplestore/lib/simplestore_model/metadata/bbmri_metadata_config.py
@@ -42,12 +42,11 @@
         'name': 'study_design',
         'col_type': db.String(256),
         'display_text': 'Study design',
-        'description': 'The type of study. Can be one or several of the following values: '
-                       'Case-control, Cohort, Cross-sectional, Longitudinal, '
-                       'Twin-study, Quality control, Population-based, Other',
-        'data_provide': 'typeahead',
-        'data_source': json.dumps(['Case-control', 'Cohort', 'Cross-sectional', 'Longitudinal',
-                                   'Twin-study', 'Quality control', 'Population-based']),
+        'data_provide': 'select',
+        'cardinality': 'n',
+        'description': 'The type of study. Can be one or several of the following values.',
+        'data_source': ['Case-control', 'Cohort', 'Cross-sectional', 'Longitudinal',
+                        'Twin-study', 'Quality control', 'Population-based', 'Other'],
         'required': False
     },
     {
@@ -65,9 +64,11 @@
                        'Can be one or several of the following values: '
                        'Biological samples, Register data, Survey data, '
                        'Physiological measurements, Imaging data, Medical records, Other',
-        'data_provide': 'typeahead',
-        'data_source': json.dumps(['Biological samples', 'Register data', 'Survey data',
-                                   'Physiological measurements', 'Imaging data', 'Medical records']),
+        'data_provide': 'select',
+        'cardinality': 'n',
+        'data_source': ['Biological samples', 'Register data', 'Survey data',
+                        'Physiological measurements', 'Imaging data', 
+                        'Medical records', 'Other'],
         'required': False
     },
     {
@@ -89,8 +90,9 @@
         'col_type': db.String(256),
         'display_text': 'Sex',
         'description': 'The sex of the study participants. Can be several of the following values: Female, Male, Other',
-        'data_provide': 'typeahead',
-        'data_source': json.dumps(['Female', 'Male']),
+        'data_provide': 'select',
+        'cardinality': 'n',
+        'data_source': ['Female', 'Male', 'Other'],
         'required': False
     },
     {
@@ -107,9 +109,10 @@
         'description': 'The nature of the biological samples that are included in the study, if any. '
                        'Can be one or several of the following values: '
                        'Whole blood, Plasma, Serum, Urine, Saliva, CSF, DNA, RNA, Tissue, Faeces, Other',
-        'data_provide': 'typeahead',
-        'data_source': json.dumps(['Whole blood', 'Plasma', 'Serum', 'Urine', 'Saliva',
-                                   'CSF', 'DNA', 'RNA', 'Tissue', 'Faeces']),
+        'data_provide': 'select',
+        'cardinality': 'n',
+        'data_source': ['Whole blood', 'Plasma', 'Serum', 'Urine', 'Saliva',
+                        'CSF', 'DNA', 'RNA', 'Tissue', 'Faeces', 'Other'],
         'required': False
     },
 ]