jj: add setup, fix assignment bugs

This commit is contained in:
Jonathan Jenne
2018-06-08 15:22:58 +02:00
parent 367eee150b
commit 39975bb875
16 changed files with 1001 additions and 747 deletions

View File

@@ -4,162 +4,166 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="23" ViewPortY="-22" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="284" ViewPortY="-428" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:TBDD_GROUPS" ZOrder="1" X="589" Y="-4" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="412" Y="407" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_MODULES" ZOrder="14" X="1446" Y="-26" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="15" X="825" Y="338" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TBDD_CLIENT" ZOrder="11" X="95" Y="723" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="2" X="56" Y="474" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TBDD_USER" ZOrder="4" X="28" Y="-22" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:TBDD_GROUPS_MODULES" ZOrder="10" X="782" Y="608" Height="229" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_GROUPS_CLIENT" ZOrder="7" X="1573" Y="274" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="13" X="1158" Y="607" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:TBLOCAL_ADGROUPS" ZOrder="12" X="1092" Y="729" Height="48" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
<Shape ID="DesignTable:TBDD_GROUPS" ZOrder="6" X="813" Y="-19" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="3" X="810" Y="357" Height="248" Width="294" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_MODULES" ZOrder="15" X="1446" Y="-26" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TBDD_USER_MODULES" ZOrder="2" X="1142" Y="58" Height="210" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TBDD_CLIENT" ZOrder="13" X="478" Y="-418" Height="305" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TBDD_CLIENT_USER" ZOrder="7" X="80" Y="42" Height="191" Width="260" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:TBDD_USER" ZOrder="5" X="461" Y="-16" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="256" />
<Shape ID="DesignTable:TBDD_GROUPS_MODULES" ZOrder="12" X="1142" Y="-286" Height="229" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBDD_GROUPS_CLIENT" ZOrder="9" X="783" Y="-302" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:TBLOCAL_ADUSERS" ZOrder="1" X="136" Y="-222" Height="105" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
<Shape ID="DesignTable:TBLOCAL_ADGROUPS" ZOrder="14" X="139" Y="-324" Height="48" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="21" LineWidth="11">
<RoutePoints>
<Point>
<X>889</X>
<Y>282</Y>
<X>1113</X>
<Y>0</Y>
</Point>
<Point>
<X>1327</X>
<Y>282</Y>
<X>1429</X>
<Y>0</Y>
</Point>
<Point>
<X>1327</X>
<Y>441</Y>
<X>1429</X>
<Y>391</Y>
</Point>
<Point>
<X>706</X>
<Y>441</Y>
<X>1104</X>
<Y>391</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_USER_MODULES_MODULE_ID" ZOrder="20" LineWidth="11">
<RoutePoints>
<Point>
<X>1463</X>
<Y>317</Y>
<X>1446</X>
<Y>163</Y>
</Point>
<Point>
<X>1463</X>
<Y>361</Y>
</Point>
<Point>
<X>1103</X>
<Y>361</Y>
<X>1420</X>
<Y>163</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_GROUP_ID" ZOrder="19" LineWidth="11">
<RoutePoints>
<Point>
<X>205</X>
<Y>723</Y>
<X>495</X>
<Y>-113</Y>
</Point>
<Point>
<X>205</X>
<Y>665</Y>
<X>495</X>
<Y>59</Y>
</Point>
<Point>
<X>340</X>
<Y>59</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="18" LineWidth="11">
<RoutePoints>
<Point>
<X>328</X>
<Y>433</Y>
<X>761</X>
<Y>383</Y>
</Point>
<Point>
<X>412</X>
<Y>433</Y>
<X>810</X>
<Y>383</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_USER_MODULES2_USER_ID" ZOrder="17" LineWidth="11">
<RoutePoints>
<Point>
<X>328</X>
<Y>391</Y>
<X>761</X>
<Y>117</Y>
</Point>
<Point>
<X>825</X>
<Y>391</Y>
<X>1142</X>
<Y>117</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_CLIENT_USER_USER_ID" ZOrder="16" LineWidth="11">
<RoutePoints>
<Point>
<X>48</X>
<Y>435</Y>
<X>461</X>
<Y>137</Y>
</Point>
<Point>
<X>48</X>
<Y>491</Y>
</Point>
<Point>
<X>56</X>
<Y>491</Y>
<X>340</X>
<Y>137</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_GROUP_ID" ZOrder="9" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_GROUP_ID" ZOrder="11" LineWidth="11">
<RoutePoints>
<Point>
<X>835</X>
<Y>358</Y>
<X>1096</X>
<Y>-19</Y>
</Point>
<Point>
<X>835</X>
<Y>608</Y>
<X>1096</X>
<Y>-74</Y>
</Point>
<Point>
<X>1142</X>
<Y>-74</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_MODULE_ID" ZOrder="8" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_MODULES_MODULE_ID" ZOrder="10" LineWidth="11">
<RoutePoints>
<Point>
<X>1471</X>
<Y>317</Y>
<X>1446</X>
<Y>-9</Y>
</Point>
<Point>
<X>1471</X>
<Y>633</Y>
<X>1421</X>
<Y>-9</Y>
</Point>
<Point>
<X>1079</X>
<Y>633</Y>
<X>1421</X>
<Y>-57</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_CLIENT_ID" ZOrder="6" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_CLIENT_ID" ZOrder="4" LineWidth="11">
<RoutePoints>
<Point>
<X>302</X>
<Y>723</Y>
<X>702</X>
<Y>-207</Y>
</Point>
<Point>
<X>302</X>
<Y>353</Y>
</Point>
<Point>
<X>1573</X>
<Y>353</Y>
<X>783</X>
<Y>-207</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_GROUP_ID" ZOrder="5" LineWidth="11">
<Connector ID="DesignRelation:FK_TBDD_GROUPS_CLIENT_GROUP_ID" ZOrder="8" LineWidth="11">
<RoutePoints>
<Point>
<X>889</X>
<Y>358</Y>
<X>1104</X>
<Y>-19</Y>
</Point>
<Point>
<X>1573</X>
<Y>358</Y>
<X>1104</X>
<Y>-310</Y>
</Point>
<Point>
<X>1054</X>
<Y>-310</Y>
</Point>
<Point>
<X>1054</X>
<Y>-302</Y>
</Point>
</RoutePoints>
</Connector>