Added ACTIVITY_STATUS vocabulary

Deleted unused welding activities

Author: JosePizarro3

bam_masterdata/datamodel/v2/CHANGES.md

@@ -7,3 +7,4 @@
 - Changed descriptions: $NAME, $SHOW_IN_PROJECT_OVERVIEW, START_DATE, END_DATE
 - `$SHOW_IN_PROJECT_OVERVIEW` changed property_label
 - Deleted EXPERIMENTAL_STEP.EXPERIMENTAL_RESULTS, $ANNOTATIONS_STATE, $XMLCOMMENTS
+- Deleted `GMAW_BASE` and `LASER_HYBRID_MAGNET` (Cagtay)

bam_masterdata/datamodel/v2/activities.py

@@ -268,34 +268,6 @@ class Weldment(Processing):
     )
 
 
-class GmawBase(Weldment):
-    defs = ObjectTypeDef(
-        code="GMAW_BASE",
-        description="""
-        A simple gas metal arc welding (GMAW) experiment
-        """,
-        iri="https://bam.de/masterdata/GmawBase",
-        references=[],
-        generated_code_prefix="GMAW_BASE",
-        aliases=[],
-        previous_versions=["EXPERIMENTAL_STEP.WELDMENT.GMAW_BASE"],
-    )
-
-
-class LaserHybridMagnet(Weldment):
-    defs = ObjectTypeDef(
-        code="LASER_HYBRID_MAGNET",
-        description="""
-        A welding experiment using laser-hybrid welding with magnetic support
-        """,
-        iri="https://bam.de/masterdata/LaserHybridMagnet",
-        references=[],
-        generated_code_prefix="LASER_HYBRI_MAGNE",
-        aliases=[],
-        previous_versions=["EXPERIMENTAL_STEP.WELDMENT.LASER_HYBRID_MAGNET"],
-    )
-
-
 class FcgTest(Test):
     defs = ObjectTypeDef(
         code="FCG_TEST",

bam_masterdata/datamodel/v2/base.py

@@ -125,7 +125,7 @@ class Activity(BaseEntity):
     )
 
     status = PropertyTypeAssignment(
-        code="STATUS",
+        code="ACTIVITY_STATUS",
         data_type="CONTROLLEDVOCABULARY",
         vocabulary_code="ACTIVITY_STATUS",
         property_label="Status",
@@ -154,8 +154,8 @@ class Activity(BaseEntity):
         data_type="XML",
         property_label="Spreadsheet",
         description="""
-        Optional structured spreadsheet used to capture tabular parameters, intermediate values,
-        or structured notes associated with an entity. This field is intended for lightweight,
+        Structured spreadsheet used to capture tabular parameters, intermediate values, or
+        structured notes associated with an entity. This field is intended for lightweight,
         human-curated data and is not a replacement for datasets or result files.
         """,
         mandatory=False,

bam_masterdata/datamodel/v2/vocabularies.py

@@ -0,0 +1,33 @@
+from bam_masterdata.metadata.definitions import VocabularyTerm, VocabularyTypeDef
+from bam_masterdata.metadata.entities import VocabularyType
+
+
+class ActivityStatus(VocabularyType):
+    defs = VocabularyTypeDef(
+        code="ACTIVITY_STATUS",
+        description="""Current status of the activity: PLANNED, RUNNING, COMPLETED, CANCELLED.""",
+    )
+
+    planned = VocabularyTerm(
+        code="PLANNED",
+        label="Planned",
+        description="""The activity is planned but has not yet started.""",
+    )
+
+    running = VocabularyTerm(
+        code="RUNNING",
+        label="Running",
+        description="""The activity is currently running.""",
+    )
+
+    completed = VocabularyTerm(
+        code="COMPLETED",
+        label="Completed",
+        description="""The activity has been completed.""",
+    )
+
+    cancelled = VocabularyTerm(
+        code="CANCELLED",
+        label="Cancelled",
+        description="""The activity has been cancelled and will not be completed.""",
+    )