Last Version of ArchitecturDocumentation and renaming imgages-folder to img
diff --git a/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc b/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
index 9d11362..6ba58c8 100644
--- a/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
+++ b/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
@@ -1,4 +1,4 @@
-////
+////
*******************************************************************************
* Copyright (c) 2019 Contributors to the Eclipse Foundation
*
@@ -13,40 +13,65 @@
*******************************************************************************
////
-openKonsequenz - Architecture of the module 'Contact Base Data'
-===============================================================
+= openKonsequenz - Architecture of the module 'Grid Failure Information'
+
+<<<
+
+Based on the ARC42-Template (v7.0):
+
+* Version: 0.1
+* Date: 24.03.2020
+* Status: Inital Draft
+
+<<<
+
:Author: Frank Dietrich
:Email: frank.dietrich@pta.de
-:Date: 2019-12-17
+
+:Date: 2020-03-24
:Revision: 1
+
:icons:
:source-highlighter: highlightjs
:highlightjs-theme: solarized_dark
+:lang: en
+:encoding: utf-8
+
:imagesdir: ../img
:iconsdir: ../img/icons
-This documentation is based on the ARC42-Template (v7.0):
+:toc:
+:toclevels: 4
+:toc-title: Table of Contents
+:toc-placement!:
+:sectanchors:
+:numbered:
+
+toc::[]
+
+<<<
== Introduction and Goals
=== Requirements Overview
+The module 'Grid Failure Information' (in German: Modul 'Störungsinformationstool')
+informs employees and customers about failures and planned interruptions of supply.
+The module realizes the whole process from the creation of a failure information,
+via the publication until the closure of the failure information.
-Many user modules of an openKONSEQUENZ installion need contact datas for their
-daily business. Furthermore they have to fulfil the regulatory requirement
-of the General Data Protection Regulation (GDPR).
+It supports the user by the acquisition of data and leads the user through
+the workflow for processing a failure information.
-This core module 'Contact Base Data' provides a central component for managing contact
-datas including the crucial functionality of GDPR.
+The module has many interfaces to other modules and external systems.
-The full requirements of the module 'Contact Base Data' (in German: Modul 'Kontaktstammdaten') is described in the document
+The full requirements of the module 'Grid Failure Information' is described in the document
-* "Anforderungsspezifikation Modul Kontaktstammdaten" version 1.2 / 07-11-2019.
-
+* "Anforderungsspezifikation Modul Störungsinformationstool" version 1.3 / 31-07-2019.
=== Quality Goals
-The module 'Contact Base Data' represents a core module that is based on the architecture platform of openKONSEQUENZ. The main quality
+The module 'Grid Failure Information' represents a user module that is based on the architecture platform of openKONSEQUENZ. The main quality
goals of the platform are:
* *Flexibility* The reference platform shall grant that different systems and modules from different vendors/developers can interact and interoperate, and may be exchanged or recombined.
@@ -76,22 +101,24 @@
are ensured by the use of sonarqube. The rule set and the qualtity gate are defined by the default, the
so called "sonar way".
-The module 'Contact Base Data' is part of the Eclipse project 'Eclipse openK Core Modules'.
+The module 'Grid Failure Information' is part of the Eclipse project 'Eclipse openK User Modules'.
This project bases on the Eclipse Public Licence 2.0.
=== Stakeholders
.Stakeholders
-[options="header,footer"]
+[options="header"]
|=========================================================
|Role/Name|Contact|Expectations
-|Product Owner (represents the Distribution System Operators)|Gordon Pickfort, Rainer Fuhrmann|The software must fulfil their functional and nonfunctional requirements.
+|Product Owner (represents the Distribution System Operators)|Maike Salbeck, Carsten Otten, Benedikt Herget, Rainer Fuhrmann|The software must fulfil their functional and nonfunctional requirements.
|Module Developer|Michel Alessandrini, Jonas Tewolde, Frank Dietrich|All relevant business and technical information must be available for implementing the software.
|External Reviewer (represents the AC/QC)|n.n.|The software and the documentation is realized according to the Quality and Architecture Handbook of openKONSEQUENZ.
|External Reviewer (represents the Eclipse-Requirements)|n.n.|The software is licensed under the EPL 2.0. It must be validated that all requirements are fulfilled.
|System Integrator|n.n.|A documentation for the integration of the module in the DSO specific environments must be available.
|=========================================================
+<<<
+
== Architecture Constraints
The main architecture constraints are:
@@ -102,8 +129,9 @@
Therefore the project is published under the following repositories:
-* https://git.eclipse.org/r/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.backend
-* https://git.eclipse.org/r/openk-usermodules/org.eclipse.openk-usermodules.contactBaseData.frontend
+* https://git.eclipse.org/r/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend
+* https://git.eclipse.org/r/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend
+* https://git.eclipse.org/r/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.documentation
=== Technical Constraints
@@ -111,7 +139,7 @@
The following technical constraints are given:
.Technical Contraints
-[options="header,footer"]
+[options="header"]
|========================================================
|Component|Constraints
|Base components of the reference platform
@@ -119,10 +147,6 @@
* JPA EclipseLink
* Database PostgreSQL
-|Enterprise service bus
-a|* ESB Talend
-* Communication via RESTful Webservices
-
|Programming language frontend
a|* Angular
* Bootstrap
@@ -157,22 +181,27 @@
=== Technical Dependencies
==== Modules
-The following modules are required to use the 'Contact Base Data':
+The following modules are required to use the 'Grid Failure Information':
.Modules
-[options="header,footer"]
+[options="header"]
|=========================================================
-|Name of the module|Purpose|Status of the module
-|'Auth&Auth'|Authentification and Authorization|available
+|Name of the module|Purpose|Status of the module|status
+|'Auth&Auth'|Authentification and Authorization|available|required
+|'Contact base data'|Contact Base Data|available|required
+|'eLogbook'|Log Book|available|optional
+|'Planned Grid Measures'|Planned Grid Measures|available|optional
+|'CIM-Cache'|Interface to the SCADA system|available|optional
|=========================================================
==== Libraries
The following libraries are used:
+TODO: Am Ende die Bibliotheken aktualisieren
.Libraries
-[options="header,footer"]
+[options="header"]
|=========================================================
|Name of the library|Version|Artefact-id|Usage|License|Tier
@@ -458,32 +487,46 @@
|=========================================================
+<<<
+
== System Scope and Context
=== Business Context
-The core module 'Contact Base Data' communicates via Restful Webservices with the follwowing modules:
+The core module 'Grid Failure Information' communicates via Restful Webservices with the follwowing modules:
-* *Core Module 'Auth & Auth'* The 'Contact Base Data' can only be used by authorized users.
+* *Core Module 'Auth & Auth'* The 'Grid Failure Information' can only be used by authorized users.
Therefore, it is essential to invoke the module 'Auth & Auth' for authorization and authentication
purposes.
+* *Core Module 'Contact base data'* The user management can only by done by the module contact base data.
+Therefore, it is essential to user the module ''Contact base data' for managing all users and customers.
+
+* *Core Module 'CIM-Cache'* The 'Grid Failure Information' can only communicate via the CIM-Cachewith the SCADA system .
+Therefore, it is essential to invoke the module 'CIM-Cache' for getting information from the SCADA system.
+
+* *User Module 'eLogbook'* The 'Grid Failure Information' can import failure information from the module 'eLogbook'.
+
+* *User Module 'Planned Grid Measures'* The 'Grid Failure Information' can import failure information from the module 'Planned Grid Measures'.
+
=== Technical Context
-The following aspects have to be taken into account for external communication of the module 'Contact Base Data':
+The following aspects have to be taken into account for external communication of the module 'Grid Failure Information':
* RESTful web services are used as interface-technology.
* Each external interface (interfaces between modules or external systems) has to be documented.
* Dependencies of modules to services realized by other modules have to be specified and documented explicitly.
-The interfaces of the module 'Contact Base Data' are described in the interface documentation.
+The interfaces of the module 'Grid Failure Information' are described in the interface documentation.
+TODO: Link zur interface documentation einfügen
=== Solution Strategy
The module 'Grid Failure Information' bases on a small microservice architecture, including
an asynchronous messaging system.
+<<<
== Building Block View
@@ -516,10 +559,10 @@
.Architecture of the grid failure information tool
-[options="header,footer"]
+[options="header"]
image::architectureSIT.png[]
-
+TODO: Ab hier komplett überarbeiten
==== contactBaseDataFE
@@ -556,7 +599,7 @@
. *Model* - The model corresponds to the view-model of the backend tier.
.Frontend tier
-[options="header,footer"]
+[options="header"]
[plantuml]
----
@@ -605,7 +648,7 @@
.Backend tier
-[options="header,footer"]
+[options="header"]
[plantuml]
----
@@ -642,7 +685,7 @@
The ContactBaseData-DB is realized as a relational database system.
.Database tier
-[options="header,footer"]
+[options="header"]
[plantuml]
----
@@ -654,6 +697,8 @@
==== Program Configuration
+<<<
+
== Runtime view
=== Login / authentication
@@ -772,11 +817,14 @@
This automatically triggers the build and the deployment on the
Q-environment.
+<<<
== Design decisions
All architecture decisions are based on the Architecture Committee Handbook. There are no deviations.
+<<<
+
== Risks and Technical Debts
(Currently there aren't any known issues)
@@ -786,7 +834,7 @@
== Glossary
.Abbreviations and glossary terms
-[options="header,footer"]
+[options="header"]
|========================================================
|Short|Long|German|Description
|AC|Architecture Committee|Architektur-Komittee|Gives framework and constraints according to architecture for oK projects.
diff --git a/src/main/asciidoc/imgages/BackendTier.png b/src/main/asciidoc/img/BackendTier.png
similarity index 100%
rename from src/main/asciidoc/imgages/BackendTier.png
rename to src/main/asciidoc/img/BackendTier.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/DatabaseTier.png b/src/main/asciidoc/img/DatabaseTier.png
similarity index 100%
rename from src/main/asciidoc/imgages/DatabaseTier.png
rename to src/main/asciidoc/img/DatabaseTier.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/DistributionOfComponents1.png b/src/main/asciidoc/img/DistributionOfComponents1.png
similarity index 100%
rename from src/main/asciidoc/imgages/DistributionOfComponents1.png
rename to src/main/asciidoc/img/DistributionOfComponents1.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/FrontendTier.png b/src/main/asciidoc/img/FrontendTier.png
similarity index 100%
rename from src/main/asciidoc/imgages/FrontendTier.png
rename to src/main/asciidoc/img/FrontendTier.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/SolutionArchitecture.png b/src/main/asciidoc/img/SolutionArchitecture.png
similarity index 100%
rename from src/main/asciidoc/imgages/SolutionArchitecture.png
rename to src/main/asciidoc/img/SolutionArchitecture.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/SystemContext.png b/src/main/asciidoc/img/SystemContext.png
similarity index 100%
rename from src/main/asciidoc/imgages/SystemContext.png
rename to src/main/asciidoc/img/SystemContext.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/abbrechen.png b/src/main/asciidoc/img/abbrechen.png
similarity index 100%
rename from src/main/asciidoc/imgages/abbrechen.png
rename to src/main/asciidoc/img/abbrechen.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/abmelden.png b/src/main/asciidoc/img/abmelden.png
similarity index 100%
rename from src/main/asciidoc/imgages/abmelden.png
rename to src/main/asciidoc/img/abmelden.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/architectureSIT.png b/src/main/asciidoc/img/architectureSIT.png
similarity index 100%
rename from src/main/asciidoc/imgages/architectureSIT.png
rename to src/main/asciidoc/img/architectureSIT.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/auge-symbol.png b/src/main/asciidoc/img/auge-symbol.png
similarity index 100%
rename from src/main/asciidoc/imgages/auge-symbol.png
rename to src/main/asciidoc/img/auge-symbol.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/beantragen.png b/src/main/asciidoc/img/beantragen.png
similarity index 100%
rename from src/main/asciidoc/imgages/beantragen.png
rename to src/main/asciidoc/img/beantragen.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/button_tabelle_kalender.jpg b/src/main/asciidoc/img/button_tabelle_kalender.jpg
similarity index 100%
rename from src/main/asciidoc/imgages/button_tabelle_kalender.jpg
rename to src/main/asciidoc/img/button_tabelle_kalender.jpg
Binary files differ
diff --git a/src/main/asciidoc/imgages/dateien_hochladen.png b/src/main/asciidoc/img/dateien_hochladen.png
similarity index 100%
rename from src/main/asciidoc/imgages/dateien_hochladen.png
rename to src/main/asciidoc/img/dateien_hochladen.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/einzelmassnahme-loeschen.png b/src/main/asciidoc/img/einzelmassnahme-loeschen.png
similarity index 100%
rename from src/main/asciidoc/imgages/einzelmassnahme-loeschen.png
rename to src/main/asciidoc/img/einzelmassnahme-loeschen.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/email-verteiler.png b/src/main/asciidoc/img/email-verteiler.png
similarity index 100%
rename from src/main/asciidoc/imgages/email-verteiler.png
rename to src/main/asciidoc/img/email-verteiler.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/erinnerung_datum_grau.png b/src/main/asciidoc/img/erinnerung_datum_grau.png
similarity index 100%
rename from src/main/asciidoc/imgages/erinnerung_datum_grau.png
rename to src/main/asciidoc/img/erinnerung_datum_grau.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/erinnerung_datum_orange.png b/src/main/asciidoc/img/erinnerung_datum_orange.png
similarity index 100%
rename from src/main/asciidoc/imgages/erinnerung_datum_orange.png
rename to src/main/asciidoc/img/erinnerung_datum_orange.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/erinnerung_datum_rot.jpg b/src/main/asciidoc/img/erinnerung_datum_rot.jpg
similarity index 100%
rename from src/main/asciidoc/imgages/erinnerung_datum_rot.jpg
rename to src/main/asciidoc/img/erinnerung_datum_rot.jpg
Binary files differ
diff --git a/src/main/asciidoc/imgages/erinnerung_glocke_grau.png b/src/main/asciidoc/img/erinnerung_glocke_grau.png
similarity index 100%
rename from src/main/asciidoc/imgages/erinnerung_glocke_grau.png
rename to src/main/asciidoc/img/erinnerung_glocke_grau.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/erinnerung_glocke_orange.png b/src/main/asciidoc/img/erinnerung_glocke_orange.png
similarity index 100%
rename from src/main/asciidoc/imgages/erinnerung_glocke_orange.png
rename to src/main/asciidoc/img/erinnerung_glocke_orange.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/erinnerung_glocke_rot.jpg b/src/main/asciidoc/img/erinnerung_glocke_rot.jpg
similarity index 100%
rename from src/main/asciidoc/imgages/erinnerung_glocke_rot.jpg
rename to src/main/asciidoc/img/erinnerung_glocke_rot.jpg
Binary files differ
diff --git a/src/main/asciidoc/imgages/filter_speichern.png b/src/main/asciidoc/img/filter_speichern.png
similarity index 100%
rename from src/main/asciidoc/imgages/filter_speichern.png
rename to src/main/asciidoc/img/filter_speichern.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm-erstellen.png b/src/main/asciidoc/img/gnm-erstellen.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm-erstellen.png
rename to src/main/asciidoc/img/gnm-erstellen.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_detail.png b/src/main/asciidoc/img/gnm_detail.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_detail.png
rename to src/main/asciidoc/img/gnm_detail.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_einzelmassnahme.png b/src/main/asciidoc/img/gnm_einzelmassnahme.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_einzelmassnahme.png
rename to src/main/asciidoc/img/gnm_einzelmassnahme.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_gesamt.png b/src/main/asciidoc/img/gnm_gesamt.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_gesamt.png
rename to src/main/asciidoc/img/gnm_gesamt.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_header.png b/src/main/asciidoc/img/gnm_header.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_header.png
rename to src/main/asciidoc/img/gnm_header.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_kalenderuebersicht.png b/src/main/asciidoc/img/gnm_kalenderuebersicht.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_kalenderuebersicht.png
rename to src/main/asciidoc/img/gnm_kalenderuebersicht.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_schrittsequenz.png b/src/main/asciidoc/img/gnm_schrittsequenz.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_schrittsequenz.png
rename to src/main/asciidoc/img/gnm_schrittsequenz.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_schrittsequenz_tabelle.png b/src/main/asciidoc/img/gnm_schrittsequenz_tabelle.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_schrittsequenz_tabelle.png
rename to src/main/asciidoc/img/gnm_schrittsequenz_tabelle.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/gnm_uebersichtstabelle.png b/src/main/asciidoc/img/gnm_uebersichtstabelle.png
similarity index 100%
rename from src/main/asciidoc/imgages/gnm_uebersichtstabelle.png
rename to src/main/asciidoc/img/gnm_uebersichtstabelle.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/icons/caution.png b/src/main/asciidoc/img/icons/caution.png
similarity index 100%
rename from src/main/asciidoc/imgages/icons/caution.png
rename to src/main/asciidoc/img/icons/caution.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/icons/important.png b/src/main/asciidoc/img/icons/important.png
similarity index 100%
rename from src/main/asciidoc/imgages/icons/important.png
rename to src/main/asciidoc/img/icons/important.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/icons/note.png b/src/main/asciidoc/img/icons/note.png
similarity index 100%
rename from src/main/asciidoc/imgages/icons/note.png
rename to src/main/asciidoc/img/icons/note.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/icons/tip.png b/src/main/asciidoc/img/icons/tip.png
similarity index 100%
rename from src/main/asciidoc/imgages/icons/tip.png
rename to src/main/asciidoc/img/icons/tip.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/icons/warning.png b/src/main/asciidoc/img/icons/warning.png
similarity index 100%
rename from src/main/asciidoc/imgages/icons/warning.png
rename to src/main/asciidoc/img/icons/warning.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/kalender_tag.png b/src/main/asciidoc/img/kalender_tag.png
similarity index 100%
rename from src/main/asciidoc/imgages/kalender_tag.png
rename to src/main/asciidoc/img/kalender_tag.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/kalender_woche.png b/src/main/asciidoc/img/kalender_woche.png
similarity index 100%
rename from src/main/asciidoc/imgages/kalender_woche.png
rename to src/main/asciidoc/img/kalender_woche.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/meldung_erfolgreich.png b/src/main/asciidoc/img/meldung_erfolgreich.png
similarity index 100%
rename from src/main/asciidoc/imgages/meldung_erfolgreich.png
rename to src/main/asciidoc/img/meldung_erfolgreich.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/meldung_fehler.png b/src/main/asciidoc/img/meldung_fehler.png
similarity index 100%
rename from src/main/asciidoc/imgages/meldung_fehler.png
rename to src/main/asciidoc/img/meldung_fehler.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/meldung_hinweis.png b/src/main/asciidoc/img/meldung_hinweis.png
similarity index 100%
rename from src/main/asciidoc/imgages/meldung_hinweis.png
rename to src/main/asciidoc/img/meldung_hinweis.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/netzmassnahme_duplizieren.png b/src/main/asciidoc/img/netzmassnahme_duplizieren.png
similarity index 100%
rename from src/main/asciidoc/imgages/netzmassnahme_duplizieren.png
rename to src/main/asciidoc/img/netzmassnahme_duplizieren.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/oeffnen-modul.png b/src/main/asciidoc/img/oeffnen-modul.png
similarity index 100%
rename from src/main/asciidoc/imgages/oeffnen-modul.png
rename to src/main/asciidoc/img/oeffnen-modul.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/rueckschaltung-planen.png b/src/main/asciidoc/img/rueckschaltung-planen.png
similarity index 100%
rename from src/main/asciidoc/imgages/rueckschaltung-planen.png
rename to src/main/asciidoc/img/rueckschaltung-planen.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/speichern.png b/src/main/asciidoc/img/speichern.png
similarity index 100%
rename from src/main/asciidoc/imgages/speichern.png
rename to src/main/asciidoc/img/speichern.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/sperrung_aufheben.png b/src/main/asciidoc/img/sperrung_aufheben.png
similarity index 100%
rename from src/main/asciidoc/imgages/sperrung_aufheben.png
rename to src/main/asciidoc/img/sperrung_aufheben.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_a_beendet.png b/src/main/asciidoc/img/status_farbe_a_beendet.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_a_beendet.png
rename to src/main/asciidoc/img/status_farbe_a_beendet.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_angefordert.png b/src/main/asciidoc/img/status_farbe_angefordert.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_angefordert.png
rename to src/main/asciidoc/img/status_farbe_angefordert.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_beantragt.png b/src/main/asciidoc/img/status_farbe_beantragt.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_beantragt.png
rename to src/main/asciidoc/img/status_farbe_beantragt.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_freigegeben.png b/src/main/asciidoc/img/status_farbe_freigegeben.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_freigegeben.png
rename to src/main/asciidoc/img/status_farbe_freigegeben.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_genehmigt.png b/src/main/asciidoc/img/status_farbe_genehmigt.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_genehmigt.png
rename to src/main/asciidoc/img/status_farbe_genehmigt.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_in_arbeit.png b/src/main/asciidoc/img/status_farbe_in_arbeit.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_in_arbeit.png
rename to src/main/asciidoc/img/status_farbe_in_arbeit.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_m_beendet.png b/src/main/asciidoc/img/status_farbe_m_beendet.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_m_beendet.png
rename to src/main/asciidoc/img/status_farbe_m_beendet.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_neu.png b/src/main/asciidoc/img/status_farbe_neu.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_neu.png
rename to src/main/asciidoc/img/status_farbe_neu.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_schalten-aktiv.png b/src/main/asciidoc/img/status_farbe_schalten-aktiv.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_schalten-aktiv.png
rename to src/main/asciidoc/img/status_farbe_schalten-aktiv.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/status_farbe_zur_genehmigung.png b/src/main/asciidoc/img/status_farbe_zur_genehmigung.png
similarity index 100%
rename from src/main/asciidoc/imgages/status_farbe_zur_genehmigung.png
rename to src/main/asciidoc/img/status_farbe_zur_genehmigung.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/statuswechsel-uebersicht.png b/src/main/asciidoc/img/statuswechsel-uebersicht.png
similarity index 100%
rename from src/main/asciidoc/imgages/statuswechsel-uebersicht.png
rename to src/main/asciidoc/img/statuswechsel-uebersicht.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/stift-symbol.png b/src/main/asciidoc/img/stift-symbol.png
similarity index 100%
rename from src/main/asciidoc/imgages/stift-symbol.png
rename to src/main/asciidoc/img/stift-symbol.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/stornieren-deaktiviert.png b/src/main/asciidoc/img/stornieren-deaktiviert.png
similarity index 100%
rename from src/main/asciidoc/imgages/stornieren-deaktiviert.png
rename to src/main/asciidoc/img/stornieren-deaktiviert.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/stornieren.png b/src/main/asciidoc/img/stornieren.png
similarity index 100%
rename from src/main/asciidoc/imgages/stornieren.png
rename to src/main/asciidoc/img/stornieren.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/stornieren_kommentar.png b/src/main/asciidoc/img/stornieren_kommentar.png
similarity index 100%
rename from src/main/asciidoc/imgages/stornieren_kommentar.png
rename to src/main/asciidoc/img/stornieren_kommentar.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/tabellen-filter.png b/src/main/asciidoc/img/tabellen-filter.png
similarity index 100%
rename from src/main/asciidoc/imgages/tabellen-filter.png
rename to src/main/asciidoc/img/tabellen-filter.png
Binary files differ
diff --git a/src/main/asciidoc/imgages/vordefinierte_filter.png b/src/main/asciidoc/img/vordefinierte_filter.png
similarity index 100%
rename from src/main/asciidoc/imgages/vordefinierte_filter.png
rename to src/main/asciidoc/img/vordefinierte_filter.png
Binary files differ
diff --git a/src/main/asciidoc/userDocumentation/userDocumentation.adoc b/src/main/asciidoc/userDocumentation/userDocumentation.adoc
index 986320f..f4b9fec 100644
--- a/src/main/asciidoc/userDocumentation/userDocumentation.adoc
+++ b/src/main/asciidoc/userDocumentation/userDocumentation.adoc
@@ -23,8 +23,8 @@
:lang: de
:encoding: utf-8
-:imagesdir: ../images
-:iconsdir: ../images/icons
+:imagesdir: ../img
+:iconsdir: ../img/icons
:toc:
:toclevels: 4
