...

Android/BewoMitarbeiterApp/app/app.iml

@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -47,7 +46,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +53,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -63,7 +60,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -71,7 +67,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -79,16 +74,12 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex-instrumentation/1.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -108,6 +99,7 @@
     <orderEntry type="library" exported="" name="robospice-1.4.14" level="project" />
     <orderEntry type="library" exported="" name="robospice-cache-1.4.14" level="project" />
     <orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
+    <orderEntry type="library" exported="" name="1_commons-io-1.3.2" level="project" />
     <orderEntry type="library" exported="" name="android-android-21" level="project" />
   </component>
 </module>

Android/BewoMitarbeiterApp/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '23.0.3'
+    buildToolsVersion '25.0.0'
 
     dexOptions {
         maxProcessCount 2

Android/BewoMitarbeiterApp/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

Android/BewoMitarbeiterApp/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 23 08:50:04 CEST 2016
+#Tue Jun 06 12:54:10 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

BeWo/BeWo.csproj

@@ -440,6 +440,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="View\Navigation\CustomerTeamNavigationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\SchulbegleitenderDienstCustomer.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -631,6 +635,7 @@
     <Compile Include="ViewModel\CustomerTeamRelationVM.cs" />
     <Compile Include="ViewModel\ContractVM.cs" />
     <Compile Include="ViewModel\CustomerAPPCodeVM.cs" />
+    <Compile Include="ViewModel\CustomerTeamVM.cs" />
     <Compile Include="ViewModel\EmployeeAPPCodeVM.cs" />
     <Compile Include="ViewModel\ChatMessageVM.cs" />
     <Compile Include="ViewModel\ChatMediaMessageVM.cs" />
@@ -841,6 +846,9 @@
     <Compile Include="View\EmployeeArbeitszeitView.xaml.cs">
       <DependentUpon>EmployeeArbeitszeitView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Navigation\CustomerTeamNavigationView.xaml.cs">
+      <DependentUpon>CustomerTeamNavigationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
       <DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon>
     </Compile>

BeWo/MainControl.xaml

@@ -353,6 +353,23 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
+
+                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View"
+                                                   Click="button_CustomerTeam_Click"
+                                                   x:Name="button_CustomerTeam"
+                                                   Style="{StaticResource NavBarButton}"
+                                                   Content="Kliententeams"
+                                                   Background="{StaticResource CustomerTeamContentBrush}" RenderTransformOrigin="0.5, 0.5"
+                                                   ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png" Width="90">
+                                <Button.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                                        <SkewTransform AngleX="0" AngleY="0" />
+                                        <RotateTransform Angle="0" />
+                                        <TranslateTransform X="0" Y="0" />
+                                    </TransformGroup>
+                                </Button.RenderTransform>
+                            </localView:ImageButton>
                             
                             <!--<localView:ImageButton r:DemandUserRight.VisibleDemands="WohnheimView_View"
                                     x:Name="button_Wohnheim" Click="button_Wohnheim_Click"

BeWo/MainControl.xaml.cs

@@ -48,8 +48,9 @@ namespace BeWo
 		Report,
 		Scheduler,
         Wohnheim,
-        SchulbegleitenderDienst
+        SchulbegleitenderDienst,
-	}
+        CustomerTeam
+    }
 
 	/// <summary>
 	///     Interaktionslogik für MainControl.xaml
@@ -210,7 +211,10 @@ namespace BeWo
                     case UIContext.SchulbegleitenderDienst:
                         view = new SchulbegleitenderDienstMasterView();
                         break;
-                }
+                    case UIContext.CustomerTeam:
+				        view = new CustomerTeamNavigationView();
+				        break;
+				}
 				_Views[uiContext] = view;
 			}
 			return _Views[uiContext];
@@ -944,7 +948,15 @@ namespace BeWo
 			}
 		}
 
-		private void button_UserGroup_Click(object sender, RoutedEventArgs e)
+        private void button_CustomerTeam_Click(object sender, RoutedEventArgs e)
+        {
+            if (DoSaveCheck())
+            {
+                NavigateTo(GetViewForUIContext(UIContext.CustomerTeam));
+            }
+        }
+
+        private void button_UserGroup_Click(object sender, RoutedEventArgs e)
 		{
 			if (DoSaveCheck())
 			{

BeWo/Styles/OrangeBlack.xaml

@@ -2130,6 +2130,21 @@
 	</ControlTemplate>
 	<!-- EndRegion -->
 
+    <!-- Region Customer Team Styles -->
+    <SolidColorBrush x:Key="CustomerTeamContentBrush" Color="#FF565999" />
+    <Style x:Key="CustomerTeamNavigationStyle" TargetType="{x:Type GroupBox}">
+        <Style.Resources>
+            <SolidColorBrush x:Key="NavigationHeaderBrush" Color="#FF2A4958" />
+            <LinearGradientBrush x:Key="NavigationContentBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+                <GradientStop Color="#FF3B7799" Offset="0" />
+                <GradientStop Color="#FF19485C" Offset="1" />
+            </LinearGradientBrush>
+        </Style.Resources>
+
+        <Setter Property="Template" Value="{StaticResource NavigationGroupTemplate}" />
+    </Style>
+    <!-- EndRegion -->
+    
 	<!-- Region Customer Styles-->
 	<SolidColorBrush x:Key="CustomerContentBrush" Color="#FF3B7799" />
 	<LinearGradientBrush x:Key="CustomerListBrush" EndPoint="0.5,1" StartPoint="0.5,0">

BeWo/View/Navigation/TeamNavigationView.xaml

@@ -1,6 +1,22 @@
-<localView:BeWoView x:Class="BeWo.View.Navigation.TeamNavigationView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View" xmlns:localNavView="clr-namespace:BeWo.View.Navigation" Loaded="OnLoaded">
+<localView:BeWoView x:Class="BeWo.View.Navigation.TeamNavigationView" 
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:localView="clr-namespace:BeWo.View" 
+                    xmlns:localNavView="clr-namespace:BeWo.View.Navigation" 
+                    Loaded="OnLoaded">
 	<Grid>
-		<localNavView:MainNavigationView x:Name="mainNavigationView" MainGroupHeader="Teams" CreateNewObject="mainNavigationView_CreateNewObject" OpenObject="mainNavigationView_OpenObject" DeleteObject="mainNavigationView_DeleteObject" DeleteDemands="DeleteAll, TeamView_Delete" CreateDemands="CreateAll, TeamView_Create" ExcelExport="mainNavigationView_ExcelExport" ContentGroupStyle="{StaticResource TeamNavigationStyle}" MainListItemStyle="{StaticResource SearchDetailStyle}" HistoryListItemStyle="{StaticResource SearchSimpleStyle}" OnReloadData="MainNavigationView_OnReloadData"/>
+		<localNavView:MainNavigationView x:Name="mainNavigationView" 
+                                         MainGroupHeader="Teams" 
+                                         CreateNewObject="mainNavigationView_CreateNewObject" 
+                                         OpenObject="mainNavigationView_OpenObject" 
+                                         DeleteObject="mainNavigationView_DeleteObject" 
+                                         DeleteDemands="DeleteAll, TeamView_Delete" 
+                                         CreateDemands="CreateAll, TeamView_Create" 
+                                         ExcelExport="mainNavigationView_ExcelExport" 
+                                         ContentGroupStyle="{StaticResource TeamNavigationStyle}" 
+                                         MainListItemStyle="{StaticResource SearchDetailStyle}" 
+                                         HistoryListItemStyle="{StaticResource SearchSimpleStyle}" 
+                                         OnReloadData="MainNavigationView_OnReloadData"/>
 
 
 	</Grid>

BeWoChatServer/Multitenancy/demo.config

@@ -15,13 +15,13 @@
                 NHibernate.Driver.MySqlDataDriver
             </property>
 
-          <!--<property name="connection.connection_string">
+            <property name="connection.connection_string">
                 Server=localhost;Password=root;User ID=root;Initial Catalog=bewodemo
-            </property>-->
+            </property>
 
-              <property name="connection.connection_string">
+              <!--<property name="connection.connection_string">
 				      Server=localhost;Password=root;User ID=root;Initial Catalog=1234567890
-			      </property>
+			      </property>-->
 
             <property name="dialect">
                 NHibernate.Dialect.MySQLDialect

Data/Data.csproj

@@ -150,6 +150,7 @@
     <Compile Include="Entities\Customer2OrganisationHistory.cs" />
     <Compile Include="Entities\Customer2PersonHistory.cs" />
     <Compile Include="Entities\CustomerHistory.cs" />
+    <Compile Include="Entities\CustomerTeam.cs" />
     <Compile Include="Entities\Darreichungsform.cs" />
     <Compile Include="Entities\DepotRhythmus.cs" />
     <Compile Include="Entities\Employee2CustomerHistory.cs" />
@@ -560,6 +561,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
+    <Content Include="Mappings\CustomerTeam.hbm.xml" />
     <EmbeddedResource Include="Mappings\ArbeitszeitEintrag.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>

Host/Multitenancy/demo.config

@@ -15,13 +15,13 @@
                 NHibernate.Driver.MySqlDataDriver
             </property>
 
-           <!--  <property name="connection.connection_string">
+            <property name="connection.connection_string">
                 Server=localhost;Password=root;User ID=root;Initial Catalog=bewodemo
-            </property>-->
+            </property>
 
-           <property name="connection.connection_string">
+           <!--<property name="connection.connection_string">
 				      Server=localhost;Password=root;User ID=root;Initial Catalog=1234567890
-			      </property>
+			      </property>-->
 
             <property name="dialect">
                 NHibernate.Dialect.MySQLDialect

Service/Service.csproj

@@ -167,6 +167,8 @@
     <Compile Include="DCEntityMapper\BargeldtransaktionDC_Bargeldtransaktion.cs" />
     <Compile Include="DCEntityMapper\BeWoFolderDC_BeWoFolder.cs" />
     <Compile Include="DCEntityMapper\BeWoMobilBrowserInfoDC_BeWoMobilBrowserInfo.cs" />
+    <Compile Include="DCEntityMapper\CompactCustomerTeamDC_CustomerTeam.cs" />
+    <Compile Include="DCEntityMapper\CustomerTeamDC_CustomerTeam.cs" />
     <Compile Include="DCEntityMapper\CustomerTeamRelDC_Team2CustomerMapper.cs" />
     <Compile Include="DCEntityMapper\DarreichungsformDC_Darreichungsform.cs" />
     <Compile Include="DCEntityMapper\DepotRhythmusDC_DepotRhythmus.cs" />

Shared/BeWoEntityEnums.cs

@@ -122,7 +122,8 @@ namespace BS.Shared
         MedRecord                                 = 115,
         ChatMessage                               = 116,
         ChatMediaMessage                          = 117,
-        NewestChatMessage                         = 118
+        NewestChatMessage                         = 118,
+        CustomerTeam                              = 119
     }
 
     public enum SystemEntryID
@@ -465,7 +466,12 @@ namespace BS.Shared
 
         //ChatSettings = 28000
 
-        VertretungenView_View = 30000
+        VertretungenView_View = 30000,
+
+        CustomerTeam_View = 40000,
+        CustomerTeam_Edit = 40001,
+        CustomerTeam_Delete = 40002,
+        CustomerTeam_Create = 40003
     }
 
     public enum PersonType

Shared/Core/EnumTranslations.cs

@@ -554,7 +554,7 @@ namespace BS.Shared.Core
                                              },
                                              {
                                                  UserRightType.VertretungenView_View, "Vertretungen verwalten"
-                                                 }
+                                             }
                                            
                 //,
                 //                             {
@@ -572,7 +572,22 @@ namespace BS.Shared.Core
                 //                             {
                 //                                 UserRightType.ChatSettings, "Chat Einstellungen"
                 //                             }
-
+                                                ,
+                                             {
+                                                 UserRightType.CustomerTeam_View, "Kliententeams ansehen"
+                                             }
+                                                ,
+                                             {
+                                                 UserRightType.CustomerTeam_Create, "Kliententeams anlegen"
+                                             }
+                                                ,
+                                             {
+                                                 UserRightType.CustomerTeam_Edit, "Kliententeams bearbeiten"
+                                             }
+                                                ,
+                                             {
+                                                 UserRightType.CustomerTeam_Delete, "Kliententeams löschen"
+                                             }
                                          };
 			#endregion
 		 

Shared/Shared.csproj

@@ -157,10 +157,13 @@
     <Compile Include="DataContracts\ClientPartials\OrganisationPersonRelationDC.cs" />
     <Compile Include="DataContracts\ClientPartials\ServiceRecordHistoryDC.cs" />
     <Compile Include="DataContracts\ClientPartials\TextbausteinDC.cs" />
+    <Compile Include="DataContracts\Compact\ClientPartials\CompactCustomerTeamDC.cs" />
     <Compile Include="DataContracts\Compact\ClientPartials\CompactGroupOfPeopleDC.cs" />
     <Compile Include="DataContracts\Compact\ClientPartials\CompactWohnheimDC.cs" />
+    <Compile Include="DataContracts\Compact\CompactCustomerTeamDC.cs" />
     <Compile Include="DataContracts\Compact\CompactGroupOfPeopleDC.cs" />
     <Compile Include="DataContracts\Compact\CompactWohnheimDC.cs" />
+    <Compile Include="DataContracts\CustomerTeamDC.cs" />
     <Compile Include="DataContracts\CustomerTeamRelationDC.cs" />
     <Compile Include="DataContracts\ContractDC.cs" />
     <Compile Include="DataContracts\DarreichungsformDC.cs" />