From 7e29c2d62e123517aa49b95410fa60c28f0d2435 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Wed, 5 Feb 2025 16:40:34 +0100
Subject: [PATCH] WIP: Remove unused properties and recordtypes
---
.../sample-management-datamodel.yml | 12 +++++++++++-
.../caosdb-webui/src/ext/js/ext_samplemanagement.js | 13 ++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/models_and_helper_scripts/sample-management-datamodel.yml b/models_and_helper_scripts/sample-management-datamodel.yml
index d769e01..cc55407 100644
--- a/models_and_helper_scripts/sample-management-datamodel.yml
+++ b/models_and_helper_scripts/sample-management-datamodel.yml
@@ -47,6 +47,15 @@ ContainerType:
obligatory_properties:
Abbreviation:
+ConditionType:
+ inherit_from_recommended:
+ - ControlledRecordtype
+StorageCondition:
+ recommended_properties:
+ ConditionType:
+ condition_value:
+ datatype: TEXT
+
Container:
obligatory_properties:
Responsible:
@@ -60,13 +69,14 @@ Container:
Container size:
description: The size of the container, e.g. number of spaces or dimension
datatype: TEXT
- Custom label:
+ custom_label:
description: A custom label for a container that doesn't have to follow the automatic labeling guidelines.
datatype: TEXT
Container Contents:
datatype: TEXT
PI:
datatype: Person
+ StorageCondition:
Sample:
recommended_properties:
diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
index a0fc26c..e55c823 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
+++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_samplemanagement.js
@@ -41,6 +41,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
"Main User",
"Latitude start",
"Longitude start",
+ "Elevation start",
"Collection",
"PI",
"Storage ID",
@@ -73,10 +74,6 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
"Station ID",
"Station number",
"Subevent",
- "Time collected start",
- "Date collected stop",
- "Time collected stop",
- "Timezone",
"Hol",
"Sampling depth start",
"Sampling depth stop",
@@ -84,6 +81,7 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
"Water depth stop",
"Latitude stop",
"Longitude stop",
+ "Elevation stop",
"Taxonomic group/Species",
"AphiaID",
"On-board sampleID",
@@ -95,10 +93,6 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
"OSIS URL",
"Ecotaxa URL",
"PDFReport",
- "Date sampled start",
- "Date sampled stop",
- "Time sampled start",
- "Time sampled stop",
"Parent LinkAhead ID"
]
const allColumnNames = non_sample_rt_column_names.concat(requiredColumnNamesChildren).concat(required_column_names);
@@ -110,9 +104,6 @@ const ext_samplemanagement = function($, navbar, log, form_elements, form_panel,
'NagoyaCase',
"Parent Sample",
"Person",
- "SampleType",
- "Time start",
- "Time stop"
]
const upload_sample_template_form_config = {
--
GitLab