Merge branch 'master' into show_last_database_update

.github/workflows/desktop.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Run desktop unit tests
         run: npm run test
         working-directory: desktop
-      - name: Run FieldHub integration tests
+      - name: Run Field Hub integration tests
         run: npm run test:hub-integration
         working-directory: desktop
       - name: Run Java tools tests
@@ -61,7 +61,7 @@ jobs:
       matrix:
         os:
           - { name: 'Linux', version: 'ubuntu-latest' }
-          - { name: 'MacOS', version: 'macos-latest' }
+          - { name: 'MacOS', version: 'macos-12' }
           - { name: 'Windows', version: 'windows-latest' }
       fail-fast: false
     runs-on: ${{ matrix.os.version }}

.github/workflows/server.yml

@@ -15,16 +15,16 @@ jobs:
       - uses: actions/checkout@v2
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: 24.3
-          elixir-version: 1.13.4
-      - name: Install inotify-tools
-        run: sudo apt-get install inotify-tools
+          otp-version: 26.0
+          elixir-version: 1.16.0
       - name: Start CouchDB
-        run: docker-compose -f docker-compose.yml --env-file .env_template up -d &
+        run: docker-compose -f docker-compose.yml --env-file .env_template up -d
         working-directory: server
-      - name: Setup server
+      - name: Sleep to await CouchDB startup
+        run: sleep 15s
+      - name: Install Field Hub dependencies and run setup
         run: mix setup
         working-directory: server
-      - name: Run server tests
+      - name: Run Field Hub tests
         run: mix test
-        working-directory: server
+        working-directory: server

.vscode/settings.json

@@ -1,7 +1,5 @@
 {
   "files.watcherExclude": {
     "**/node_modules/*/**": true
-  },
-  "elixirLS.projectDir": "server"
-}
-
+  }
+}

README.md

@@ -4,7 +4,7 @@ This is a monorepo containing five packages:
 
 * [Field Desktop](desktop): The Field Desktop application based on Angular and Electron
 * [Field Mobile](mobile): The Field Mobile application based on React Native (early development, no release yet)
-* [FieldHub](server): The (optional) synchronisation server application.
+* [Field Hub](server): The (optional) synchronisation server application.
 * [Field Core](core): Shared TypeScript modules
 * [iDAI.field Web](web): The iDAI.field Web publication platform
 

core/config/Config-Default.json

@@ -215,6 +215,34 @@
     "Type:default": {
       "hidden": [],
       "fields": {}
+    },
+    "StoragePlace:default": {
+      "hidden": [],
+      "fields": {}
+    },
+    "StorageBuilding:default": {
+      "hidden": [],
+      "fields": {}
+    },
+    "StorageRoom:default": {
+      "hidden": [],
+      "fields": {}
+    },
+    "StorageShelf:default": {
+      "hidden": [],
+      "fields": {}
+    },
+    "StorageCompartment:default": {
+      "hidden": [],
+      "fields": {}
+    },
+    "StorageBox:default": {
+      "hidden": [],
+      "fields": {}
+    },
+    "StorageBag:default": {
+      "hidden": [],
+      "fields": {}
     }
   },
   "order": [
@@ -271,6 +299,13 @@
     "Drawing",
     "Photo",
     "TypeCatalog",
-    "Type"
+    "Type",
+    "StoragePlace",
+    "StorageBuilding",
+    "StorageRoom",
+    "StorageShelf",
+    "StorageCompartment",
+    "StorageBox",
+    "StorageBag"
   ]
 }

core/config/Core/Language.de.json

@@ -9,6 +9,12 @@
     },
     "shortDescription": {
       "label": "Kurzbeschreibung"
+    },
+    "hasChildren": {
+      "label": "Untergeordnete Ressourcen"
+    },
+    "includesStratigraphicalUnits": {
+      "label": "Umfasst stratigraphische Einheiten"
     }
   },
   "categories": {
@@ -107,6 +113,12 @@
     },
     "hasInstance": {
       "label": "Zugeordnete Funde"
+    },
+    "isStoredIn": {
+      "label": "Wird aufbewahrt in"
+    },
+    "isStoragePlaceOf": {
+      "label": "Ist Aufbewahrungsort von"
     }
   }
 }

core/config/Core/Language.en.json

@@ -9,6 +9,12 @@
     },
     "shortDescription": {
       "label": "Short description"
+    },
+    "includesStratigraphicalUnits": {
+      "label": "Includes stratigraphical units"
+    },
+    "hasChildren": {
+      "label": "Child resources"
     }
   },
   "categories": {
@@ -107,6 +113,12 @@
     },
     "hasInstance": {
       "label": "Associated finds"
+    },
+    "isStoredIn": {
+      "label": "Is stored in"
+    },
+    "isStoragePlaceOf": {
+      "label": "Is storage place of"
     }
   }
 }

core/config/Core/Language.fr.json

@@ -9,6 +9,12 @@
     },
     "shortDescription": {
       "label": "Description sommaire"
+    },
+    "includesStratigraphicalUnits": {
+      "label": "Inclus les unités stratigraphiques"
+    },
+    "hasChildren": {
+      "label": "Ressources subordonnées"
     }
   },
   "categories": {
@@ -17,6 +23,9 @@
       "fields": {
         "coordinateReferenceSystem": {
           "label": "Système de référence de coordonnées"
+        },
+        "shortName": {
+          "label": "Nom du projet"
         }
       }
     },
@@ -37,7 +46,7 @@
       "label": "Enregistré pendant l'opération"
     },
     "liesWithin": {
-      "label": "Dans"
+      "label": "Se trouve dans"
     },
     "includes": {
       "label": "Inclut"
@@ -49,7 +58,7 @@
       "label": "Sous"
     },
     "isSameAs": {
-      "label": "Le même que"
+      "label": "Identique à"
     },
     "cuts": {
       "label": "Coupe"
@@ -64,13 +73,13 @@
       "label": "Remplit"
     },
     "borders": {
-      "label": "Borde"
+      "label": "Adjacent à"
     },
     "isAfter": {
-      "label": "Après"
+      "label": "Chronologiquement postérieure à"
     },
     "isBefore": {
-      "label": "Avant"
+      "label": "Chronologiquement antérieure à"
     },
     "isContemporaryWith": {
       "label": "Contemporaine à"
@@ -92,6 +101,18 @@
     },
     "hasInstance": {
       "label": "Découvertes associées"
+    },
+    "isPresentIn": {
+      "label": "Est inclus dans le profil/plan"
+    },
+    "abuts": {
+      "label": "Bute contre"
+    },
+    "isStoredIn": {
+      "label": "Conservé à"
+    },
+    "isStoragePlaceOf": {
+      "label": "Est le lieu de conservation de"
     }
   }
 }

core/config/Core/Language.it.json

@@ -9,6 +9,12 @@
     },
     "shortDescription": {
       "label": "Descrizione breve"
+    },
+    "includesStratigraphicalUnits": {
+      "label": "Comprende le unità stratigrafiche"
+    },
+    "hasChildren": {
+      "label": "Risorse subordinate"
     }
   },
   "categories": {
@@ -107,6 +113,12 @@
     },
     "hasInstance": {
       "label": "Reperti pertinenti"
+    },
+    "isStoredIn": {
+      "label": "Conservato a"
+    },
+    "isStoragePlaceOf": {
+      "label": "È il luogo di conservazione di"
     }
   }
 }

core/config/Core/Language.tr.json

@@ -9,6 +9,12 @@
     },
     "shortDescription": {
       "label": "Kısa açıklama"
+    },
+    "includesStratigraphicalUnits": {
+      "label": "Stratigrafik Birimler içerir"
+    },
+    "hasChildren": {
+      "label": "Alt Girdiler"
     }
   },
   "categories": {
@@ -107,6 +113,12 @@
     },
     "bondsWith": {
       "label": "ile bağlı"
+    },
+    "isStoragePlaceOf": {
+      "label": "Depolama yeri-"
+    },
+    "isStoredIn": {
+      "label": "-de saklanır"
     }
   }
 }

core/config/Core/Language.uk.json

@@ -9,6 +9,12 @@
     },
     "shortDescription": {
       "label": "Короткий опис"
+    },
+    "includesStratigraphicalUnits": {
+      "label": "Включає/містить стратиграфічні одиниці"
+    },
+    "hasChildren": {
+      "label": "Підпорядковані ресурси"
     }
   },
   "categories": {
@@ -107,6 +113,12 @@
     },
     "isAbuttedBy": {
       "label": "викликається"
+    },
+    "isStoredIn": {
+      "label": "Зберігатися буде в"
+    },
+    "isStoragePlaceOf": {
+      "label": "Є місцем зберігання для"
     }
   }
 }

core/config/Library/Categories.json

@@ -1617,5 +1617,35 @@
         "valuelistId": "damages-default"
       }
     }
+  },
+  "StorageBuilding": {
+    "parent": "StoragePlace",
+    "description": {},
+    "fields": {}
+  },
+  "StorageRoom": {
+    "parent": "StoragePlace",
+    "description": {},
+    "fields": {}
+  },
+  "StorageShelf": {
+    "parent": "StoragePlace",
+    "description": {},
+    "fields": {}
+  },
+  "StorageCompartment": {
+    "parent": "StoragePlace",
+    "description": {},
+    "fields": {}
+  },
+  "StorageBox": {
+    "parent": "StoragePlace",
+    "description": {},
+    "fields": {}
+  },
+  "StorageBag": {
+    "parent": "StoragePlace",
+    "description": {},
+    "fields": {}
   }
 }