Skip to content

Commit

Permalink
Domain -> Servername (#259)
Browse files Browse the repository at this point in the history 
* Replace domain with server in images
* Rename domain to server in new schemas
  • Loading branch information
@Johennes
Johennes authored Sep 4, 2024
1 parent 251ca88 commit eb24183
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 78 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
src/fhir/input-cache
.idea
target/
.DS_Store
Binary file modified images/generated/TI-M_Basis/Berechtigung_UI.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/generated/TI-M_Basis/Berechtigung_UI.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/generated/TI-M_Basis/Berechtigungen_setzen.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/generated/TI-M_Basis/Berechtigungen_setzen.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 70 additions & 70 deletions src/images/TI-M_Basis/Berechtigung_UI.drawio
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
<mxfile host="65bd71144e">
<diagram name="Berechtigung-UI" id="5W39nyvdsAi6H0qSFlow">
<mxGraphModel dx="775" dy="823" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-1" value="&lt;h1&gt;TI-Messenger&lt;/h1&gt;" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;glass=0;shadow=0;strokeColor=#999999;" parent="1" vertex="1">
<mxGeometry x="90" y="60" width="270" height="360" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-2" value="&lt;h3&gt;Wer darf mich kontaktieren?&lt;/h3&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;align=left;" parent="1" vertex="1">
<mxGeometry x="120" y="140" width="220" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-16" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="177.5" width="80" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-8" value="" style="ellipse;shape=doubleEllipse;whiteSpace=wrap;html=1;aspect=fixed;strokeWidth=2;strokeColor=#006EAF;" parent="DQwhOIoZfkcR7J3Anc3N-16" vertex="1">
<mxGeometry y="7.5" width="15" height="15" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-9" value="&lt;p&gt;&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Jeder&lt;/font&gt;&lt;/p&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-16" vertex="1">
<mxGeometry x="20" width="60" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-17" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="210" width="80" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-18" value="" style="ellipse;shape=doubleEllipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;fontColor=#ffffff;strokeColor=#006EAF;strokeWidth=2;" parent="DQwhOIoZfkcR7J3Anc3N-17" vertex="1">
<mxGeometry y="7.5" width="15" height="15" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-19" value="&lt;p&gt;&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Niemand&lt;/font&gt;&lt;/p&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-17" vertex="1">
<mxGeometry x="20" width="60" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-20" value="&lt;h3&gt;Ausnahmen&lt;/h3&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;align=left;" parent="1" vertex="1">
<mxGeometry x="120" y="260" width="220" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-24" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="300" width="210" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-25" value="" style="group" parent="DQwhOIoZfkcR7J3Anc3N-24" vertex="1" connectable="0">
<mxGeometry width="210" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-26" value="&lt;b&gt;&lt;font style=&quot;font-size: 16px;&quot; color=&quot;#b85450&quot;&gt;–&lt;/font&gt;&lt;/b&gt;" style="ellipse;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" parent="DQwhOIoZfkcR7J3Anc3N-25" vertex="1">
<mxGeometry x="200" y="6" width="20" height="20" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-27" value="&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Domain: gematik.de&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-25" vertex="1">
<mxGeometry width="190" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-38" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="370" width="225" height="30" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-35" value="" style="shape=cross;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=2;" parent="DQwhOIoZfkcR7J3Anc3N-38" vertex="1">
<mxGeometry y="5" width="20" height="20" as="geometry"/>
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-37" value="&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Weitere Kategorie hinzufügen&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-38" vertex="1">
<mxGeometry x="25" width="200" height="30" as="geometry"/>
</mxCell>
<mxCell id="2" value="" style="group" vertex="1" connectable="0" parent="1">
<mxGeometry x="120" y="330" width="210" height="30" as="geometry"/>
</mxCell>
<mxCell id="3" value="" style="group" vertex="1" connectable="0" parent="2">
<mxGeometry width="210" height="30" as="geometry"/>
</mxCell>
<mxCell id="4" value="&lt;b&gt;&lt;font style=&quot;font-size: 16px;&quot; color=&quot;#b85450&quot;&gt;–&lt;/font&gt;&lt;/b&gt;" style="ellipse;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" vertex="1" parent="3">
<mxGeometry x="200" y="5" width="20" height="20" as="geometry"/>
</mxCell>
<mxCell id="5" value="&lt;font style=&quot;font-size: 14.04px;&quot;&gt;MXID:@DrMeier:mypraxis.de&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="3">
<mxGeometry x="-1" width="190" height="30" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
<mxfile host="Electron" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.8 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.8">
<diagram name="Berechtigung-UI" id="5W39nyvdsAi6H0qSFlow">
<mxGraphModel dx="1026" dy="743" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="DQwhOIoZfkcR7J3Anc3N-1" value="&lt;h1&gt;TI-Messenger&lt;/h1&gt;" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;glass=0;shadow=0;strokeColor=#999999;" parent="1" vertex="1">
<mxGeometry x="90" y="60" width="270" height="360" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-2" value="&lt;h3&gt;Wer darf mich kontaktieren?&lt;/h3&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;align=left;" parent="1" vertex="1">
<mxGeometry x="120" y="140" width="220" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-16" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="177.5" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-8" value="" style="ellipse;shape=doubleEllipse;whiteSpace=wrap;html=1;aspect=fixed;strokeWidth=2;strokeColor=#006EAF;" parent="DQwhOIoZfkcR7J3Anc3N-16" vertex="1">
<mxGeometry y="7.5" width="15" height="15" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-9" value="&lt;p&gt;&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Jeder&lt;/font&gt;&lt;/p&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-16" vertex="1">
<mxGeometry x="20" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-17" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="210" width="80" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-18" value="" style="ellipse;shape=doubleEllipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#1ba1e2;fontColor=#ffffff;strokeColor=#006EAF;strokeWidth=2;" parent="DQwhOIoZfkcR7J3Anc3N-17" vertex="1">
<mxGeometry y="7.5" width="15" height="15" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-19" value="&lt;p&gt;&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Niemand&lt;/font&gt;&lt;/p&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-17" vertex="1">
<mxGeometry x="20" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-20" value="&lt;h3&gt;Ausnahmen&lt;/h3&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;align=left;" parent="1" vertex="1">
<mxGeometry x="120" y="260" width="220" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-24" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="300" width="210" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-25" value="" style="group" parent="DQwhOIoZfkcR7J3Anc3N-24" vertex="1" connectable="0">
<mxGeometry width="210" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-26" value="&lt;b&gt;&lt;font style=&quot;font-size: 16px;&quot; color=&quot;#b85450&quot;&gt;–&lt;/font&gt;&lt;/b&gt;" style="ellipse;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" parent="DQwhOIoZfkcR7J3Anc3N-25" vertex="1">
<mxGeometry x="200" y="6" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-27" value="&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Server: gematik.de&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-25" vertex="1">
<mxGeometry width="190" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-38" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="370" width="225" height="30" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-35" value="" style="shape=cross;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=2;" parent="DQwhOIoZfkcR7J3Anc3N-38" vertex="1">
<mxGeometry y="5" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="DQwhOIoZfkcR7J3Anc3N-37" value="&lt;font style=&quot;font-size: 14.04px;&quot;&gt;Weitere Kategorie hinzufügen&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="DQwhOIoZfkcR7J3Anc3N-38" vertex="1">
<mxGeometry x="25" width="200" height="30" as="geometry" />
</mxCell>
<mxCell id="2" value="" style="group" parent="1" vertex="1" connectable="0">
<mxGeometry x="120" y="330" width="210" height="30" as="geometry" />
</mxCell>
<mxCell id="3" value="" style="group" parent="2" vertex="1" connectable="0">
<mxGeometry width="210" height="30" as="geometry" />
</mxCell>
<mxCell id="4" value="&lt;b&gt;&lt;font style=&quot;font-size: 16px;&quot; color=&quot;#b85450&quot;&gt;–&lt;/font&gt;&lt;/b&gt;" style="ellipse;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" parent="3" vertex="1">
<mxGeometry x="200" y="5" width="20" height="20" as="geometry" />
</mxCell>
<mxCell id="5" value="&lt;font style=&quot;font-size: 14.04px;&quot;&gt;MXID:@DrMeier:mypraxis.de&lt;/font&gt;" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="3" vertex="1">
<mxGeometry x="-1" width="190" height="30" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
8 changes: 4 additions & 4 deletions src/images/TI-M_Basis/Berechtigungen_setzen.puml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ start
if ("Allow all" or "Block all") then (Allow all)
if(Beschränkungen einrichten) then (Ja)
if(BlockedUser-Liste bearbeiten) then (Hinzufügen)
:User/Domain hinzufügen;
:User/Server hinzufügen;
else (Entfernen)
:User/Domain entfernen;
:User/Server entfernen;
endif
else(Nein)
endif
else (Block all)
if(Erlaubnisse einrichten) then (Ja)
if(AllowedUser-Liste bearbeiten) then (Hinzufügen)
:User/Domain hinzufügen;
:User/Server hinzufügen;
else (Entfernen)
:User/Domain entfernen;
:User/Server entfernen;
endif
else(Nein)
endif
Expand Down
2 changes: 1 addition & 1 deletion src/schema/TI-M_Pro/permissionConfig_V1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"block all"
]
},
"domainExceptions": {
"serverExceptions": {
"type": "object",
"description": "The map of servers to in-/exclude. This is a mapping of Matrix server name (https://spec.matrix.org/v1.3/appendices/#server-name) to empty object.",
"patternProperties": {
Expand Down
2 changes: 1 addition & 1 deletion src/schema/TI-M_ePA/permissionConfig_V1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"block all"
]
},
"domainExceptions": {
"serverExceptions": {
"type": "object",
"description": "The map of servers to in-/exclude. This is a mapping of Matrix server name (https://spec.matrix.org/v1.3/appendices/#server-name) to empty object.",
"patternProperties": {
Expand Down

0 comments on commit eb24183

Please sign in to comment.