Updated UML, fusion of campus modules and other tweaks

docs/UML/AbstractModules.pu

@@ -16,8 +16,8 @@ package AbstractModels #lightgrey{
 
     abstract class ScholarShip{
         + type : string
-        + amount_min : float {€}
-        + amount_max : float {€}
+        + amount_min : float {currency}
+        + amount_max : float {currency}
     }
 
     abstract class Photo{
@@ -26,39 +26,9 @@ package AbstractModels #lightgrey{
         + description : MD
     }
 
-    BasicModule -up-|> Module
+    BasicModule -left-|> Module
     Photo -right-|> Module
-    ScholarShip -right-|> BasicModule
-
-    abstract class Campus{
-        + name : string
-        + Comment : MD
-        + longitude : float
-        + latitude : float
-    }
-
-    Campus -left|> Module
-
-    class CityCopy1 as "City" #red
-    Campus "*" -right[bold,#green]- "1" CityCopy1
-
-}
-
-
-package CampusExtra {
-    abstract class BasicModuleCopyCampusExtra as "BasicModule" #red
-
-    class CultureAndStudentLife
-    class Accomodation
-    class Transport
-
-    CultureAndStudentLife -up-|> BasicModuleCopyCampusExtra
-    Accomodation -up-|> BasicModuleCopyCampusExtra
-    Transport -up-|> BasicModuleCopyCampusExtra
-
+    ScholarShip -left-|> BasicModule
 }
-CultureAndStudentLife -down- Campus
-Accomodation -down- Campus
-Transport -down- Campus
 
 @enduml
\ No newline at end of file

docs/UML/Architecture.pu

 @startuml
 
+!include AbstractModules.pu
 !include Core.pu
 !include UniversityModules.pu
 !include CountryModules.pu
-!include AbstractModules.pu
+!include Campus.pu
 !include IndiFunctions.pu
 
 @enduml

docs/UML/Campus.pu

+@startuml
+
+
+package Campus {
+
+    abstract class Campus{
+        + is_main_campus : bool
+        + name : string
+        + Comment : MD
+        + longitude : float
+        + latitude : float
+    }
+    class CityCopy1 as "City" #red
+    Campus "*" -left[bold,#green]- "1" CityCopy1
+
+    abstract class ModuleCopyCampusExtra as "Module" #red
+    Campus -down|> ModuleCopyCampusExtra
+
+    abstract class BasicModuleCopyCampusExtra as "BasicModule" #red
+
+    class CultureAndStudentLife
+    class Accomodation
+    class Transport
+
+    CultureAndStudentLife -up-|> BasicModuleCopyCampusExtra
+    Accomodation -up-|> BasicModuleCopyCampusExtra
+    Transport -up-|> BasicModuleCopyCampusExtra
+
+    CultureAndStudentLife -- Campus
+    Accomodation -- Campus
+    Transport -- Campus
+}
+
+Campus "1..n" -- "1" University
+@enduml
\ No newline at end of file

docs/UML/Core.pu

@@ -41,18 +41,10 @@ class University  #wheat {
 University "1" .right. "1" City
 note on link #white
     This link is acheived
-    through the main campus module
+    through the campus module
+    (where is_main = true)
     end note
 
-    abstract class CampusCopy1 as "Campus" #red
-
-    class MainCampus
-
-    MainCampus -|>  CampusCopy1
-    MainCampus "1" -[bold,#green]up- "1" University
-
-
-
     Class Offer {
         + nb_seats_offered : int
     }

docs/UML/Makefile

@@ -4,6 +4,7 @@ TARGET=\
 		generated/UniversityModules.svg \
 		generated/CountryModules.svg \
 		generated/AbstractModules.svg \
+		generated/Campus.svg \
 		generated/IndiFunctions.svg
 
 

docs/UML/UniversityModules.pu

@@ -8,16 +8,13 @@ package UniversityModule{
     abstract class PhotoCopyUniversity as "Photo" #red
     abstract class BasicModuleCopyUniversity as "BasicModule" #red
     abstract class ScholarShipCopyUniversity as "Scholarship" #red
-    abstract class CampusCopyUniversity as "Campus" #red
 
     class CultureUniversity as "Culture"
-    class TransportUniversity
     class PhotoUniversity 
     class ScholarshipUniversity 
     class Courses
     class SpecialOffer
     class OtherStuff
-    class OtherCampus
 
     class SemesterDate{
         + autumn_begin : date
@@ -34,15 +31,12 @@ package UniversityModule{
     }
     
     CultureUniversity -up-|> BasicModuleCopyUniversity
-    TransportUniversity -up-|> BasicModuleCopyUniversity
     Courses -up-|> BasicModuleCopyUniversity
     SpecialOffer -up-|> BasicModuleCopyUniversity
     OtherStuff -up-|> BasicModuleCopyUniversity
     SemesterDate -up-|> BasicModuleCopyUniversity
     UniversityInfo -up-|> BasicModuleCopyUniversity
 
-    OtherCampus -up-|> CampusCopyUniversity
-
     PhotoUniversity -left-|> PhotoCopyUniversity
     
     ScholarshipUniversity -right-|> ScholarShipCopyUniversity
@@ -51,16 +45,14 @@ package UniversityModule{
 
 
     CultureUniversity "1" -down[bold,#green]- "1" UniversityModules
-    TransportUniversity "1" -down[bold,#green]- "1" UniversityModules
     PhotoUniversity "1" -right[bold,#green]- "1" UniversityModules
-    Courses "1" -right[bold,#green]- "1" UniversityModules
-    OtherStuff "1" -right[bold,#green]- "1" UniversityModules
-    SpecialOffer "1" -right[bold,#green]- "1" UniversityModules
-    UniversityInfo "1" -right[bold,#green]- "1" UniversityModules
-    SemesterDate "1" -right[bold,#green]- "1" UniversityModules
+    Courses "1" -down[bold,#green]- "1" UniversityModules
+    OtherStuff "1" -down[bold,#green]- "1" UniversityModules
+    SpecialOffer "1" -down[bold,#green]- "1" UniversityModules
+    UniversityInfo "1" -down[bold,#green]- "1" UniversityModules
+    SemesterDate "1" -down[bold,#green]- "1" UniversityModules
 
     ScholarshipUniversity "*" -left- "1" UniversityModules
-    OtherCampus "*" -left- "1" UniversityModules
 }
 UniversityModules -down[bold,#green]- University
 

docs/architecture.md

@@ -9,6 +9,7 @@ Vue complète :
 Vue plus précise :
 ![Core](UML/generated/Core.svg)
 ![AbstractModules](UML/generated/UniversityModules.svg)
+![Architecture](UML/generated/Campus.svg)
 ![Architecture](UML/generated/CountryModules.svg)
 ![Architecture](UML/generated/AbstractModules.svg)
 ![Architecture](UML/generated/IndiFunctions.svg)
\ No newline at end of file