From 14e9df557860b61e8ec1a81b6f0aaea3157b9140 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Wed, 2 Nov 2022 22:32:18 +0100
Subject: [PATCH] Update structure

---
 gradation.md             |  12 +++
 structure/structure.puml | 179 ++++++++++++++++++++++++++-------------
 tt/STE.csv               |   2 +-
 3 files changed, 133 insertions(+), 60 deletions(-)
 create mode 100644 gradation.md

diff --git a/gradation.md b/gradation.md
new file mode 100644
index 0000000..cc9aa70
--- /dev/null
+++ b/gradation.md
@@ -0,0 +1,12 @@
+
+# Gradation
+
+| Unit                        | Abbreviation | Countries                                            |
+|-----------------------------|--------------|------------------------------------------------------|
+| Klosterneuburger Mostwaage  | °KMW         | Austria, Italy, Hungary, Slovakia, former Yugoslavia |
+| Oechsle                     | °Oe          | Germany, Switzerland, Luxembourg                     |
+| Baumé                       | °Bé          | France, Spain                                        |
+| Brix                        | °Bx          | English-speaking world                               |
+| Normalizovaný moštoměr      | °NM          | Czechia, Slovakia                                    |
+| -                           | g/L          | SI                                                   |
+
diff --git a/structure/structure.puml b/structure/structure.puml
index 98b2900..1bae3a4 100644
--- a/structure/structure.puml
+++ b/structure/structure.puml
@@ -4,96 +4,157 @@ hide circle
 
 namespace BaseData {
 
-class WineType {
-    id
-    name
-}
+    class Country {
+        alpha2
+        alpha3
+        numeric
+        name
+    }
 
-class WineTypeAttribute {
-    id
-    name
-}
+    class WineType {
+        id
+        name
+    }
 
-class QualityLevel {
+    class WineTypeAttribute {
+        id
+        name
+        short
+    }
 
-}
+    class QualityLevel {
 
-class Region {
+    }
 
-}
+    class Region {
+        id
+        name
+    }
 
-class Area {
+    class Area {
+        id
+        name
+    }
 
-}
+    class VineyardArea {
+        number
+        name
+    }
 
-class VineyardArea {
+    class Municipality {
+        number
+        name
+    }
 
-}
+    class Reed {
+        number
+        name
+    }
 
-class Municipality {
+    class Bank {
+        country
+        bankCode
+        fullName
+        name
+        street
+        postalCode
+        city
+        telNr
+        emailAddress
+        website
+    }
 
-}
+    Country -- Bank
+    Country -- Region
 
-class Reed {
-
-}
-
-class Bank {
-    bic
-    blz
-    fullName
-    name
-    shortName
-    street
-    postalCode
-    city
-
-}
-
-Region -- Area
-Area -- VineyardArea
-VineyardArea -- Municipality
-Municipality -- Reed
+    Region - Area
+    Area - VineyardArea
+    VineyardArea - Municipality
+    Municipality - Reed
 
 }
 
 namespace Data {
 
-class Member {
+    class Member {
+        number
+        givenName
+        familyName
+        contactInformation
+        billingAddress
+    }
 
-}
+    class Branch {
 
-class Branch {
+    }
 
-}
+    class AreaCommitment {
 
-class AreaCommitment {
+    }
 
-}
+    class ContactInformation {
+        country
+        postalCode
+        city
+        street
+        telNr
+        mobileNr
+        emailAddress
+    }
 
-class BillingAddress {
+    class BillingAddress {
+        name
+        country
+        postalCode
+        city
+        street
+    }
 
-}
+    class BankAccount {
+        country
+        bankCode
+        accountNumber
+        name
+    }
 
-class BankAccount {
+    class Delivery {
+        date
+        branchId
+        number
+        time
+    }
 
-}
+    class DeliveryPart {
+        delivery
+        weight
+        gradation
+        qualityLevel
+        wineType
+    }
 
-class Delivery {
+    BankAccount -- BaseData.Bank
 
-}
+    Member -- Branch
+    Member -- AreaCommitment
+    Member -- ContactInformation
+    Member -- BillingAddress
+    Member -- BankAccount
+    Member -- BaseData.Country
 
-Member -- Branch
-Member -- AreaCommitment
-Member -- BillingAddress
+    BillingAddress -- BaseData.Country
+    ContactInformation --- BaseData.Country
 
+    AreaCommitment -- BaseData.WineType
+    AreaCommitment -- BaseData.WineTypeAttribute
+    AreaCommitment -- BaseData.Municipality
+    AreaCommitment -- BaseData.Reed
 
-AreaCommitment -- BaseData.WineType
-AreaCommitment -- BaseData.WineTypeAttribute
-
-Delivery -- Member
-Delivery -- BranchOffice
-
+    Delivery -- Member
+    Delivery -- Branch
+    Delivery - DeliveryPart
+    DeliveryPart -- BaseData.QualityLevel
+    DeliveryPart -- BaseData.WineType
+    DeliveryPart -- BaseData.WineTypeAttribute
 }
 
 @enduml
diff --git a/tt/STE.csv b/tt/STE.csv
index 8771004..1147ebd 100644
--- a/tt/STE.csv
+++ b/tt/STE.csv
@@ -2,4 +2,4 @@ date;from;to;hours;category;name
 2022-10-13;09:00;12:00;3;assessment;Ersteinschätzung WG Master in Matzen
 2022-10-31;16:00;18:00;2;assessment;Erstes Treffen mit Christian Perschl
 2022-10-31;22:00;01:00;3;structure;Projektstruktur
-2022-11-02;19:30;20:15;0.75;structure;Klassendiagram
+2022-11-02;19:30;21:30;2;structure;Klassendiagram