Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Fixed wrongly named faims_archent_type #11

Open
DoxasticFox wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed wrongly named faims_archent_type #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bca5851
Fixed wrongly named faims_archent_type
Sep 29, 2015
c43a5e0
Fixed wrongly named faims_archent_type
Sep 29, 2015
f5fb8d5
Removed trailing space from directory name
Sep 29, 2015
cfe6596
Removed trailing space from directory name
Sep 29, 2015
32e454a
Fixed capitalisation
Oct 1, 2015
31da292
Fixed capitalisation
Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions faims-android-app/projects/Gallery_Example/ui_logic.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ String entity_id;
int entityCount;

initialise() {
fetchEntityList("simple", new FetchCallback() {
fetchEntityList("Simple", new FetchCallback() {
onFetch(result) {
entityCount = result.size() + 1;
}
Expand Down Expand Up @@ -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();
Expand All @@ -84,7 +84,7 @@ updateEntity(entity_id) {
}

refreshEntities() {
fetchEntityList("simple", new FetchCallback() {
fetchEntityList("Simple", new FetchCallback() {
onFetch(result) {
populateDropDown("tabgroup1/tab3/entity", result);
}
Expand Down
2 changes: 1 addition & 1 deletion faims-android-app/projects/Gallery_Example/ui_schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</select1>
</group>
</group>
<group ref="tabgroup1" faims_archent_type="simpleentity">
<group ref="tabgroup1" faims_archent_type="Simple">
<label>Simple Entity Example</label>
<group ref="tab1">
<label>Entity Tab1</label>
Expand Down
2 changes: 1 addition & 1 deletion faims-android-app/projects/Map Example/data_schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</property>
</RelationshipElement>

<ArchaeologicalElement name="SimpleEntity">
<ArchaeologicalElement name="simpleentity">
<description>
An simple entity
</description>
Expand Down
6 changes: 3 additions & 3 deletions faims-android-app/projects/Map Example/ui_logic.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")));
Expand Down Expand Up @@ -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")));
Expand Down Expand Up @@ -1191,4 +1191,4 @@ loadUIRelationship(relId) {
showTab("tabgroup5/tab3");
}
});
}
}
4 changes: 2 additions & 2 deletions faims-android-app/projects/Sync Example/ui_logic.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -372,7 +372,7 @@ loadMembers() {
}
});

fetchRelationshipList("abovebelow", new FetchCallback() {
fetchRelationshipList("AboveBelow", new FetchCallback() {
onFetch(result) {
populateDropDown("tabgroup4/tab1/relationships", result);
}
Expand Down
0 ...ts/Testing Modules/Logic /data_schema.xml → ...cts/Testing Modules/Logic/data_schema.xml
View file
Open in desktop
File renamed without changes.
0 ...jects/Testing Modules/Logic /ui_logic.bsh → ...ojects/Testing Modules/Logic/ui_logic.bsh
View file
Open in desktop
File renamed without changes.
0 ...ects/Testing Modules/Logic /ui_schema.xml → ...jects/Testing Modules/Logic/ui_schema.xml
View file
Open in desktop
File renamed without changes.
0 ... Modules/Tracklog Module /data_schema.xml → ...g Modules/Tracklog Module/data_schema.xml
View file
Open in desktop
File renamed without changes.
0 ...ing Modules/Tracklog Module /ui_logic.bsh → ...ting Modules/Tracklog Module/ui_logic.bsh
View file
Open in desktop
File renamed without changes.
0 ...ng Modules/Tracklog Module /ui_schema.xml → ...ing Modules/Tracklog Module/ui_schema.xml
View file
Open in desktop
File renamed without changes.