preparation for migration to grails 3.x, lastests fixes for 1.5.x

ppazos · Oct 1, 2019 · a17678a · a17678a
1 parent 19f4126
commit a17678a
Show file tree

Hide file tree

Showing 55 changed files with 26,697 additions and 5,936 deletions.
diff --git a/grails-app/conf/DataSource.groovy b/grails-app/conf/DataSource.groovy
@@ -59,7 +59,7 @@ environments {
             url = "jdbc:mysql://$host:$port/$dbName" // ?useTimezone=true&serverTimezone=UTC
 
             username = 'root'
-            password = ''
+            password = 'toor'
         }
     }
     production {

diff --git a/opts/base_opts/tmp/LabResults1.opt → opts/base_opts/LabResults1.opt b/opts/base_opts/tmp/LabResults1.opt → opts/base_opts/LabResults1.opt
diff --git a/opts/base_opts/tmp/Problem List EN.opt → opts/base_opts/Problem List EN.opt b/opts/base_opts/tmp/Problem List EN.opt → opts/base_opts/Problem List EN.opt
diff --git a/opts/base_opts/tmp/Signos.opt → opts/base_opts/Signos.opt b/opts/base_opts/tmp/Signos.opt → opts/base_opts/Signos.opt
diff --git a/opts/base_opts/tmp/Simple Encounter EN.opt → opts/base_opts/Simple Encounter EN.opt b/opts/base_opts/tmp/Simple Encounter EN.opt → opts/base_opts/Simple Encounter EN.opt
diff --git a/opts/base_opts/tmp/Simple Encounter ES.opt → opts/base_opts/Simple Encounter ES.opt b/opts/base_opts/tmp/Simple Encounter ES.opt → opts/base_opts/Simple Encounter ES.opt
diff --git a/opts/base_opts/tmp/Simple Lab Order EN.opt → opts/base_opts/Simple Lab Order EN.opt b/opts/base_opts/tmp/Simple Lab Order EN.opt → opts/base_opts/Simple Lab Order EN.opt
diff --git a/...opts/tmp/Simple Vaccination Record EN.opt → ...ase_opts/Simple Vaccination Record EN.opt b/...opts/tmp/Simple Vaccination Record EN.opt → ...ase_opts/Simple Vaccination Record EN.opt
diff --git a/opts/base_opts/tmp/Test all datatypes_en.opt → opts/base_opts/Test all datatypes_en.opt b/opts/base_opts/tmp/Test all datatypes_en.opt → opts/base_opts/Test all datatypes_en.opt
diff --git a/opts/base_opts/tmp/Test all datatypes_es.opt → opts/base_opts/Test all datatypes_es.opt b/opts/base_opts/tmp/Test all datatypes_es.opt → opts/base_opts/Test all datatypes_es.opt
diff --git a/...ase_opts/tmp/Test index references EN.opt → opts/base_opts/Test index references EN.opt b/...ase_opts/tmp/Test index references EN.opt → opts/base_opts/Test index references EN.opt
diff --git a/...ase_opts/tmp/Test index references ES.opt → opts/base_opts/Test index references ES.opt b/...ase_opts/tmp/Test index references ES.opt → opts/base_opts/Test index references ES.opt
diff --git a/...e_opts/tmp/Test_Indexig_Evaluation_ES.opt → .../base_opts/Test_Indexig_Evaluation_ES.opt b/...e_opts/tmp/Test_Indexig_Evaluation_ES.opt → .../base_opts/Test_Indexig_Evaluation_ES.opt
diff --git a/opts/base_opts/tmp/Vital Signs.opt → opts/base_opts/Vital Signs.opt b/opts/base_opts/tmp/Vital Signs.opt → opts/base_opts/Vital Signs.opt
diff --git a/...ase_opts/tmp/datos_demograficos.es.v2.opt → opts/base_opts/datos_demograficos.es.v2.opt b/...ase_opts/tmp/datos_demograficos.es.v2.opt → opts/base_opts/datos_demograficos.es.v2.opt
diff --git a/...se_opts/tmp/test_index_admin_entry_EN.opt → opts/base_opts/test_index_admin_entry_EN.opt b/...se_opts/tmp/test_index_admin_entry_EN.opt → opts/base_opts/test_index_admin_entry_EN.opt
diff --git a/...se_opts/tmp/test_index_interval_event.opt → opts/base_opts/test_index_interval_event.opt b/...se_opts/tmp/test_index_interval_event.opt → opts/base_opts/test_index_interval_event.opt
diff --git a/opts/base_opts/tmp/test_indexing_section.opt → opts/base_opts/test_indexing_section.opt b/opts/base_opts/tmp/test_indexing_section.opt → opts/base_opts/test_indexing_section.opt
diff --git a/opts/base_opts/tmp/test_ism_paths.opt → opts/base_opts/test_ism_paths.opt b/opts/base_opts/tmp/test_ism_paths.opt → opts/base_opts/test_ism_paths.opt
diff --git a/.../045809ee-71f0-4c2b-80c3-930f42f99905.opt → .../045809ee-71f0-4c2b-80c3-930f42f99905.opt b/.../045809ee-71f0-4c2b-80c3-930f42f99905.opt → .../045809ee-71f0-4c2b-80c3-930f42f99905.opt
diff --git a/.../09708263-e985-4e1b-aa4f-a15334ad306e.opt → .../09708263-e985-4e1b-aa4f-a15334ad306e.opt b/.../09708263-e985-4e1b-aa4f-a15334ad306e.opt → .../09708263-e985-4e1b-aa4f-a15334ad306e.opt
diff --git a/opts/e9d13294-bce7-44e7-9635-8e906da0c914/0e66b0ef-6244-4c69-b6cf-2e35d314994e.opt b/opts/e9d13294-bce7-44e7-9635-8e906da0c914/0e66b0ef-6244-4c69-b6cf-2e35d314994e.opt
diff --git a/.../4fd11bb6-d552-40ef-a0e7-4ff75e0e687b.opt → .../11f62854-6e57-4f13-a892-1be0e891defb.opt b/.../4fd11bb6-d552-40ef-a0e7-4ff75e0e687b.opt → .../11f62854-6e57-4f13-a892-1be0e891defb.opt
@@ -5,7 +5,7 @@
     <terminology_id>
       <value>ISO_639-1</value>
     </terminology_id>
-    <code_string>es</code_string>
+    <code_string>en</code_string>
   </language>
   <description>
     <original_author id="Original Author">Not Specified</original_author>
@@ -27,18 +27,18 @@
         <terminology_id>
           <value>ISO_639-1</value>
         </terminology_id>
-        <code_string>es</code_string>
+        <code_string>en</code_string>
       </language>
       <purpose>Not Specified</purpose>
     </details>
   </description>
   <uid>
-    <value>259e96aa-1a4f-406b-8995-2b43df9a456b</value>
+    <value>e749b019-c222-41c7-bbae-39dc7f97a824</value>
   </uid>
   <template_id>
-    <value>datos_demograficos.es.v2</value>
+    <value>basic_demographic.en.v1</value>
   </template_id>
-  <concept>Datos demograficos basicos</concept>
+  <concept>Basic demographic</concept>
   <definition>
     <rm_type_name>COMPOSITION</rm_type_name>
     <occurrences>
@@ -214,6 +214,67 @@
                   </children>
                 </attributes>
               </children>
+              <children xsi:type="C_COMPLEX_OBJECT">
+                <rm_type_name>ELEMENT</rm_type_name>
+                <occurrences>
+                  <lower_included>true</lower_included>
+                  <upper_included>true</upper_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>false</upper_unbounded>
+                  <lower>0</lower>
+                  <upper>1</upper>
+                </occurrences>
+                <node_id>at0006</node_id>
+                <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                  <rm_attribute_name>value</rm_attribute_name>
+                  <existence>
+                    <lower_included>true</lower_included>
+                    <upper_included>true</upper_included>
+                    <lower_unbounded>false</lower_unbounded>
+                    <upper_unbounded>false</upper_unbounded>
+                    <lower>0</lower>
+                    <upper>1</upper>
+                  </existence>
+                  <children xsi:type="C_COMPLEX_OBJECT">
+                    <rm_type_name>DV_DATE</rm_type_name>
+                    <occurrences>
+                      <lower_included>true</lower_included>
+                      <upper_included>true</upper_included>
+                      <lower_unbounded>false</lower_unbounded>
+                      <upper_unbounded>false</upper_unbounded>
+                      <lower>1</lower>
+                      <upper>1</upper>
+                    </occurrences>
+                    <node_id />
+                    <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                      <rm_attribute_name>value</rm_attribute_name>
+                      <existence>
+                        <lower_included>true</lower_included>
+                        <upper_included>true</upper_included>
+                        <lower_unbounded>false</lower_unbounded>
+                        <upper_unbounded>false</upper_unbounded>
+                        <lower>1</lower>
+                        <upper>1</upper>
+                      </existence>
+                      <children xsi:type="C_PRIMITIVE_OBJECT">
+                        <rm_type_name>DATE</rm_type_name>
+                        <occurrences>
+                          <lower_included>true</lower_included>
+                          <upper_included>true</upper_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>false</upper_unbounded>
+                          <lower>1</lower>
+                          <upper>1</upper>
+                        </occurrences>
+                        <node_id />
+                        <item xsi:type="C_DATE">
+                          <pattern>yyyy-mm-dd</pattern>
+                        </item>
+                      </children>
+                    </attributes>
+                  </children>
+                </attributes>
+              </children>
               <cardinality>
                 <is_ordered>false</is_ordered>
                 <is_unique>false</is_unique>
@@ -231,28 +292,32 @@
           <value>openEHR-EHR-ADMIN_ENTRY.basic_demographic.v1</value>
         </archetype_id>
         <term_definitions code="at0000">
-          <items id="description">unknown</items>
+          <items id="description">*</items>
           <items id="text">Basic demographic</items>
         </term_definitions>
         <term_definitions code="at0001">
           <items id="description">@ internal @</items>
-          <items id="text">Arbol</items>
+          <items id="text">Tree</items>
         </term_definitions>
         <term_definitions code="at0002">
-          <items id="description">*</items>
-          <items id="text">Género</items>
+          <items id="description">Patient gender or administrative sex</items>
+          <items id="text">Gender</items>
         </term_definitions>
         <term_definitions code="at0003">
-          <items id="description">Masculino</items>
-          <items id="text">Masculino</items>
+          <items id="description">*</items>
+          <items id="text">Masculine</items>
         </term_definitions>
         <term_definitions code="at0004">
-          <items id="description">Femenino</items>
-          <items id="text">Femenino</items>
+          <items id="description">*</items>
+          <items id="text">Feminine</items>
         </term_definitions>
         <term_definitions code="at0005">
-          <items id="description">Desconocido</items>
-          <items id="text">Desconocido</items>
+          <items id="description">*</items>
+          <items id="text">Unknown</items>
+        </term_definitions>
+        <term_definitions code="at0006">
+          <items id="description">*</items>
+          <items id="text">Date of birth</items>
         </term_definitions>
       </children>
       <cardinality>
@@ -262,19 +327,19 @@
           <lower_included>true</lower_included>
           <lower_unbounded>false</lower_unbounded>
           <upper_unbounded>true</upper_unbounded>
-          <lower>0</lower>
+          <lower>1</lower>
         </interval>
       </cardinality>
     </attributes>
     <archetype_id>
       <value>openEHR-EHR-COMPOSITION.basic_demographic.v1</value>
     </archetype_id>
     <template_id>
-      <value>datos_demograficos.es.v2</value>
+      <value>basic_demographic.en.v1</value>
     </template_id>
     <term_definitions code="at0000">
-      <items id="description">unknown</items>
+      <items id="description">*unknown(es)</items>
       <items id="text">Basic demographic</items>
     </term_definitions>
   </definition>
-</template>
+</template>