GNM-1255 Doku aktualisiert
diff --git a/src/main/asciidoc/howto/howtoBuild.adoc b/src/main/asciidoc/howto/howtoBuild.adoc
index 93afdec..fe5adb8 100644
--- a/src/main/asciidoc/howto/howtoBuild.adoc
+++ b/src/main/asciidoc/howto/howtoBuild.adoc
@@ -1,18 +1,4 @@
-////
- *******************************************************************************
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************
-////
-= openKonsequenz - How to build the module "plannedGridMeasures@openK"
+= openKonsequenz - How to build the module "eLogbook@openK"
:Date: 2017-11-17
:Revision: 1
:icons:
@@ -24,17 +10,40 @@
IMPORTANT: Please be sure that you have first *Portal (Auth n Auth)* installed and configured!
== Requirements
-* Node.js 6.10.3
+* Apache Tomcat 8.0.30
+* Node.js 6.10.0
* Angular-CLI
* Graphviz
== How to build the Backend
To build the backend you need to have installed Apache Maven and Java (look at `/deploy/`*get_started.txt*).
+=== Install and Configure Apache Tomcat
+Tomcat is an open-source Java Servlet Container and provides a "pure Java" HTTP web server environment in which Java code can run.
+
+* Download Tomcat version 8.0.30 from https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.30/bin/
+and extract it (apache-tomcat-8-0-30.zip).
+* Place the extracted folder on your C drive.
+* Configure Tomcat:
+** Configure the *context.xml* file. Copy the *<Resource … >* block from the project file `deploy/conf/`*context.xml*
+and paste it in the `<tomcat>/conf/`*context.xml* in the *<Context>* block.
+** To run both backend projects (elogbook and portal) at the same time on Tomcat you have to
+ give him the parameters for different backend configs. Just paste the following line in the *context.xml* over the *<Resource … >*:
+
+ <Parameter name="OK_ELOGBOOK_ENVIRONMENT" override="false" value="DevLocal"/>
+
+** Dont forget to save it.
+
+
+TIP: For more informations check *Deployment View* Chapter in *http://87.128.212.254:8880/elogbookFE_ADoc/elogbook_architectureDocumentation.html[elogbook_architectureDocumentation]*.
+
+** Tomcat also needs the database driver to be placed in `<tomcat>/lib`. Find it in the project file `deploy/lib/`*postgresql-xxx.jar*.
+
+
=== Install Graphviz
Graphviz is open source graph visualization software. You need this software because of auto-generated graphics in the documentations.
-* Download and install Graphviz from https://graphviz.gitlab.io/_pages/Download/Download_windows.html
+* Download and install Graphviz from http://www.graphviz.org/Download_windows.php
* If not, set the PATH variable
Name of variable: GRAPHVIZ_DOT
@@ -47,10 +56,10 @@
Node.js is an open-source, cross-platform JavaScript run-time environment for executing JavaScript (also Typescript which is a strongly typed form of JavaScript) code server-side.
-* Download Node.js 6.10.3 from https://nodejs.org/download/release/v6.10.3/ by clicking on a xxx.msi image for windows.
+* Download Node.js 6.10.0 from https://nodejs.org/download/release/v6.10.0/ by clicking on a xxx.msi image for windows.
* Run the downloaded Node.js .msi Installer - including accepting the license, selecting the destination, and authenticating for the install.
This requires Administrator privileges, and you may need to authenticate
-* To ensure Node.js has been installed, run the following in your terminal which should show you the installed version. (For example: v6.10.0)
+* To ensure Node.js has been installed, run the following in your terminal - you should get something like v6.10.0
[source,command]
----
@@ -59,7 +68,7 @@
{blank}
=== Update the npm Angular-CLI client
-This package manager comes bundled with Node.js and it is good to have the latest version.
+This package manager comes bundled with Node.js and its good to have the latest version.
* Open a command line and navigate to the root folder of the frontend project
* Run the following commands (the version is defined in the package.json file):
@@ -76,7 +85,7 @@
----
{blank}
-TIP: Next Step -> Read the *howtoRun* file!
+TIP: Next Step -> Read the *elogbook_howtoRun* file!
diff --git a/src/main/asciidoc/howto/howtoRun.adoc b/src/main/asciidoc/howto/howtoRun.adoc
index 79f7d3d..66e895e 100644
--- a/src/main/asciidoc/howto/howtoRun.adoc
+++ b/src/main/asciidoc/howto/howtoRun.adoc
@@ -1,19 +1,5 @@
-////
- *******************************************************************************
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************
-////
-= openKonsequenz - How to run the module "Plannedgridmeasures"
-:Date: 2018-06-25
+= openKonsequenz - How to run the module "eLogbook@openK"
+:Date: 2017-11-17
:Revision: 1
:icons:
:source-highlighter: highlightjs
@@ -24,70 +10,36 @@
IMPORTANT: Please be sure that you have first *Portal (Auth n Auth)* installed and configured!
== Requirements
-* Java 8 Runtime Environment
-* Build-Artifacts (look at *howtoBuild* or you get them from a Jenkins source as zip):
-** MicsHomeService Backend
-** MicsCentralService Backend-Microservice
-** PlannedGridMeasures Backend-Microservice
-** PlannedGridMeasures Frontend
+* Browser (Chrome or IE11 suggested)
== Prerequisites
-* *Portal (Auth n Auth) application has to be installed and configured.* The Portal is the entrypoint
-for this module and mandatory for its authentification.
+* *To see this application running you have to run Portal application too.* The reason is the authentication, which happened in the Portal login phase.
-==== Install and Configure Apache Tomcat
-Tomcat is an open-source Java Servlet Container and provides a "pure Java" HTTP web server environment in which Java code can run.
+* A developing and administrating software for databases
-1. Download Tomcat version 8.5.24 from https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.24/bin
-and extract it (apache-tomcat-8.5.24.zip).
-2. Configure Tomcat:
- a. Configure the *context.xml* file. Copy the *<Resource … >* block from the project file `deploy/conf/`*context.xml*
-and paste it in the `<tomcat>/conf/`*context.xml* in the *<Context>* block.
+** To work with a postgreSQL database is pgAdmin suggested
-b. Dont forget to save it.
-
-
-TIP: For more informations check *Deployment View* Chapter in *http://169.50.13.154/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]*.
-
-** Tomcat also needs the database driver to be placed in `<tomcat>/lib`. Find it in the project file `deploy/lib/`*postgresql-xxx.jar*.
-
-TIP: It is recommend to install a service for starting and stopping the Apache Tomcat.
-
-==== Install and Configure a PostgreSQL database
-
-To work with a postgreSQL database pgAdmin is suggested
-
-1. Download and install pgAdmin (we suggest "Version 3" since it performs better than "Version 4") from:
+*** Download and install pgAdmin (version 3 is used during developing process) from:
https://www.pgadmin.org/download/
-2. Create a database and adapt the `<tomcat>/conf/`*context.xml* file to your database (look at *Install and Configure Apache Tomcat*).
+*** Create a database and adapt the `<tomcat>/conf/`*context.xml* file to your database (look at *elogbook_howtoBuild*).
-3. To initialize the database schema run the last sql script:
+*** To initialize the database schema run the sql scripts:
- /db/migrations/V0_XX__CREATE_PLGM_DB.sql
-
-TIP: It is recommend to install a service for starting and stopping the PostgreSQL database.
-
-TIP: For detailed instructions look at *http://169.50.13.154/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]*.
-
-== How to deploy and run the Backend
-To run the backend you need to have installed and configured Apache Tomcat (look at *Install and Configure Apache Tomcat*).
-The Backend consists of 3 Artifacts:
-
-** One Web Application Archive (war) file which is deployed on an Apache Tomcat
-*** MicsHomeService (*mics-home-service.war*)
-** Two Java Archives (jar) started as Microservices
-*** MicsCentralService Backend-Microservice (*mics-central-service.jar*)
-*** PlannedGridMeasures Backend-Microservice (*planned-grid-measures.jar*)
+ /db/postgreSQL/02_create_DB_1.0.0.sql
+ /db/postgreSQL/03_config_DB_1.0.0.sql
-=== Deploy MicsHomeService (war-file) and start Apache Tomcat
-Tomcat needs the Web Application Archive (war) file. Get it from a successfully maven build or via zip from a Jenkins source.
+TIP: For detailed instructions look at *http://87.128.212.254:8880/elogbookFE_ADoc/elogbook_architectureDocumentation.html[elogbook_architectureDocumentation]*
-1. Copy the *mics-home-service.war* file from the `/target` folder of
-project "MicsHomeService" (zip or maven-build) to the `<tomcat>/webapps` folder.
-If there is already a folder named *mics-home-service* you have to delete it.
-2. Navigate to your `apache-tomcat-8.5.24\bin` folder and start Tomcat by clicking on *startup.bat* (Windows) or executing *startup.sh* (Linux).
+== How to run the Backend
+To run the backend you need to have installed and configured Apache Tomcat (look at *elogbook_howtoBuild*).
+
+=== Set up and start Apache Tomcat
+Tomcat needs the Web Application Archive (war) file, which is produced by building the maven project, to run the application.
+
+* Copy the *betriebstagebuch.war* file from the project file `/target` in the `<tomcat>/webapps` file. If there is a folder named *betriebstagebuch*, delete it before.
+* Navigate to `C:\apache-tomcat-8.0.30\bin` and start Tomcat by clicking on *startup.bat*.
* Tomcat's default port is *8080*.
[source,text]
@@ -98,233 +50,39 @@
- Replace "8080" by your port number (for example 8181)
- Restart tomcat server (in the same folder which startup.bat is located, you can also find a shutdown.bat file).
----
-IMPORTANT: If you change the port number you have also adapt the port in the
-frontend project: File "<PRJ_plannedGridMeasuresFE>/proxy.conf.json"
+{blank}
-[start=3]
-3. Stop your the Apache Tomcat.
-4. Navigate to `webapps/mics-home-service/WEB-INF/classes` and open *backendConfigProduction.json*
+IMPORTANT: If you change the part number you have also adapt the port in the
+frontend project: File "<PRJ_elogbookFE>/proxy.conf.json"
+TIP: Look at the *http://87.128.212.254:8880/elogbookFE_ADoc/elogbook_interfaceDocumentation.html[elogbook_interfaceDocumentation]* for informations about the services.
+
+== How to run the Frontend
+To run the frontend project you need to have installed and updated Node.js and npm Angular-CLI.
+
+=== Compile the Frontend
+
+To compile say Angular-CLI to start.
+
+* Open a command line and navigate to the root folder of the frontend project
+* Run the command
+
+[source,command]
----
-{
- "micsDistributionCluster" : "openK",
- "micsCentralURL" : "http://169.50.13.154:9010/mics/central",
- "micsHealthStateExtraPath" : "healthcheck?pretty=true",
- "micsCentralIsHttps" : false
-}
+ $ npm start
----
-[start=5]
-5. Set the "micsCentralURL" accordingly. Change the IP to the server where the MicsCentralService Microservice is/will be installed on.
-6. Start your Apache Tomcat.
+{blank}
+* Open a browser and type:
-=== Deploy and start Microservices
-
-==== Microservices File Structures
-No matter where the artifacts are from, a zip file from a Jenkins source or from a maven built
-result (look at *howtoBuild*), the final structure and existence of the files/folders has to look
-like the following layout (see File/Folder Structure below) after you deployed it to your chosen
-folder.
-
-a. If you got it as zip it should already has the correct structure after extraction. (ignore b.)
-b. If you have a maven built:
-* The needed jar-file is always in the `/target` folder of the related project folder after a successful maven build (look at *howtoBuild*).
-The other files and folders needed are in the root folder `/` of the related project after a successful maven build.
-
-==== MicsCentralService Backend-Microservice
-
-===== File/Folder Structure
+[source,http]
----
-<yourChoosenFolder_MicsCentralService>/mics-central-service.jar
- /serviceConfig_QA.yml
- /servicesDistributionQAServer.json
+ http://localhost:4200
----
-===== Configuring and starting the microservice
-The name of `*.yml` file can be changed but you have to use the same file as starting parameter when starting
-the microservice later on. In our example it is `serviceConfig_QA.yml`.
+{blank}
-*serviceConfig_QA.yml*
-----
-servicesDistributionFileName: servicesDistributionQAServer.json
-
-
-logging:
- level: INFO
- appenders:
- - type: file
- currentLogFilename: /opt/mics/logs/mics-central-service.log
- threshold: ALL
- archive: true
- archivedLogFilenamePattern: /opt/mics/logs/mics-central-service-%d.log
- archivedFileCount: 5
- timeZone: UTC
- loggers:
- org.eclipse.openk: DEBUG
- org.eclipse.jetty.servlets: DEBUG
-
-server:
- applicationConnectors:
- - type: http
- port: 9010
- adminConnectors:
- - type: http
- port: 9011
-
-
-----
-
-** servicesDistributionFileName: The file name of the configuration for the intercommunictaion between the services (see below).
-** applicationConnectors: Type and port on which the microservice is running.
-The latest set of socalled "service distribution cluster" can be found in the Architecture documentation.
-
-
-*servicesDistributionQAServer.json*
-----
-{
- "active": "true",
- "clustername": "openK",
- "description": "service cluster for openKonsequenz",
- "distributions": [
- {
- "active": "true",
- "name": "planned-grid-measures.openK",
- "protocol": "http",
- "host": "169.50.13.154",
- "urlPath": "/mics/gridmeasures",
- "portApp": "9050",
- "portHealth": "9051",
- "description": "Planned Grid Measures Backend"
- },
- {
- "active": "true",
- "name": "authNauth.openK",
- "protocol": "http",
- "host": "169.50.13.154",
- "urlPath": "/portal/rest/beservice",
- "healthUrlPath": "/portal/rest/beservice",
- "portApp": "8080",
- "portHealth": "8080",
- "description": "Auth&Auth-Modul"
- },
- {
- "active": "true",
- "name": "mics-central-service",
- "protocol": "http",
- "host": "169.50.13.154",
- "urlPath": "/mics/central",
- "portApp": "9010",
- "portHealth": "9011",
- "description": "Mics Central Service-Configures and dispatches different service clusters for different modules"
- }
- ]
- }
-----
-
-
-** "name" : Name of the service (must not be changed, since it is hardwired in the client-applications!)
-** "protocol" : HTTP or HTTPS
-** "host" : IP of the server where the service can be reached
-** "urlPath" : (must not be changed)
-** "portApp" : Port of the service. For example for `mics-central-service` it is `9010` because that is
-what we configured in the related `serviceConfig_QA.yml` under `applicationConnectors` -> `type` and `port`.
-** "portHealth": Port of the dropWizard-Health-Service.
-** "description" : Description of the service
-
-The microservice can now be started via Java-Runtime in a console from your <yourChoosenFolder_MicsCentralService>:
-
-Remember to use the *.yml file as parameter like below, in our example it is `serviceConfig_QA.yml`:
-----
-java -jar mics-central-service.jar server serviceConfig_QA.yml
-----
-
-TIP: It is recommend to install this execution as a service.
-
-==== PlannedGridMeasures Backend-Microservice
-
-===== File/Folder Structure
-----
-<yourChoosenFolder_PlannedGridMeasures>/planned-grid-measures.jar
- /qserver.yml
- /roleAccessConfiguration/role-access-definition.json
- /emailConfiguration/mailTemplatesPaths.json
- /emailConfiguration/emailTemplates/<MULTIPLE_EMAIL_TEMPLATES>.txt
-----
-===== Configuring and starting the microservice
-The name of `*.yml` file can be changed but you have to use the same file as starting parameter when starting
-the microservice later on. In our example it is `qserver.yml`.
-
-*qserver.yml*
-----
-persistencyUnit: planned-grid-measures-devserver
-portalBaseURL: http://localhost:8080/portal/rest/beservice
-whiteListDocumenttypes: application/pdf,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel.sheet.macroEnabled.12,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-word.document.macroEnabled.12,image/png,image/jpeg
-
-
-dbConn:
- driver: org.postgresql.Driver
- url: jdbc:postgresql://localhost:5432/plannedgridmeasuresqa
- user: plgm_service
- password: plgm_service
-
-emailConfiguration:
- smtpHost: localhost
- port: 1025
- sender: testSenderDevServer@test.de
-
-logging:
- level: INFO
- appenders:
- - type: file
- currentLogFilename: /opt/mics/logs/planned-grid-measures.log
- threshold: ALL
- archive: true
- archivedLogFilenamePattern: /opt/mics/logs/planned-grid-measures-%d.log
- archivedFileCount: 5
- timeZone: UTC
- loggers:
- org.eclipse.openk: DEBUG
- org.eclipse.jetty.servlets: DEBUG
-
-server:
- applicationConnectors:
- - type: http
- port: 9050
- adminConnectors:
- - type: http
- port: 9051
-
-----
-** portalBaseURL: The URL to the Auth&Auth Module (Backend)
-** whiteListDocumenttypes: File types you want to allow for upload in *MIME-Type*
-(https://wiki.selfhtml.org/wiki/MIME-Type/%C3%9Cbersicht)
-** dbConn: Configuration of your postgreSQL database
-** applicationConnectors: Type and port on which the microservice is running
-
-
-The microservice can now be started via Java-Runtime in a console from your <yourChoosenFolder_PlannedGridMeasures>.
-Remember to use the *.yml file as parameter like below, in our example it is `qserver.yml`:
-
-----
-java -jar planned-grid-measures.jar server qserver.yml
-----
-
-TIP: It is recommend to install this execution as a service.
-
-TIP: Look at the *http://169.50.13.154/gridMeasuresADoc/architectureDocumentation.html[PlannedGridMeasures Architecture Documentation]* for informations about the services.
-
-== How to deploy and run the Frontend
-Go to `<tomcat>/webapps` folder, if there is already a folder named *plannedGridMeasures* delete it.
-You can get the Frontend sources as a artifact (zip) from Jenkins or by a maven-build.
-If you get the artifact from Jenkins as zip extract the content to the `<tomcat>/webapps` folder.
-If you do a maven-build, copy the content of the `dist` folder in the project folder of "PlannedGridMeasures Frontend" to `<tomcat>/webapps/plannedGridMeasures`.
-
-Nevertheless guarantee the following file/folder structure after extraction/copying:
-----
-<tomcat>/webapps/plannedGridMeasures
-<tomcat>/webapps/plannedGridMeasures/index.html
-<tomcat>/webapps/plannedGridMeasures/*.*
-<tomcat>/webapps/plannedGridMeasures/assets/*.*
-----
+IMPORTANT: The reason you maybe don´t see the application running properly, is that you have not even logged in.
+To do so, run first the Portal project, where you can log in and then open the elogbook.
diff --git a/src/main/asciidoc/images/gnm_kalenderuebersicht.png b/src/main/asciidoc/images/gnm_kalenderuebersicht.png
index fc7d4d9..0ade69d 100644
--- a/src/main/asciidoc/images/gnm_kalenderuebersicht.png
+++ b/src/main/asciidoc/images/gnm_kalenderuebersicht.png
Binary files differ
diff --git a/src/main/asciidoc/images/gnm_schrittsequenz.png b/src/main/asciidoc/images/gnm_schrittsequenz.png
index 3e11ee6..1fdf2ed 100644
--- a/src/main/asciidoc/images/gnm_schrittsequenz.png
+++ b/src/main/asciidoc/images/gnm_schrittsequenz.png
Binary files differ
diff --git a/src/main/asciidoc/images/kalender_tag.png b/src/main/asciidoc/images/kalender_tag.png
index dfb4aad..59ea073 100644
--- a/src/main/asciidoc/images/kalender_tag.png
+++ b/src/main/asciidoc/images/kalender_tag.png
Binary files differ
diff --git a/src/main/asciidoc/images/kalender_woche.png b/src/main/asciidoc/images/kalender_woche.png
index 11b59a1..bec72f4 100644
--- a/src/main/asciidoc/images/kalender_woche.png
+++ b/src/main/asciidoc/images/kalender_woche.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_a_beendet.png b/src/main/asciidoc/images/status_farbe_a_beendet.png
new file mode 100644
index 0000000..b86a3c9
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_a_beendet.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_angefordert.png b/src/main/asciidoc/images/status_farbe_angefordert.png
new file mode 100644
index 0000000..ca89557
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_angefordert.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_beantragt.png b/src/main/asciidoc/images/status_farbe_beantragt.png
new file mode 100644
index 0000000..10e1129
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_beantragt.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_freigegeben.png b/src/main/asciidoc/images/status_farbe_freigegeben.png
new file mode 100644
index 0000000..dd7ae29
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_freigegeben.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_genehmigt.png b/src/main/asciidoc/images/status_farbe_genehmigt.png
new file mode 100644
index 0000000..3d0a1ba
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_genehmigt.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_in_arbeit.png b/src/main/asciidoc/images/status_farbe_in_arbeit.png
new file mode 100644
index 0000000..7ca59bd
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_in_arbeit.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_m_beendet.png b/src/main/asciidoc/images/status_farbe_m_beendet.png
new file mode 100644
index 0000000..afcb205
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_m_beendet.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_neu.png b/src/main/asciidoc/images/status_farbe_neu.png
new file mode 100644
index 0000000..972fc33
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_neu.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_schalten-aktiv.png b/src/main/asciidoc/images/status_farbe_schalten-aktiv.png
new file mode 100644
index 0000000..9f65e09
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_schalten-aktiv.png
Binary files differ
diff --git a/src/main/asciidoc/images/status_farbe_zur_genehmigung.png b/src/main/asciidoc/images/status_farbe_zur_genehmigung.png
new file mode 100644
index 0000000..fc10974
--- /dev/null
+++ b/src/main/asciidoc/images/status_farbe_zur_genehmigung.png
Binary files differ
diff --git a/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_1.bpmn b/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_1.bpmn
index 8ca271f..7b4185f 100644
--- a/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_1.bpmn
+++ b/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_1.bpmn
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.16.2">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
<bpmn:collaboration id="Collaboration_12wz08v">
<bpmn:participant id="Participant_0otw9c4" name="Antragsteller" processRef="Process_1" />
<bpmn:participant id="Participant_1p95h6s" name="Maßnahmeantrag" processRef="Process_0j08xuw" />
@@ -12,91 +12,31 @@
<bpmn:messageFlow id="MessageFlow_1cdmhoz" sourceRef="IntermediateThrowEvent_0bl3lkd" targetRef="Participant_0otw9c4" />
<bpmn:messageFlow id="MessageFlow_19dm73r" sourceRef="IntermediateThrowEvent_1inljg0" targetRef="Participant_0otw9c4" />
<bpmn:messageFlow id="MessageFlow_03ewhg8" sourceRef="IntermediateThrowEvent_1inljg0" targetRef="Participant_010bjd5" />
- <bpmn:messageFlow id="MessageFlow_1m2y84z" sourceRef="EndEvent_0ymfux1" targetRef="Participant_0otw9c4" />
- <bpmn:messageFlow id="MessageFlow_17595r5" sourceRef="EndEvent_0ymfux1" targetRef="Participant_010bjd5" />
</bpmn:collaboration>
<bpmn:process id="Process_1" isExecutable="true" />
<bpmn:process id="Process_0j08xuw" isExecutable="false">
- <bpmn:sequenceFlow id="SequenceFlow_10rg81i" sourceRef="IntermediateThrowEvent_198tcy7" targetRef="IntermediateThrowEvent_0peu6a9" />
- <bpmn:sequenceFlow id="SequenceFlow_0ktqb7q" sourceRef="IntermediateThrowEvent_0peu6a9" targetRef="Task_1euso4y" />
- <bpmn:sequenceFlow id="SequenceFlow_1flkn86" name="ja" sourceRef="ExclusiveGateway_001oo0e" targetRef="IntermediateThrowEvent_00cdzsy" />
- <bpmn:sequenceFlow id="SequenceFlow_1d87js5" name="ja" sourceRef="ExclusiveGateway_1k55f7m" targetRef="IntermediateThrowEvent_0350wsr" />
- <bpmn:sequenceFlow id="SequenceFlow_1uwbemv" name="nein" sourceRef="ExclusiveGateway_1k55f7m" targetRef="ExclusiveGateway_001oo0e" />
- <bpmn:sequenceFlow id="SequenceFlow_17449rm" sourceRef="Task_1euso4y" targetRef="ExclusiveGateway_1k55f7m" />
- <bpmn:sequenceFlow id="SequenceFlow_0u4snq8" name="storniert (JA)" sourceRef="ExclusiveGateway_1aau17v" targetRef="EndEvent_0ymfux1" />
- <bpmn:sequenceFlow id="SequenceFlow_0m63nnm" name="nein" sourceRef="ExclusiveGateway_001oo0e" targetRef="ExclusiveGateway_1aau17v" />
- <bpmn:sequenceFlow id="SequenceFlow_1puvmik" name="anfordern (NEIN)" sourceRef="ExclusiveGateway_1aau17v" targetRef="IntermediateThrowEvent_0q6p6io" />
+ <bpmn:sequenceFlow id="SequenceFlow_02hfotj" name="Maßnahme zur Zeit nicht möglich" sourceRef="ExclusiveGateway_0x9yr4g" targetRef="IntermediateThrowEvent_0bl3lkd" />
<bpmn:sequenceFlow id="SequenceFlow_0rbrfmo" sourceRef="IntermediateThrowEvent_0bl3lkd" targetRef="IntermediateThrowEvent_0lqcxbt" />
- <bpmn:sequenceFlow id="SequenceFlow_02vwa01" sourceRef="IntermediateThrowEvent_0q6p6io" targetRef="Task_197mpbp" />
- <bpmn:sequenceFlow id="SequenceFlow_0pgzax1" sourceRef="IntermediateThrowEvent_04ti381" targetRef="IntermediateThrowEvent_0bl3lkd" />
<bpmn:sequenceFlow id="SequenceFlow_1unnid8" name="Maßname nicht mehr nötig" sourceRef="ExclusiveGateway_0x9yr4g" targetRef="EndEvent_1ifo6ny" />
- <bpmn:sequenceFlow id="SequenceFlow_02hfotj" name="Maßnahme zur Zeit nicht möglich" sourceRef="ExclusiveGateway_0x9yr4g" targetRef="IntermediateThrowEvent_04ti381" />
- <bpmn:sequenceFlow id="SequenceFlow_1w0wd0p" sourceRef="Task_197mpbp" targetRef="ExclusiveGateway_0x9yr4g" />
- <bpmn:sequenceFlow id="SequenceFlow_1i3z6t7" name="Ja" sourceRef="ExclusiveGateway_0x9yr4g" targetRef="IntermediateThrowEvent_1inljg0" />
- <bpmn:sequenceFlow id="SequenceFlow_04zp5fs" sourceRef="IntermediateThrowEvent_1inljg0" targetRef="IntermediateThrowEvent_0xoyqwy" />
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0lqcxbt" name="1">
- <bpmn:incoming>SequenceFlow_0rbrfmo</bpmn:incoming>
- </bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_198tcy7" name="2">
- <bpmn:outgoing>SequenceFlow_10rg81i</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_024p0l7" sourceRef="IntermediateThrowEvent_07j0e50" targetRef="IntermediateThrowEvent_0peu6a9" />
<bpmn:intermediateCatchEvent id="IntermediateThrowEvent_0peu6a9" name="Maßnahme anfordern">
- <bpmn:incoming>SequenceFlow_10rg81i</bpmn:incoming>
<bpmn:incoming>SequenceFlow_024p0l7</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0ktqb7q</bpmn:outgoing>
<bpmn:messageEventDefinition />
</bpmn:intermediateCatchEvent>
- <bpmn:task id="Task_1euso4y" name="Maßnahme anfordern <APPROVED>">
+ <bpmn:task id="Task_1euso4y" name="Maßnahme anfordern">
<bpmn:incoming>SequenceFlow_0ktqb7q</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_17449rm</bpmn:outgoing>
</bpmn:task>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0350wsr" name="4">
- <bpmn:incoming>SequenceFlow_1d87js5</bpmn:incoming>
- </bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_00cdzsy" name="5">
- <bpmn:incoming>SequenceFlow_1flkn86</bpmn:incoming>
- </bpmn:intermediateThrowEvent>
- <bpmn:exclusiveGateway id="ExclusiveGateway_001oo0e" name="Konfig: SkipRequesting">
- <bpmn:incoming>SequenceFlow_1uwbemv</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0m63nnm</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1flkn86</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:exclusiveGateway id="ExclusiveGateway_1k55f7m" name="Konfig: EndAfterApproval">
- <bpmn:incoming>SequenceFlow_17449rm</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1uwbemv</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1d87js5</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:endEvent id="EndEvent_0ymfux1">
- <bpmn:incoming>SequenceFlow_0u4snq8</bpmn:incoming>
- <bpmn:messageEventDefinition />
- </bpmn:endEvent>
- <bpmn:exclusiveGateway id="ExclusiveGateway_1aau17v" name="Maßnahme nicht mehr nötig">
- <bpmn:incoming>SequenceFlow_0m63nnm</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1puvmik</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_0u4snq8</bpmn:outgoing>
- </bpmn:exclusiveGateway>
<bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0q6p6io" name="angefordert">
- <bpmn:incoming>SequenceFlow_1puvmik</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_17449rm</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_02vwa01</bpmn:outgoing>
<bpmn:messageEventDefinition />
</bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0bl3lkd" name="zurückgewiesen">
- <bpmn:incoming>SequenceFlow_0pgzax1</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0rbrfmo</bpmn:outgoing>
- <bpmn:messageEventDefinition />
- </bpmn:intermediateThrowEvent>
- <bpmn:task id="Task_197mpbp" name="Maßnahme und Ablauf überprüfen <REQUESTED>">
+ <bpmn:task id="Task_197mpbp" name="Maßnahme und Ablauf überprüfen">
<bpmn:incoming>SequenceFlow_02vwa01</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1w0wd0p</bpmn:outgoing>
</bpmn:task>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_04ti381" name="Status APPLIED setzen">
- <bpmn:incoming>SequenceFlow_02hfotj</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0pgzax1</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
- <bpmn:endEvent id="EndEvent_1ifo6ny" name="storniert">
- <bpmn:incoming>SequenceFlow_1unnid8</bpmn:incoming>
- <bpmn:messageEventDefinition />
- </bpmn:endEvent>
<bpmn:exclusiveGateway id="ExclusiveGateway_0x9yr4g">
<bpmn:incoming>SequenceFlow_1w0wd0p</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1unnid8</bpmn:outgoing>
@@ -108,333 +48,235 @@
<bpmn:outgoing>SequenceFlow_04zp5fs</bpmn:outgoing>
<bpmn:messageEventDefinition />
</bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0xoyqwy" name="6">
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0xoyqwy" name="2">
<bpmn:incoming>SequenceFlow_04zp5fs</bpmn:incoming>
</bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_0ktqb7q" sourceRef="IntermediateThrowEvent_0peu6a9" targetRef="Task_1euso4y" />
+ <bpmn:sequenceFlow id="SequenceFlow_17449rm" sourceRef="Task_1euso4y" targetRef="IntermediateThrowEvent_0q6p6io" />
+ <bpmn:sequenceFlow id="SequenceFlow_02vwa01" sourceRef="IntermediateThrowEvent_0q6p6io" targetRef="Task_197mpbp" />
+ <bpmn:sequenceFlow id="SequenceFlow_1w0wd0p" sourceRef="Task_197mpbp" targetRef="ExclusiveGateway_0x9yr4g" />
+ <bpmn:sequenceFlow id="SequenceFlow_1i3z6t7" name="Ja" sourceRef="ExclusiveGateway_0x9yr4g" targetRef="IntermediateThrowEvent_1inljg0" />
+ <bpmn:sequenceFlow id="SequenceFlow_04zp5fs" sourceRef="IntermediateThrowEvent_1inljg0" targetRef="IntermediateThrowEvent_0xoyqwy" />
+ <bpmn:endEvent id="EndEvent_1ifo6ny" name="storniert">
+ <bpmn:incoming>SequenceFlow_1unnid8</bpmn:incoming>
+ <bpmn:messageEventDefinition />
+ </bpmn:endEvent>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0bl3lkd" name="zurückgewiesen">
+ <bpmn:incoming>SequenceFlow_02hfotj</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0rbrfmo</bpmn:outgoing>
+ <bpmn:messageEventDefinition />
+ </bpmn:intermediateThrowEvent>
<bpmn:intermediateThrowEvent id="IntermediateThrowEvent_07j0e50" name="3">
<bpmn:outgoing>SequenceFlow_024p0l7</bpmn:outgoing>
</bpmn:intermediateThrowEvent>
- <bpmn:sequenceFlow id="SequenceFlow_024p0l7" sourceRef="IntermediateThrowEvent_07j0e50" targetRef="IntermediateThrowEvent_0peu6a9" />
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0lqcxbt" name="1">
+ <bpmn:incoming>SequenceFlow_0rbrfmo</bpmn:incoming>
+ </bpmn:intermediateThrowEvent>
</bpmn:process>
<bpmn:process id="Process_1z0bvsp" isExecutable="false" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_12wz08v">
<bpmndi:BPMNShape id="Participant_0otw9c4_di" bpmnElement="Participant_0otw9c4">
- <dc:Bounds x="123" y="23" width="1226" height="75" />
+ <dc:Bounds x="123" y="23" width="949" height="76" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_1p95h6s_di" bpmnElement="Participant_1p95h6s">
- <dc:Bounds x="123" y="130" width="1228" height="446" />
+ <dc:Bounds x="123" y="127" width="949" height="352" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_010bjd5_di" bpmnElement="Participant_010bjd5">
- <dc:Bounds x="123" y="597" width="1231" height="70" />
+ <dc:Bounds x="123" y="506" width="949" height="70" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_1l1mp73_di" bpmnElement="MessageFlow_1l1mp73">
- <di:waypoint x="286" y="98" />
- <di:waypoint x="286" y="271" />
+ <di:waypoint xsi:type="dc:Point" x="237" y="99" />
+ <di:waypoint xsi:type="dc:Point" x="237" y="268" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="256" y="177.5" width="90" height="14" />
+ <dc:Bounds x="207" y="176.5" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateCatchEvent_1fg67tv_di" bpmnElement="IntermediateThrowEvent_0peu6a9">
- <dc:Bounds x="268" y="271" width="36" height="36" />
+ <dc:Bounds x="219" y="268" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="210" y="250" width="53" height="28" />
+ <dc:Bounds x="163" y="272" width="53" height="28" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_1euso4y_di" bpmnElement="Task_1euso4y">
- <dc:Bounds x="321" y="249" width="100" height="80" />
+ <dc:Bounds x="298" y="246" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0ktqb7q_di" bpmnElement="SequenceFlow_0ktqb7q">
- <di:waypoint x="304" y="289" />
- <di:waypoint x="321" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="255" y="286" />
+ <di:waypoint xsi:type="dc:Point" x="298" y="286" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="267.5" y="267" width="90" height="14" />
+ <dc:Bounds x="232" y="264" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_17449rm_di" bpmnElement="SequenceFlow_17449rm">
- <di:waypoint x="421" y="289" />
- <di:waypoint x="445" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="398" y="286" />
+ <di:waypoint xsi:type="dc:Point" x="454" y="286" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="388" y="267" width="90" height="14" />
+ <dc:Bounds x="381" y="264" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_0c394i6_di" bpmnElement="IntermediateThrowEvent_0q6p6io">
- <dc:Bounds x="845" y="271" width="36" height="36" />
+ <dc:Bounds x="454" y="268" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="834" y="248" width="57" height="14" />
+ <dc:Bounds x="443" y="245" width="57" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_197mpbp_di" bpmnElement="Task_197mpbp">
- <dc:Bounds x="1003" y="249" width="100" height="80" />
+ <dc:Bounds x="544" y="246" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_02vwa01_di" bpmnElement="SequenceFlow_02vwa01">
- <di:waypoint x="881" y="289" />
- <di:waypoint x="1003" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="490" y="286" />
+ <di:waypoint xsi:type="dc:Point" x="544" y="286" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="897" y="267" width="90" height="14" />
+ <dc:Bounds x="472" y="264" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_0lmpuxm_di" bpmnElement="MessageFlow_0lmpuxm">
- <di:waypoint x="863" y="307" />
- <di:waypoint x="863" y="597" />
+ <di:waypoint xsi:type="dc:Point" x="472" y="304" />
+ <di:waypoint xsi:type="dc:Point" x="472" y="506" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="833" y="445" width="90" height="14" />
+ <dc:Bounds x="442" y="398" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_0x9yr4g_di" bpmnElement="ExclusiveGateway_0x9yr4g" isMarkerVisible="true">
- <dc:Bounds x="1125" y="264" width="50" height="50" />
+ <dc:Bounds x="708" y="261" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1105" y="317" width="90" height="14" />
+ <dc:Bounds x="688" y="314" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1w0wd0p_di" bpmnElement="SequenceFlow_1w0wd0p">
- <di:waypoint x="1103" y="289" />
- <di:waypoint x="1125" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="644" y="286" />
+ <di:waypoint xsi:type="dc:Point" x="708" y="286" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1069" y="267" width="90" height="14" />
+ <dc:Bounds x="631" y="264" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1unnid8_di" bpmnElement="SequenceFlow_1unnid8">
- <di:waypoint x="1150" y="264" />
- <di:waypoint x="1150" y="205" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="261" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="231" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="231" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="202" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1114" y="230.4237288135593" width="73" height="28" />
+ <dc:Bounds x="648.83051554527" y="216.75433620755393" width="73" height="28" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_1qfn9q2_di" bpmnElement="EndEvent_1ifo6ny">
- <dc:Bounds x="1132" y="169" width="36" height="36" />
+ <dc:Bounds x="715" y="166" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1086" y="171" width="40" height="14" />
+ <dc:Bounds x="669" y="168" width="40" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_1kg5s6u_di" bpmnElement="MessageFlow_1kg5s6u">
- <di:waypoint x="1150" y="169" />
- <di:waypoint x="1150" y="98" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="166" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="99" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1120" y="126.5" width="90" height="14" />
+ <dc:Bounds x="703" y="125.5" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_0rutzwg_di" bpmnElement="MessageFlow_0rutzwg">
- <di:waypoint x="1150" y="205" />
- <di:waypoint x="1150" y="597" />
+ <di:waypoint xsi:type="dc:Point" x="751" y="184" />
+ <di:waypoint xsi:type="dc:Point" x="807" y="184" />
+ <di:waypoint xsi:type="dc:Point" x="807" y="504" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1120" y="394" width="90" height="14" />
+ <dc:Bounds x="734" y="162" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_02hfotj_di" bpmnElement="SequenceFlow_02hfotj">
- <di:waypoint x="1150" y="314" />
- <di:waypoint x="1150" y="413" />
- <di:waypoint x="1120" y="413" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="311" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="352" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="352" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="392" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1133" y="351" width="83" height="28" />
+ <dc:Bounds x="643" y="329.6545454545454" width="83" height="28" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_0u1k7ev_di" bpmnElement="IntermediateThrowEvent_0bl3lkd">
- <dc:Bounds x="956" y="395" width="36" height="36" />
+ <dc:Bounds x="715" y="392" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="880" y="389" width="81" height="14" />
+ <dc:Bounds x="639" y="386" width="81" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_0egiz49_di" bpmnElement="MessageFlow_0egiz49">
- <di:waypoint x="974" y="431" />
- <di:waypoint x="974" y="597" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="428" />
+ <di:waypoint xsi:type="dc:Point" x="733" y="506" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="944" y="507" width="90" height="14" />
+ <dc:Bounds x="703" y="460" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_1cdmhoz_di" bpmnElement="MessageFlow_1cdmhoz">
- <di:waypoint x="974" y="395" />
- <di:waypoint x="974" y="98" />
+ <di:waypoint xsi:type="dc:Point" x="751" y="410" />
+ <di:waypoint xsi:type="dc:Point" x="776" y="410" />
+ <di:waypoint xsi:type="dc:Point" x="776" y="99" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="944" y="239.5" width="90" height="14" />
+ <dc:Bounds x="718.5" y="388" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1i3z6t7_di" bpmnElement="SequenceFlow_1i3z6t7">
- <di:waypoint x="1175" y="289" />
- <di:waypoint x="1239" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="758" y="286" />
+ <di:waypoint xsi:type="dc:Point" x="923" y="286" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1208.8945652740833" y="264.4237288135593" width="11" height="14" />
+ <dc:Bounds x="835.0578324514048" y="264" width="11" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_1cy8f3a_di" bpmnElement="IntermediateThrowEvent_1inljg0">
- <dc:Bounds x="1239" y="271" width="36" height="36" />
+ <dc:Bounds x="923" y="268" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1186" y="296" width="58" height="14" />
+ <dc:Bounds x="870" y="293" width="58" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_19dm73r_di" bpmnElement="MessageFlow_19dm73r">
- <di:waypoint x="1257" y="271" />
- <di:waypoint x="1257" y="98" />
+ <di:waypoint xsi:type="dc:Point" x="941" y="268" />
+ <di:waypoint xsi:type="dc:Point" x="941" y="99" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1227" y="177.5" width="90" height="14" />
+ <dc:Bounds x="911" y="176.5" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_03ewhg8_di" bpmnElement="MessageFlow_03ewhg8">
- <di:waypoint x="1257" y="307" />
- <di:waypoint x="1257" y="597" />
+ <di:waypoint xsi:type="dc:Point" x="941" y="304" />
+ <di:waypoint xsi:type="dc:Point" x="941" y="506" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1227" y="445" width="90" height="14" />
+ <dc:Bounds x="911" y="398" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_0lqcxbt_di" bpmnElement="IntermediateThrowEvent_0lqcxbt">
- <dc:Bounds x="174" y="395" width="36" height="36" />
+ <dc:Bounds x="219" y="392" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="189" y="405" width="6" height="14" />
+ <dc:Bounds x="234" y="402" width="6" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0rbrfmo_di" bpmnElement="SequenceFlow_0rbrfmo">
- <di:waypoint x="956" y="413" />
- <di:waypoint x="210" y="413" />
+ <di:waypoint xsi:type="dc:Point" x="715" y="410" />
+ <di:waypoint xsi:type="dc:Point" x="255" y="410" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="538" y="391" width="90" height="14" />
+ <dc:Bounds x="440" y="388" width="90" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_0xoyqwy_di" bpmnElement="IntermediateThrowEvent_0xoyqwy">
- <dc:Bounds x="1292" y="271" width="36" height="36" />
+ <dc:Bounds x="1012.0696864111499" y="268" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1309" y="282" width="6" height="14" />
+ <dc:Bounds x="1029" y="279" width="6" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_04zp5fs_di" bpmnElement="SequenceFlow_04zp5fs">
- <di:waypoint x="1275" y="289" />
- <di:waypoint x="1292" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="959" y="286" />
+ <di:waypoint xsi:type="dc:Point" x="1012" y="286" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1238.5" y="267" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_04ti381_di" bpmnElement="IntermediateThrowEvent_04ti381">
- <dc:Bounds x="1084" y="395" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1065" y="434" width="75" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0pgzax1_di" bpmnElement="SequenceFlow_0pgzax1">
- <di:waypoint x="1084" y="413" />
- <di:waypoint x="992" y="413" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="993" y="391" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_1aau17v_di" bpmnElement="ExclusiveGateway_1aau17v" isMarkerVisible="true">
- <dc:Bounds x="715" y="264" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="700" y="310" width="79" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1puvmik_di" bpmnElement="SequenceFlow_1puvmik">
- <di:waypoint x="765" y="289" />
- <di:waypoint x="845" y="289" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="757.2657286891737" y="267" width="81" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_1yctnh9_di" bpmnElement="EndEvent_0ymfux1">
- <dc:Bounds x="722" y="169" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="695" y="208" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0u4snq8_di" bpmnElement="SequenceFlow_0u4snq8">
- <di:waypoint x="740" y="264" />
- <di:waypoint x="740" y="235" />
- <di:waypoint x="740" y="235" />
- <di:waypoint x="740" y="205" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="708" y="233.906636024131" width="64" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="MessageFlow_1m2y84z_di" bpmnElement="MessageFlow_1m2y84z">
- <di:waypoint x="740" y="169" />
- <di:waypoint x="740" y="98" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="710" y="126.5" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_1k55f7m_di" bpmnElement="ExclusiveGateway_1k55f7m" isMarkerVisible="true">
- <dc:Bounds x="445" y="264" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="427" y="317" width="87" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1uwbemv_di" bpmnElement="SequenceFlow_1uwbemv">
- <di:waypoint x="495" y="289" />
- <di:waypoint x="579" y="289" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="527" y="267" width="20" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_001oo0e_di" bpmnElement="ExclusiveGateway_001oo0e" isMarkerVisible="true">
- <dc:Bounds x="579" y="264" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="567" y="317" width="74" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0m63nnm_di" bpmnElement="SequenceFlow_0m63nnm">
- <di:waypoint x="629" y="289" />
- <di:waypoint x="715" y="289" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="662" y="267" width="20" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_0350wsr_di" bpmnElement="IntermediateThrowEvent_0350wsr">
- <dc:Bounds x="1292" y="519" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1306" y="530" width="6" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_00cdzsy_di" bpmnElement="IntermediateThrowEvent_00cdzsy">
- <dc:Bounds x="1292" y="466" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1306" y="476" width="6" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1d87js5_di" bpmnElement="SequenceFlow_1d87js5">
- <di:waypoint x="470" y="314" />
- <di:waypoint x="470" y="537" />
- <di:waypoint x="1292" y="537" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="479" y="358" width="9" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1flkn86_di" bpmnElement="SequenceFlow_1flkn86">
- <di:waypoint x="604" y="314" />
- <di:waypoint x="604" y="484" />
- <di:waypoint x="1292" y="484" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="614" y="358" width="9" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_198tcy7_di" bpmnElement="IntermediateThrowEvent_198tcy7">
- <dc:Bounds x="174" y="271" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="193" y="282" width="6" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_10rg81i_di" bpmnElement="SequenceFlow_10rg81i">
- <di:waypoint x="210" y="289" />
- <di:waypoint x="268" y="289" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="239" y="267" width="0" height="14" />
+ <dc:Bounds x="985.5" y="264" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_07j0e50_di" bpmnElement="IntermediateThrowEvent_07j0e50">
- <dc:Bounds x="174" y="346" width="36" height="36" />
+ <dc:Bounds x="219" y="343.61207897793264" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="191" y="355" width="6" height="14" />
+ <dc:Bounds x="236" y="353" width="6" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_024p0l7_di" bpmnElement="SequenceFlow_024p0l7">
- <di:waypoint x="210" y="364" />
- <di:waypoint x="286" y="364" />
- <di:waypoint x="286" y="307" />
+ <di:waypoint xsi:type="dc:Point" x="237" y="344" />
+ <di:waypoint xsi:type="dc:Point" x="237" y="304" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="203" y="342" width="90" height="14" />
+ <dc:Bounds x="252" y="317" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="MessageFlow_17595r5_di" bpmnElement="MessageFlow_17595r5">
- <di:waypoint x="740" y="205" />
- <di:waypoint x="740" y="597" />
- </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
diff --git a/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_2.bpmn b/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_2.bpmn
index e99158f..e3891f4 100644
--- a/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_2.bpmn
+++ b/src/main/asciidoc/originalfiles/massnahme_durchfuehren_u_abschliessen_2.bpmn
@@ -11,202 +11,144 @@
<bpmn:messageFlow id="MessageFlow_1s0pj8o" sourceRef="Participant_1cdzc63" targetRef="IntermediateCatchEvent_0iktfkm" />
<bpmn:messageFlow id="MessageFlow_19thj68" sourceRef="Participant_1cdzc63" targetRef="IntermediateCatchEvent_1kwvf1t" />
<bpmn:messageFlow id="MessageFlow_0nlpipb" sourceRef="Participant_1cdzc63" targetRef="IntermediateCatchEvent_1wnlzou" />
- <bpmn:messageFlow id="MessageFlow_02rlfue" sourceRef="Participant_1cdzc63" targetRef="IntermediateThrowEvent_1x84jos" />
</bpmn:collaboration>
<bpmn:process id="Process_1" isExecutable="true" />
<bpmn:process id="Process_0gtvrko" isExecutable="false">
- <bpmn:task id="Task_04dyx7j" name="Maßnahme begonnen <RELEASED>">
+ <bpmn:task id="Task_04dyx7j" name="Maßnahme begonnen">
<bpmn:incoming>SequenceFlow_12l5dxh</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1idlok4</bpmn:outgoing>
</bpmn:task>
- <bpmn:sequenceFlow id="SequenceFlow_1idlok4" sourceRef="Task_04dyx7j" targetRef="ExclusiveGateway_073wsz5" />
+ <bpmn:intermediateCatchEvent id="IntermediateCatchEvent_1wnlzou" name="Maßnahme aktiv">
+ <bpmn:incoming>SequenceFlow_1idlok4</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_007e4sv</bpmn:outgoing>
+ <bpmn:messageEventDefinition />
+ </bpmn:intermediateCatchEvent>
+ <bpmn:task id="Task_0jvozhg" name="Maßnahme ausgegführt">
+ <bpmn:incoming>SequenceFlow_007e4sv</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0gwydqp</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:sequenceFlow id="SequenceFlow_1idlok4" sourceRef="Task_04dyx7j" targetRef="IntermediateCatchEvent_1wnlzou" />
<bpmn:sequenceFlow id="SequenceFlow_007e4sv" sourceRef="IntermediateCatchEvent_1wnlzou" targetRef="Task_0jvozhg" />
- <bpmn:sequenceFlow id="SequenceFlow_0gwydqp" sourceRef="Task_0jvozhg" targetRef="ExclusiveGateway_1w6e1nl" />
+ <bpmn:sequenceFlow id="SequenceFlow_0gwydqp" sourceRef="Task_0jvozhg" targetRef="IntermediateCatchEvent_1kwvf1t" />
<bpmn:sequenceFlow id="SequenceFlow_0hentfy" sourceRef="IntermediateCatchEvent_1kwvf1t" targetRef="Task_106dpr7" />
<bpmn:sequenceFlow id="SequenceFlow_0yj0aw5" sourceRef="Task_106dpr7" targetRef="IntermediateCatchEvent_0iktfkm" />
<bpmn:sequenceFlow id="SequenceFlow_12l5dxh" sourceRef="StartEvent_1" targetRef="Task_04dyx7j" />
<bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1aq7vte" name="3">
<bpmn:incoming>SequenceFlow_1xadpn3</bpmn:incoming>
</bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="StartEvent_1" name="6">
+ <bpmn:intermediateThrowEvent id="StartEvent_1" name="2">
<bpmn:outgoing>SequenceFlow_12l5dxh</bpmn:outgoing>
</bpmn:intermediateThrowEvent>
- <bpmn:sequenceFlow id="SequenceFlow_0o76z6l" sourceRef="IntermediateCatchEvent_0iktfkm" targetRef="Task_19d4h92" />
- <bpmn:sequenceFlow id="SequenceFlow_0x9wx4i" name="keine weitere Maßnahme notwendig" sourceRef="ExclusiveGateway_14c3mza" targetRef="IntermediateThrowEvent_0y1b6mz" />
- <bpmn:sequenceFlow id="SequenceFlow_1nxe7iw" sourceRef="IntermediateThrowEvent_0y1b6mz" targetRef="Task_0r4k9vh" />
- <bpmn:sequenceFlow id="SequenceFlow_0ywtsv9" sourceRef="Task_0r4k9vh" targetRef="EndEvent_151eqdp" />
- <bpmn:sequenceFlow id="SequenceFlow_1xadpn3" name="Weitere Maßnahme notwendig" sourceRef="ExclusiveGateway_14c3mza" targetRef="IntermediateThrowEvent_1aq7vte" />
- <bpmn:sequenceFlow id="SequenceFlow_0c9bje2" sourceRef="Task_19d4h92" targetRef="IntermediateThrowEvent_1x84jos" />
- <bpmn:sequenceFlow id="SequenceFlow_1kvrbdz" sourceRef="IntermediateThrowEvent_1x84jos" targetRef="ExclusiveGateway_14c3mza" />
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_19mgk3e" name="5">
- <bpmn:outgoing>SequenceFlow_0polkmn</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1a0hokd" name="4">
- <bpmn:outgoing>SequenceFlow_0tj2ml8</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0mrshq5" name="Status: CLOSED setzen">
- <bpmn:incoming>SequenceFlow_0tj2ml8</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0pgszu3</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
- <bpmn:sequenceFlow id="SequenceFlow_0polkmn" sourceRef="IntermediateThrowEvent_19mgk3e" targetRef="IntermediateThrowEvent_13xz905" />
- <bpmn:sequenceFlow id="SequenceFlow_0k3wf5t" sourceRef="IntermediateThrowEvent_13xz905" targetRef="IntermediateCatchEvent_1wnlzou" />
- <bpmn:sequenceFlow id="SequenceFlow_0tj2ml8" sourceRef="IntermediateThrowEvent_1a0hokd" targetRef="IntermediateThrowEvent_0mrshq5" />
- <bpmn:sequenceFlow id="SequenceFlow_0pgszu3" sourceRef="IntermediateThrowEvent_0mrshq5" targetRef="EndEvent_151eqdp" />
- <bpmn:endEvent id="EndEvent_151eqdp" name="geschlossen">
- <bpmn:incoming>SequenceFlow_0ywtsv9</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0pgszu3</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_1jimz92</bpmn:incoming>
- <bpmn:messageEventDefinition />
- </bpmn:endEvent>
- <bpmn:task id="Task_0r4k9vh" name="Dokumentation erstellen <FINISHED>">
- <bpmn:incoming>SequenceFlow_1nxe7iw</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0ywtsv9</bpmn:outgoing>
- </bpmn:task>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0y1b6mz" name="beendet">
- <bpmn:incoming>SequenceFlow_0x9wx4i</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_1mtk9p3</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1nxe7iw</bpmn:outgoing>
- <bpmn:messageEventDefinition />
- </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_0o76z6l" sourceRef="IntermediateCatchEvent_0iktfkm" targetRef="ExclusiveGateway_14c3mza" />
<bpmn:exclusiveGateway id="ExclusiveGateway_14c3mza">
- <bpmn:incoming>SequenceFlow_1kvrbdz</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0o76z6l</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0x9wx4i</bpmn:outgoing>
<bpmn:outgoing>SequenceFlow_1xadpn3</bpmn:outgoing>
</bpmn:exclusiveGateway>
- <bpmn:intermediateCatchEvent id="IntermediateThrowEvent_1x84jos" name="Maßnahme beenden">
- <bpmn:incoming>SequenceFlow_0c9bje2</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1kvrbdz</bpmn:outgoing>
- <bpmn:messageEventDefinition />
- </bpmn:intermediateCatchEvent>
- <bpmn:task id="Task_19d4h92" name="Arbeit beendet <WORK_FINISHED>">
- <bpmn:incoming>SequenceFlow_0o76z6l</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0c9bje2</bpmn:outgoing>
- </bpmn:task>
<bpmn:intermediateCatchEvent id="IntermediateCatchEvent_0iktfkm" name="Arbeit beendet">
<bpmn:incoming>SequenceFlow_0yj0aw5</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0o76z6l</bpmn:outgoing>
<bpmn:messageEventDefinition />
</bpmn:intermediateCatchEvent>
- <bpmn:task id="Task_106dpr7" name="Arbeiten durchführen <IN_WORK>">
+ <bpmn:task id="Task_106dpr7" name="Arbeiten durchführen">
<bpmn:incoming>SequenceFlow_0hentfy</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0yj0aw5</bpmn:outgoing>
</bpmn:task>
<bpmn:intermediateCatchEvent id="IntermediateCatchEvent_1kwvf1t" name="in Arbeit">
- <bpmn:incoming>SequenceFlow_0dfmcg0</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0gwydqp</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0hentfy</bpmn:outgoing>
<bpmn:messageEventDefinition />
</bpmn:intermediateCatchEvent>
- <bpmn:exclusiveGateway id="ExclusiveGateway_073wsz5" name="Konfig: EndAfterReleased">
- <bpmn:incoming>SequenceFlow_1idlok4</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1kpujam</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1nlz04b</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1kpujam" name="nein" sourceRef="ExclusiveGateway_073wsz5" targetRef="IntermediateCatchEvent_1wnlzou" />
- <bpmn:sequenceFlow id="SequenceFlow_1nlz04b" sourceRef="ExclusiveGateway_073wsz5" targetRef="IntermediateThrowEvent_16zv2vj" />
- <bpmn:intermediateCatchEvent id="IntermediateCatchEvent_1wnlzou" name="Maßnahme aktiv">
- <bpmn:incoming>SequenceFlow_1kpujam</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0k3wf5t</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_007e4sv</bpmn:outgoing>
+ <bpmn:sequenceFlow id="SequenceFlow_0x9wx4i" name="keine weitere Maßnahme notwendig" sourceRef="ExclusiveGateway_14c3mza" targetRef="IntermediateThrowEvent_0y1b6mz" />
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0y1b6mz" name="beendet">
+ <bpmn:incoming>SequenceFlow_0x9wx4i</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1nxe7iw</bpmn:outgoing>
<bpmn:messageEventDefinition />
- </bpmn:intermediateCatchEvent>
- <bpmn:sequenceFlow id="SequenceFlow_1jimz92" sourceRef="IntermediateThrowEvent_16zv2vj" targetRef="EndEvent_151eqdp" />
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_16zv2vj" name="Status: CLOSED setzen">
- <bpmn:incoming>SequenceFlow_1nlz04b</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1jimz92</bpmn:outgoing>
</bpmn:intermediateThrowEvent>
- <bpmn:task id="Task_0jvozhg" name="Maßnahme ausgegführt <ACTIVE>">
- <bpmn:incoming>SequenceFlow_007e4sv</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0gwydqp</bpmn:outgoing>
+ <bpmn:task id="Task_0r4k9vh" name="Dokumentation erstellen">
+ <bpmn:incoming>SequenceFlow_1nxe7iw</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0ywtsv9</bpmn:outgoing>
</bpmn:task>
- <bpmn:exclusiveGateway id="ExclusiveGateway_1w6e1nl" name="Konfig: SkipInWork">
- <bpmn:incoming>SequenceFlow_0gwydqp</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0dfmcg0</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_11sek6f</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_0dfmcg0" name="nein" sourceRef="ExclusiveGateway_1w6e1nl" targetRef="IntermediateCatchEvent_1kwvf1t" />
- <bpmn:sequenceFlow id="SequenceFlow_11sek6f" name="ja" sourceRef="ExclusiveGateway_1w6e1nl" targetRef="IntermediateThrowEvent_06l7cb8" />
- <bpmn:sequenceFlow id="SequenceFlow_1mtk9p3" sourceRef="IntermediateThrowEvent_06l7cb8" targetRef="IntermediateThrowEvent_0y1b6mz" />
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_06l7cb8" name="Status: FINISHED setzen">
- <bpmn:incoming>SequenceFlow_11sek6f</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1mtk9p3</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
- <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_13xz905" name="Status ACTIVE setzen">
- <bpmn:incoming>SequenceFlow_0polkmn</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0k3wf5t</bpmn:outgoing>
- </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_1nxe7iw" sourceRef="IntermediateThrowEvent_0y1b6mz" targetRef="Task_0r4k9vh" />
+ <bpmn:sequenceFlow id="SequenceFlow_0ywtsv9" sourceRef="Task_0r4k9vh" targetRef="EndEvent_151eqdp" />
+ <bpmn:endEvent id="EndEvent_151eqdp" name="geschlossen">
+ <bpmn:incoming>SequenceFlow_0ywtsv9</bpmn:incoming>
+ <bpmn:messageEventDefinition />
+ </bpmn:endEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_1xadpn3" name="Weitere Maßnahme notwendig" sourceRef="ExclusiveGateway_14c3mza" targetRef="IntermediateThrowEvent_1aq7vte" />
</bpmn:process>
<bpmn:process id="Process_1w06u94" isExecutable="false" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_17qxou7">
<bpmndi:BPMNShape id="Participant_0955zzp_di" bpmnElement="Participant_0955zzp">
- <dc:Bounds x="123" y="17" width="1656" height="78" />
+ <dc:Bounds x="123" y="17" width="1287" height="78" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_1768x6g_di" bpmnElement="Participant_1768x6g">
- <dc:Bounds x="123" y="119" width="1655" height="427" />
+ <dc:Bounds x="123" y="119" width="1291" height="262" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Participant_1cdzc63_di" bpmnElement="Participant_1cdzc63">
- <dc:Bounds x="123" y="565" width="1658" height="79" />
+ <dc:Bounds x="123" y="403" width="1293" height="82" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_04dyx7j_di" bpmnElement="Task_04dyx7j">
<dc:Bounds x="238" y="189" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="IntermediateCatchEvent_1wnlzou_di" bpmnElement="IntermediateCatchEvent_1wnlzou">
- <dc:Bounds x="460" y="211" width="36" height="36" />
+ <dc:Bounds x="367" y="211" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="439" y="189" width="78" height="14" />
+ <dc:Bounds x="346" y="189" width="78" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_0jvozhg_di" bpmnElement="Task_0jvozhg">
- <dc:Bounds x="533" y="189" width="100" height="80" />
+ <dc:Bounds x="437" y="189" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="IntermediateCatchEvent_1kwvf1t_di" bpmnElement="IntermediateCatchEvent_1kwvf1t">
- <dc:Bounds x="778" y="211" width="36" height="36" />
+ <dc:Bounds x="567" y="211" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="776" y="188" width="40" height="14" />
+ <dc:Bounds x="565" y="188" width="40" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Task_106dpr7_di" bpmnElement="Task_106dpr7">
- <dc:Bounds x="858" y="189" width="100" height="80" />
+ <dc:Bounds x="635" y="189" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="IntermediateCatchEvent_0iktfkm_di" bpmnElement="IntermediateCatchEvent_0iktfkm">
- <dc:Bounds x="986" y="211" width="36" height="36" />
+ <dc:Bounds x="771" y="211" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="968" y="188" width="71" height="14" />
+ <dc:Bounds x="753" y="188" width="71" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1idlok4_di" bpmnElement="SequenceFlow_1idlok4">
<di:waypoint xsi:type="dc:Point" x="338" y="229" />
- <di:waypoint xsi:type="dc:Point" x="360" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="367" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="304" y="207" width="90" height="14" />
+ <dc:Bounds x="308.5" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_007e4sv_di" bpmnElement="SequenceFlow_007e4sv">
- <di:waypoint xsi:type="dc:Point" x="496" y="229" />
- <di:waypoint xsi:type="dc:Point" x="533" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="403" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="437" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="469.5" y="207" width="90" height="14" />
+ <dc:Bounds x="375" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0gwydqp_di" bpmnElement="SequenceFlow_0gwydqp">
- <di:waypoint xsi:type="dc:Point" x="633" y="229" />
- <di:waypoint xsi:type="dc:Point" x="674" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="537" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="567" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="608.5" y="207" width="90" height="14" />
+ <dc:Bounds x="552" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0hentfy_di" bpmnElement="SequenceFlow_0hentfy">
- <di:waypoint xsi:type="dc:Point" x="814" y="229" />
- <di:waypoint xsi:type="dc:Point" x="858" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="603" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="635" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="791" y="207" width="90" height="14" />
+ <dc:Bounds x="619" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0yj0aw5_di" bpmnElement="SequenceFlow_0yj0aw5">
- <di:waypoint xsi:type="dc:Point" x="958" y="229" />
- <di:waypoint xsi:type="dc:Point" x="986" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="735" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="771" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="927" y="207" width="90" height="14" />
+ <dc:Bounds x="753" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_12l5dxh_di" bpmnElement="SequenceFlow_12l5dxh">
@@ -229,269 +171,109 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_14c3mza_di" bpmnElement="ExclusiveGateway_14c3mza" isMarkerVisible="true">
- <dc:Bounds x="1370" y="204" width="50" height="50" />
+ <dc:Bounds x="839.634278002699" y="203.92712550607288" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1350" y="257" width="90" height="14" />
+ <dc:Bounds x="864.634278002699" y="256.9271255060729" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0o76z6l_di" bpmnElement="SequenceFlow_0o76z6l">
- <di:waypoint xsi:type="dc:Point" x="1022" y="229" />
- <di:waypoint xsi:type="dc:Point" x="1090" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="807" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="840" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1011" y="207" width="90" height="14" />
+ <dc:Bounds x="823.5" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0x9wx4i_di" bpmnElement="SequenceFlow_0x9wx4i">
- <di:waypoint xsi:type="dc:Point" x="1420" y="229" />
- <di:waypoint xsi:type="dc:Point" x="1459" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="890" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="981" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1373" y="157" width="65" height="42" />
+ <dc:Bounds x="906" y="174" width="65" height="42" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="IntermediateThrowEvent_1hx6l2v_di" bpmnElement="IntermediateThrowEvent_0y1b6mz">
- <dc:Bounds x="1459" y="211" width="36" height="36" />
+ <dc:Bounds x="981" y="211" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1517" y="208" width="39" height="14" />
+ <dc:Bounds x="1014" y="242" width="39" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_1xqjfm5_di" bpmnElement="MessageFlow_1xqjfm5">
- <di:waypoint xsi:type="dc:Point" x="1477" y="211" />
- <di:waypoint xsi:type="dc:Point" x="1477" y="95" />
+ <di:waypoint xsi:type="dc:Point" x="999" y="211" />
+ <di:waypoint xsi:type="dc:Point" x="999" y="95" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1447" y="146" width="90" height="14" />
+ <dc:Bounds x="1014" y="146" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_13nltqw_di" bpmnElement="MessageFlow_13nltqw">
- <di:waypoint xsi:type="dc:Point" x="1477" y="247" />
- <di:waypoint xsi:type="dc:Point" x="1477" y="565" />
+ <di:waypoint xsi:type="dc:Point" x="999" y="247" />
+ <di:waypoint xsi:type="dc:Point" x="999" y="403" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1447" y="399" width="90" height="14" />
+ <dc:Bounds x="1014" y="318" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Task_0r4k9vh_di" bpmnElement="Task_0r4k9vh">
- <dc:Bounds x="1559" y="189" width="100" height="80" />
+ <dc:Bounds x="1074.6342780026991" y="189" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1nxe7iw_di" bpmnElement="SequenceFlow_1nxe7iw">
- <di:waypoint xsi:type="dc:Point" x="1495" y="229" />
- <di:waypoint xsi:type="dc:Point" x="1559" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="1017" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="1075" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1482" y="207" width="90" height="14" />
+ <dc:Bounds x="1046" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0ywtsv9_di" bpmnElement="SequenceFlow_0ywtsv9">
- <di:waypoint xsi:type="dc:Point" x="1659" y="229" />
- <di:waypoint xsi:type="dc:Point" x="1708" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="1175" y="229" />
+ <di:waypoint xsi:type="dc:Point" x="1269" y="229" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1638.5" y="207" width="90" height="14" />
+ <dc:Bounds x="1222" y="207" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_1kfxd0w_di" bpmnElement="EndEvent_151eqdp">
- <dc:Bounds x="1708" y="211" width="36" height="36" />
+ <dc:Bounds x="1269" y="211" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1695" y="268" width="62" height="14" />
+ <dc:Bounds x="1303" y="239" width="62" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="MessageFlow_1bfcdxw_di" bpmnElement="MessageFlow_1bfcdxw">
- <di:waypoint xsi:type="dc:Point" x="1726" y="211" />
- <di:waypoint xsi:type="dc:Point" x="1726" y="95" />
+ <di:waypoint xsi:type="dc:Point" x="1287" y="211" />
+ <di:waypoint xsi:type="dc:Point" x="1287" y="95" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1696" y="146" width="90" height="14" />
+ <dc:Bounds x="1302" y="146" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_0nlg74v_di" bpmnElement="MessageFlow_0nlg74v">
- <di:waypoint xsi:type="dc:Point" x="1726" y="247" />
- <di:waypoint xsi:type="dc:Point" x="1726" y="565" />
+ <di:waypoint xsi:type="dc:Point" x="1287" y="247" />
+ <di:waypoint xsi:type="dc:Point" x="1287" y="403" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1696" y="399" width="90" height="14" />
+ <dc:Bounds x="1302" y="318" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1xadpn3_di" bpmnElement="SequenceFlow_1xadpn3">
- <di:waypoint xsi:type="dc:Point" x="1395" y="254" />
- <di:waypoint xsi:type="dc:Point" x="1395" y="319" />
+ <di:waypoint xsi:type="dc:Point" x="865" y="254" />
+ <di:waypoint xsi:type="dc:Point" x="865" y="319" />
<di:waypoint xsi:type="dc:Point" x="205" y="319" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1406" y="260" width="53" height="42" />
+ <dc:Bounds x="876" y="260" width="53" height="42" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_1s0pj8o_di" bpmnElement="MessageFlow_1s0pj8o">
- <di:waypoint xsi:type="dc:Point" x="1002" y="562" />
- <di:waypoint xsi:type="dc:Point" x="1002" y="406" />
- <di:waypoint xsi:type="dc:Point" x="1002" y="246" />
+ <di:waypoint xsi:type="dc:Point" x="787" y="403" />
+ <di:waypoint xsi:type="dc:Point" x="787" y="246" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="972" y="477" width="90" height="14" />
+ <dc:Bounds x="802" y="317.5" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_19thj68_di" bpmnElement="MessageFlow_19thj68">
- <di:waypoint xsi:type="dc:Point" x="797" y="560" />
- <di:waypoint xsi:type="dc:Point" x="796" y="247" />
+ <di:waypoint xsi:type="dc:Point" x="585" y="403" />
+ <di:waypoint xsi:type="dc:Point" x="585" y="247" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="751.5" y="381.5" width="90" height="14" />
+ <dc:Bounds x="600" y="318" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="MessageFlow_0nlpipb_di" bpmnElement="MessageFlow_0nlpipb">
- <di:waypoint xsi:type="dc:Point" x="478" y="560" />
- <di:waypoint xsi:type="dc:Point" x="478" y="406" />
- <di:waypoint xsi:type="dc:Point" x="478" y="247" />
+ <di:waypoint xsi:type="dc:Point" x="385" y="403" />
+ <di:waypoint xsi:type="dc:Point" x="385" y="247" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="448" y="476" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="Task_19d4h92_di" bpmnElement="Task_19d4h92">
- <dc:Bounds x="1090" y="189" width="100" height="80" />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0c9bje2_di" bpmnElement="SequenceFlow_0c9bje2">
- <di:waypoint xsi:type="dc:Point" x="1190" y="229" />
- <di:waypoint xsi:type="dc:Point" x="1251" y="229" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1175.5" y="207" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1kvrbdz_di" bpmnElement="SequenceFlow_1kvrbdz">
- <di:waypoint xsi:type="dc:Point" x="1287" y="229" />
- <di:waypoint xsi:type="dc:Point" x="1370" y="229" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1283.5" y="207" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateCatchEvent_0pvf3wz_di" bpmnElement="IntermediateThrowEvent_1x84jos">
- <dc:Bounds x="1251" y="211" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1242" y="174" width="53" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="MessageFlow_02rlfue_di" bpmnElement="MessageFlow_02rlfue">
- <di:waypoint xsi:type="dc:Point" x="1272" y="565" />
- <di:waypoint xsi:type="dc:Point" x="1272" y="246" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1242" y="398.5" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_19mgk3e_di" bpmnElement="IntermediateThrowEvent_19mgk3e">
- <dc:Bounds x="169" y="358" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="183" y="365" width="6" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_1a0hokd_di" bpmnElement="IntermediateThrowEvent_1a0hokd">
- <dc:Bounds x="169" y="445" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="183" y="456" width="6" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_13xz905_di" bpmnElement="IntermediateThrowEvent_13xz905">
- <dc:Bounds x="223" y="358" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="204" y="397" width="75" height="26" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_0mrshq5_di" bpmnElement="IntermediateThrowEvent_0mrshq5">
- <dc:Bounds x="262" y="445" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="242" y="484" width="78" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0polkmn_di" bpmnElement="SequenceFlow_0polkmn">
- <di:waypoint xsi:type="dc:Point" x="205" y="376" />
- <di:waypoint xsi:type="dc:Point" x="223" y="376" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="214" y="354" width="0" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0k3wf5t_di" bpmnElement="SequenceFlow_0k3wf5t">
- <di:waypoint xsi:type="dc:Point" x="259" y="376" />
- <di:waypoint xsi:type="dc:Point" x="450" y="376" />
- <di:waypoint xsi:type="dc:Point" x="450" y="281" />
- <di:waypoint xsi:type="dc:Point" x="470" y="245" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="420" y="321.5" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0tj2ml8_di" bpmnElement="SequenceFlow_0tj2ml8">
- <di:waypoint xsi:type="dc:Point" x="205" y="463" />
- <di:waypoint xsi:type="dc:Point" x="262" y="463" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="233.5" y="441" width="0" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0pgszu3_di" bpmnElement="SequenceFlow_0pgszu3">
- <di:waypoint xsi:type="dc:Point" x="298" y="463" />
- <di:waypoint xsi:type="dc:Point" x="1684" y="463" />
- <di:waypoint xsi:type="dc:Point" x="1684" y="276" />
- <di:waypoint xsi:type="dc:Point" x="1710" y="237" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1699" y="362.5" width="0" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_073wsz5_di" bpmnElement="ExclusiveGateway_073wsz5" isMarkerVisible="true">
- <dc:Bounds x="360" y="204" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="341" y="257" width="88" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1kpujam_di" bpmnElement="SequenceFlow_1kpujam">
- <di:waypoint xsi:type="dc:Point" x="410" y="229" />
- <di:waypoint xsi:type="dc:Point" x="460" y="229" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="425.1655629139073" y="207" width="20" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1nlz04b_di" bpmnElement="SequenceFlow_1nlz04b">
- <di:waypoint xsi:type="dc:Point" x="385" y="254" />
- <di:waypoint xsi:type="dc:Point" x="385" y="409" />
- <di:waypoint xsi:type="dc:Point" x="565" y="410" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="400" y="324.5" width="0" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_16zv2vj_di" bpmnElement="IntermediateThrowEvent_16zv2vj">
- <dc:Bounds x="565" y="392" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="545" y="431" width="78" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1jimz92_di" bpmnElement="SequenceFlow_1jimz92">
- <di:waypoint xsi:type="dc:Point" x="601" y="410" />
- <di:waypoint xsi:type="dc:Point" x="1662" y="410" />
- <di:waypoint xsi:type="dc:Point" x="1662" y="272" />
- <di:waypoint xsi:type="dc:Point" x="1709" y="234" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1677" y="334" width="0" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_1w6e1nl_di" bpmnElement="ExclusiveGateway_1w6e1nl" isMarkerVisible="true">
- <dc:Bounds x="674" y="204" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="654" y="257" width="90" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_0dfmcg0_di" bpmnElement="SequenceFlow_0dfmcg0">
- <di:waypoint xsi:type="dc:Point" x="724" y="229" />
- <di:waypoint xsi:type="dc:Point" x="778" y="229" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="741" y="207" width="20" height="14" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_11sek6f_di" bpmnElement="SequenceFlow_11sek6f">
- <di:waypoint xsi:type="dc:Point" x="699" y="254" />
- <di:waypoint xsi:type="dc:Point" x="699" y="344" />
- <di:waypoint xsi:type="dc:Point" x="890" y="344" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="678" y="323" width="10" height="13" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="IntermediateThrowEvent_06l7cb8_di" bpmnElement="IntermediateThrowEvent_06l7cb8">
- <dc:Bounds x="890" y="326" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="868" y="365" width="81" height="28" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1mtk9p3_di" bpmnElement="SequenceFlow_1mtk9p3">
- <di:waypoint xsi:type="dc:Point" x="926" y="344" />
- <di:waypoint xsi:type="dc:Point" x="1514" y="344" />
- <di:waypoint xsi:type="dc:Point" x="1514" y="263" />
- <di:waypoint xsi:type="dc:Point" x="1486" y="245" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1529" y="296.5" width="0" height="14" />
+ <dc:Bounds x="400" y="318" width="0" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
diff --git a/src/main/asciidoc/originalfiles/massnahme_planen_und_genehmigen.bpmn b/src/main/asciidoc/originalfiles/massnahme_planen_und_genehmigen.bpmn
new file mode 100644
index 0000000..3f865e1
--- /dev/null
+++ b/src/main/asciidoc/originalfiles/massnahme_planen_und_genehmigen.bpmn
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
+ <bpmn:collaboration id="Collaboration_00socrt">
+ <bpmn:extensionElements>
+ <camunda:properties>
+ <camunda:property />
+ <camunda:property />
+ </camunda:properties>
+ </bpmn:extensionElements>
+ <bpmn:participant id="Participant_0q0x948" name="Maßnahmeanrag" processRef="Process_07g8nsh" />
+ <bpmn:participant id="Participant_1ejfxi0" name="Leitsystem" processRef="Process_09mc0gn" />
+ <bpmn:participant id="Participant_1t9gai3" name="Antragsteller" processRef="Process_13t0ny3" />
+ <bpmn:messageFlow id="MessageFlow_1ms9428" sourceRef="IntermediateThrowEvent_1kqxy62" targetRef="Participant_1ejfxi0" />
+ <bpmn:messageFlow id="MessageFlow_1wtoexj" name="storniert" sourceRef="EndEvent_1fh4uu9" targetRef="Participant_1ejfxi0" />
+ <bpmn:messageFlow id="MessageFlow_1xfeopt" sourceRef="Participant_1t9gai3" targetRef="StartEvent_0kv29ip" />
+ <bpmn:messageFlow id="MessageFlow_0bcw2p9" sourceRef="IntermediateThrowEvent_0keyj21" targetRef="Participant_1ejfxi0" />
+ <bpmn:messageFlow id="MessageFlow_0g3k7h7" sourceRef="EndEvent_1fh4uu9" targetRef="Participant_1t9gai3" />
+ <bpmn:messageFlow id="MessageFlow_0m1tbsx" sourceRef="EndEvent_0waaz2f" targetRef="Participant_1ejfxi0" />
+ <bpmn:messageFlow id="MessageFlow_0mcvp6y" sourceRef="IntermediateThrowEvent_1grve4w" targetRef="Participant_1t9gai3" />
+ <bpmn:messageFlow id="MessageFlow_1vngqu4" sourceRef="IntermediateThrowEvent_1grve4w" targetRef="Participant_1ejfxi0" />
+ <bpmn:messageFlow id="MessageFlow_1f3wbzc" sourceRef="IntermediateThrowEvent_1kbmtlt" targetRef="Participant_1t9gai3" />
+ <bpmn:messageFlow id="MessageFlow_0w6kszv" sourceRef="IntermediateThrowEvent_1kbmtlt" targetRef="Participant_1ejfxi0" />
+ </bpmn:collaboration>
+ <bpmn:process id="Process_07g8nsh" isExecutable="false">
+ <bpmn:sequenceFlow id="SequenceFlow_1d1slhx" sourceRef="StartEvent_0kv29ip" targetRef="Task_10u6hfm" />
+ <bpmn:sequenceFlow id="SequenceFlow_12k0s2s" sourceRef="Task_10u6hfm" targetRef="ExclusiveGateway_0vdhmyq" />
+ <bpmn:sequenceFlow id="SequenceFlow_0b62jvx" sourceRef="IntermediateThrowEvent_1kqxy62" targetRef="Task_1jrw8mo" />
+ <bpmn:sequenceFlow id="SequenceFlow_141nguo" sourceRef="Task_1jrw8mo" targetRef="ExclusiveGateway_08bd5w3" />
+ <bpmn:sequenceFlow id="SequenceFlow_1okwwsz" name="nein nicht durchführbar" sourceRef="ExclusiveGateway_08bd5w3" targetRef="EndEvent_1fh4uu9" />
+ <bpmn:sequenceFlow id="SequenceFlow_13v3onr" name="ja" sourceRef="ExclusiveGateway_08bd5w3" targetRef="IntermediateThrowEvent_0keyj21" />
+ <bpmn:sequenceFlow id="SequenceFlow_0jqiz0n" sourceRef="IntermediateThrowEvent_0keyj21" targetRef="Task_0u6wffz" />
+ <bpmn:sequenceFlow id="SequenceFlow_0zgyrbw" sourceRef="Task_0u6wffz" targetRef="ExclusiveGateway_1fe4e85" />
+ <bpmn:sequenceFlow id="SequenceFlow_0rl7fn3" name="nein absolut nicht durchführbar" sourceRef="ExclusiveGateway_1fe4e85" targetRef="EndEvent_0waaz2f" />
+ <bpmn:endEvent id="EndEvent_0waaz2f" name="storniert">
+ <bpmn:incoming>SequenceFlow_0rl7fn3</bpmn:incoming>
+ <bpmn:messageEventDefinition />
+ </bpmn:endEvent>
+ <bpmn:task id="Task_0u6wffz" name="Maßnahme-antrag und Ablauf prüfen <FOR_APPROVAL>">
+ <bpmn:incoming>SequenceFlow_0jqiz0n</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0zgyrbw</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_1fe4e85" name="korrigierbare Fehler">
+ <bpmn:incoming>SequenceFlow_0zgyrbw</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0rl7fn3</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_08u5nff</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_1kub1bk</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:sequenceFlow id="SequenceFlow_08u5nff" sourceRef="ExclusiveGateway_1fe4e85" targetRef="IntermediateThrowEvent_1grve4w" />
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1grve4w" name="zurückgewiesen">
+ <bpmn:incoming>SequenceFlow_08u5nff</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1imhzvv</bpmn:outgoing>
+ <bpmn:messageEventDefinition />
+ </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_1imhzvv" sourceRef="IntermediateThrowEvent_1grve4w" targetRef="Task_1jrw8mo" />
+ <bpmn:sequenceFlow id="SequenceFlow_1kub1bk" name="Maßnahme genehmigt" sourceRef="ExclusiveGateway_1fe4e85" targetRef="IntermediateThrowEvent_1kbmtlt" />
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1kbmtlt" name="genehmigt">
+ <bpmn:incoming>SequenceFlow_1kub1bk</bpmn:incoming>
+ <bpmn:messageEventDefinition />
+ </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_1qxdyec" sourceRef="StartEvent_15c1bg4" targetRef="Task_1jrw8mo" />
+ <bpmn:startEvent id="StartEvent_15c1bg4" name="1">
+ <bpmn:outgoing>SequenceFlow_1qxdyec</bpmn:outgoing>
+ </bpmn:startEvent>
+ <bpmn:startEvent id="StartEvent_0kv29ip" name="Arbeitsauftrag">
+ <bpmn:outgoing>SequenceFlow_1d1slhx</bpmn:outgoing>
+ <bpmn:messageEventDefinition />
+ </bpmn:startEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_0c6q1vx" name="ja" sourceRef="ExclusiveGateway_0vdhmyq" targetRef="IntermediateThrowEvent_1kqxy62" />
+ <bpmn:task id="Task_1jrw8mo" name="Maßn.-antrag bearb. und Ablauf festlegen <APPLIED>">
+ <bpmn:incoming>SequenceFlow_0b62jvx</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_1imhzvv</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_1qxdyec</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_141nguo</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1kqxy62" name="beantragt">
+ <bpmn:incoming>SequenceFlow_0c6q1vx</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0b62jvx</bpmn:outgoing>
+ <bpmn:messageEventDefinition />
+ </bpmn:intermediateThrowEvent>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0vdhmyq" name="beantragen? (Status = APPLIED)?">
+ <bpmn:incoming>SequenceFlow_12k0s2s</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0c6q1vx</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_0mpvsgn</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:task id="Task_10u6hfm" name="Maßnahme-antrag anlegen <NEW>">
+ <bpmn:incoming>SequenceFlow_1d1slhx</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0mpvsgn</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_12k0s2s</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:sequenceFlow id="SequenceFlow_0mpvsgn" name="nein" sourceRef="ExclusiveGateway_0vdhmyq" targetRef="Task_10u6hfm" />
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0keyj21" name="Zur Genehmigung">
+ <bpmn:incoming>SequenceFlow_13v3onr</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0jqiz0n</bpmn:outgoing>
+ <bpmn:messageEventDefinition />
+ </bpmn:intermediateThrowEvent>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_08bd5w3" name="Maßnahme möglich">
+ <bpmn:incoming>SequenceFlow_141nguo</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1okwwsz</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_13v3onr</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:endEvent id="EndEvent_1fh4uu9">
+ <bpmn:incoming>SequenceFlow_1okwwsz</bpmn:incoming>
+ <bpmn:messageEventDefinition />
+ </bpmn:endEvent>
+ </bpmn:process>
+ <bpmn:process id="Process_09mc0gn" isExecutable="false" />
+ <bpmn:process id="Process_13t0ny3" isExecutable="false" />
+ <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+ <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_00socrt">
+ <bpmndi:BPMNShape id="Participant_0q0x948_di" bpmnElement="Participant_0q0x948">
+ <dc:Bounds x="123" y="130" width="1235" height="391" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Participant_1ejfxi0_di" bpmnElement="Participant_1ejfxi0">
+ <dc:Bounds x="123" y="544" width="1237" height="74" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Task_10u6hfm_di" bpmnElement="Task_10u6hfm">
+ <dc:Bounds x="251" y="224" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1d1slhx_di" bpmnElement="SequenceFlow_1d1slhx">
+ <di:waypoint xsi:type="dc:Point" x="207" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="251" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="184" y="242" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="StartEvent_0fg3lo6_di" bpmnElement="StartEvent_0kv29ip">
+ <dc:Bounds x="171" y="246" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="154" y="285" width="70" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_12k0s2s_di" bpmnElement="SequenceFlow_12k0s2s">
+ <di:waypoint xsi:type="dc:Point" x="351" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="382" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="321.5" y="242" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_1uyj4kv_di" bpmnElement="IntermediateThrowEvent_1kqxy62">
+ <dc:Bounds x="469" y="246" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="464" y="223" width="46" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="MessageFlow_1ms9428_di" bpmnElement="MessageFlow_1ms9428">
+ <di:waypoint xsi:type="dc:Point" x="487" y="282" />
+ <di:waypoint xsi:type="dc:Point" x="487" y="544" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="457" y="406" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_1jrw8mo_di" bpmnElement="Task_1jrw8mo">
+ <dc:Bounds x="526" y="224" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0b62jvx_di" bpmnElement="SequenceFlow_0b62jvx">
+ <di:waypoint xsi:type="dc:Point" x="505" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="526" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="470.5" y="242" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_08bd5w3_di" bpmnElement="ExclusiveGateway_08bd5w3" isMarkerVisible="true">
+ <dc:Bounds x="659" y="239" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="658" y="292" width="53" height="28" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_141nguo_di" bpmnElement="SequenceFlow_141nguo">
+ <di:waypoint xsi:type="dc:Point" x="626" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="659" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="597.5" y="242" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1okwwsz_di" bpmnElement="SequenceFlow_1okwwsz">
+ <di:waypoint xsi:type="dc:Point" x="684" y="239" />
+ <di:waypoint xsi:type="dc:Point" x="684" y="212" />
+ <di:waypoint xsi:type="dc:Point" x="684" y="212" />
+ <di:waypoint xsi:type="dc:Point" x="684" y="184" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="686" y="180.87272727272727" width="64" height="28" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="EndEvent_06ho5ly_di" bpmnElement="EndEvent_1fh4uu9">
+ <dc:Bounds x="666" y="148" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="639" y="187" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="MessageFlow_1wtoexj_di" bpmnElement="MessageFlow_1wtoexj">
+ <di:waypoint xsi:type="dc:Point" x="666" y="166" />
+ <di:waypoint xsi:type="dc:Point" x="642" y="166" />
+ <di:waypoint xsi:type="dc:Point" x="642" y="544" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="615.9836065573771" y="144.00000000000006" width="40" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Participant_1t9gai3_di" bpmnElement="Participant_1t9gai3">
+ <dc:Bounds x="123" y="24" width="1235" height="81" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="MessageFlow_1xfeopt_di" bpmnElement="MessageFlow_1xfeopt">
+ <di:waypoint xsi:type="dc:Point" x="191" y="105" />
+ <di:waypoint xsi:type="dc:Point" x="191" y="247" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="161" y="169" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_13v3onr_di" bpmnElement="SequenceFlow_13v3onr">
+ <di:waypoint xsi:type="dc:Point" x="709" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="759" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="712.3529411764706" y="243" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_0cyrqh9_di" bpmnElement="IntermediateThrowEvent_0keyj21">
+ <dc:Bounds x="759" y="246" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="734" y="223" width="86" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="MessageFlow_0bcw2p9_di" bpmnElement="MessageFlow_0bcw2p9">
+ <di:waypoint xsi:type="dc:Point" x="777" y="282" />
+ <di:waypoint xsi:type="dc:Point" x="777" y="544" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="747" y="406" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="MessageFlow_0g3k7h7_di" bpmnElement="MessageFlow_0g3k7h7">
+ <di:waypoint xsi:type="dc:Point" x="684" y="148" />
+ <di:waypoint xsi:type="dc:Point" x="684" y="105" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="654" y="119.5" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_0u6wffz_di" bpmnElement="Task_0u6wffz">
+ <dc:Bounds x="818.376" y="223.59699999999998" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0jqiz0n_di" bpmnElement="SequenceFlow_0jqiz0n">
+ <di:waypoint xsi:type="dc:Point" x="795" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="818" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="761.5" y="242" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_1fe4e85_di" bpmnElement="ExclusiveGateway_1fe4e85" isMarkerVisible="true">
+ <dc:Bounds x="1000.376" y="238.59699999999998" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1031" y="290" width="61" height="28" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0zgyrbw_di" bpmnElement="SequenceFlow_0zgyrbw">
+ <di:waypoint xsi:type="dc:Point" x="918" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="959" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="959" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="1001" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="974" y="257" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0rl7fn3_di" bpmnElement="SequenceFlow_0rl7fn3">
+ <di:waypoint xsi:type="dc:Point" x="1025" y="239" />
+ <di:waypoint xsi:type="dc:Point" x="1025" y="184" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1028" y="192" width="84" height="28" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="EndEvent_12ezuh1_di" bpmnElement="EndEvent_0waaz2f">
+ <dc:Bounds x="1007" y="148" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="953" y="143" width="40" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="MessageFlow_0m1tbsx_di" bpmnElement="MessageFlow_0m1tbsx">
+ <di:waypoint xsi:type="dc:Point" x="1007" y="166" />
+ <di:waypoint xsi:type="dc:Point" x="947" y="166" />
+ <di:waypoint xsi:type="dc:Point" x="947" y="544" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="977" y="144" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_08u5nff_di" bpmnElement="SequenceFlow_08u5nff">
+ <di:waypoint xsi:type="dc:Point" x="1025" y="288" />
+ <di:waypoint xsi:type="dc:Point" x="1025" y="342" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1040" y="308" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_0j3xitj_di" bpmnElement="IntermediateThrowEvent_1grve4w">
+ <dc:Bounds x="1007" y="342" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1042" y="364" width="81" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1imhzvv_di" bpmnElement="SequenceFlow_1imhzvv">
+ <di:waypoint xsi:type="dc:Point" x="1007" y="360" />
+ <di:waypoint xsi:type="dc:Point" x="576" y="360" />
+ <di:waypoint xsi:type="dc:Point" x="576" y="304" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="746.5" y="338" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="MessageFlow_0mcvp6y_di" bpmnElement="MessageFlow_0mcvp6y">
+ <di:waypoint xsi:type="dc:Point" x="1043" y="360" />
+ <di:waypoint xsi:type="dc:Point" x="1136" y="360" />
+ <di:waypoint xsi:type="dc:Point" x="1136" y="105" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1044.5" y="338" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="MessageFlow_1vngqu4_di" bpmnElement="MessageFlow_1vngqu4">
+ <di:waypoint xsi:type="dc:Point" x="1025" y="378" />
+ <di:waypoint xsi:type="dc:Point" x="1025" y="544" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1040" y="454" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1kub1bk_di" bpmnElement="SequenceFlow_1kub1bk">
+ <di:waypoint xsi:type="dc:Point" x="1050" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="1227" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1161" y="225" width="53" height="28" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_07tnt55_di" bpmnElement="IntermediateThrowEvent_1kbmtlt">
+ <dc:Bounds x="1227" y="246" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1264" y="266" width="49" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="MessageFlow_1f3wbzc_di" bpmnElement="MessageFlow_1f3wbzc">
+ <di:waypoint xsi:type="dc:Point" x="1245" y="246" />
+ <di:waypoint xsi:type="dc:Point" x="1245" y="105" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1260" y="168.5" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="MessageFlow_0w6kszv_di" bpmnElement="MessageFlow_0w6kszv">
+ <di:waypoint xsi:type="dc:Point" x="1245" y="282" />
+ <di:waypoint xsi:type="dc:Point" x="1245" y="544" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1260" y="406" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="StartEvent_11vz43w_di" bpmnElement="StartEvent_15c1bg4">
+ <dc:Bounds x="1298" y="403" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1314" y="417" width="6" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1qxdyec_di" bpmnElement="SequenceFlow_1qxdyec">
+ <di:waypoint xsi:type="dc:Point" x="1298" y="421" />
+ <di:waypoint xsi:type="dc:Point" x="551" y="421" />
+ <di:waypoint xsi:type="dc:Point" x="551" y="304" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="879.5" y="399" width="90" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_0vdhmyq_di" bpmnElement="ExclusiveGateway_0vdhmyq" isMarkerVisible="true">
+ <dc:Bounds x="382" y="239" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="377" y="292" width="61" height="42" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0c6q1vx_di" bpmnElement="SequenceFlow_0c6q1vx">
+ <di:waypoint xsi:type="dc:Point" x="432" y="264" />
+ <di:waypoint xsi:type="dc:Point" x="469" y="264" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="446" y="242" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0mpvsgn_di" bpmnElement="SequenceFlow_0mpvsgn">
+ <di:waypoint xsi:type="dc:Point" x="407" y="289" />
+ <di:waypoint xsi:type="dc:Point" x="407" y="423" />
+ <di:waypoint xsi:type="dc:Point" x="301" y="423" />
+ <di:waypoint xsi:type="dc:Point" x="301" y="304" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="344" y="401" width="20" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</bpmn:definitions>
diff --git a/src/main/asciidoc/userDocumentation/userDocumentation.adoc b/src/main/asciidoc/userDocumentation/userDocumentation.adoc
index 1094889..543fb08 100644
--- a/src/main/asciidoc/userDocumentation/userDocumentation.adoc
+++ b/src/main/asciidoc/userDocumentation/userDocumentation.adoc
@@ -1,25 +1,10 @@
-////
- *******************************************************************************
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************
-////
-
= Benutzerhandbuch: Geplante Netzmaßnahmen
<<<
-* Version: 0.2
-* Datum: 14.09.2018
+* Version: 0.3
+* Datum: 21.09.2018
* Status: zur Prüfung
<<<
@@ -27,7 +12,7 @@
:Author: Dr. Michel Alessandrini
:Email: michel.alessandrini@pta.de
-:Date: 2018-09-14
+:Date: 2018-09-21
:Revision: 0.2
:icons:
@@ -74,7 +59,7 @@
[[uebersicht-benutzerrollen]]
=== Benutzerrollen und Aufgaben
-Zur Bearbeitung von geplanten Netzmaßnahnmen sind folgende Benutzerrollen
+Zur Bearbeitung von geplanten Netzmaßnahmen sind folgende Benutzerrollen
definiert.
==== Maßnahmen-Antragsteller
@@ -129,7 +114,7 @@
[[uebersicht-statuszustaende]]
=== Statuszustände
-Zur Bearbeitung von geplanten Netzmaßnahnmen sind folgende Status
+Zur Bearbeitung von geplanten Netzmaßnahmen sind folgende Status
definiert.
.Hinweis zu den optionalen Status:
@@ -156,7 +141,7 @@
Geplanten Netzmaßnahme erfasst.
==== Zur Genehmigung _(optional)_
-* Die Geplante Netzmaßnahme ist vollständig geplant und kann zur Genehnmigung
+* Die Geplante Netzmaßnahme ist vollständig geplant und kann zur Genehmigung
vorgelegt werden.
* Betroffene Betriebsmittel, Zeitpunkte und die Dauer der
Geplanten Netzmaßnahme sind erfasst.
@@ -246,7 +231,7 @@
=== Gesamtprozess
Der gesamte Prozessablauf über den Lebenszyklus einer Geplanten Netzmaßnahme
ist im folgenden Prozessdiagramm dargestellt. Aufgrund besserer Lesbarkeit
-ist der Prozess in drei zusammenhängenen Prozessabschnitten aufgeteilt.
+ist der Prozess in drei zusammenhängenden Prozessabschnitten aufgeteilt.
.Prozessübersicht (Abschnitt 1: "Neu" bis "Genehmigt")
[options="header,footer"]
@@ -380,7 +365,7 @@
Netzmaßnahme angelegt werden, siehe Abschnitt <<gnm-duplizieren>>.
==== Kalender-Ansicht
-Der Kalender stellt drei Ansichten zur Verfügungen, um die Einzelmaßnahmen der
+Der Kalender stellt drei Ansichten zur Verfügung, um die Einzelmaßnahmen der
Geplanten Netzmaßnahmenkalendarisch anzuzeigen. Die Auswahl erfolgt über die
entsprechenden Schaltflächen
auf der rechten Seite.
@@ -409,16 +394,79 @@
Geplante Netzmaßnahme anzulegen, siehe Absatz <<gnm-erstellen>>.
===== Monatsansicht
-In der Monatsansicht ist jede Einzelmaßnahme mit einen roten Punkt dargestellt
-und zwar für jeden Tag innerhalb des Zeitraums der Einzelmaßnahme. Die rot
-umkreiste Zahl zeigt die Anzahl der Einzelmaßnahmen für den jeweiligen
+In der Monatsansicht ist jede Einzelmaßnahme mit einem farbigen Punkt dargestellt
+und zwar für jeden Tag innerhalb des Zeitraums der Einzelmaßnahme. Jede Farbe
+steht für einen Status:
+
+.Farben der Statuszustände in Kalenderansicht
+[options="header,footer"]
+|=========================================================
+|Status|Farbe
+
+|Neu
+
+a|
+image::status_farbe_neu.png[]
+
+|Beantragt
+
+a|
+image::status_farbe_beantragt.png[]
+
+|Zur Genehmigung
+
+a|
+image::status_farbe_zur_genehmigung.png[]
+
+|Genehmigt
+
+a|
+image::status_farbe_genehmigt.png[]
+
+|Angefordert
+
+a|
+image::status_farbe_angefordert.png[]
+
+|Freigegeben
+
+a|
+image::status_farbe_freigegeben.png[]
+
+|Schalten aktiv
+
+a|
+image::status_farbe_schalten-aktiv.png[]
+
+|In Arbeit
+
+a|
+image::status_farbe_in_arbeit.png[]
+
+|Arbeit beendet
+
+a|
+image::status_farbe_a_beendet.png[]
+
+|Maßnahme beendet
+
+a|
+image::status_farbe_m_beendet.png[]
+
+|Geschlossen| _keine Anzeige im Kalender_
+
+|Storniert| _keine Anzeige im Kalender_
+
+|=========================================================
+
+Die rot umkreiste Zahl zeigt die Anzahl der Einzelmaßnahmen für den jeweiligen
Kalendertag an.
.Monatsansicht im Kalender
[options="header,footer"]
image::gnm_kalenderuebersicht.png[]
-Um zu erkennen, welche Einzelmaßnahmen sich hinter den roten Punkten verbergen,
+Um zu erkennen, welche Einzelmaßnahmen sich hinter den farbigen Punkten verbergen,
reicht ein Klick auf den entsprechenden Kalendertag aus. Anschließend öffnet
sich ein Bereich unterhalb des ausgewählten Kalendertags und zeigt die Titel der
Einzelmaßnahmen an. Mit einem Klick auf die Einzelmaßnahme lässt sich die
@@ -512,7 +560,7 @@
[options="header,footer"]
image::gnm_header.png[]
-Eine Geplante Netzmaßnahme (Teil: Basisinformationen) besitzt folgende Attibute:
+Eine Geplante Netzmaßnahme (Teil: Basisinformationen) besitzt folgende Attribute:
.Attribute einer Geplanten Netzmaßnahme (Teil: Basisinformationen)
[options="header,footer"]
@@ -560,7 +608,7 @@
|Wiederholung |ja |Neu, Beantragt |Auswahl-Liste |täglich, wöchentlich, monatlich, jährlich
|Wiederbereitstellungszeit |ja |Neu, Beantragt |Textfeld |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
|Beschreibung der Maßnahme |ja |Neu, Beantragt |Textfeld |Beschreibende Erläuterung als Freitext
-|Bemerkungen |nein |alle ausser Geschlossen|Textfeld |Bemerkungen, z.B. für Statuswechsel oder Genehmigungsvermerke
+|Bemerkungen |nein |alle außer Geschlossen|Textfeld |Bemerkungen, z.B. für Statuswechsel oder Genehmigungsvermerke
|Anhang |nein |Neu, Beantragt |Dateiablage |Erforderliche Dateien zur Ergänzung der Geplanten Netzmaßnahme
|Letzter Bearbeiter |- |- |Automatisch |Aktuell angemeldeter Benutzer
|Abteilung letzter Bearbeiter |ja |Neu |Textfeld |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
@@ -614,7 +662,7 @@
[options="header,footer"]
image::gnm_einzelmassnahme.png[]
-Eine Einzelmaßnahme besitzt folgende Attibute:
+Eine Einzelmaßnahme besitzt folgende Attribute:
.Attribute einer Einzelmaßnahme
[options="header,footer"]
@@ -634,13 +682,13 @@
===== Schrittsequenz
Im unteren Bereich befinden sich die Schrittsequenzen einer Einzelmaßnahme. Auf
-linken Seite können Schrittsequenzen erfasst werden.
+der linken Seite können Schrittsequenzen erfasst werden.
.Informationen einer Schrittsequenz
[options="header,footer"]
image::gnm_schrittsequenz.png[]
-Eine Schrittsequenz (als Teil einer Einzelmaßnahme) besitzt folgende Attibute:
+Eine Schrittsequenz (als Teil einer Einzelmaßnahme) besitzt folgende Attribute:
.Attribute einer Schrittsequenz
[options="header,footer"]
@@ -655,9 +703,9 @@
Alternativ: Eingabe als Freitext.
|Ist-Zustand |nein |Textfeld |Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
|Soll-Zustand |nein |Textfeld |Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
-|Ist-Zeit |nein |Textfeld |Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
+|Ist-Zeit |nein |Textfeld (hh:mm)|Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
|Typ |nein |Textfeld |Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
-|Ausführender |nein |Textfeld |Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
+|Ausführender |nein |Textfeld |Neu, Beantragt |Freie Eingabe oder Auswahl eines vorherigen Eintrags möglich
|=========================================================
(*) Pflichtfeld um eine Schrittsequenz über die Schaltfläche "Schritt hinzufügen" anlegen zu können.
@@ -701,7 +749,7 @@
* Storniert
* Zurückgewiesen
-Die Adresssaten sind über die E-Mail Verteilerliste für Status Genehmigt,
+Die Adressaten sind über die E-Mail Verteilerliste für Status Genehmigt,
Storniert und Zurückgewiesen definiert.
Die individuelle Anpassung der Verteilerliste ist im Abschnitt
@@ -813,7 +861,7 @@
[[vordefinierte-filter]]
==== Vordefinierte Filter
-In der Tabellen-Ansicht sind drei Filer vordefiniert, die über eine
+In der Tabellen-Ansicht sind drei Filter vordefiniert, die über eine
Schalterleiste im Tabellenkopf ein- und ausgestellt werden können:
.Vordefinierte Filter
@@ -829,14 +877,14 @@
** Eine Kombination mit den Filtern "Geschlossene" und "Stornierte" ist nicht möglich.
Diese Filter sind deaktiviert bzw. werden automatisch deaktiviert.
. Geschlossene
-** In der Tabelle werden zusätzlich alle geschlossenen Geplanten Netzßmaßnahmen
+** In der Tabelle werden zusätzlich alle geschlossenen Geplanten Netzmaßnahmen
angezeigt.
** Eine Kombination mit dem Filter "Meine Vorgänge" ist nicht möglich. Sollte der
Filter "Meine Vorgänge" ausgewählt sein, so muss dieser zunächst deaktiviert werden.
Anschließend kann der Filter "Geschlossene" aktiviert werden.
** Eine Kombination mit dem Filter "Storniert" ist möglich.
. Stornierte
-** In der Tabelle werden zusätzlich alle stornierten Geplanten Netzßmaßnahmen
+** In der Tabelle werden zusätzlich alle stornierten Geplanten Netzmaßnahmen
angezeigt.
** Eine Kombination mit dem Filter "Meine Vorgänge" ist nicht möglich. Sollte der
Filter "Meine Vorgänge" ausgewählt sein, so muss dieser zunächst deaktiviert werden.
@@ -847,7 +895,7 @@
==== Filtern und Sortieren von Tabellenspalten
Mit den Filtern in der Übersichtstabelle werden nicht relevante Inhalte ausgeblendet.
Es kann in einer Spalte gefiltert werden, wie in der Abbildung dargestellt.
-Es können aber auch Filter in mehrern Spalten gleichzeitig definiert werden,
+Es können aber auch Filter in mehreren Spalten gleichzeitig definiert werden,
um noch gezieltere Suchen durchzuführen.
.Filter in der Übersichtstabelle
@@ -866,7 +914,7 @@
image::filter_speichern.png[]
Die Schaltfläche "Filter Speichern" ist solange deaktiviert, bis eine Änderung an
-den Filtereinstellung vornommen wird. Soll der aktuelle Filter dauerhaft gespeichert werden,
+den Filtereinstellung vorgenommen wird. Soll der aktuelle Filter dauerhaft gespeichert werden,
so ist ein Klick auf die Schaltfläche "Filter Speichern" notwendig. Damit ist
der neue Filter als Standardeinstellung für den aktuellen Benutzer gesetzt.
@@ -893,7 +941,7 @@
===== Datei hochladen
Dateien können nur in den Status "Neu" und "Beantragt" hochgeladen werden.
-Die Schaltfläche "Datei auswählen" öffent einen Dialog zur Auswahl einer Datei
+Die Schaltfläche "Datei auswählen" öffnet einen Dialog zur Auswahl einer Datei
im Dateisystem. Alternativ kann eine Datei per Drag and Drop in den Bereich
"Datei ziehen und hier ablegen" gezogen werden. Anschließend ist der Dateiname
im grauen Feld unter "Anhang" sichtbar und die Schaltfläche "Datei hochladen"
@@ -981,7 +1029,7 @@
image::stornieren.png[]
Anschließend muss eine Begründung für das Stornieren der Geplanten Netzmaßnahme
-eingetragen und mit einem Klick auf "Bestätigen" finalisert werden.
+eingetragen und mit einem Klick auf "Bestätigen" finalisiert werden.
.Begründung für das Stornieren einer Geplanten Netzmaßnahme erfassen
[options="header,footer"]
@@ -1008,7 +1056,7 @@
neue Geplante Netzmaßnahme, die bereits mit den Inhalten der zuvor ausgewählten
Netzmaßnahme gespeichert wurde.
-Grundsätzlich sind die Inhalte identisch. Lediglich bei folgenden Felder existieren
+Grundsätzlich sind die Inhalte identisch. Lediglich bei folgenden Feldern existieren
Unterschiede:
.Feld-Anpassungen beim Duplizieren von Geplanten Netzmaßnahmen
@@ -1020,7 +1068,7 @@
| Status | Geändert auf "Neu"
| Angehängte Dateien | Entfernt
| E-Mail Verteiler für Status Genehmigt, Storniert und Zurückgewiesen| Geändert auf Standard-Verteiler
-| Statuswechsel-Hisotrie | Entfernt
+| Statuswechsel-Historie | Entfernt
|=========================================================
@@ -1038,7 +1086,7 @@
==== Benutzersperre aufheben
Sobald ein Benutzer eine Geplante Netzmaßnahme zum Bearbeiten (über das Stift-Symbol)
-öffnet, ist diese Geplante Netznaßnahme für andere Benutzer im Zeitraum der Bearbeitung
+öffnet, ist diese Geplante Netzmaßnahme für andere Benutzer im Zeitraum der Bearbeitung
gesperrt. Wenn ein anderer Benutzer nun in diesem Zeitraum die gleiche Geplante
Netzmaßnahme zum Bearbeiten öffnet, erscheint ein Hinweis. Dieser enthält neben
dem Namen des anderen Bearbeiters auch die Möglichkeit die Sperre gleich aufzuheben.
@@ -1053,7 +1101,7 @@
CAUTION: Der andere Bearbeiter erhält keinen Hinweis, dass die Sperrung aufgehoben wurde.
D.h. es muss organisatorisch sichergestellt werden, dass der andere Bearbeiter
-die Geplante Netzmaßnahme nicht im gleichen Zeitraum weiter bearbeitet.
+die Geplante Netzmaßnahme nicht im gleichen Zeitraum weiterbearbeitet.
==== Abmelden
@@ -1064,9 +1112,9 @@
image::abmelden.png[]
CAUTION: Beim Klick auf "Abmelden" erfolgt nicht nur die Abmeldung vom Modul Geplante
-Netznahme, sondern die Abmeldung vom Portal. D.h. alle parallel geöffneten
+Netzmaßnahme, sondern die Abmeldung vom Portal. D.h. alle parallel geöffneten
openKONSEQUENZ-Module (wie z.B. Betriebstagebuch, Bereitschaftsplanung) werden
automatisch mit abgemeldet.
Um die parallel geöffneten openKONSEQUENZ-Module nicht mit abzumelden, ist
-lediglich das Browserfenster mit dem Modul Geplante Netzmaßnahnme zu schließen.
+lediglich das Browserfenster mit dem Modul Geplante Netzmaßnahme zu schließen.
