Merge branch 'beschreibungen'

# Conflicts:
#	.gitlab-ci.yml

.gitlab-ci.yml

 stages:
   - build
-  - triage
-  - run
 
 build:
-  image: debian:stable
+  image: debian:oldstable
   stage: build
   script:
   - apt-get update && apt-get -y install graphviz openjdk-11-jre-headless wget
@@ -15,48 +13,3 @@ build:
   artifacts:
     paths:
       - public
\ No newline at end of file
-
-build-image:build:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
-  only:
-    - master
-    - docker-dzwald
-
-dry-run:triage:
-  image: ruby:2.5
-  stage: triage
-  script:
-    - gem install activesupport -v 6.1.4.4
-    - gem install gitlab-triage
-    - gitlab-triage --help
-    - gitlab-triage --dry-run --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH --host-url https://git-ce.rwth-aachen.de/
-  when: manual
-  except:
-    - schedules
-
-policy:run:
-  image: ruby:2.5
-  stage: run
-  script:
-    - gem install activesupport -v 6.1.4.4
-    - gem install gitlab-triage
-    - gitlab-triage --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH --host-url https://git-ce.rwth-aachen.de
-  when: manual
-  except:
-    - schedules
-
-schedule:policyrun:
-  image: ruby:2.5
-  stage: run
-  script:
-    - gem install activesupport -v 6.1.4.4
-    - gem install gitlab-triage
-    - gitlab-triage --token $API_TOKEN --source projects --source-id $CI_PROJECT_PATH --host-url https://git-ce.rwth-aachen.de
-  only:
-    - schedules

.triage-policies.yml

-resource_rules:
-  issues:
-    rules:
-      - name: find all issues of milestone AP 0 and set label wp 0
-        conditions:
-          milestone: AP 0 - Projektmanagement und Dissemination 
-        actions:
-          labels:
-            - WP 0
-      - name: find all issues of milestone AP 1 and set label wp 1
-        conditions:
-          milestone: AP 1 - Definition der Anwendungsszenarien
-        actions:
-          labels:
-            - WP 1
-      - name: find all issues of milestone AP 2 and set label wp 2
-        conditions:
-          milestone: AP 2 - Integration von BaSys 4 und WH4.0
-        actions:
-          labels:
-            - WP 2
-      - name: find all issues of milestone AP 3 and set label wp 3
-        conditions:
-          milestone: AP 3 - Entwicklung eines DZ Wald
-        actions:
-          labels:
-            - WP 3
-      - name: find all issues of milestone AP 4 and set label wp 4
-        conditions:
-          milestone: AP 4 - Integration eines Waldmanagementsystems
-        actions:
-          labels:
-            - WP 4
-      - name: find all issues of milestone AP 5 and set label wp 5
-        conditions:
-          milestone: AP 5 - Integration einer Holzhandelsplattform
-        actions:
-          labels:
-            - WP 5
-      - name: find all issues of milestone AP 6 and set label wp 6
-        conditions:
-          milestone: AP 6 - Entwicklung einer Demo-Applikation für die Abnehmerseite
-        actions:
-          labels:
-            - WP 6
-      - name: find all issues of milestone AP 7 and set label wp 7
-        conditions:
-          milestone: AP 7 - Integration Holzaufnahme-App
-        actions:
-          labels:
-            - WP 7
-      - name: find all issues of milestone AP 8 and set label wp 8
-        conditions:
-          milestone: AP 8 - Integration, Demonstration und Dokumentation der Ergebnisse
-        actions:
-          labels:
-            - WP 8
-

modellierung/holzliste.puml

@@ -58,7 +58,6 @@ class Beobachtung <<Submodel>>{
 }
 
 class ZuFaellendeBaeume <<Submodel>>{
-    Name: String [1]
     Beschreibung: String [1]
     Umring: SEC.Umring [1]
     Position: SEC.Standort [0..1]
@@ -92,7 +91,10 @@ class Preismatrixeintrag <<SubmodelElementCollection>>{
     Preis: Float [1]
     MittendurchmesserVon: Float [0..1]
     MittendurchmesserBis: Float [0..1]
-    Gueteklasse: ENUM.Gueteklasse [0..1]
+    GueteklasseVon: ENUM.Gueteklasse [0..1]
+    GueteklasseBis: ENUM.Gueteklasse [0..1]
+    Sortimentstyp: ENUM.Sortimentstyp [0..1]
+    Sorte: ENUM.Sorte [0..1]
 }
 
 Verkaufslos *--> "0..*" Preismatrixeintrag
@@ -154,7 +156,6 @@ class Holzliste <<Submodel>>{
     Holzart: ENUM.Holzart [1]
     ' https://eldatstandard.de/dokumentation/1.0.2/species
     Holzlistenstatus: ENUM.Holzlistenstatus[1]
-    Preismatrix: SEList.SEC.Preismatrixeintrag [0..n]
 }
 
 class Kopfdaten <<SubmodelElementCollection>>{
@@ -174,7 +175,6 @@ class Kopfdaten <<SubmodelElementCollection>>{
 
 class Kontakt <<SubmodelElementCollection>>{
     'https://eldatstandard.de/dokumentation/1.0.2/consumer
-    Kontaktrolle: ENUM.Kontaktrolle [1]
     Firmenname: String [0..1]
     Anrede: String [0..1]
     Vorname: String [0..1]
@@ -195,9 +195,8 @@ class Polter <<SubmodelElementCollection>> {
     Messergebnis_RaummassIndustrieholz : SEC.RaummassIndustrieholz [0..1]
     Messergebnis_RaummassEnergieholz : SEC.RaummassEnergieholz [0..1]
     Polterstatus: ENUM.Polterstatus [1]
-    Fotos: SEList.URL|Base64 [0..*]
+    Fotos: SEList.URL [0..*]
     Videos: SEList.URL [0..*]
-    'Foto TBD
 }
 
 class Standort <<SubmodelElementCollection>> {
@@ -246,7 +245,6 @@ class RaummassEnergieholz <<SubmodelElementCollection>> {
 
 Holzliste *-> Kopfdaten
 'Kopfdaten --> Kontakt
-Holzliste --> "0..*" Preismatrixeintrag
 Holzliste *-- "*" Polter
 Polter *-- "0..1" RaummassIndustrieholz
 Polter *-- "0..1" RaummassEnergieholz

modellierung/holzliste_enums.puml

@@ -262,17 +262,6 @@ enum Hieb{
 }
 note top #FF0000: TODO Eigendefinition?
 
-enum Kontaktrolle{
-    Waldbesitzer
-    Lieferant
-    Verkaeufer
-    Kaeufer
-    Fuhrmann
-    UnternehmerHolzernte
-    UnternehmerHolzrueckung
-}
-note top: Eigendefinition
-
 enum Bereitstellungsart{
     uws - Unfrei Waldstraße
     uwe - Unfrei Werk