Merge branch 'master' into turkish

dainst · Mar 18, 2024 · 68668fc · 68668fc
2 parents 8eecf03 + c9f146c
commit 68668fc
Show file tree

Hide file tree

Showing 514 changed files with 84,996 additions and 61,012 deletions.
diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
@@ -100,9 +100,9 @@ jobs:
     - name: Create Windows package
       run: npm run package:win
       if: runner.os == 'Windows'
-      env:
-        CSC_LINK: ${{ secrets.WIN_CERT }}
-        CSC_KEY_PASSWORD: ${{ secrets.WIN_CERT_PW }}
+#      env:
+#        CSC_LINK: ${{ secrets.WIN_CERT }}
+#        CSC_KEY_PASSWORD: ${{ secrets.WIN_CERT_PW }}
       working-directory: desktop
     - name: Create Linux package
       run: npm run package:lnx

diff --git a/.github/workflows/server.yml b/.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 FieldHub dependencies and run setup
         run: mix setup
         working-directory: server
-      - name: Run server tests
+      - name: Run FieldHub tests
         run: mix test
-        working-directory: server
+        working-directory: server
diff --git a/core/config/Config-Default.json b/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"
   ]
 }
diff --git a/core/config/Core/Language.de.json b/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"
     }
   }
 }
diff --git a/core/config/Core/Language.el.json b/core/config/Core/Language.el.json
@@ -0,0 +1,112 @@
+{
+  "fields": {
+    "category": {
+      "label": ""
+    },
+    "identifier": {
+      "label": "",
+      "description": ""
+    },
+    "shortDescription": {
+      "label": ""
+    }
+  },
+  "categories": {
+    "Project": {
+      "label": "",
+      "fields": {
+        "coordinateReferenceSystem": {
+          "label": ""
+        },
+        "shortName": {
+          "label": ""
+        }
+      }
+    },
+    "Image": {
+      "label": "",
+      "fields": {
+        "height": {
+          "label": ""
+        },
+        "width": {
+          "label": ""
+        }
+      }
+    }
+  },
+  "relations": {
+    "isRecordedIn": {
+      "label": ""
+    },
+    "liesWithin": {
+      "label": ""
+    },
+    "includes": {
+      "label": ""
+    },
+    "isPresentIn": {
+      "label": ""
+    },
+    "isAbove": {
+      "label": ""
+    },
+    "isBelow": {
+      "label": ""
+    },
+    "isSameAs": {
+      "label": ""
+    },
+    "cuts": {
+      "label": ""
+    },
+    "isCutBy": {
+      "label": ""
+    },
+    "fills": {
+      "label": ""
+    },
+    "isFilledBy": {
+      "label": ""
+    },
+    "borders": {
+      "label": ""
+    },
+    "abuts": {
+      "label": ""
+    },
+    "isAbuttedBy": {
+      "label": ""
+    },
+    "bondsWith": {
+      "label": ""
+    },
+    "isAfter": {
+      "label": ""
+    },
+    "isBefore": {
+      "label": ""
+    },
+    "isContemporaryWith": {
+      "label": ""
+    },
+    "depicts": {
+      "label": ""
+    },
+    "isDepictedIn": {
+      "label": ""
+    },
+    "isMapLayerOf": {
+      "label": ""
+    },
+    "hasMapLayer": {
+      "label": ""
+    },
+    "isInstanceOf": {
+      "label": ""
+    },
+    "hasInstance": {
+      "label": ""
+    }
+  }
+}
diff --git a/core/config/Core/Language.en.json b/core/config/Core/Language.en.json
@@ -107,6 +107,12 @@
     },
     "hasInstance": {
       "label": "Associated finds"
+    },
+    "isStoredIn": {
+      "label": "Is stored in"
+    },
+    "isStoragePlaceOf": {
+      "label": "Is storage place of"
     }
   }
 }
diff --git a/core/config/Library/Categories.json b/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": {}
   }
 }