ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update auf DevExpress 23.2.4

Browse Source
This commit is contained in:
Christian
2024-03-03 21:42:06 +01:00
parent 089b531a14
commit 4be7211ff4
24 changed files with 289 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
BeWo/BeWo.csproj
View File

@@ -43,13 +43,13 @@
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>ownSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.231</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.232</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>232</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<ApplicationVersion>2.0.1.232</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
@@ -98,45 +98,52 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Blacklight.Wpf.Controls.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Pdf.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v17.1.Export, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Accordion.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Core.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Charts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Docking.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.DocumentViewer.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Xpf.Grid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Grid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Layout.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.LayoutControl.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.PivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Printing.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Ribbon.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.RichEdit.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Scheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.LightGray.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2010Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2013.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2016White.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraBars.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.PivotGrid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Sparkline.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.CodeParser.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Web.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Accordion.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.CodeView.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Core.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Charts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Docking.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.DocumentViewer.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Xpf.Grid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Grid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Layout.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.LayoutControl.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.PivotGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Controls.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Printing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Ribbon.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Images.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Office.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.RichEdit.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Scheduler.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.LightGray.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2010Black.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2013.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Themes.Office2016White.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraBars.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraEditors.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.PivotGrid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Sparkline.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.CodeParser.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraGrid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2.Core.Desktop, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -2586,7 +2593,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Charts.v17.1.Core">
<PublishFile Include="DevExpress.Charts.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2596,7 +2603,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v17.1">
<PublishFile Include="DevExpress.Data.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2606,7 +2613,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Data.v17.1.Linq">
<PublishFile Include="DevExpress.Data.v23.2.Linq">
<Visible>False</Visible>
<Group>
</Group>
@@ -2616,7 +2623,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Office.v17.1.Core">
<PublishFile Include="DevExpress.Office.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2626,7 +2633,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.PivotGrid.v17.1.Core">
<PublishFile Include="DevExpress.PivotGrid.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2636,7 +2643,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Printing.v17.1.Core">
<PublishFile Include="DevExpress.Printing.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2646,7 +2653,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v17.1.Core">
<PublishFile Include="DevExpress.RichEdit.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2656,7 +2663,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.RichEdit.v17.1.Export">
<PublishFile Include="DevExpress.RichEdit.v23.2.Export">
<Visible>False</Visible>
<Group>
</Group>
@@ -2666,7 +2673,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Sparkline.v17.1.Core">
<PublishFile Include="DevExpress.Sparkline.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2676,7 +2683,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Utils.v17.1">
<PublishFile Include="DevExpress.Utils.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2686,7 +2693,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Accordion.v17.1">
<PublishFile Include="DevExpress.Xpf.Accordion.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2696,7 +2703,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Charts.v17.1">
<PublishFile Include="DevExpress.Xpf.Charts.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2706,7 +2713,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Core.v17.1">
<PublishFile Include="DevExpress.Xpf.Core.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2716,7 +2723,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Docking.v17.1">
<PublishFile Include="DevExpress.Xpf.Docking.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2726,7 +2733,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v17.1">
<PublishFile Include="DevExpress.Xpf.Grid.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2736,7 +2743,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Grid.v17.1.Core">
<PublishFile Include="DevExpress.Xpf.Grid.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2746,7 +2753,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Layout.v17.1.Core">
<PublishFile Include="DevExpress.Xpf.Layout.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2756,7 +2763,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Mvvm.v17.1">
<PublishFile Include="DevExpress.Xpf.Mvvm.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2766,7 +2773,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v17.1">
<PublishFile Include="DevExpress.Xpf.Printing.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2776,7 +2783,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Printing.v17.1.Core">
<PublishFile Include="DevExpress.Xpf.Printing.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2786,7 +2793,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Ribbon.v17.1">
<PublishFile Include="DevExpress.Xpf.Ribbon.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2796,7 +2803,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Scheduler.v17.1">
<PublishFile Include="DevExpress.Xpf.Scheduler.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2806,7 +2813,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v17.1">
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2816,7 +2823,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v17.1">
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2826,7 +2833,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v17.1">
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2836,7 +2843,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2013.v17.1">
<PublishFile Include="DevExpress.Xpf.Themes.Office2013.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2846,7 +2853,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.Xpf.Themes.Office2016White.v17.1">
<PublishFile Include="DevExpress.Xpf.Themes.Office2016White.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2856,7 +2863,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraBars.v17.1">
<PublishFile Include="DevExpress.XtraBars.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2866,7 +2873,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraCharts.v17.1">
<PublishFile Include="DevExpress.XtraCharts.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2876,7 +2883,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraEditors.v17.1">
<PublishFile Include="DevExpress.XtraEditors.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2886,7 +2893,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraNavBar.v17.1">
<PublishFile Include="DevExpress.XtraNavBar.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2896,7 +2903,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPivotGrid.v17.1">
<PublishFile Include="DevExpress.XtraPivotGrid.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2906,7 +2913,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraPrinting.v17.1">
<PublishFile Include="DevExpress.XtraPrinting.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2916,7 +2923,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraReports.v17.1">
<PublishFile Include="DevExpress.XtraReports.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2926,7 +2933,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1">
<PublishFile Include="DevExpress.XtraScheduler.v23.2">
<Visible>False</Visible>
<Group>
</Group>
@@ -2936,7 +2943,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Core">
<PublishFile Include="DevExpress.XtraScheduler.v23.2.Core">
<Visible>False</Visible>
<Group>
</Group>
@@ -2946,7 +2953,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Reporting">
<PublishFile Include="DevExpress.XtraScheduler.v23.2.Reporting">
<Visible>False</Visible>
<Group>
</Group>
@@ -2956,7 +2963,7 @@
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="DevExpress.XtraTreeList.v17.1">
<PublishFile Include="DevExpress.XtraTreeList.v23.2">
<Visible>False</Visible>
<Group>
</Group>

2
BeWo/BeWo.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
<InstallUrlHistory>https://app.ownsoft.de/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbdtest/</InstallUrlHistory>
<InstallUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
<BootstrapperUrlHistory />

1
BeWo/Properties/licenses.licx
View File

@@ -1 +0,0 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

4
BeWo/Scheduler/View/SchedulerView.xaml
View File

@@ -7,8 +7,8 @@
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v23.2.Core"
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2"
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:search="clr-namespace:BeWo.View.Search"

2
BeWo/Scheduler/View/ServiceRecordScheduler.xaml
View File

@@ -6,7 +6,7 @@
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black">
<UserControl.Resources>

5
BeWo/View/BargeldkassenView.xaml.cs
View File

@@ -351,7 +351,10 @@ namespace BeWo.View
{
return;
}
if (!NewBargeldtransaktion.Betrag.HasValue || NewBargeldtransaktion.Zahlungstyp == null)
{
return;
}
var transaktionsBetrag = NewBargeldtransaktion.Betrag * (NewBargeldtransaktion.Zahlungstyp.Enum == Zahlungstyp.Auszahlung ? -1 : 1);
var latestTransactionDate = new DateTime(1, 1, 1);

2
BeWo/View/Controls/ComboBoxTreeViewControlV2.xaml
View File

@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v17.1"
xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v23.2"
xmlns:shared="clr-namespace:BeWo.Core"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">

13
BeWo/View/Controls/EnumComboBoxStyleSettings.cs
View File

@@ -30,13 +30,18 @@ namespace BeWo.View.Controls
cb.DisplayTextConverter = (IValueConverter)Application.Current.FindResource("enumToDescriptionConverter");
}
protected override Style GetItemContainerStyle(LookUpEditBase cb)
protected override Style GetItemContainerStyle(LookUpEditBase control)
{
if (HasFlagsAttribute())
return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.CheckBoxItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
throw new NotImplementedException();
}
//protected override Style GetItemContainerStyle(LookUpEditBase cb)
//{
// if (HasFlagsAttribute())
// return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.CheckBoxItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
// return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
//}
//protected override SelectionMode SelectionMode

6
BeWo/View/Detail/AdditionalServiceView.xaml
View File

@@ -12,9 +12,9 @@
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2"
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1.Core"
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2.Core"
xmlns:converter="clr-namespace:BeWo.Converter"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:detail="clr-namespace:BeWo.View.Detail"
@@ -705,7 +705,7 @@
<dxg:GridColumn x:Name="T30" FieldName="t30" Header="31." Width="27" CellStyle="{StaticResource CustomCellStyle}" EditSettings="{dxe:CheckSettings}" />
<dxg:GridColumn x:Name="ColumnNotice" Header="Bemerkungen" FieldName="Notice.Notice" Width="300">
<dxg:GridColumn.EditSettings>
<dxe:MemoEditSettings TextWrapping="Wrap" AcceptsReturn="True" MemoTextWrapping="Wrap" MemoAcceptsReturn="True" ShowIcon="False" ShowTooltipForTrimmedText="True" >
<dxe:MemoEditSettings TextWrapping="Wrap" AcceptsReturn="True" MemoTextWrapping="Wrap" MemoAcceptsReturn="True" ShowIcon="False" ShowTooltipForTrimmedText="True">
</dxe:MemoEditSettings>
</dxg:GridColumn.EditSettings>

5
BeWo/View/Detail/BudgetView.xaml
View File

@@ -1,12 +1,11 @@
<localView:BeWoView
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
<localView:BeWoView xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
x:Class="BeWo.View.Detail.BudgetView"
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:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v17.1"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v23.2"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="root" Header="Aktuell definierte Budgets" Style="{StaticResource ObjectEditGroupBox}">

11
BeWo/View/Detail/NotizenKategorieView.xaml
View File

@@ -1,16 +1,15 @@
<localView:BeWoView
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
<localView:BeWoView xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
x:Class="BeWo.View.Detail.NotizenKategorieView"
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:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v17.1"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v23.2"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<ScrollViewer HorizontalAlignment="Left" Height="Auto" Margin="10,10,0,0" VerticalAlignment="Top" Width="Auto" >
<Grid Width="Auto" x:Name="Root" >
<ScrollViewer HorizontalAlignment="Left" Height="Auto" Margin="10,10,0,0" VerticalAlignment="Top" Width="Auto">
<Grid Width="Auto" x:Name="Root">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@@ -20,7 +19,7 @@
</Grid.RowDefinitions>
<Border x:Name="borderTemp" Visibility="Collapsed"/>
<Border x:Name="borderTemp" Visibility="Collapsed" />
</Grid>

13
BeWo/View/Detail/RatingTypeView.xaml
View File

@@ -1,12 +1,11 @@
<localView:BeWoView
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
<localView:BeWoView xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
x:Class="BeWo.View.Detail.RatingTypeView"
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:val="clr-namespace:BeWo.Validation"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v17.1"
xmlns:dxe2="clr-namespace:DevExpress.XtraEditors;assembly=DevExpress.XtraEditors.v23.2"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<GroupBox Name="root" Header="Bewertungsskala" Style="{StaticResource ObjectEditGroupBox}">
@@ -25,11 +24,11 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label Margin="3">Position</Label>
<TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Position, UpdateSourceTrigger=PropertyChanged}" Width="100"/>
<TextBox Grid.Column="1" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.Position, UpdateSourceTrigger=PropertyChanged}" Width="100" />
<Label Margin="3" Grid.Column="2">Bewertung</Label>
<TextBox Grid.Column="3" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.RatingId, UpdateSourceTrigger=PropertyChanged}" Width="100"/>
<TextBox Grid.Column="3" Margin="3" Height="23" Text="{val:ValidationBinding Path=NewVM.RatingId, UpdateSourceTrigger=PropertyChanged}" Width="100" />
<Label Grid.Column="4" Margin="3">Bezeichnung</Label>
<dxe:TextEdit Grid.Column="5" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.DisplayName, UpdateSourceTrigger=PropertyChanged}" Width="300"/>
<dxe:TextEdit Grid.Column="5" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditValue="{val:ValidationBinding Path=NewVM.DisplayName, UpdateSourceTrigger=PropertyChanged}" Width="300" />
<Button Name="button_addRatingType" Click="Button_addRatingType_Click" Grid.Column="6" Height="25" Margin="3,3,3,3" Padding="5 0" IsDefault="True" Content="Hinzufügen" />
<dxg:GridControl x:Name="DatagridRatingTypes" Margin="0,10,0,0" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" DataSource="{Binding VMList}">
@@ -51,7 +50,7 @@
<dxe:TextEditSettings DisplayFormat="0" Mask="0" MaskType="Numeric" AllowNullInput="True"></dxe:TextEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn FieldName="DisplayName" Header="Bezeichnung" Width="400" >
<dxg:GridColumn FieldName="DisplayName" Header="Bezeichnung" Width="400">
</dxg:GridColumn>
</dxg:GridControl.Columns>

55
BeWo/View/Detail/Report/AbwesenheitsView.xaml
View File

@@ -1,5 +1,4 @@
<localView:BeWoView
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<localView:BeWoView xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
@@ -10,7 +9,7 @@
xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxschi="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
xmlns:XtraScheduler="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
xmlns:XtraScheduler="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v23.2.Core"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:report="clr-namespace:BeWo.View.Detail.Report"
x:Class="BeWo.View.Detail.Report.AbwesenheitstabelleView"
@@ -103,7 +102,7 @@
<Setter TargetName="rightBorder" Property="Fill" Value="Gray" />
<Setter TargetName="bottomBorder" Property="Fill" Value="Gray" />
</DataTrigger>
<DataTrigger Binding="{Binding IsHoliday}" Value="True">
<DataTrigger Binding="{Binding IsHoliday}" Value="True">
<Setter TargetName="cell" Property="Background" Value="LightPink" />
<Setter TargetName="rightBorder" Property="Fill" Value="Gray" />
<Setter TargetName="bottomBorder" Property="Fill" Value="Gray" />
@@ -125,7 +124,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" MinWidth="10"/>
<ColumnDefinition Width="*" MinWidth="10" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
@@ -138,13 +137,13 @@
<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal">
<Label Grid.Column="2" Margin="3,3,0,3" Content="Datum:" />
<controls:MonthPicker Grid.Column="3" x:Name="_MonthPicker" Margin="0,3,3,3" MinWidth="100" HorizontalContentAlignment="Stretch" />
<dxe:ComboBoxEdit Grid.Column="4" x:Name="_YearPicker" Margin="0,3,3,3" IsManipulationEnabled="False" IsTextEditable="False" MinWidth="55" HorizontalContentAlignment="Stretch"/>
<Button Content="Erstellen" Margin="3" MinWidth="100" Click="Button_Click"/>
<dxe:ComboBoxEdit Grid.Column="4" x:Name="_YearPicker" Margin="0,3,3,3" IsManipulationEnabled="False" IsTextEditable="False" MinWidth="55" HorizontalContentAlignment="Stretch" />
<Button Content="Erstellen" Margin="3" MinWidth="100" Click="Button_Click" />
</StackPanel>
<StackPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal">
<Label Content="Anzahl der angezeigten Tage" Margin="3,3,0,3"/>
<dxe:SpinEdit x:Name="_SpinEdit" Margin="3" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEdit_EditValueChanged"/>
<Label Content="Anzahl der angezeigten Tage" Margin="3,3,0,3" />
<dxe:SpinEdit x:Name="_SpinEdit" Margin="3" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEdit_EditValueChanged" />
</StackPanel>
<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Horizontal">
@@ -155,14 +154,14 @@
</dxe:ComboBoxEdit.StyleSettings>
</dxe:ComboBoxEdit>
<Label Content="Beschäftigungsart: " Margin="3,3,0,3"/>
<Label Content="Beschäftigungsart: " Margin="3,3,0,3" />
<dxe:ComboBoxEdit x:Name="FilterBeschaftigungsart" Margin="0,3,3,3" DisplayMember="Name" Width="180">
<dxe:ComboBoxEdit.StyleSettings>
<dxe:CheckedComboBoxStyleSettings />
</dxe:ComboBoxEdit.StyleSettings>
</dxe:ComboBoxEdit>
<Label Content="Team: " Margin="3,3,0,3"/>
<Label Content="Team: " Margin="3,3,0,3" />
<dxe:ComboBoxEdit x:Name="FilterTeams" Margin="0,3,3,3" DisplayMember="Name" Width="180">
<dxe:ComboBoxEdit.StyleSettings>
<dxe:CheckedComboBoxStyleSettings />
@@ -184,38 +183,38 @@
<dxsch:SchedulerControl.OptionsCustomization>
<dxsch:OptionsCustomization AllowAppointmentCopy="None" AllowAppointmentCreate="All" AllowAppointmentDelete="None" AllowAppointmentDrag="None"
AllowAppointmentDragBetweenResources="None" AllowAppointmentEdit="All" AllowAppointmentResize="None" AllowInplaceEditor="None"
AllowAppointmentMultiSelect="False"/>
AllowAppointmentMultiSelect="False" />
</dxsch:SchedulerControl.OptionsCustomization>
<dxsch:SchedulerControl.OptionsView>
<dxsch:OptionsView/>
<dxsch:OptionsView />
</dxsch:SchedulerControl.OptionsView>
<dxsch:SchedulerControl.OptionsBehavior>
<dxsch:OptionsBehavior/>
<dxsch:OptionsBehavior />
</dxsch:SchedulerControl.OptionsBehavior>
<dxsch:SchedulerControl.DayView >
<dxsch:DayView Enabled="false"/>
<dxsch:SchedulerControl.DayView>
<dxsch:DayView Enabled="false" />
</dxsch:SchedulerControl.DayView>
<dxsch:SchedulerControl.FullWeekView >
<dxsch:FullWeekView Enabled="false"/>
<dxsch:SchedulerControl.FullWeekView>
<dxsch:FullWeekView Enabled="false" />
</dxsch:SchedulerControl.FullWeekView>
<dxsch:SchedulerControl.MonthView >
<dxsch:MonthView Enabled="False"/>
<dxsch:SchedulerControl.MonthView>
<dxsch:MonthView Enabled="False" />
</dxsch:SchedulerControl.MonthView>
<dxsch:SchedulerControl.WeekView >
<dxsch:WeekView Enabled="false"/>
<dxsch:SchedulerControl.WeekView>
<dxsch:WeekView Enabled="false" />
</dxsch:SchedulerControl.WeekView>
<dxsch:SchedulerControl.WorkWeekView>
<dxsch:WorkWeekView Enabled="false"/>
<dxsch:WorkWeekView Enabled="false" />
</dxsch:SchedulerControl.WorkWeekView>
<dxsch:SchedulerControl.TimelineView>
<dxsch:TimelineView ResourcesPerPage="10" IntervalCount="31" TimelineScrollBarVisibility="Auto" AppointmentToolTipVisibility="Never" >
<dxsch:TimelineView ResourcesPerPage="10" IntervalCount="31" TimelineScrollBarVisibility="Auto" AppointmentToolTipVisibility="Never">
<dxsch:TimelineView.Scales>
<XtraScheduler:TimeScaleYear/>
<XtraScheduler:TimeScaleMonth/>
<XtraScheduler:TimeScaleDay/>
<XtraScheduler:TimeScaleYear />
<XtraScheduler:TimeScaleMonth />
<XtraScheduler:TimeScaleDay />
</dxsch:TimelineView.Scales>
<dxsch:TimelineView.AppointmentDisplayOptions>
<dxsch:SchedulerTimelineViewAppointmentDisplayOptions SnapToCellsMode="Auto" EndTimeVisibility="Never" StartTimeVisibility="Never"/>
<dxsch:SchedulerTimelineViewAppointmentDisplayOptions SnapToCellsMode="Auto" EndTimeVisibility="Never" StartTimeVisibility="Never" />
</dxsch:TimelineView.AppointmentDisplayOptions>
</dxsch:TimelineView>
</dxsch:SchedulerControl.TimelineView>

3
BeWo/View/Detail/Report/AbwesenheitsView.xaml.cs
View File

@@ -5,6 +5,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Translation;
using DevExpress.Portable.Input;
using DevExpress.Services;
using DevExpress.Xpf.Scheduler;
using DevExpress.Xpf.Scheduler.Drawing;
@@ -623,7 +624,7 @@ namespace BeWo.View.Detail.Report
this.provider = provider;
}
public override void OnMouseWheel(System.Windows.Forms.MouseEventArgs e)
public override void OnMouseWheel(PortableMouseEventArgs e)
{
if ((System.Windows.Forms.Control.ModifierKeys & Keys.Control) != Keys.Control)
base.OnMouseWheel(e);

129
BeWo/View/Detail/Report/DienstplanerView.xaml
View File

@@ -1,5 +1,4 @@
<localView:BeWoView
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<localView:BeWoView xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
@@ -8,7 +7,7 @@
xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:dxschi="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
xmlns:XtraScheduler="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
xmlns:XtraScheduler="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v23.2.Core"
xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
@@ -18,28 +17,28 @@
<!--DienstplanerValue="{Binding Value}"-->
<localView:BeWoView.Resources>
<ControlTemplate x:Key="ctrlDay">
<controls:DPCtrlDay Margin="0" Cursor="Arrow" Focusable="True" DPCtrlDayInformation="{Binding Value}"/>
<controls:DPCtrlDay Margin="0" Cursor="Arrow" Focusable="True" DPCtrlDayInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlWeek">
<controls:DPCtrlWeek Margin="0" Focusable="True" DPCtrlWeekInformation="{Binding Value}"/>
<controls:DPCtrlWeek Margin="0" Focusable="True" DPCtrlWeekInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlEmp">
<controls:DPCtrlEmployee Margin="0" Focusable="True" EmployeeInformation="{Binding Value}"/>
<controls:DPCtrlEmployee Margin="0" Focusable="True" EmployeeInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlSoll">
<controls:DPCtrlSoll Margin="0" Focusable="True" SollInformation="{Binding Value}"/>
<controls:DPCtrlSoll Margin="0" Focusable="True" SollInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlIst">
<controls:DPCtrlIst Margin="0" Focusable="True" IstInformation="{Binding Value}"/>
<controls:DPCtrlIst Margin="0" Focusable="True" IstInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlSaldo">
<controls:DPCtrlSaldo Margin="0" Focusable="True" SaldoInformation="{Binding Value}"/>
<controls:DPCtrlSaldo Margin="0" Focusable="True" SaldoInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlZeitkonto">
<controls:DPCtrlZeitkonto Margin="0" Focusable="True" ZeitkontoInformation="{Binding Value}"/>
<controls:DPCtrlZeitkonto Margin="0" Focusable="True" ZeitkontoInformation="{Binding Value}" />
</ControlTemplate>
<ControlTemplate x:Key="ctrlUrlaubKrankheit">
<controls:DPCtrlUrlaubKrankheit Margin="0" Focusable="True" UrlaubKrankheitInformation="{Binding Value}"/>
<controls:DPCtrlUrlaubKrankheit Margin="0" Focusable="True" UrlaubKrankheitInformation="{Binding Value}" />
</ControlTemplate>
@@ -77,20 +76,20 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Content="{t:Translate Wohnprojekte}" Margin="3,3,0,3"/>
<dxe:ComboBoxEdit x:Name="_WohnheimPicker" Grid.Column="1" Margin="0,3,3,3" IsTextEditable="False" MinWidth="150" Width="200"/>
<Label Grid.Column="0" Content="{t:Translate Wohnprojekte}" Margin="3,3,0,3" />
<dxe:ComboBoxEdit x:Name="_WohnheimPicker" Grid.Column="1" Margin="0,3,3,3" IsTextEditable="False" MinWidth="150" Width="200" />
<Label Grid.Column="2" Margin="3,3,0,3" Content="Datum:" />
<controls:MonthPicker Grid.Column="3" x:Name="_MonthPicker" Margin="0,3,3,3" Width="100" />
<dxe:ComboBoxEdit Grid.Column="4" x:Name="_YearPicker" Margin="0,3,3,3" IsManipulationEnabled="False" IsTextEditable="False"/>
<controls:MonthPicker Grid.Column="3" x:Name="_MonthPicker" Margin="0,3,3,3" Width="100" />
<dxe:ComboBoxEdit Grid.Column="4" x:Name="_YearPicker" Margin="0,3,3,3" IsManipulationEnabled="False" IsTextEditable="False" />
<!--<dxe:DateEdit x:Name="_DatumPicker" Grid.Column="3" Margin="0,3,3,3" Mask="MM.yyyy" Loaded="DatumPicker_Loaded" MaskUseAsDisplayFormat="True" AllowNullInput="False" />-->
<Button x:Name="_BtnAnzeigen" Grid.Column="5" Content="Anzeigen" MinWidth="100" Margin="10,3,3,3" Click="BtnAnzeigen_Click"/>
<Button x:Name="_BtnAnzeigen" Grid.Column="5" Content="Anzeigen" MinWidth="100" Margin="10,3,3,3" Click="BtnAnzeigen_Click" />
<WrapPanel Grid.Column="7" HorizontalAlignment="Right" Margin="10,3,3,3">
<Button x:Name="button_mehrereDienste" Content="Mehrere Dienste anlegen" Margin=" 0 0 5 0" Click="button_mehrereDienste_Click" Visibility="Collapsed"/>
<Button x:Name="button_neuerMitarbeiter" Content="{markup:Translate Neuen Mitarbeiter einfügen}" Margin=" 0 0 5 0" Click="button_neuerMitarbeiter_Click" Visibility="Collapsed"/>
<Button x:Name="_BtnRemoveAllDiensteForMonth" Content="Alle Schichten entfernen" Click="_BtnRemoveAllDiensteForMonth_Click" Visibility="Collapsed"/>
<Button x:Name="button_mehrereDienste" Content="Mehrere Dienste anlegen" Margin=" 0 0 5 0" Click="button_mehrereDienste_Click" Visibility="Collapsed" />
<Button x:Name="button_neuerMitarbeiter" Content="{markup:Translate Neuen Mitarbeiter einfügen}" Margin=" 0 0 5 0" Click="button_neuerMitarbeiter_Click" Visibility="Collapsed" />
<Button x:Name="_BtnRemoveAllDiensteForMonth" Content="Alle Schichten entfernen" Click="_BtnRemoveAllDiensteForMonth_Click" Visibility="Collapsed" />
</WrapPanel>
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_neuerMitarbeiterFuerWohnheim" Width="350" StaysOpen="False" Placement="MousePoint">
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_neuerMitarbeiterFuerWohnheim" Width="350" StaysOpen="False" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_neuerMitarbeiterFuerWohnheim" Header="{markup:Translate Mitarbeiter hinzufügen}" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -104,14 +103,14 @@
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="{t:Translate MitarbeiterSingular}" />
<ComboBox x:Name="combobox_mitarbeiter" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="10 0 0 0"/>
<ComboBox x:Name="combobox_mitarbeiter" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="10 0 0 0" />
<Button x:Name="button_add_employee" Grid.Column="2" Grid.Row="1" Content="Hinzufügen" Click="button_add_employee_Click" Margin="0 7 0 0"/>
<Button x:Name="button_add_employee" Grid.Column="2" Grid.Row="1" Content="Hinzufügen" Click="button_add_employee_Click" Margin="0 7 0 0" />
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost>
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_mehrereDienste" Width="350" StaysOpen="False" Placement="MousePoint">
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_mehrereDienste" Width="350" StaysOpen="False" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_mehereDienste" Header="Mehrere Dienste hinzufügen" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -130,7 +129,7 @@
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="0" Margin="0 5 0 0" Content="{t:Translate MitarbeiterSingular}" />
<ComboBox x:Name="combobox_mehrereDienste_mitarbeiter" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0 5 0 0" SelectionChanged="combobox_mehrereDienste_mitarbeiter_SelectionChanged"/>
<ComboBox x:Name="combobox_mehrereDienste_mitarbeiter" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0 5 0 0" SelectionChanged="combobox_mehrereDienste_mitarbeiter_SelectionChanged" />
<ListBox x:Name="mehrereDienste_listbox_dienste" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" MaxHeight="300" Margin="5 10 0 10"
SelectionChanged="mehrereDienste_listbox_dienste_SelectionChanged">
<ListBox.ItemTemplate>
@@ -151,15 +150,15 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<WrapPanel x:Name="mehrereDienste_wrappanel_zeile" FlowDirection="LeftToRight" Grid.Row="2" Grid.ColumnSpan="3" Visibility="Collapsed" >
<Label Content="Zeile:"/>
<WrapPanel x:Name="mehrereDienste_wrappanel_zeile" FlowDirection="LeftToRight" Grid.Row="2" Grid.ColumnSpan="3" Visibility="Collapsed">
<Label Content="Zeile:" />
<dxe:SpinEdit x:Name="mehrereDienste_spinedit_zeile" Margin="28 0 0 5" Width="75" MaskType="Numeric" Mask="##" />
</WrapPanel>
<WrapPanel FlowDirection="LeftToRight" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3">
<Label Content="Startzeit:"/>
<dxe:TextEdit x:Name="mehrereDienste_textbox_startzeit" Width="75" Margin="10 0 10 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="mehrereDienste_textbox_startzeit_EditValueChanged"/>
<Label Content="Startzeit:" />
<dxe:TextEdit x:Name="mehrereDienste_textbox_startzeit" Width="75" Margin="10 0 10 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="mehrereDienste_textbox_startzeit_EditValueChanged" />
<Label Content="Endzeit:" />
<dxe:TextEdit x:Name="mehrereDienste_textbox_endzeit" Width="75" Margin="10 0 0 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="mehrereDienste_textbox_endzeit_EditValueChanged"/>
<dxe:TextEdit x:Name="mehrereDienste_textbox_endzeit" Width="75" Margin="10 0 0 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="mehrereDienste_textbox_endzeit_EditValueChanged" />
</WrapPanel>
<WrapPanel FlowDirection="LeftToRight" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="3" Margin="0 5 0 0">
<Label Content="Dauer:" Margin="0 0 5 0" />
@@ -168,12 +167,12 @@
<Calendar x:Name="_CalenderControl" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" SelectionMode="MultipleRange"
HorizontalAlignment="Left" Margin="5 10 0 10" IsTodayHighlighted="False" />
<Button x:Name="mehrereDienste_button_speichern" Content="Dienste erstellen" Grid.Column="2" Grid.Row="6" Click="mehrereDienste_button_speichern_Click"/>
<Button x:Name="mehrereDienste_button_speichern" Content="Dienste erstellen" Grid.Column="2" Grid.Row="6" Click="mehrereDienste_button_speichern_Click" />
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost>
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_schichtenEntfernen" Width="350" StaysOpen="False" Placement="MousePoint">
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_schichtenEntfernen" Width="350" StaysOpen="False" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_schichtenEntfernen" Header="Schichten entfernen" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -188,9 +187,9 @@
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Zeitraum" />
<ComboBox x:Name="Combobox_SchichtenEntfernen" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="10 0 0 0"/>
<CheckBox x:Name="Checkbox_RegelmaessigeSchichtenEntfernen" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" FlowDirection="LeftToRight" Content="Auch regelmäßige Dienste entfernen"/>
<Button x:Name="Button_SchichtenEntfernenBestaetigen" Grid.Column="2" Grid.Row="2" Content="Entfernen" Click="Button_SchichtenEntfernenBestaetigen_Click" Margin="0 7 0 0"/>
<ComboBox x:Name="Combobox_SchichtenEntfernen" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="10 0 0 0" />
<CheckBox x:Name="Checkbox_RegelmaessigeSchichtenEntfernen" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" FlowDirection="LeftToRight" Content="Auch regelmäßige Dienste entfernen" />
<Button x:Name="Button_SchichtenEntfernenBestaetigen" Grid.Column="2" Grid.Row="2" Content="Entfernen" Click="Button_SchichtenEntfernenBestaetigen_Click" Margin="0 7 0 0" />
</Grid>
</GroupBox>
</Border>
@@ -205,23 +204,23 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="16*"/>
<ColumnDefinition Width="466*"/>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="16*" />
<ColumnDefinition Width="466*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Visibility="Hidden" x:Name="_TxtWohnheimInfo" Content="Dienstplan für: "/>
<Label Grid.Column="1" Visibility="Hidden" x:Name="_TxtWohnheim" Grid.ColumnSpan="2" Margin="0,0,0,0"/>
<Label Grid.Column="0" Visibility="Hidden" x:Name="_TxtWohnheimInfo" Content="Dienstplan für: " />
<Label Grid.Column="1" Visibility="Hidden" x:Name="_TxtWohnheim" Grid.ColumnSpan="2" Margin="0,0,0,0" />
<TextBlock x:Name="_Textblock_link_sortierung" Grid.Column="3" Margin="5,5,5,0" Visibility="Collapsed">
<Hyperlink x:Name="linkSortierung" TargetName="_NewWindow" Foreground="Black" Click="linkSortierung_Click">
<Run Text="Sortierung" />
</Hyperlink>
</TextBlock>
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_sortierung" Width="350" StaysOpen="False" Placement="MousePoint">
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_sortierung" Width="350" StaysOpen="False" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_sortierung" Header="Sortierung anpassen" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -237,12 +236,12 @@
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Sortierung" />
<ComboBox x:Name="Combobox_Sortierungsarten" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="10 0 0 0"/>
<ComboBox x:Name="Combobox_Sortierungsarten" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="10 0 0 0" />
<WrapPanel Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0">
<RadioButton x:Name="radiobutton_aufsteigend" GroupName="Reihenfolge" Margin="0 5 0 0" IsChecked="True">Aufsteigend</RadioButton>
<RadioButton x:Name="radiobutton_absteigend" GroupName="Reihenfolge" Margin="10 5 0 0">Absteigend</RadioButton>
</WrapPanel>
<Button x:Name="Button_SortierungBestaetigen" Grid.Column="2" Grid.Row="3" Content="Ausführen" Click="Button_SortierungBestaetigen_Click" Margin="0 7 0 0"/>
<Button x:Name="Button_SortierungBestaetigen" Grid.Column="2" Grid.Row="3" Content="Ausführen" Click="Button_SortierungBestaetigen_Click" Margin="0 7 0 0" />
</Grid>
</GroupBox>
</Border>
@@ -266,7 +265,7 @@
</StackPanel>
<!--Ende-->
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popUp_RightClick" Width="350" StaysOpen="True" Placement="MousePoint" MouseDown="groupbox_popUp_RightClick_MouseDown">
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popUp_RightClick" Width="350" StaysOpen="True" Placement="MousePoint" MouseDown="groupbox_popUp_RightClick_MouseDown">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_RightClick" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -305,38 +304,38 @@
</ListBox>
<WrapPanel FlowDirection="LeftToRight" Margin="0 5 0 0" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3">
<Label Content="Startzeit:" Margin="0 0 5 0" />
<dxe:TextEdit x:Name="textbox_startzeit" Width="75" Margin="0 0 20 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="textbox_startzeit_EditValueChanged"/>
<dxe:TextEdit x:Name="textbox_startzeit" Width="75" Margin="0 0 20 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="textbox_startzeit_EditValueChanged" />
<Label Content="Endzeit:" Margin="0 0 5 0" />
<dxe:TextEdit Width="75" x:Name="textbox_endzeit" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="textbox_endzeit_EditValueChanged"/>
<dxe:TextEdit Width="75" x:Name="textbox_endzeit" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="textbox_endzeit_EditValueChanged" />
</WrapPanel>
<WrapPanel FlowDirection="LeftToRight" Margin="0 5 0 0" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3">
<Label Content="Dauer:" Margin="0 0 5 0" />
<dxe:TextEdit x:Name="textbox_dauer" Width="75" Margin="12 0 0 0" MaskType="Numeric" Mask="########0.00" EditValueChanged="textbox_dauer_EditValueChanged" />
</WrapPanel>
<Label Grid.Column="0" Grid.Row="4" Content="Bemerkung:" Margin="0 4 0 0" />
<TextBox x:Name="textbox_bemerkung" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Margin="0 0 0 3" Height="50"
TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
<TextBox x:Name="textbox_bemerkung" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Margin="0 0 0 3" Height="50"
TextWrapping="Wrap" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" />
<Button x:Name="button_save_bemerkung" Grid.Column="2" Grid.Row="6" Content="Speichern" Click="button_save_Click" Margin="0 7 0 0"></Button>
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost>
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popUp_RightClickEmployee" MouseDown="groupbox_popUp_RightClick_MouseDown" Width="400" StaysOpen="True" Placement="MousePoint" Opened="popUp_RightClickEmployee_Opened">
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popUp_RightClickEmployee" MouseDown="groupbox_popUp_RightClick_MouseDown" Width="400" StaysOpen="True" Placement="MousePoint" Opened="popUp_RightClickEmployee_Opened">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_RightClickEmployee" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Regelmäßige Schichten"/>
<Label Grid.Column="0" Grid.Row="0" Content="Regelmäßige Schichten" />
<ListBox x:Name="listbox_regelmaessige_dienste" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="3" Height="100" SelectionChanged="combobox_regelmaessige_dienste_SelectionChanged">
<ListBox.ItemTemplate>
<DataTemplate>
@@ -356,14 +355,14 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Button x:Name="Btn_RegelSchichtHinzufuegen" Grid.Column="3" Grid.Row="2" Margin="5 5 0 0" Content="Hinzufügen" Click="Btn_RegelSchichtHinzufuegen_Click"/>
<Button x:Name="Btn_RegelSchichtEntfernen" Grid.Column="2" Grid.Row="2" Margin="0 5 0 0" Content="Löschen" Click="Btn_RegelSchichtEntfernen_Click"/>
<Button x:Name="Btn_ZeileHinzufuegen" Grid.Column="0" Grid.Row="2" Margin="0 5 0 0" HorizontalAlignment="Left" Content="Zeile hinzufügen" Click="Btn_ZeileHinzufuegen_Click"/>
<Button x:Name="Btn_RegelSchichtHinzufuegen" Grid.Column="3" Grid.Row="2" Margin="5 5 0 0" Content="Hinzufügen" Click="Btn_RegelSchichtHinzufuegen_Click" />
<Button x:Name="Btn_RegelSchichtEntfernen" Grid.Column="2" Grid.Row="2" Margin="0 5 0 0" Content="Löschen" Click="Btn_RegelSchichtEntfernen_Click" />
<Button x:Name="Btn_ZeileHinzufuegen" Grid.Column="0" Grid.Row="2" Margin="0 5 0 0" HorizontalAlignment="Left" Content="Zeile hinzufügen" Click="Btn_ZeileHinzufuegen_Click" />
</Grid>
</GroupBox>
</Border>
</controls:PopupNonTopmost >
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_Regeldiensterstellung" Width="400" StaysOpen="True" Placement="MousePoint" MouseDown="groupbox_popUp_RightClick_MouseDown" Opened="popUp_Regeldiensterstellung_Opened">
</controls:PopupNonTopmost>
<controls:PopupNonTopmost Topmost="False" x:Name="popUp_Regeldiensterstellung" Width="400" StaysOpen="True" Placement="MousePoint" MouseDown="groupbox_popUp_RightClick_MouseDown" Opened="popUp_Regeldiensterstellung_Opened">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_popUp_Regeldiensterstellung" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -402,17 +401,17 @@
</ListBox>
<WrapPanel FlowDirection="LeftToRight" Margin="0 5 0 0" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="3">
<Label Content="Startzeit:" Margin="0 0 5 0" />
<dxe:TextEdit x:Name="routine_textbox_startzeit" Width="75" Margin="13 0 20 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="routine_textbox_startzeit_EditValueChanged"/>
<dxe:TextEdit x:Name="routine_textbox_startzeit" Width="75" Margin="13 0 20 0" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="routine_textbox_startzeit_EditValueChanged" />
<Label Content="Endzeit:" Margin="0 0 5 0" />
<dxe:TextEdit Width="75" x:Name="routine_textbox_endzeit" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="routine_textbox_endzeit_EditValueChanged"/>
<dxe:TextEdit Width="75" x:Name="routine_textbox_endzeit" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" EditValueChanged="routine_textbox_endzeit_EditValueChanged" />
</WrapPanel>
<WrapPanel FlowDirection="LeftToRight" Margin="0 5 0 0" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="3">
<Label Content="Dauer:" Margin="0 0 5 0" />
<dxe:TextEdit x:Name="routine_textbox_dauer" Width="75" Margin="24 0 0 0" MaskType="Numeric" Mask="########0.00" />
</WrapPanel>
<Label Grid.Column="0" Grid.Row="4" Content="Wochentag" Margin="0 4 0 0" />
<ComboBox x:Name="routine_combobox_weekdays" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Height="23" Margin="4 6 0 0"/>
<Button x:Name="routine_button_save" Grid.Column="2" Grid.Row="6" Content="Speichern" Click="routine_button_save_Click" Margin="0 7 0 0"></Button>
<ComboBox x:Name="routine_combobox_weekdays" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Height="23" Margin="4 6 0 0" />
<Button x:Name="routine_button_save" Grid.Column="2" Grid.Row="6" Content="Speichern" Click="routine_button_save_Click" Margin="0 7 0 0"></Button>
</Grid>
</GroupBox>
</Border>

26
BeWo/View/Detail/Report/PivotGridReport.Designer.cs generated
View File

@@ -42,7 +42,7 @@ namespace BeWo.View.Detail.Report
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPivotGrid1});
this.Detail.Font = new System.Drawing.Font("Arial", 10F);
this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Detail.HeightF = 60.00001F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -61,15 +61,15 @@ namespace BeWo.View.Detail.Report
//
// xrPivotGrid1
//
this.xrPivotGrid1.Appearance.Cell.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.CustomTotalCell.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldHeader.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldValue.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldValueGrandTotal.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldValueTotal.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.GrandTotalCell.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.Lines.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.TotalCell.Font = new System.Drawing.Font("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.Cell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.CustomTotalCell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldHeader.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldValue.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldValueGrandTotal.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.FieldValueTotal.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.GrandTotalCell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.Lines.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Appearance.TotalCell.Font = new DevExpress.Drawing.DXFont("Tahoma", 8.25F);
this.xrPivotGrid1.Fields.AddRange(new DevExpress.XtraReports.UI.PivotGrid.XRPivotGridField[] {
this.pivotGridField3});
this.xrPivotGrid1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
@@ -90,12 +90,12 @@ namespace BeWo.View.Detail.Report
this.topMarginBand1,
this.bottomMarginBand1});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 10F);
this.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.Landscape = true;
this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 75);
this.Margins = new DevExpress.Drawing.DXMargins(75, 75, 75, 75);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();

2
BeWo/View/Detail/TextbausteinView.xaml
View File

@@ -68,7 +68,7 @@
<Button Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="4" HorizontalAlignment="Right" Content="Hinzufügen" Margin="3,3,0,3" Click="AddTextModuleButton_Click" />
<dxg:TreeListControl Name="TreeListControl" Grid.Column="0" Grid.ColumnSpan="4" Grid.Row="5" dx:ThemeManager.ThemeName="Office2010Black" ItemsSource="{Binding Path=VMList, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Margin="0" ContextMenu="{StaticResource ContextMenuTextModules}"
ItemsSourceChanged="TreeListControl_OnItemsSourceChanged"
ItemsSourceChanged="TreeListControl_ItemsSourceChanged"
PreviewMouseDown="TreeListControl_OnPreviewMouseDown">
<dxg:TreeListControl.Columns>
<dxg:TreeListColumn FieldName="IsDeleteable" FixedWidth="True" Width="24" ReadOnly="True" Header=" ">

2
BeWo/View/Detail/TextbausteinView.xaml.cs
View File

@@ -223,7 +223,7 @@ namespace BeWo.View.Detail
}
}
private void TreeListControl_OnItemsSourceChanged(object sender, ItemsSourceChangedEventArgs e)
private void TreeListControl_ItemsSourceChanged(object sender, DevExpress.Xpf.Grid.ItemsSourceChangedEventArgs e)
{
TreeListControl.SelectedItem = null;
}

2
BeWo/View/Detail/WordDocumentTemplateView.xaml
View File

@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2"
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">

2
BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
View File

@@ -343,7 +343,7 @@ namespace BeWo.View.Detail.Zeiterfassung
}
private void SrGridControl_ItemsSourceChanged(object sender, ItemsSourceChangedEventArgs e)
private void SrGridControl_ItemsSourceChanged(object sender, DevExpress.Xpf.Grid.ItemsSourceChangedEventArgs e)
{
ErstelleRecordInformationString();

4
BeWo/View/Detail/backup/AdditionalServiceView.xaml
View File

@@ -12,9 +12,9 @@
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2"
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1.Core"
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v23.2.Core"
xmlns:converter="clr-namespace:BeWo.Converter"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
<localView:BeWoView.Resources>

4
BeWo/View/Report/FLSReport/FLSOverviewChart.xaml
View File

@@ -1,5 +1,5 @@
<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:dxc="http://schemas.devexpress.com/winfx/2008/xaml/charts" xmlns:dxdb="http://schemas.devexpress.com/winfx/2008/xaml/demobase"
xmlns:xtraCharts="clr-namespace:DevExpress.XtraCharts;assembly=DevExpress.XtraCharts.v17.1"
xmlns:xtraCharts="clr-namespace:DevExpress.XtraCharts;assembly=DevExpress.XtraCharts.v23.2"
mc:Ignorable="d" x:Class="BeWo.View.Report.FLSReport.FLSOverviewChart" x:Name="UserControl" d:DesignWidth="640" d:DesignHeight="480">
<UserControl.Resources>
<ResourceDictionary>
@@ -11,7 +11,7 @@
</ResourceDictionary>
</UserControl.Resources>
<Grid x:Name="root">
<dxc:ChartControl Name="chart" BorderBrush="Transparent" Background="Transparent" >
<dxc:ChartControl Name="chart" BorderBrush="Transparent" Background="Transparent">
<dxc:ChartControl.Diagram>
<dxc:XYDiagram2D>
<dxc:XYDiagram2D.AxisY>

63
BeWo/app.config
View File

@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="DXThemeManager" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<!--<system.net>
<defaultProxy useDefaultCredentials="true" />
</system.net>-->
@@ -7,56 +12,64 @@
<bindings>
<basicHttpBinding>
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
<security mode="None"/>
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="None" />
<!-- mode="Transport" für https und "None" sonst-->
</binding>
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" transferMode="StreamedRequest" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
<security mode="None"/>
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="None" />
<!-- mode="Transport" für https -->
</binding>
<binding name="QueryServiceEndpoint" closeTimeout="00:10:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
<security mode="None">
<transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
<message clientCredentialType="UserName" algorithmSuite="Default"/>
<transport clientCredentialType="None" proxyCredentialType="None" realm="" />
<message clientCredentialType="UserName" algorithmSuite="Default" />
</security>
</binding>
</basicHttpBinding>
</bindings>
<client>
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="BeWo.ServiceProxy.IQueryService" name="QueryServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint"/>
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.ICustomerService" name="CustomerServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IUserService" name="UserServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IDownloadService" name="DownloadServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IResourceService" name="BeWoBasicEndpoint"/>
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IOperationsService" name="OperationsServiceEndpoint"/>
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAccountingService" name="AccountingServiceEndpoint"/>
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAnalysisService" name="AnalysisServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IMailService" name="MailServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IReportService" name="ReportServiceEndpoint"/>
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="BeWo.ServiceProxy.IQueryService" name="QueryServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint" />
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.ICustomerService" name="CustomerServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IUserService" name="UserServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IDownloadService" name="DownloadServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IResourceService" name="BeWoBasicEndpoint" />
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IOperationsService" name="OperationsServiceEndpoint" />
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAccountingService" name="AccountingServiceEndpoint" />
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAnalysisService" name="AnalysisServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IMailService" name="MailServiceEndpoint" />
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IReportService" name="ReportServiceEndpoint" />
</client>
<behaviors>
<endpointBehaviors>
<behavior name="BeWoServiceBehavior">
<dataContractSerializer maxItemsInObjectGraph="2147483647"/>
<dataContractSerializer maxItemsInObjectGraph="2147483647" />
</behavior>
</endpointBehaviors>
</behaviors>
</system.serviceModel>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0"/>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<userSettings>
<DXThemeManager>
<setting name="ApplicationThemeName" serializeAs="String">
<value>Office2016White</value>
</setting>
</DXThemeManager>
</userSettings>
</configuration>

25
Shared/Shared.csproj
View File

@@ -81,14 +81,23 @@
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Core.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Grid.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Grid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.RichEdit.v23.2.Export, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.CodeView.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Core.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Grid.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpf.Grid.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2.Core.Desktop, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraScheduler.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>