From bca5851321a67e7a44537b176145a56083148626 Mon Sep 17 00:00:00 2001 From: Christian Nassif-Haynes Date: Tue, 29 Sep 2015 14:06:44 +1000 Subject: [PATCH 1/6] Fixed wrongly named faims_archent_type --- faims-android-app/projects/Gallery_Example/ui_logic.bsh | 6 +++--- faims-android-app/projects/Gallery_Example/ui_schema.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/faims-android-app/projects/Gallery_Example/ui_logic.bsh b/faims-android-app/projects/Gallery_Example/ui_logic.bsh index 26f0477b..d1dfe090 100644 --- a/faims-android-app/projects/Gallery_Example/ui_logic.bsh +++ b/faims-android-app/projects/Gallery_Example/ui_logic.bsh @@ -24,7 +24,7 @@ String entity_id; int entityCount; initialise() { - fetchEntityList("simple", new FetchCallback() { + fetchEntityList("Simple", new FetchCallback() { onFetch(result) { entityCount = result.size() + 1; } @@ -74,7 +74,7 @@ updateEntity(entity_id) { attributes.add(createEntityAttribute("supervisor", getFieldValue("tabgroup1/tab2/supervisor"), null, null, getFieldCertainty("tabgroup1/tab2/supervisor"))); - saveArchEnt(entity_id, "simple", null, attributes, new SaveCallback() { + saveArchEnt(entity_id, "Simple", null, attributes, new SaveCallback() { onSave(uuid, newRecord) { entity_id = uuid; refreshEntities(); @@ -84,7 +84,7 @@ updateEntity(entity_id) { } refreshEntities() { - fetchEntityList("simple", new FetchCallback() { + fetchEntityList("Simple", new FetchCallback() { onFetch(result) { populateDropDown("tabgroup1/tab3/entity", result); } diff --git a/faims-android-app/projects/Gallery_Example/ui_schema.xml b/faims-android-app/projects/Gallery_Example/ui_schema.xml index 7240b353..1b01dd5e 100644 --- a/faims-android-app/projects/Gallery_Example/ui_schema.xml +++ b/faims-android-app/projects/Gallery_Example/ui_schema.xml @@ -55,7 +55,7 @@ - + From c43a5e07134a5f88c42726fd7e00e38fdc445f2e Mon Sep 17 00:00:00 2001 From: Christian Nassif-Haynes Date: Tue, 29 Sep 2015 14:26:54 +1000 Subject: [PATCH 2/6] Fixed wrongly named faims_archent_type --- faims-android-app/projects/Map Example/data_schema.xml | 2 +- faims-android-app/projects/Map Example/ui_logic.bsh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/faims-android-app/projects/Map Example/data_schema.xml b/faims-android-app/projects/Map Example/data_schema.xml index 7ce76a47..79f1c99e 100755 --- a/faims-android-app/projects/Map Example/data_schema.xml +++ b/faims-android-app/projects/Map Example/data_schema.xml @@ -44,7 +44,7 @@ - + An simple entity diff --git a/faims-android-app/projects/Map Example/ui_logic.bsh b/faims-android-app/projects/Map Example/ui_logic.bsh index 85a84cbf..956febe1 100755 --- a/faims-android-app/projects/Map Example/ui_logic.bsh +++ b/faims-android-app/projects/Map Example/ui_logic.bsh @@ -708,7 +708,7 @@ updateEntity(String entityId) { List attributes = createAttributeList(); if (entityId == null) { - attributes.add(createEntityAttribute("entity", "Simple " + entityCount++, null, null, null)); + attributes.add(createEntityAttribute("entity", "simpleentity" + entityCount++, null, null, null)); } attributes.add(createEntityAttribute("name", getFieldValue("tabgroup2/tab2/name"), null, null, getFieldCertainty("tabgroup2/tab2/name"))); attributes.add(createEntityAttribute("value", getFieldAnnotation("tabgroup2/tab2/value"), null, getFieldValue("tabgroup2/tab2/value"), getFieldCertainty("tabgroup2/tab2/value"))); @@ -1060,7 +1060,7 @@ updateUIEntity(String entityId) { List attributes = createAttributeList(); if (entityId == null) { - attributes.add(createEntityAttribute("entity", "Simple " + entityCount++, null, null, null)); + attributes.add(createEntityAttribute("entity", "simpleentity " + entityCount++, null, null, null)); } attributes.add(createEntityAttribute("name", getFieldValue("tabgroup5/tab2/name"), null, null, getFieldCertainty("tabgroup5/tab2/name"))); attributes.add(createEntityAttribute("value", getFieldAnnotation("tabgroup5/tab2/value"), null, getFieldValue("tabgroup5/tab2/value"), getFieldCertainty("tabgroup5/tab2/value"))); @@ -1191,4 +1191,4 @@ loadUIRelationship(relId) { showTab("tabgroup5/tab3"); } }); -} \ No newline at end of file +} From f5fb8d58fdfa58239ad30ad9ec968c3001c13375 Mon Sep 17 00:00:00 2001 From: Christian Nassif-Haynes Date: Tue, 29 Sep 2015 15:43:26 +1000 Subject: [PATCH 3/6] Removed trailing space from directory name --- .../projects/Testing Modules/{Logic => Logic}/data_schema.xml | 0 .../projects/Testing Modules/{Logic => Logic}/ui_logic.bsh | 0 .../projects/Testing Modules/{Logic => Logic}/ui_schema.xml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename faims-android-app/projects/Testing Modules/{Logic => Logic}/data_schema.xml (100%) rename faims-android-app/projects/Testing Modules/{Logic => Logic}/ui_logic.bsh (100%) rename faims-android-app/projects/Testing Modules/{Logic => Logic}/ui_schema.xml (100%) diff --git a/faims-android-app/projects/Testing Modules/Logic /data_schema.xml b/faims-android-app/projects/Testing Modules/Logic/data_schema.xml similarity index 100% rename from faims-android-app/projects/Testing Modules/Logic /data_schema.xml rename to faims-android-app/projects/Testing Modules/Logic/data_schema.xml diff --git a/faims-android-app/projects/Testing Modules/Logic /ui_logic.bsh b/faims-android-app/projects/Testing Modules/Logic/ui_logic.bsh similarity index 100% rename from faims-android-app/projects/Testing Modules/Logic /ui_logic.bsh rename to faims-android-app/projects/Testing Modules/Logic/ui_logic.bsh diff --git a/faims-android-app/projects/Testing Modules/Logic /ui_schema.xml b/faims-android-app/projects/Testing Modules/Logic/ui_schema.xml similarity index 100% rename from faims-android-app/projects/Testing Modules/Logic /ui_schema.xml rename to faims-android-app/projects/Testing Modules/Logic/ui_schema.xml From cfe6596e4169e4ad3c9ddfe6551743df5ca3b60a Mon Sep 17 00:00:00 2001 From: Christian Nassif-Haynes Date: Tue, 29 Sep 2015 16:08:18 +1000 Subject: [PATCH 4/6] Removed trailing space from directory name --- .../{Tracklog Module => Tracklog Module}/data_schema.xml | 0 .../{Tracklog Module => Tracklog Module}/ui_logic.bsh | 0 .../{Tracklog Module => Tracklog Module}/ui_schema.xml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename faims-android-app/projects/Testing Modules/{Tracklog Module => Tracklog Module}/data_schema.xml (100%) rename faims-android-app/projects/Testing Modules/{Tracklog Module => Tracklog Module}/ui_logic.bsh (100%) rename faims-android-app/projects/Testing Modules/{Tracklog Module => Tracklog Module}/ui_schema.xml (100%) diff --git a/faims-android-app/projects/Testing Modules/Tracklog Module /data_schema.xml b/faims-android-app/projects/Testing Modules/Tracklog Module/data_schema.xml similarity index 100% rename from faims-android-app/projects/Testing Modules/Tracklog Module /data_schema.xml rename to faims-android-app/projects/Testing Modules/Tracklog Module/data_schema.xml diff --git a/faims-android-app/projects/Testing Modules/Tracklog Module /ui_logic.bsh b/faims-android-app/projects/Testing Modules/Tracklog Module/ui_logic.bsh similarity index 100% rename from faims-android-app/projects/Testing Modules/Tracklog Module /ui_logic.bsh rename to faims-android-app/projects/Testing Modules/Tracklog Module/ui_logic.bsh diff --git a/faims-android-app/projects/Testing Modules/Tracklog Module /ui_schema.xml b/faims-android-app/projects/Testing Modules/Tracklog Module/ui_schema.xml similarity index 100% rename from faims-android-app/projects/Testing Modules/Tracklog Module /ui_schema.xml rename to faims-android-app/projects/Testing Modules/Tracklog Module/ui_schema.xml From 32e454ad18ceb23a625b0b31cfeb7e27d8c17e4b Mon Sep 17 00:00:00 2001 From: Christian Nassif-Haynes Date: Thu, 1 Oct 2015 12:18:22 +1000 Subject: [PATCH 5/6] Fixed capitalisation --- faims-android-app/projects/Sync Example/ui_logic.bsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faims-android-app/projects/Sync Example/ui_logic.bsh b/faims-android-app/projects/Sync Example/ui_logic.bsh index ca4aea6b..eab3386e 100644 --- a/faims-android-app/projects/Sync Example/ui_logic.bsh +++ b/faims-android-app/projects/Sync Example/ui_logic.bsh @@ -239,7 +239,7 @@ closeRelationship() { onEvent("tabgroup2/tab1/close", "click", "closeRelationship()"); loadRelationships() { - fetchRelationshipList("abovebelow", new FetchCallback() { + fetchRelationshipList("AboveBelow", new FetchCallback() { onFetch(result) { populateDropDown("tabgroup2/tab2/relationships", result); } From 31da29207bf0196538d02b66465a6570fc8b382f Mon Sep 17 00:00:00 2001 From: Christian Nassif-Haynes Date: Thu, 1 Oct 2015 12:24:04 +1000 Subject: [PATCH 6/6] Fixed capitalisation --- faims-android-app/projects/Sync Example/ui_logic.bsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faims-android-app/projects/Sync Example/ui_logic.bsh b/faims-android-app/projects/Sync Example/ui_logic.bsh index eab3386e..81ba8bd6 100644 --- a/faims-android-app/projects/Sync Example/ui_logic.bsh +++ b/faims-android-app/projects/Sync Example/ui_logic.bsh @@ -372,7 +372,7 @@ loadMembers() { } }); - fetchRelationshipList("abovebelow", new FetchCallback() { + fetchRelationshipList("AboveBelow", new FetchCallback() { onFetch(result) { populateDropDown("tabgroup4/tab1/relationships", result); }