BewoPlaner .Net Version 4.5 und Devexpress version 17....
plus RTF Dokumentation für HPH bersenbrueck unter ServiceRecord und paar kleinigkeiten
This commit is contained in:
Waldi
@@ -49,10 +49,12 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Xpf.Mvvm.v13.2, Version=13.2.13.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.v13.2, Version=13.2.13.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.xpf.layoutcontrol.v13.2, Version=13.2.13.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.Xpf.Core.v17.1, 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="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
|||||||
184
BeWo/BeWo.csproj
184
BeWo/BeWo.csproj
@@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWo</RootNamespace>
|
<RootNamespace>BeWo</RootNamespace>
|
||||||
<AssemblyName>BeWoPlaner</AssemblyName>
|
<AssemblyName>BeWoPlaner</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
@@ -23,7 +23,8 @@
|
|||||||
<IsWebBootstrapper>true</IsWebBootstrapper>
|
<IsWebBootstrapper>true</IsWebBootstrapper>
|
||||||
<SignAssembly>false</SignAssembly>
|
<SignAssembly>false</SignAssembly>
|
||||||
<ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
|
<ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
|
||||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
<TargetFrameworkProfile>
|
||||||
|
</TargetFrameworkProfile>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<OldToolsVersion>3.5</OldToolsVersion>
|
<OldToolsVersion>3.5</OldToolsVersion>
|
||||||
@@ -65,6 +66,7 @@
|
|||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
<UseVSHostingProcess>true</UseVSHostingProcess>
|
<UseVSHostingProcess>true</UseVSHostingProcess>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -74,6 +76,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ApplicationIcon>BeWoPlaner.ico</ApplicationIcon>
|
<ApplicationIcon>BeWoPlaner.ico</ApplicationIcon>
|
||||||
@@ -91,37 +94,43 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\Lib\Blacklight.Wpf.Controls.dll</HintPath>
|
<HintPath>..\Lib\Blacklight.Wpf.Controls.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DevExpress.Charts.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.RichEdit.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.Xpf.Mvvm.v13.2, Version=13.2.13.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.Xpf.Core.v13.2, Version=13.2.13.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.Xpf.Charts.v13.2, Version=13.2.13.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.Docking.v13.2, Version=13.2.13.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.v13.2.Core, Version=13.2.13.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.Grid.v13.2, Version=13.2.13.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.Layout.v13.2.Core, Version=13.2.13.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.Printing.v13.2, Version=13.2.13.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.Ribbon.v13.2, Version=13.2.13.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.RichEdit.v13.2, Version=13.2.13.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.Scheduler.v13.2, Version=13.2.13.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.Themes.LightGray.v13.2, Version=13.2.13.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.Themes.Office2007Black.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Images.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Xpf.Themes.Office2010Black.v13.2, Version=13.2.13.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.XtraBars.v13.2, Version=13.2.13.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.XtraEditors.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Xpf.Themes.Office2007Black.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraPivotGrid.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2, Version=13.2.13.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.XtraScheduler.v13.2.Reporting.Extensions, Version=13.2.13.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.XtraScheduler.v13.2, Version=13.2.13.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.XtraScheduler.v13.2.Core, Version=13.2.13.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.XtraScheduler.v13.2.Reporting, Version=13.2.13.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.XtraScheduler.v17.1.Reporting.Extensions, 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.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||||
</Reference>
|
</Reference>
|
||||||
@@ -262,6 +271,10 @@
|
|||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Include="View\Detail\ServiceRecordRTFWindowView.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
<Page Include="View\MessageDialog.xaml">
|
<Page Include="View\MessageDialog.xaml">
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
@@ -718,6 +731,9 @@
|
|||||||
<Compile Include="View\ChatProgressBarView.xaml.cs">
|
<Compile Include="View\ChatProgressBarView.xaml.cs">
|
||||||
<DependentUpon>ChatProgressBarView.xaml</DependentUpon>
|
<DependentUpon>ChatProgressBarView.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
|
||||||
|
<DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="View\MessageDialog.xaml.cs">
|
<Compile Include="View\MessageDialog.xaml.cs">
|
||||||
<DependentUpon>MessageDialog.xaml</DependentUpon>
|
<DependentUpon>MessageDialog.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -1965,10 +1981,32 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Service References\QueryService\QueryService.xsd" />
|
<None Include="Service References\QueryService\QueryService.xsd" />
|
||||||
<None Include="Service References\QueryService\QueryService1.xsd" />
|
<None Include="Service References\QueryService\QueryService1.xsd" />
|
||||||
|
<None Include="Service References\QueryService\QueryService10.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
|
<None Include="Service References\QueryService\QueryService11.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
|
<None Include="Service References\QueryService\QueryService12.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
<None Include="Service References\QueryService\QueryService2.xsd" />
|
<None Include="Service References\QueryService\QueryService2.xsd" />
|
||||||
<None Include="Service References\QueryService\QueryService3.xsd" />
|
<None Include="Service References\QueryService\QueryService3.xsd" />
|
||||||
<None Include="Service References\QueryService\QueryService4.xsd" />
|
<None Include="Service References\QueryService\QueryService4.xsd" />
|
||||||
|
<None Include="Service References\QueryService\QueryService6.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
|
<None Include="Service References\QueryService\QueryService7.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
|
<None Include="Service References\QueryService\QueryService8.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
|
<None Include="Service References\QueryService\QueryService9.xsd">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
</None>
|
||||||
<None Include="Service References\QueryService\QueryServiceImp.wsdl" />
|
<None Include="Service References\QueryService\QueryServiceImp.wsdl" />
|
||||||
|
<None Include="Service References\QueryService\QueryServiceImp1.wsdl" />
|
||||||
<None Include="ServiceReferences.bat" />
|
<None Include="ServiceReferences.bat" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -2011,7 +2049,6 @@
|
|||||||
<None Include="Service References\QueryService\configuration.svcinfo" />
|
<None Include="Service References\QueryService\configuration.svcinfo" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Service References\QueryService\QueryService6.xsd" />
|
|
||||||
<None Include="Service References\QueryService\Reference.svcmap">
|
<None Include="Service References\QueryService\Reference.svcmap">
|
||||||
<Generator>WCF Proxy Generator</Generator>
|
<Generator>WCF Proxy Generator</Generator>
|
||||||
<LastGenOutput>Reference.cs</LastGenOutput>
|
<LastGenOutput>Reference.cs</LastGenOutput>
|
||||||
@@ -2079,7 +2116,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Charts.v13.2.Core">
|
<PublishFile Include="DevExpress.Charts.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2089,7 +2126,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Data.v13.2">
|
<PublishFile Include="DevExpress.Data.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2099,7 +2136,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Data.v13.2.Linq">
|
<PublishFile Include="DevExpress.Data.v17.1.Linq">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2109,7 +2146,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Office.v13.2.Core">
|
<PublishFile Include="DevExpress.Office.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2119,7 +2156,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.PivotGrid.v13.2.Core">
|
<PublishFile Include="DevExpress.PivotGrid.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2129,7 +2166,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Printing.v13.2.Core">
|
<PublishFile Include="DevExpress.Printing.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2139,7 +2176,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.RichEdit.v13.2.Core">
|
<PublishFile Include="DevExpress.RichEdit.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2149,7 +2186,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Sparkline.v13.2.Core">
|
<PublishFile Include="DevExpress.Sparkline.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2159,7 +2196,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Utils.v13.2">
|
<PublishFile Include="DevExpress.Utils.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2169,7 +2206,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Charts.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Charts.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2179,7 +2216,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Core.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Core.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2189,7 +2226,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Docking.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Docking.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2199,7 +2236,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Grid.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Grid.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2209,7 +2246,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Grid.v13.2.Core">
|
<PublishFile Include="DevExpress.Xpf.Grid.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2219,7 +2256,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Layout.v13.2.Core">
|
<PublishFile Include="DevExpress.Xpf.Layout.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2229,7 +2266,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Mvvm.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Mvvm.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2239,7 +2276,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Printing.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Printing.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2249,7 +2286,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Printing.v13.2.Core">
|
<PublishFile Include="DevExpress.Xpf.Printing.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2259,7 +2296,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Ribbon.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Ribbon.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2269,7 +2306,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Scheduler.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Scheduler.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2279,7 +2316,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2289,7 +2326,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2299,7 +2336,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v13.2">
|
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2309,7 +2346,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraBars.v13.2">
|
<PublishFile Include="DevExpress.XtraBars.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2319,7 +2356,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraCharts.v13.2">
|
<PublishFile Include="DevExpress.XtraCharts.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2329,7 +2366,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraEditors.v13.2">
|
<PublishFile Include="DevExpress.XtraEditors.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2339,7 +2376,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraNavBar.v13.2">
|
<PublishFile Include="DevExpress.XtraNavBar.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2349,7 +2386,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraPivotGrid.v13.2">
|
<PublishFile Include="DevExpress.XtraPivotGrid.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2359,7 +2396,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraPrinting.v13.2">
|
<PublishFile Include="DevExpress.XtraPrinting.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2369,7 +2406,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraReports.v13.2">
|
<PublishFile Include="DevExpress.XtraReports.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2379,7 +2416,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraScheduler.v13.2">
|
<PublishFile Include="DevExpress.XtraScheduler.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2389,7 +2426,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraScheduler.v13.2.Core">
|
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Core">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2399,7 +2436,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraScheduler.v13.2.Reporting">
|
<PublishFile Include="DevExpress.XtraScheduler.v17.1.Reporting">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2409,7 +2446,7 @@
|
|||||||
<IncludeHash>True</IncludeHash>
|
<IncludeHash>True</IncludeHash>
|
||||||
<FileType>Assembly</FileType>
|
<FileType>Assembly</FileType>
|
||||||
</PublishFile>
|
</PublishFile>
|
||||||
<PublishFile Include="DevExpress.XtraTreeList.v13.2">
|
<PublishFile Include="DevExpress.XtraTreeList.v17.1">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
<Group>
|
<Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -2437,14 +2474,6 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Properties\DataSources\BS.Shared.DataContracts.QueryDC.datasource" />
|
<None Include="Properties\DataSources\BS.Shared.DataContracts.QueryDC.datasource" />
|
||||||
<None Include="Properties\DataSources\System.Data.DataTable.datasource" />
|
<None Include="Properties\DataSources\System.Data.DataTable.datasource" />
|
||||||
<None Include="Service References\QueryService\QueryService1.disco" />
|
|
||||||
<None Include="Service References\QueryService\QueryService61.xsd" />
|
|
||||||
<None Include="Service References\QueryService\QueryService62.xsd" />
|
|
||||||
<None Include="Service References\QueryService\QueryService63.xsd" />
|
|
||||||
<None Include="Service References\QueryService\QueryService64.xsd" />
|
|
||||||
<None Include="Service References\QueryService\QueryService65.xsd" />
|
|
||||||
<None Include="Service References\QueryService\QueryService7.xsd" />
|
|
||||||
<None Include="Service References\QueryService\QueryServiceImp1.wsdl" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Ressources\Icons\Archiv.png" />
|
<Resource Include="Ressources\Icons\Archiv.png" />
|
||||||
@@ -2520,6 +2549,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Resource Include="Ressources\Icons\ArrowLeft.png" />
|
<Resource Include="Ressources\Icons\ArrowLeft.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="Service References\QueryService\QueryService1.disco" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
|
|||||||
@@ -203,6 +203,7 @@ namespace BeWo
|
|||||||
bool isZeiterfassungInStdMin = false;
|
bool isZeiterfassungInStdMin = false;
|
||||||
int lastSelectedStundenkontoIntervall = 3;
|
int lastSelectedStundenkontoIntervall = 3;
|
||||||
bool showSignatures = false;
|
bool showSignatures = false;
|
||||||
|
bool showRtfTextfeld = false;
|
||||||
|
|
||||||
|
|
||||||
AppSettings.ShowAdvisedAttendedFlag = false;
|
AppSettings.ShowAdvisedAttendedFlag = false;
|
||||||
@@ -377,6 +378,12 @@ namespace BeWo
|
|||||||
showSignatures = true;
|
showSignatures = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val = GetSettingValue(_Mandator.Settings, "ShowRtfTextfeld");
|
||||||
|
if (val != null && val.Equals("1"))
|
||||||
|
{
|
||||||
|
showRtfTextfeld = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
switch (_Mandator.BeWoClientType)
|
switch (_Mandator.BeWoClientType)
|
||||||
{
|
{
|
||||||
@@ -443,6 +450,7 @@ namespace BeWo
|
|||||||
AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung;
|
AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung;
|
||||||
AppSettings.ShowArbeitszeiten = showArbeitszeiten;
|
AppSettings.ShowArbeitszeiten = showArbeitszeiten;
|
||||||
AppSettings.ShowSignatures = showSignatures;
|
AppSettings.ShowSignatures = showSignatures;
|
||||||
|
AppSettings.ShowRtfTextfeld = showRtfTextfeld;
|
||||||
AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields;
|
AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields;
|
||||||
AppSettings.ShowAdditionalService = showAdditionalService;
|
AppSettings.ShowAdditionalService = showAdditionalService;
|
||||||
AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;
|
AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;
|
||||||
|
|||||||
@@ -13,11 +13,12 @@ namespace BeWo.Converter
|
|||||||
if (value == null)
|
if (value == null)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
var EnVal = value as DevExpress.Xpf.Core.EnumHelper.EnumItem;
|
throw new Exception("Hier muss noch was getestet werden");
|
||||||
var fi2 = EnVal.Id.GetType().GetField(EnVal.Id.ToString());
|
//var EnVal = value as DevExpress.Xpf.Core.EnumHelper. EnumItem;
|
||||||
var attrs = (DescriptionAttribute[])fi2.GetCustomAttributes(typeof(DescriptionAttribute), true);
|
//var fi2 = EnVal.Id.GetType().GetField(EnVal.Id.ToString());
|
||||||
|
//var attrs = (DescriptionAttribute[])fi2.GetCustomAttributes(typeof(DescriptionAttribute), true);
|
||||||
|
|
||||||
return !attrs.Any() ? value : attrs[0].Description;
|
//return !attrs.Any() ? value : attrs[0].Description;
|
||||||
}
|
}
|
||||||
|
|
||||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||||
|
|||||||
@@ -318,6 +318,8 @@ namespace BeWo.Core.Config
|
|||||||
|
|
||||||
public bool ShowSignatures { get; set; }
|
public bool ShowSignatures { get; set; }
|
||||||
|
|
||||||
|
public bool ShowRtfTextfeld { get; set; }
|
||||||
|
|
||||||
public bool ShowTeamNews { get; set; }
|
public bool ShowTeamNews { get; set; }
|
||||||
|
|
||||||
public bool ShowMarker { get; set; }
|
public bool ShowMarker { get; set; }
|
||||||
|
|||||||
2
BeWo/Properties/Resources.Designer.cs
generated
2
BeWo/Properties/Resources.Designer.cs
generated
@@ -1,7 +1,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.17929
|
// Laufzeitversion:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
|
|||||||
4
BeWo/Properties/Settings.Designer.cs
generated
4
BeWo/Properties/Settings.Designer.cs
generated
@@ -1,7 +1,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.17929
|
// Laufzeitversion:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
@@ -12,7 +12,7 @@ namespace BeWo.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
DevExpress.Xpf.RichEdit.RichEditControl, DevExpress.Xpf.RichEdit.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||||
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
||||||
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
||||||
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.2"
|
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
|
||||||
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
|
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
|
||||||
xmlns:view="clr-namespace:BeWo.Scheduler.View"
|
xmlns:view="clr-namespace:BeWo.Scheduler.View"
|
||||||
xmlns:converter="clr-namespace:BeWo.Converter"
|
xmlns:converter="clr-namespace:BeWo.Converter"
|
||||||
|
|||||||
@@ -305,10 +305,12 @@ namespace BeWo.Scheduler.View
|
|||||||
|
|
||||||
if (Appointment.RecurrenceInfo != null)
|
if (Appointment.RecurrenceInfo != null)
|
||||||
{
|
{
|
||||||
ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), Appointment.RecurrenceInfo.Id);
|
//###Lyndon testen!!!
|
||||||
}
|
ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()));
|
||||||
|
//ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), Appointment.RecurrenceInfo.Id);
|
||||||
|
}
|
||||||
|
|
||||||
if (Appointment.IsOccurrence && item == null)
|
if (Appointment.IsOccurrence && item == null)
|
||||||
{
|
{
|
||||||
((List<Employee2SchedulerAppointmentDC>)Appointment.CustomFields["EmployeeList"]).ForEach(each =>
|
((List<Employee2SchedulerAppointmentDC>)Appointment.CustomFields["EmployeeList"]).ForEach(each =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,8 +7,8 @@
|
|||||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||||
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
||||||
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
||||||
xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v13.1.Core"
|
xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
|
||||||
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1"
|
xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
|
||||||
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
|
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
|
||||||
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||||
xmlns:search="clr-namespace:BeWo.View.Search"
|
xmlns:search="clr-namespace:BeWo.View.Search"
|
||||||
@@ -119,11 +119,13 @@
|
|||||||
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}">
|
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}">
|
||||||
<!--AppointmentToolTip-->
|
<!--AppointmentToolTip-->
|
||||||
<ToolTipService.ToolTip>
|
<ToolTipService.ToolTip>
|
||||||
<ToolTip Content="{TemplateBinding ViewInfo}" ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
|
<ToolTip Content="{TemplateBinding ViewInfo}"
|
||||||
|
ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
|
||||||
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
|
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
|
||||||
</ToolTip>
|
</ToolTip>
|
||||||
</ToolTipService.ToolTip>
|
</ToolTipService.ToolTip>
|
||||||
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Background="{Binding ElementName=clrConvCtrl, Path=Container, Converter={StaticResource brushResourcesConverter}, ConverterParameter=ColorDefinition_BackBorder}" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}">
|
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Background="{Binding ElementName=clrConvCtrl, Path=Container, Converter={StaticResource brushResourcesConverter}, ConverterParameter=ColorDefinition_BackBorder}" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
|
||||||
|
>
|
||||||
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
||||||
<dxschint:AppointmentBorder.Background>
|
<dxschint:AppointmentBorder.Background>
|
||||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||||
@@ -132,7 +134,7 @@
|
|||||||
</dxschint:AppointmentBorder.Background>
|
</dxschint:AppointmentBorder.Background>
|
||||||
<dxschint:AppointmentBorder DefaultCornerRadius="2" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
<dxschint:AppointmentBorder DefaultCornerRadius="2" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
||||||
<dxschint:AppointmentBorder.Background>
|
<dxschint:AppointmentBorder.Background>
|
||||||
<SolidColorBrush Color="{Binding ViewInfo.LabelColor, RelativeSource={RelativeSource TemplatedParent}}"/>
|
<SolidColorBrush Color="{Binding ViewInfo.LabelColor, RelativeSource={RelativeSource TemplatedParent}}" />
|
||||||
</dxschint:AppointmentBorder.Background>
|
</dxschint:AppointmentBorder.Background>
|
||||||
</dxschint:AppointmentBorder>
|
</dxschint:AppointmentBorder>
|
||||||
</dxschint:AppointmentBorder>
|
</dxschint:AppointmentBorder>
|
||||||
@@ -149,7 +151,8 @@
|
|||||||
<ContentPresenter x:Name="PART_Content" Grid.Column="1" Margin="10,6,10,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
|
<ContentPresenter x:Name="PART_Content" Grid.Column="1" Margin="10,6,10,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
||||||
DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}" BorderBrush="Black"
|
DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
|
||||||
|
BorderBrush="Black"
|
||||||
Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
|
Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
|
||||||
<!--ResizingHitTest-->
|
<!--ResizingHitTest-->
|
||||||
<Rectangle Fill="Transparent" Height="5" VerticalAlignment="Top" HorizontalAlignment="Stretch"
|
<Rectangle Fill="Transparent" Height="5" VerticalAlignment="Top" HorizontalAlignment="Stretch"
|
||||||
@@ -226,10 +229,11 @@
|
|||||||
<ToolTipService.ToolTip>
|
<ToolTipService.ToolTip>
|
||||||
<ToolTip Content="{TemplateBinding ViewInfo}"
|
<ToolTip Content="{TemplateBinding ViewInfo}"
|
||||||
ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
|
ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
|
||||||
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
|
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
|
||||||
</ToolTip>
|
</ToolTip>
|
||||||
</ToolTipService.ToolTip>
|
</ToolTipService.ToolTip>
|
||||||
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Background="{Binding ElementName=clrConvCtrl, Path=Container, Converter={StaticResource brushResourcesConverter}, ConverterParameter=ColorDefinition_BackBorder}" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}">
|
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Background="{Binding ElementName=clrConvCtrl, Path=Container, Converter={StaticResource brushResourcesConverter}, ConverterParameter=ColorDefinition_BackBorder}" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
|
||||||
|
>
|
||||||
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
||||||
<dxschint:AppointmentBorder.Background>
|
<dxschint:AppointmentBorder.Background>
|
||||||
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
||||||
@@ -238,7 +242,7 @@
|
|||||||
</dxschint:AppointmentBorder.Background>
|
</dxschint:AppointmentBorder.Background>
|
||||||
<dxschint:AppointmentBorder DefaultCornerRadius="2" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
<dxschint:AppointmentBorder DefaultCornerRadius="2" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}">
|
||||||
<dxschint:AppointmentBorder.Background>
|
<dxschint:AppointmentBorder.Background>
|
||||||
<SolidColorBrush Color="{Binding ViewInfo.LabelColor, RelativeSource={RelativeSource TemplatedParent}}"/>
|
<SolidColorBrush Color="{Binding ViewInfo.LabelColor, RelativeSource={RelativeSource TemplatedParent}}" />
|
||||||
</dxschint:AppointmentBorder.Background>
|
</dxschint:AppointmentBorder.Background>
|
||||||
</dxschint:AppointmentBorder>
|
</dxschint:AppointmentBorder>
|
||||||
</dxschint:AppointmentBorder>
|
</dxschint:AppointmentBorder>
|
||||||
@@ -261,9 +265,9 @@
|
|||||||
<ContentPresenter x:Name="PART_Content" Grid.Row="1" Margin="6,0,6,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
|
<ContentPresenter x:Name="PART_Content" Grid.Row="1" Margin="6,0,6,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
||||||
DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
|
DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
|
||||||
BorderBrush="Black"
|
BorderBrush="Black"
|
||||||
Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
|
Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
|
||||||
<!--ResizingHitTest-->
|
<!--ResizingHitTest-->
|
||||||
<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Left"
|
<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Left"
|
||||||
Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
|
Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
|
||||||
@@ -385,7 +389,8 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel x:Name="DayViewOptions" Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
|
<StackPanel x:Name="DayViewOptions" Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
|
||||||
<Label>anz Tage:</Label>
|
<Label>anz Tage:</Label>
|
||||||
<dxe:SpinEdit x:Name="SpinEditDayViewDayCount" MaxValue="100" AllowNullInput="False" Width="50" IsFloatValue="False"
|
<dxe:SpinEdit x:Name="SpinEditDayViewDayCount" MaxValue="100" AllowNullInput="False"
|
||||||
|
Width="50" IsFloatValue="False"
|
||||||
EditValueChanged="SpinEditDayViewDayCount_EditValueChanged" />
|
EditValueChanged="SpinEditDayViewDayCount_EditValueChanged" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel x:Name="TimelineViewOptions" Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
|
<StackPanel x:Name="TimelineViewOptions" Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
|
||||||
@@ -404,7 +409,8 @@
|
|||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Label Grid.Column="0" x:Name="FilterLabel" Content="Filter:" Margin="1" VerticalAlignment="Bottom" />
|
<Label Grid.Column="0" x:Name="FilterLabel" Content="Filter:" Margin="1" VerticalAlignment="Bottom" />
|
||||||
<dxe:ComboBoxEdit Grid.Column="1" x:Name="Filter1BoxEdit" Height="23" Width="200" Margin="1"
|
<dxe:ComboBoxEdit Grid.Column="1" x:Name="Filter1BoxEdit" Height="23" Width="200" Margin="1"
|
||||||
EditValueChanged="Filter1BoxEdit_EditValueChanged" VerticalAlignment="Bottom" />
|
EditValueChanged="Filter1BoxEdit_EditValueChanged" VerticalAlignment="Bottom"
|
||||||
|
/>
|
||||||
<dxe:ComboBoxEdit SelectedIndexChanged="Filter2BoxEdit_OnSelectedIndexChanged" Grid.Column="2"
|
<dxe:ComboBoxEdit SelectedIndexChanged="Filter2BoxEdit_OnSelectedIndexChanged" Grid.Column="2"
|
||||||
x:Name="Filter2BoxEdit" Height="23" Width="150" Margin="1"
|
x:Name="Filter2BoxEdit" Height="23" Width="150" Margin="1"
|
||||||
EditValueChanged="Filter2BoxEdit_EditValueChanged" VerticalAlignment="Bottom"
|
EditValueChanged="Filter2BoxEdit_EditValueChanged" VerticalAlignment="Bottom"
|
||||||
@@ -416,7 +422,8 @@
|
|||||||
<search:EmployeeSearchView ItemSelected="EmployeeSearchView_EmployeeSelected" x:Name="EmployeeSearchView" />
|
<search:EmployeeSearchView ItemSelected="EmployeeSearchView_EmployeeSelected" x:Name="EmployeeSearchView" />
|
||||||
</Popup>
|
</Popup>
|
||||||
<controls:PopUpEdit Height="23" VerticalAlignment="Bottom" IsReadOnly="True" Margin="1" Grid.Column="2"
|
<controls:PopUpEdit Height="23" VerticalAlignment="Bottom" IsReadOnly="True" Margin="1" Grid.Column="2"
|
||||||
DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" Name="PopupeditCustomer"
|
DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch"
|
||||||
|
Name="PopupeditCustomer"
|
||||||
PopUpClick="popupedit_customer_PopUpClick" />
|
PopUpClick="popupedit_customer_PopUpClick" />
|
||||||
<Popup Margin="10" Grid.Column="2" Name="PopupCustomer" StaysOpen="False" Placement="MousePoint" Width="370" Height="300">
|
<Popup Margin="10" Grid.Column="2" Name="PopupCustomer" StaysOpen="False" Placement="MousePoint" Width="370" Height="300">
|
||||||
<search:CustomerSearchView ItemSelected="CustomerSearchView_CustomerSelected" x:Name="CustomerSearchView" />
|
<search:CustomerSearchView ItemSelected="CustomerSearchView_CustomerSelected" x:Name="CustomerSearchView" />
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
||||||
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
||||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||||
xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v13.1"
|
xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black">
|
d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
|
|||||||
@@ -80,7 +80,9 @@ namespace BeWo.Scheduler.ViewModel
|
|||||||
|
|
||||||
var prefilteredAppointments = appointments.Where(w => (w.EmployeeList.Count == 0 && w.Originator.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ||
|
var prefilteredAppointments = appointments.Where(w => (w.EmployeeList.Count == 0 && w.Originator.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ||
|
||||||
w.EmployeeList.Count > 0 && w.EmployeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)) ||
|
w.EmployeeList.Count > 0 && w.EmployeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)) ||
|
||||||
BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || w.EmployeeList.IsEmpty()));
|
BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || (w.EmployeeList == null || w.EmployeeList.Count == 0)));
|
||||||
|
//###cb testen :w.EmployeeList.IsEmpty geht nicht mehr
|
||||||
|
|
||||||
|
|
||||||
var vm = new SchedulerAppointmentListVM(prefilteredAppointments.ToList(), allCust, allEmps, mAllCats2ResInDic);
|
var vm = new SchedulerAppointmentListVM(prefilteredAppointments.ToList(), allCust, allEmps, mAllCats2ResInDic);
|
||||||
|
|
||||||
|
|||||||
@@ -339,9 +339,12 @@ namespace BeWo.Scheduler.ViewModel
|
|||||||
if (app.RecurrenceInfo != null)
|
if (app.RecurrenceInfo != null)
|
||||||
{
|
{
|
||||||
var index = app.RecurrenceIndex.ToString();
|
var index = app.RecurrenceIndex.ToString();
|
||||||
var id = app.RecurrenceInfo.Id;
|
|
||||||
|
|
||||||
if (changedOccurencyCustomFields.ContainsKey(app.RecurrenceInfo.Id) && changedOccurencyCustomFields[id].ContainsKey(index))
|
//###Lyndon testen!!!
|
||||||
|
//var id = app.RecurrenceInfo.Id;
|
||||||
|
var id = new Guid(app.RecurrenceInfo.Id.ToString());
|
||||||
|
|
||||||
|
if (changedOccurencyCustomFields.ContainsKey(id) && changedOccurencyCustomFields[id].ContainsKey(index))
|
||||||
{
|
{
|
||||||
if (app.Type.Equals(AppointmentType.ChangedOccurrence))
|
if (app.Type.Equals(AppointmentType.ChangedOccurrence))
|
||||||
{
|
{
|
||||||
@@ -376,7 +379,10 @@ namespace BeWo.Scheduler.ViewModel
|
|||||||
}
|
}
|
||||||
|
|
||||||
var index = appointment.RecurrenceIndex;
|
var index = appointment.RecurrenceIndex;
|
||||||
var id = appointment.RecurrenceInfo.Id;
|
//###Lyndon testen!!!
|
||||||
|
//var id = app.RecurrenceInfo.Id;
|
||||||
|
var id = new Guid(appointment.RecurrenceInfo.Id.ToString());
|
||||||
|
|
||||||
|
|
||||||
if (changedOccurencyCustomFields.ContainsKey(id) && changedOccurencyCustomFields[id].ContainsKey(index.ToString()))
|
if (changedOccurencyCustomFields.ContainsKey(id) && changedOccurencyCustomFields[id].ContainsKey(index.ToString()))
|
||||||
{
|
{
|
||||||
@@ -548,12 +554,16 @@ namespace BeWo.Scheduler.ViewModel
|
|||||||
customFieldCollection[CF_ORIGINATOR] = termin.Originator;
|
customFieldCollection[CF_ORIGINATOR] = termin.Originator;
|
||||||
customFieldCollection[CF_ISPRIVATE] = termin.IsPrivate;
|
customFieldCollection[CF_ISPRIVATE] = termin.IsPrivate;
|
||||||
|
|
||||||
if (!changedOccurencyCustomFields.ContainsKey(ri.Id))
|
//###Lyndon testen!!!
|
||||||
changedOccurencyCustomFields.Add(ri.Id, new Dictionary<string, Dictionary<string, object>> { { index, customFieldCollection } });
|
//var id = app.RecurrenceInfo.Id;
|
||||||
else if (!changedOccurencyCustomFields[ri.Id].ContainsKey(index))
|
var id = new Guid(ri.Id.ToString());
|
||||||
changedOccurencyCustomFields[ri.Id].Add(index, customFieldCollection);
|
|
||||||
|
if (!changedOccurencyCustomFields.ContainsKey(id))
|
||||||
|
changedOccurencyCustomFields.Add(id, new Dictionary<string, Dictionary<string, object>> { { index, customFieldCollection } });
|
||||||
|
else if (!changedOccurencyCustomFields[id].ContainsKey(index))
|
||||||
|
changedOccurencyCustomFields[id].Add(index, customFieldCollection);
|
||||||
else
|
else
|
||||||
changedOccurencyCustomFields[ri.Id][index] = customFieldCollection;
|
changedOccurencyCustomFields[id][index] = customFieldCollection;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ using BS.Shared.DataContracts;
|
|||||||
using BS.Shared.DataContracts.Compact;
|
using BS.Shared.DataContracts.Compact;
|
||||||
|
|
||||||
using DevExpress.Data.Linq;
|
using DevExpress.Data.Linq;
|
||||||
|
using BS.Shared.Extensions;
|
||||||
|
|
||||||
namespace BeWo.Scheduler.ViewModel
|
namespace BeWo.Scheduler.ViewModel
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -308,7 +308,7 @@
|
|||||||
|
|
||||||
<dxg:GridColumn FieldName="Kunde" Header="Klient / in" Width="125" ReadOnly="True">
|
<dxg:GridColumn FieldName="Kunde" Header="Klient / in" Width="125" ReadOnly="True">
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.IsKunde}" Value="1">
|
<DataTrigger Binding="{Binding RowData.Row.IsKunde}" Value="1">
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
@@ -404,7 +404,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMo}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMo}" Value=" ">
|
||||||
@@ -434,7 +434,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDi}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDi}" Value=" ">
|
||||||
@@ -464,7 +464,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMi}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiMi}" Value=" ">
|
||||||
@@ -494,7 +494,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDo}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiDo}" Value=" ">
|
||||||
@@ -524,7 +524,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiFr}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiFr}" Value=" ">
|
||||||
@@ -554,7 +554,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiSa}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.EingesetztBeiSa}" Value=" ">
|
||||||
@@ -601,7 +601,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.VertretungMo}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.VertretungMo}" Value=" ">
|
||||||
@@ -631,7 +631,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.VertretungDi}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.VertretungDi}" Value=" ">
|
||||||
@@ -662,7 +662,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.VertretungMi}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.VertretungMi}" Value=" ">
|
||||||
@@ -692,7 +692,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.VertretungDo}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.VertretungDo}" Value=" ">
|
||||||
@@ -722,7 +722,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.VertretungFr}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.VertretungFr}" Value=" ">
|
||||||
@@ -752,7 +752,7 @@
|
|||||||
</dxe:ButtonEditSettings>
|
</dxe:ButtonEditSettings>
|
||||||
</dxg:GridColumn.EditSettings>
|
</dxg:GridColumn.EditSettings>
|
||||||
<dxg:GridColumn.CellStyle>
|
<dxg:GridColumn.CellStyle>
|
||||||
<Style TargetType="{x:Type dxg:CellContentPresenter}" >
|
<Style TargetType="{x:Type dxg:LightweightCellEditor}" >
|
||||||
<Setter Property="Background" Value="#7fff7f" />
|
<Setter Property="Background" Value="#7fff7f" />
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding RowData.Row.VertretungSa}" Value=" ">
|
<DataTrigger Binding="{Binding RowData.Row.VertretungSa}" Value=" ">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
|
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
|
||||||
<contractRef ref="http://localhost/Host/QueryService.svc?wsdl" docRef="http://localhost/Host/QueryService.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
|
<contractRef ref="http://bib-pc3/Host/QueryService.svc?wsdl" docRef="http://bib-pc3/Host/QueryService.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
|
||||||
</discovery>
|
</discovery>
|
||||||
@@ -1,85 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/BS.Shared.Core" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
||||||
<xs:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" />
|
<xs:complexType name="DateTimeSpan">
|
||||||
<xs:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/BS.Shared" />
|
<xs:sequence>
|
||||||
<xs:element name="ExecuteQuery">
|
<xs:element minOccurs="0" name="EndDateTime" type="xs:dateTime" />
|
||||||
<xs:complexType>
|
<xs:element minOccurs="0" name="StartDateTime" type="xs:dateTime" />
|
||||||
<xs:sequence>
|
</xs:sequence>
|
||||||
<xs:element minOccurs="0" name="pQueryOid" type="xs:long" />
|
</xs:complexType>
|
||||||
<xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" minOccurs="0" name="parameter" nillable="true" type="q1:ArrayOfQueryParamDC" />
|
<xs:element name="DateTimeSpan" nillable="true" type="tns:DateTimeSpan" />
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="ExecuteQueryResponse">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" name="ExecuteQueryResult" nillable="true">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:annotation>
|
|
||||||
<xs:appinfo>
|
|
||||||
<ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/" />
|
|
||||||
</xs:appinfo>
|
|
||||||
</xs:annotation>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
|
|
||||||
<xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="GetAllQueriesOfType">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/BS.Shared" minOccurs="0" name="pType" type="q2:QueryType" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="GetAllQueriesOfTypeResponse">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" minOccurs="0" name="GetAllQueriesOfTypeResult" nillable="true" type="q3:ArrayOfQueryDC" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="PrepareQueryReport">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" name="dataTable" nillable="true">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:annotation>
|
|
||||||
<xs:appinfo>
|
|
||||||
<ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/" />
|
|
||||||
</xs:appinfo>
|
|
||||||
</xs:annotation>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
|
|
||||||
<xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element minOccurs="0" name="id" nillable="true" type="xs:string" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="PrepareQueryReportResponse">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" name="PrepareQueryReportResult" nillable="true" type="xs:string" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="ReportTypes">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" minOccurs="0" name="pType" type="q4:ReportTypes" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
<xs:element name="ReportTypesResponse">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:sequence />
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
</xs:schema>
|
</xs:schema>
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/BS.Shared.Core" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
||||||
<xs:complexType name="DateTimeSpan">
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" name="EndDateTime" type="xs:dateTime" />
|
|
||||||
<xs:element minOccurs="0" name="StartDateTime" type="xs:dateTime" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
<xs:element name="DateTimeSpan" nillable="true" type="tns:DateTimeSpan" />
|
|
||||||
</xs:schema>
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/System.Data" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
||||||
<xs:element name="DataTable" nillable="true">
|
|
||||||
<xs:complexType>
|
|
||||||
<xs:annotation>
|
|
||||||
<xs:appinfo>
|
|
||||||
<ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/" />
|
|
||||||
</xs:appinfo>
|
|
||||||
</xs:annotation>
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
|
|
||||||
<xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
</xs:element>
|
|
||||||
</xs:schema>
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/BS.Shared" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/BS.Shared" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
||||||
<xs:simpleType name="QueryParameterType">
|
|
||||||
<xs:restriction base="xs:string">
|
|
||||||
<xs:enumeration value="SupportConcept" />
|
|
||||||
<xs:enumeration value="Employee" />
|
|
||||||
<xs:enumeration value="Customer" />
|
|
||||||
<xs:enumeration value="Month" />
|
|
||||||
<xs:enumeration value="Date" />
|
|
||||||
<xs:enumeration value="DateRange" />
|
|
||||||
<xs:enumeration value="Team" />
|
|
||||||
<xs:enumeration value="CostCenter" />
|
|
||||||
<xs:enumeration value="ServiceCategory" />
|
|
||||||
<xs:enumeration value="ServiceDescription" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
<xs:element name="QueryParameterType" nillable="true" type="tns:QueryParameterType" />
|
|
||||||
<xs:simpleType name="QueryType">
|
|
||||||
<xs:restriction base="xs:string">
|
|
||||||
<xs:enumeration value="Public" />
|
|
||||||
<xs:enumeration value="Internal" />
|
|
||||||
<xs:enumeration value="Monthly" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
<xs:element name="QueryType" nillable="true" type="tns:QueryType" />
|
|
||||||
</xs:schema>
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<xs:schema xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
||||||
<xs:element name="anyType" nillable="true" type="xs:anyType" />
|
|
||||||
<xs:element name="anyURI" nillable="true" type="xs:anyURI" />
|
|
||||||
<xs:element name="base64Binary" nillable="true" type="xs:base64Binary" />
|
|
||||||
<xs:element name="boolean" nillable="true" type="xs:boolean" />
|
|
||||||
<xs:element name="byte" nillable="true" type="xs:byte" />
|
|
||||||
<xs:element name="dateTime" nillable="true" type="xs:dateTime" />
|
|
||||||
<xs:element name="decimal" nillable="true" type="xs:decimal" />
|
|
||||||
<xs:element name="double" nillable="true" type="xs:double" />
|
|
||||||
<xs:element name="float" nillable="true" type="xs:float" />
|
|
||||||
<xs:element name="int" nillable="true" type="xs:int" />
|
|
||||||
<xs:element name="long" nillable="true" type="xs:long" />
|
|
||||||
<xs:element name="QName" nillable="true" type="xs:QName" />
|
|
||||||
<xs:element name="short" nillable="true" type="xs:short" />
|
|
||||||
<xs:element name="string" nillable="true" type="xs:string" />
|
|
||||||
<xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte" />
|
|
||||||
<xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt" />
|
|
||||||
<xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong" />
|
|
||||||
<xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort" />
|
|
||||||
<xs:element name="char" nillable="true" type="tns:char" />
|
|
||||||
<xs:simpleType name="char">
|
|
||||||
<xs:restriction base="xs:int" />
|
|
||||||
</xs:simpleType>
|
|
||||||
<xs:element name="duration" nillable="true" type="tns:duration" />
|
|
||||||
<xs:simpleType name="duration">
|
|
||||||
<xs:restriction base="xs:duration">
|
|
||||||
<xs:pattern value="\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?" />
|
|
||||||
<xs:minInclusive value="-P10675199DT2H48M5.4775808S" />
|
|
||||||
<xs:maxInclusive value="P10675199DT2H48M5.4775807S" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
<xs:element name="guid" nillable="true" type="tns:guid" />
|
|
||||||
<xs:simpleType name="guid">
|
|
||||||
<xs:restriction base="xs:string">
|
|
||||||
<xs:pattern value="[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
<xs:attribute name="FactoryType" type="xs:QName" />
|
|
||||||
<xs:attribute name="Id" type="xs:ID" />
|
|
||||||
<xs:attribute name="Ref" type="xs:IDREF" />
|
|
||||||
</xs:schema>
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" xmlns:xs="http://www.w3.org/2001/XMLSchema">
|
|
||||||
<xs:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/BS.Shared" />
|
|
||||||
<xs:complexType name="ArrayOfQueryParamDC">
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="QueryParamDC" nillable="true" type="tns:QueryParamDC" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
<xs:element name="ArrayOfQueryParamDC" nillable="true" type="tns:ArrayOfQueryParamDC" />
|
|
||||||
<xs:complexType name="QueryParamDC">
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
|
|
||||||
<xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/BS.Shared" minOccurs="0" name="ParamType" type="q1:QueryParameterType" />
|
|
||||||
<xs:element minOccurs="0" name="Value" nillable="true" type="xs:anyType" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
<xs:element name="QueryParamDC" nillable="true" type="tns:QueryParamDC" />
|
|
||||||
<xs:complexType name="ArrayOfQueryDC">
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" maxOccurs="unbounded" name="QueryDC" nillable="true" type="tns:QueryDC" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
<xs:element name="ArrayOfQueryDC" nillable="true" type="tns:ArrayOfQueryDC" />
|
|
||||||
<xs:complexType name="QueryDC">
|
|
||||||
<xs:sequence>
|
|
||||||
<xs:element minOccurs="0" name="Oid" type="xs:long" />
|
|
||||||
<xs:element minOccurs="0" name="Parameter" nillable="true" type="tns:ArrayOfQueryParamDC" />
|
|
||||||
<xs:element minOccurs="0" name="Title" nillable="true" type="xs:string" />
|
|
||||||
<xs:element minOccurs="0" name="UserGroupOids" nillable="true" type="xs:string" />
|
|
||||||
</xs:sequence>
|
|
||||||
</xs:complexType>
|
|
||||||
<xs:element name="QueryDC" nillable="true" type="tns:QueryDC" />
|
|
||||||
<xs:simpleType name="ReportTypes">
|
|
||||||
<xs:restriction base="xs:string">
|
|
||||||
<xs:enumeration value="ServiceOverviewAllCustomers" />
|
|
||||||
<xs:enumeration value="ServiceOverviewSingleCustomer" />
|
|
||||||
<xs:enumeration value="Settlement" />
|
|
||||||
<xs:enumeration value="CustomerData" />
|
|
||||||
<xs:enumeration value="ServiceRecordList" />
|
|
||||||
<xs:enumeration value="SupportConceptReport" />
|
|
||||||
<xs:enumeration value="FLSReport" />
|
|
||||||
<xs:enumeration value="CustomerInvoice" />
|
|
||||||
<xs:enumeration value="QueryReport" />
|
|
||||||
<xs:enumeration value="ServiceInvoice" />
|
|
||||||
</xs:restriction>
|
|
||||||
</xs:simpleType>
|
|
||||||
<xs:element name="ReportTypes" nillable="true" type="tns:ReportTypes" />
|
|
||||||
</xs:schema>
|
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
<xs:enumeration value="Concurrency" />
|
<xs:enumeration value="Concurrency" />
|
||||||
<xs:enumeration value="DeleteNotPossible" />
|
<xs:enumeration value="DeleteNotPossible" />
|
||||||
<xs:enumeration value="LoginNameTaken" />
|
<xs:enumeration value="LoginNameTaken" />
|
||||||
|
<xs:enumeration value="CustomWithoutDetails" />
|
||||||
</xs:restriction>
|
</xs:restriction>
|
||||||
</xs:simpleType>
|
</xs:simpleType>
|
||||||
<xs:element name="BeWoFaultType" nillable="true" type="tns:BeWoFaultType" />
|
<xs:element name="BeWoFaultType" nillable="true" type="tns:BeWoFaultType" />
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="QueryServiceImp" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
|
<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="QueryServiceImp" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
|
||||||
<wsdl:types>
|
<wsdl:types>
|
||||||
<xsd:schema targetNamespace="http://tempuri.org/Imports">
|
<xsd:schema targetNamespace="http://tempuri.org/Imports">
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd6" namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd6" namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts" />
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/BS.Shared.DataContracts" />
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/BS.Shared" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd3" namespace="http://schemas.datacontract.org/2004/07/BS.Shared" />
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd4" namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd4" namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core" />
|
||||||
<xsd:import schemaLocation="http://localhost/Host/QueryService.svc?xsd=xsd5" namespace="http://schemas.datacontract.org/2004/07/System.Data" />
|
<xsd:import schemaLocation="http://bib-pc3/Host/QueryService.svc?xsd=xsd5" namespace="http://schemas.datacontract.org/2004/07/System.Data" />
|
||||||
</xsd:schema>
|
</xsd:schema>
|
||||||
</wsdl:types>
|
</wsdl:types>
|
||||||
<wsdl:message name="IQueryService_ExecuteQuery_InputMessage">
|
<wsdl:message name="IQueryService_ExecuteQuery_InputMessage">
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
</wsdl:binding>
|
</wsdl:binding>
|
||||||
<wsdl:service name="QueryServiceImp">
|
<wsdl:service name="QueryServiceImp">
|
||||||
<wsdl:port name="QueryServiceEndpoint" binding="tns:QueryServiceEndpoint">
|
<wsdl:port name="QueryServiceEndpoint" binding="tns:QueryServiceEndpoint">
|
||||||
<soap:address location="http://localhost/Host/QueryService.svc" />
|
<soap:address location="http://bib-pc3/Host/QueryService.svc" />
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
</wsdl:definitions>
|
</wsdl:definitions>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.225
|
// Laufzeitversion:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
@@ -137,6 +137,9 @@ namespace BeWo.QueryService {
|
|||||||
|
|
||||||
[System.Runtime.Serialization.EnumMemberAttribute()]
|
[System.Runtime.Serialization.EnumMemberAttribute()]
|
||||||
LoginNameTaken = 3,
|
LoginNameTaken = 3,
|
||||||
|
|
||||||
|
[System.Runtime.Serialization.EnumMemberAttribute()]
|
||||||
|
CustomWithoutDetails = 4,
|
||||||
}
|
}
|
||||||
|
|
||||||
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
|
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
|
||||||
|
|||||||
@@ -23,15 +23,15 @@
|
|||||||
<MetadataSource Address="http://localhost/Host/QueryService.svc" Protocol="http" SourceId="1" />
|
<MetadataSource Address="http://localhost/Host/QueryService.svc" Protocol="http" SourceId="1" />
|
||||||
</MetadataSources>
|
</MetadataSources>
|
||||||
<Metadata>
|
<Metadata>
|
||||||
<MetadataFile FileName="QueryService1.disco" MetadataType="Disco" ID="908da318-055b-4280-aafd-55647ec18170" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?disco" />
|
<MetadataFile FileName="QueryService6.xsd" MetadataType="Schema" ID="6b889ba6-4b3d-464d-9e3e-9ae6cf862b65" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd4" />
|
||||||
<MetadataFile FileName="QueryServiceImp1.wsdl" MetadataType="Wsdl" ID="af5422bf-f8aa-4a88-bc91-47b58f3dce40" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?wsdl" />
|
<MetadataFile FileName="QueryService7.xsd" MetadataType="Schema" ID="ed65de4a-5130-486c-a40e-42b1dd5eeb58" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd6" />
|
||||||
<MetadataFile FileName="QueryService61.xsd" MetadataType="Schema" ID="182468a7-f185-4d54-9b83-5c3512c00f74" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd4" />
|
<MetadataFile FileName="QueryService1.disco" MetadataType="Disco" ID="4a7a2a45-c6c0-487c-bd19-9e97c207e9d5" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?disco" />
|
||||||
<MetadataFile FileName="QueryService7.xsd" MetadataType="Schema" ID="6a16eb52-4081-4347-8b19-b58532933123" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd6" />
|
<MetadataFile FileName="QueryServiceImp1.wsdl" MetadataType="Wsdl" ID="08958428-a7c5-4b48-bef5-7fe3bba4f790" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?wsdl" />
|
||||||
<MetadataFile FileName="QueryService6.xsd" MetadataType="Schema" ID="117a396a-9086-4c99-997b-0139aa9ec7f0" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd0" />
|
<MetadataFile FileName="QueryService8.xsd" MetadataType="Schema" ID="2f9ea708-d1b2-400f-9a89-f47db1448ede" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd5" />
|
||||||
<MetadataFile FileName="QueryService62.xsd" MetadataType="Schema" ID="bbdfe316-3ad9-4285-9845-597911b0ab02" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd5" />
|
<MetadataFile FileName="QueryService9.xsd" MetadataType="Schema" ID="7a5130b7-46fd-4145-a837-f9c58f707401" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd2" />
|
||||||
<MetadataFile FileName="QueryService65.xsd" MetadataType="Schema" ID="267e0224-c571-427b-bb85-5f9564bcfaf0" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd2" />
|
<MetadataFile FileName="QueryService10.xsd" MetadataType="Schema" ID="2d4689aa-1b4a-4c56-ae97-256297665444" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd3" />
|
||||||
<MetadataFile FileName="QueryService64.xsd" MetadataType="Schema" ID="d4482648-c10d-40fd-8c95-5c691c6d738c" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd1" />
|
<MetadataFile FileName="QueryService11.xsd" MetadataType="Schema" ID="55b8a910-a460-48e8-b307-e462db20d242" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd0" />
|
||||||
<MetadataFile FileName="QueryService63.xsd" MetadataType="Schema" ID="442ca413-3827-4b74-8d84-26819bc4f950" SourceId="1" SourceUrl="http://localhost/Host/QueryService.svc?xsd=xsd3" />
|
<MetadataFile FileName="QueryService12.xsd" MetadataType="Schema" ID="2190e187-1f4b-4383-9a0b-34234c68938a" SourceId="1" SourceUrl="http://bib-pc3/Host/QueryService.svc?xsd=xsd1" />
|
||||||
</Metadata>
|
</Metadata>
|
||||||
<Extensions>
|
<Extensions>
|
||||||
<ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
|
<ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
|
<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
|
||||||
<behaviors />
|
<behaviors />
|
||||||
<bindings>
|
<bindings>
|
||||||
<binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" messageEncoding="Text" name="QueryServiceEndpoint1" textEncoding="utf-8" transferMode="Buffered"><readerQuotas maxArrayLength="16384" maxBytesPerRead="4096" maxDepth="32" maxNameTableCharCount="16384" maxStringContentLength="8192" /><security mode="None"><message algorithmSuite="Default" clientCredentialType="UserName" /><transport clientCredentialType="None" proxyCredentialType="None" realm="" /></security></Data>" bindingType="basicHttpBinding" name="QueryServiceEndpoint1" />
|
<binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data name="QueryServiceEndpoint1" />" bindingType="basicHttpBinding" name="QueryServiceEndpoint1" />
|
||||||
</bindings>
|
</bindings>
|
||||||
<endpoints>
|
<endpoints>
|
||||||
<endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost/Host/QueryService.svc" binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint1" contract="QueryService.IQueryService" name="QueryServiceEndpoint1" />" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost/Host/QueryService.svc" binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint1" contract="QueryService.IQueryService" name="QueryServiceEndpoint1" />" contractName="QueryService.IQueryService" name="QueryServiceEndpoint1" />
|
<endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://bib-pc3/Host/QueryService.svc" binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint1" contract="QueryService.IQueryService" name="QueryServiceEndpoint1" />" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://bib-pc3/Host/QueryService.svc" binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint1" contract="QueryService.IQueryService" name="QueryServiceEndpoint1" />" contractName="QueryService.IQueryService" name="QueryServiceEndpoint1" />
|
||||||
</endpoints>
|
</endpoints>
|
||||||
</configurationSnapshot>
|
</configurationSnapshot>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="vld8gngBew/GnlWvyUYX7ztB9jQ=">
|
<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="c07rOlPQnOi272Q2LeTIOw5Y+Cw=">
|
||||||
<bindingConfigurations>
|
<bindingConfigurations>
|
||||||
<bindingConfiguration bindingType="basicHttpBinding" name="QueryServiceEndpoint1">
|
<bindingConfiguration bindingType="basicHttpBinding" name="QueryServiceEndpoint1">
|
||||||
<properties>
|
<properties>
|
||||||
@@ -7,37 +7,34 @@
|
|||||||
<serializedValue>QueryServiceEndpoint1</serializedValue>
|
<serializedValue>QueryServiceEndpoint1</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>00:01:00</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/openTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/openTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>00:01:00</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/receiveTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/receiveTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>00:10:00</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/sendTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/sendTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>00:01:00</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/allowCookies" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/allowCookies" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>False</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/bypassProxyOnLocal" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/bypassProxyOnLocal" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>False</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/hostNameComparisonMode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.HostNameComparisonMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/hostNameComparisonMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HostNameComparisonMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>StrongWildcard</serializedValue>
|
<serializedValue>StrongWildcard</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/maxBufferSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<serializedValue>65536</serializedValue>
|
|
||||||
</property>
|
|
||||||
<property path="/maxBufferPoolSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/maxBufferPoolSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>524288</serializedValue>
|
<serializedValue />
|
||||||
|
</property>
|
||||||
|
<property path="/maxBufferSize" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<serializedValue>65536</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/maxReceivedMessageSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/maxReceivedMessageSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>65536</serializedValue>
|
<serializedValue />
|
||||||
</property>
|
|
||||||
<property path="/messageEncoding" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.WSMessageEncoding, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<serializedValue>Text</serializedValue>
|
|
||||||
</property>
|
</property>
|
||||||
<property path="/proxyAddress" isComplexType="false" isExplicitlyDefined="false" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/proxyAddress" isComplexType="false" isExplicitlyDefined="false" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue />
|
<serializedValue />
|
||||||
@@ -45,34 +42,46 @@
|
|||||||
<property path="/readerQuotas" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/readerQuotas" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement</serializedValue>
|
<serializedValue>System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/readerQuotas/maxDepth" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/readerQuotas/maxDepth" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>32</serializedValue>
|
<serializedValue>0</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/readerQuotas/maxStringContentLength" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/readerQuotas/maxStringContentLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>8192</serializedValue>
|
<serializedValue>0</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/readerQuotas/maxArrayLength" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/readerQuotas/maxArrayLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>16384</serializedValue>
|
<serializedValue>0</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/readerQuotas/maxBytesPerRead" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/readerQuotas/maxBytesPerRead" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>4096</serializedValue>
|
<serializedValue>0</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/readerQuotas/maxNameTableCharCount" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/readerQuotas/maxNameTableCharCount" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>16384</serializedValue>
|
<serializedValue>0</serializedValue>
|
||||||
|
</property>
|
||||||
|
<property path="/textEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.Text.Encoding, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<serializedValue>System.Text.UTF8Encoding</serializedValue>
|
||||||
|
</property>
|
||||||
|
<property path="/transferMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<serializedValue>Buffered</serializedValue>
|
||||||
|
</property>
|
||||||
|
<property path="/useDefaultWebProxy" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<serializedValue />
|
||||||
|
</property>
|
||||||
|
<property path="/messageEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.WSMessageEncoding, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<serializedValue>Text</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>System.ServiceModel.Configuration.BasicHttpSecurityElement</serializedValue>
|
<serializedValue>System.ServiceModel.Configuration.BasicHttpSecurityElement</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/mode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.BasicHttpSecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/mode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpSecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>None</serializedValue>
|
<serializedValue>None</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.HttpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.HttpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>System.ServiceModel.Configuration.HttpTransportSecurityElement</serializedValue>
|
<serializedValue>System.ServiceModel.Configuration.HttpTransportSecurityElement</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/transport/clientCredentialType" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.HttpClientCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/transport/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpClientCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>None</serializedValue>
|
<serializedValue>None</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/transport/proxyCredentialType" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.HttpProxyCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/transport/proxyCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpProxyCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>None</serializedValue>
|
<serializedValue>None</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
@@ -87,35 +96,26 @@
|
|||||||
<property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>(Auflistung)</serializedValue>
|
<serializedValue>(Auflistung)</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue />
|
<serializedValue />
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpMessageSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpMessageSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>System.ServiceModel.Configuration.BasicHttpMessageSecurityElement</serializedValue>
|
<serializedValue>System.ServiceModel.Configuration.BasicHttpMessageSecurityElement</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.BasicHttpMessageCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpMessageCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>UserName</serializedValue>
|
<serializedValue>UserName</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/security/message/algorithmSuite" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.Security.SecurityAlgorithmSuite, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/security/message/algorithmSuite" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.Security.SecurityAlgorithmSuite, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>Default</serializedValue>
|
<serializedValue>Default</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/textEncoding" isComplexType="false" isExplicitlyDefined="true" clrType="System.Text.Encoding, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<serializedValue>System.Text.UTF8Encoding</serializedValue>
|
|
||||||
</property>
|
|
||||||
<property path="/transferMode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<serializedValue>Buffered</serializedValue>
|
|
||||||
</property>
|
|
||||||
<property path="/useDefaultWebProxy" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
|
||||||
<serializedValue>True</serializedValue>
|
|
||||||
</property>
|
|
||||||
</properties>
|
</properties>
|
||||||
</bindingConfiguration>
|
</bindingConfiguration>
|
||||||
</bindingConfigurations>
|
</bindingConfigurations>
|
||||||
<endpoints>
|
<endpoints>
|
||||||
<endpoint name="QueryServiceEndpoint1" contract="QueryService.IQueryService" bindingType="basicHttpBinding" address="http://localhost/Host/QueryService.svc" bindingConfiguration="QueryServiceEndpoint1">
|
<endpoint name="QueryServiceEndpoint1" contract="QueryService.IQueryService" bindingType="basicHttpBinding" address="http://bib-pc3/Host/QueryService.svc" bindingConfiguration="QueryServiceEndpoint1">
|
||||||
<properties>
|
<properties>
|
||||||
<property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue>http://localhost/Host/QueryService.svc</serializedValue>
|
<serializedValue>http://bib-pc3/Host/QueryService.svc</serializedValue>
|
||||||
</property>
|
</property>
|
||||||
<property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<serializedValue />
|
<serializedValue />
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v13.2"
|
xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v17.1"
|
||||||
xmlns:shared="clr-namespace:BeWo.Core"
|
xmlns:shared="clr-namespace:BeWo.Core"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="300" d:DesignWidth="300">
|
d:DesignHeight="300" d:DesignWidth="300">
|
||||||
|
|||||||
@@ -37,18 +37,20 @@ namespace BeWo.View.Controls
|
|||||||
return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
|
return (Style)cb.FindResource(new EditorListBoxThemeKeyExtension { ResourceKey = EditorListBoxThemeKeys.DefaultItemStyle, ThemeName = ThemeHelper.GetEditorThemeName(cb) });
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override SelectionMode SelectionMode
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return HasFlagsAttribute() ? SelectionMode.Multiple : SelectionMode.Single;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override bool CloseOnMouseUp
|
|
||||||
{
|
//protected override SelectionMode SelectionMode
|
||||||
get { return !HasFlagsAttribute(); }
|
//{
|
||||||
}
|
// get
|
||||||
|
// {
|
||||||
|
// return HasFlagsAttribute() ? SelectionMode.Multiple : SelectionMode.Single;
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
|
||||||
|
//protected override bool CloseOnMouseUp
|
||||||
|
//{
|
||||||
|
// get { return !HasFlagsAttribute(); }
|
||||||
|
//}
|
||||||
|
|
||||||
protected override bool ShowCustomItem(LookUpEditBase editor)
|
protected override bool ShowCustomItem(LookUpEditBase editor)
|
||||||
{
|
{
|
||||||
@@ -75,5 +77,10 @@ namespace BeWo.View.Controls
|
|||||||
|
|
||||||
return c != 0;
|
return c != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override SelectionMode GetSelectionMode(LookUpEditBase editor)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,9 +11,9 @@
|
|||||||
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
|
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
|
||||||
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
|
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
|
||||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2"
|
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
|
||||||
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
|
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
|
||||||
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2.Core"
|
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1.Core"
|
||||||
xmlns:converter="clr-namespace:BeWo.Converter"
|
xmlns:converter="clr-namespace:BeWo.Converter"
|
||||||
xmlns:detail="clr-namespace:BeWo.View.Detail"
|
xmlns:detail="clr-namespace:BeWo.View.Detail"
|
||||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
|
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
|
||||||
|
|||||||
@@ -56,8 +56,9 @@
|
|||||||
<ControlTemplate x:Key="display_asv">
|
<ControlTemplate x:Key="display_asv">
|
||||||
<controls:AssessmentSheetValueControl Margin="3" Cursor="Hand" Focusable="True" AssessmetSheetValue="{Binding Value}"/>
|
<controls:AssessmentSheetValueControl Margin="3" Cursor="Hand" Focusable="True" AssessmetSheetValue="{Binding Value}"/>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
<Style x:Key="highlightedCell" TargetType="dxg:CellContentPresenter">
|
<Style x:Key="highlightedCell" TargetType="dxg:LightweightCellEditor">
|
||||||
<Setter Property="Background" Value="#9fbce3" />
|
<Setter Property="Background" Value="#9fbce3" />
|
||||||
|
|
||||||
</Style>
|
</Style>
|
||||||
<conv:AssessmentSheetHeaderToForegroundConverter x:Key="ColorConverter" />
|
<conv:AssessmentSheetHeaderToForegroundConverter x:Key="ColorConverter" />
|
||||||
</dxg:GridControl.Resources>
|
</dxg:GridControl.Resources>
|
||||||
|
|||||||
@@ -28,17 +28,18 @@ using BS.Shared.Extensions;
|
|||||||
using DevExpress.Utils;
|
using DevExpress.Utils;
|
||||||
using DevExpress.Xpf.Editors.Settings;
|
using DevExpress.Xpf.Editors.Settings;
|
||||||
using DevExpress.Xpf.Grid;
|
using DevExpress.Xpf.Grid;
|
||||||
using DevExpress.XtraGrid;
|
|
||||||
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using System.Windows.Media.Imaging;
|
using System.Windows.Media.Imaging;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
using DevExpress.XtraGrid;
|
||||||
using Binding = System.Windows.Data.Binding;
|
using Binding = System.Windows.Data.Binding;
|
||||||
using Button = System.Windows.Controls.Button;
|
using Button = System.Windows.Controls.Button;
|
||||||
using CheckBox = System.Windows.Controls.CheckBox;
|
using CheckBox = System.Windows.Controls.CheckBox;
|
||||||
using ComboBox = System.Windows.Controls.ComboBox;
|
using ComboBox = System.Windows.Controls.ComboBox;
|
||||||
using Control = System.Windows.Controls.Control;
|
using Control = System.Windows.Controls.Control;
|
||||||
|
using GridControl = DevExpress.Xpf.Grid.GridControl;
|
||||||
using GroupBox = System.Windows.Controls.GroupBox;
|
using GroupBox = System.Windows.Controls.GroupBox;
|
||||||
using HorizontalAlignment = System.Windows.HorizontalAlignment;
|
using HorizontalAlignment = System.Windows.HorizontalAlignment;
|
||||||
using Hyperlink = System.Windows.Documents.Hyperlink;
|
using Hyperlink = System.Windows.Documents.Hyperlink;
|
||||||
|
|||||||
@@ -8,6 +8,9 @@
|
|||||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||||
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
||||||
|
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
|
||||||
|
xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
|
||||||
|
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
|
||||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
|
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
|
||||||
<Grid Width="Auto" Height="Auto">
|
<Grid Width="Auto" Height="Auto">
|
||||||
<!--uc:ShadowChrome-->
|
<!--uc:ShadowChrome-->
|
||||||
@@ -310,6 +313,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF1" x:Name="TabitemRtf1Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager1" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox1" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar1" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl1" BarManager="{Binding ElementName=barManager1, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice2" x:Name="TabItem2_Notice">
|
<TabItem Header="Notice2" x:Name="TabItem2_Notice">
|
||||||
<TextBox x:Name="TextboxNotice2"
|
<TextBox x:Name="TextboxNotice2"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -319,6 +351,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF2" x:Name="TabitemRtf2Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager2" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox2" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar2" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl2" BarManager="{Binding ElementName=barManager2, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice3" x:Name="TabItem3_Notice">
|
<TabItem Header="Notice3" x:Name="TabItem3_Notice">
|
||||||
<TextBox x:Name="TextboxNotice3"
|
<TextBox x:Name="TextboxNotice3"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -328,6 +389,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF3" x:Name="TabitemRtf3Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager3" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox3" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar3" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl3" BarManager="{Binding ElementName=barManager3, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice4" x:Name="TabItem4_Notice">
|
<TabItem Header="Notice4" x:Name="TabItem4_Notice">
|
||||||
<TextBox x:Name="TextboxNotice4"
|
<TextBox x:Name="TextboxNotice4"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -337,6 +427,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF4" x:Name="TabitemRtf4Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager4" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox4" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar4" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl4" BarManager="{Binding ElementName=barManager4, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice5" x:Name="TabItem5_Notice">
|
<TabItem Header="Notice5" x:Name="TabItem5_Notice">
|
||||||
<TextBox x:Name="TextboxNotice5"
|
<TextBox x:Name="TextboxNotice5"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -346,6 +465,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF5" x:Name="TabitemRtf5Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager5" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox5" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar5" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl5" BarManager="{Binding ElementName=barManager5, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -166,7 +166,16 @@ namespace BeWo.View.Detail
|
|||||||
ComboBoxTreeViewControl.Visibility = (_ServiceRecordVM.IsGoalTreeVisible) ? Visibility.Visible : Visibility.Collapsed;
|
ComboBoxTreeViewControl.Visibility = (_ServiceRecordVM.IsGoalTreeVisible) ? Visibility.Visible : Visibility.Collapsed;
|
||||||
Loaded += ServiceRecordEditView_Loaded;
|
Loaded += ServiceRecordEditView_Loaded;
|
||||||
|
|
||||||
ConfigureDocTypes();
|
|
||||||
|
if(BeWoApp.AppSettings.ShowRtfTextfeld)
|
||||||
|
{
|
||||||
|
ConfigureRTFDocTypes();
|
||||||
|
LoadNoticeInRTFTxte();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
ConfigureDocTypes();
|
||||||
|
}
|
||||||
|
|
||||||
isEndDateVisible(pSCViewModel.ServiceRecordFormat, pSCViewModel.DurationInStunden.Value);
|
isEndDateVisible(pSCViewModel.ServiceRecordFormat, pSCViewModel.DurationInStunden.Value);
|
||||||
|
|
||||||
if (!pSCViewModel.EditAllowed)
|
if (!pSCViewModel.EditAllowed)
|
||||||
@@ -351,6 +360,12 @@ namespace BeWo.View.Detail
|
|||||||
// {
|
// {
|
||||||
// _ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
|
// _ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
if (BeWoApp.AppSettings.ShowRtfTextfeld)
|
||||||
|
{
|
||||||
|
SetRTFDaten();
|
||||||
|
}
|
||||||
|
|
||||||
_ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
|
_ServiceRecordVM.RoundedDuration = _ServiceRecordVM.Duration.Value;
|
||||||
if (_SelectedEmployee != null)
|
if (_SelectedEmployee != null)
|
||||||
_ServiceRecordVM.Employee = _SelectedEmployee;
|
_ServiceRecordVM.Employee = _SelectedEmployee;
|
||||||
@@ -375,6 +390,51 @@ namespace BeWo.View.Detail
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetRTFDaten()
|
||||||
|
{
|
||||||
|
|
||||||
|
if (richEditControl1.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice = richEditControl1.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice = richEditControl1.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl2.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice2 = richEditControl2.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice2 = richEditControl2.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl3.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice3 = richEditControl3.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice3 = richEditControl3.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl4.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice4 = richEditControl4.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice4 = richEditControl4.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl5.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice5 = richEditControl5.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice5 = richEditControl5.RtfText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LoadNoticeInRTFTxte()
|
||||||
|
{
|
||||||
|
richEditControl1.Text = _ServiceRecordVM.Notice;
|
||||||
|
richEditControl2.Text = _ServiceRecordVM.Notice2;
|
||||||
|
richEditControl3.Text = _ServiceRecordVM.Notice3;
|
||||||
|
richEditControl4.Text = _ServiceRecordVM.Notice4;
|
||||||
|
richEditControl5.Text = _ServiceRecordVM.Notice5;
|
||||||
|
|
||||||
|
richEditControl1.RtfText = _ServiceRecordVM.RTFNotice;
|
||||||
|
richEditControl2.RtfText = _ServiceRecordVM.RTFNotice2;
|
||||||
|
richEditControl3.RtfText = _ServiceRecordVM.RTFNotice3;
|
||||||
|
richEditControl4.RtfText = _ServiceRecordVM.RTFNotice4;
|
||||||
|
richEditControl5.RtfText = _ServiceRecordVM.RTFNotice5;
|
||||||
|
}
|
||||||
|
|
||||||
private void EmployeeSearchView_CustomerSelected(object sender, EventArgs<CompactEmployeeDC> e)
|
private void EmployeeSearchView_CustomerSelected(object sender, EventArgs<CompactEmployeeDC> e)
|
||||||
{
|
{
|
||||||
_ServiceRecordVM.Employee = e.Data;
|
_ServiceRecordVM.Employee = e.Data;
|
||||||
@@ -444,6 +504,83 @@ namespace BeWo.View.Detail
|
|||||||
))));
|
))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void ConfigureRTFDocTypes()
|
||||||
|
{
|
||||||
|
//hier der Aufruf für die RTF GEdönse
|
||||||
|
TabitemRtf1Note.IsSelected = true;
|
||||||
|
|
||||||
|
TabItem1_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem2_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem3_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem4_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem5_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
TabitemRtf1Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
int i = ViewModel.AllDocTypes.Count;
|
||||||
|
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = "Dokumentation";
|
||||||
|
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 2)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 3)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[2].ToString();
|
||||||
|
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 4)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
|
||||||
|
TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
|
||||||
|
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 5)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
|
||||||
|
TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
|
||||||
|
TabitemRtf5Note.Header = ViewModel.AllDocTypes[4].ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void ConfigureDocTypes()
|
private void ConfigureDocTypes()
|
||||||
{
|
{
|
||||||
//Tabs und Tabelle
|
//Tabs und Tabelle
|
||||||
|
|||||||
@@ -7,6 +7,9 @@
|
|||||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||||
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
||||||
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||||
|
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
|
||||||
|
xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
|
||||||
|
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
|
||||||
Height="Auto" Width="Auto"
|
Height="Auto" Width="Auto"
|
||||||
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
||||||
Focusable="True">
|
Focusable="True">
|
||||||
@@ -304,6 +307,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True"/>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF1" x:Name="TabitemRtf1Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager1" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox1" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar1" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl1" BarManager="{Binding ElementName=barManager1, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice2" x:Name="TabItem2_Notice">
|
<TabItem Header="Notice2" x:Name="TabItem2_Notice">
|
||||||
<TextBox x:Name="TextboxNotice2"
|
<TextBox x:Name="TextboxNotice2"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -313,6 +345,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF2" x:Name="TabitemRtf2Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager2" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox2" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar2" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl2" BarManager="{Binding ElementName=barManager2, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice3" x:Name="TabItem3_Notice">
|
<TabItem Header="Notice3" x:Name="TabItem3_Notice">
|
||||||
<TextBox x:Name="TextboxNotice3"
|
<TextBox x:Name="TextboxNotice3"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -322,6 +383,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF3" x:Name="TabitemRtf3Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager3" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox3" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar3" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl3" BarManager="{Binding ElementName=barManager3, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice4" x:Name="TabItem4_Notice">
|
<TabItem Header="Notice4" x:Name="TabItem4_Notice">
|
||||||
<TextBox x:Name="TextboxNotice4"
|
<TextBox x:Name="TextboxNotice4"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -331,6 +421,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF4" x:Name="TabitemRtf4Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager4" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox4" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar4" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl4" BarManager="{Binding ElementName=barManager4, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice5" x:Name="TabItem5_Notice">
|
<TabItem Header="Notice5" x:Name="TabItem5_Notice">
|
||||||
<TextBox x:Name="TextboxNotice5"
|
<TextBox x:Name="TextboxNotice5"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
@@ -340,6 +459,35 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<TabItem Header="RTF5" x:Name="TabitemRtf5Note" Visibility="Collapsed">
|
||||||
|
<dxb:BarManager x:Name="barManager5" ToolbarGlyphSize="Small" >
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox5" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar5" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl5" BarManager="{Binding ElementName=barManager5, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
</TabControl>
|
</TabControl>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -128,7 +128,19 @@ namespace BeWo.View.Detail
|
|||||||
_ServiceRecordVM.ServiceDescription = _OldServiceDescription;
|
_ServiceRecordVM.ServiceDescription = _OldServiceDescription;
|
||||||
_ServiceRecordVM.SetDirty(false);
|
_ServiceRecordVM.SetDirty(false);
|
||||||
|
|
||||||
ConfigureDocTypes();
|
|
||||||
|
if (BeWoApp.AppSettings.ShowRtfTextfeld)
|
||||||
|
{
|
||||||
|
ConfigureRTFDocTypes();
|
||||||
|
LoadNoticeInRTFTxte();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ConfigureDocTypes();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
InitSelectionList();
|
InitSelectionList();
|
||||||
ConfigureServiceRecordFormats(pSelectedViewModel.ServiceRecordFormat,pSelectedViewModel.DurationInStunden.Value);
|
ConfigureServiceRecordFormats(pSelectedViewModel.ServiceRecordFormat,pSelectedViewModel.DurationInStunden.Value);
|
||||||
|
|
||||||
@@ -145,6 +157,20 @@ namespace BeWo.View.Detail
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void LoadNoticeInRTFTxte()
|
||||||
|
{
|
||||||
|
richEditControl1.Text = _ServiceRecordVM.Notice;
|
||||||
|
richEditControl2.Text = _ServiceRecordVM.Notice2;
|
||||||
|
richEditControl3.Text = _ServiceRecordVM.Notice3;
|
||||||
|
richEditControl4.Text = _ServiceRecordVM.Notice4;
|
||||||
|
richEditControl5.Text = _ServiceRecordVM.Notice5;
|
||||||
|
|
||||||
|
richEditControl1.RtfText = _ServiceRecordVM.RTFNotice;
|
||||||
|
richEditControl2.RtfText = _ServiceRecordVM.RTFNotice2;
|
||||||
|
richEditControl3.RtfText = _ServiceRecordVM.RTFNotice3;
|
||||||
|
richEditControl4.RtfText = _ServiceRecordVM.RTFNotice4;
|
||||||
|
richEditControl5.RtfText = _ServiceRecordVM.RTFNotice5;
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsCustomerChangeAllowed()
|
public bool IsCustomerChangeAllowed()
|
||||||
{
|
{
|
||||||
@@ -262,11 +288,46 @@ namespace BeWo.View.Detail
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetRTFDaten()
|
||||||
|
{
|
||||||
|
|
||||||
|
if (richEditControl1.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice = richEditControl1.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice = richEditControl1.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl2.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice2 = richEditControl2.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice2 = richEditControl2.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl3.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice3 = richEditControl3.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice3 = richEditControl3.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl4.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice4 = richEditControl4.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice4 = richEditControl4.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl5.Text != "")
|
||||||
|
{
|
||||||
|
_ServiceRecordVM.Notice5 = richEditControl5.Text;
|
||||||
|
_ServiceRecordVM.RTFNotice5 = richEditControl5.RtfText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void Save()
|
protected override void Save()
|
||||||
{
|
{
|
||||||
if (!IsDirty)
|
if (!IsDirty)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (BeWoApp.AppSettings.ShowRtfTextfeld)
|
||||||
|
{
|
||||||
|
SetRTFDaten();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
UpdateServiceRecordGroup();
|
UpdateServiceRecordGroup();
|
||||||
|
|
||||||
@@ -637,6 +698,84 @@ namespace BeWo.View.Detail
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void ConfigureRTFDocTypes()
|
||||||
|
{
|
||||||
|
//hier der Aufruf für die RTF GEdönse
|
||||||
|
TabitemRtf1Note.IsSelected = true;
|
||||||
|
|
||||||
|
TabItem1_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem2_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem3_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem4_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem5_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
TabitemRtf1Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
int i = ViewModel.AllDocTypes.Count;
|
||||||
|
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = "Dokumentation";
|
||||||
|
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 2)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 3)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[2].ToString();
|
||||||
|
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 4)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
|
||||||
|
TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
|
||||||
|
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
|
else if (i == 5)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf3Note.Header = ViewModel.AllDocTypes[2].ToString();
|
||||||
|
TabitemRtf4Note.Header = ViewModel.AllDocTypes[3].ToString();
|
||||||
|
TabitemRtf5Note.Header = ViewModel.AllDocTypes[4].ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void ConfigureDocTypes()
|
private void ConfigureDocTypes()
|
||||||
{
|
{
|
||||||
//Tabs und Tabelle
|
//Tabs und Tabelle
|
||||||
|
|||||||
66
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
Normal file
66
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
<Window x:Class="BeWo.View.Detail.ServiceRecordRTFWindowView"
|
||||||
|
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:local="clr-namespace:BeWo.View.Detail"
|
||||||
|
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
|
||||||
|
xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
|
||||||
|
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
|
||||||
|
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||||
|
xmlns:search="clr-namespace:BeWo.View.Search"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
Height="900" Width="900" x:Name="RtfWindow" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterScreen" >
|
||||||
|
<GroupBox Style="{DynamicResource MainContentGroupBoxWithMinimizeBtnStyle}">
|
||||||
|
|
||||||
|
<Grid Margin="0" >
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!-- Von hier -->
|
||||||
|
<Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
|
||||||
|
<Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRTF" Content="Textbausteine" Click="ButtonBase_OnClick" />
|
||||||
|
|
||||||
|
<!-- Bis hier rausnehmen -->
|
||||||
|
|
||||||
|
<dxb:BarManager x:Name="barManager" ToolbarGlyphSize="Small" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl" BarManager="{Binding ElementName=barManager, Mode=OneTime}" CommandBarStyle="Ribbon" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
|
||||||
|
|
||||||
|
<Popup Margin="10" x:Name="popup_textbausteine" StaysOpen="False" Placement="MousePoint" Width="400" Height="400">
|
||||||
|
<search:TextbausteineSearchView x:Name="textbausteineSearchView" ItemSelected="TextbausteineSearchView_OnItemSelected" />
|
||||||
|
</Popup>
|
||||||
|
</Grid>
|
||||||
|
</GroupBox>
|
||||||
|
</Window>
|
||||||
208
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
Normal file
208
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
Normal file
@@ -0,0 +1,208 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Controls.Primitives;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Shapes;
|
||||||
|
using BeWo.ViewModel;
|
||||||
|
using BS.Shared;
|
||||||
|
using BS.Shared.Core;
|
||||||
|
using BS.Shared.DataContracts;
|
||||||
|
using BS.Shared.Extensions;
|
||||||
|
|
||||||
|
namespace BeWo.View.Detail
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interaktionslogik für ServiceRecordRTFWindowView.xaml
|
||||||
|
/// </summary>
|
||||||
|
public partial class ServiceRecordRTFWindowView : Window
|
||||||
|
{
|
||||||
|
public event EventHandler<CustomRTFWindowArgs> RaiseCustomEvent;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public ServiceRecordRTFWindowView(string titel,string text, string rtfText)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
|
||||||
|
RtfWindow.Title = titel;
|
||||||
|
|
||||||
|
richEditControl.Text = text;
|
||||||
|
richEditControl.RtfText = rtfText;
|
||||||
|
|
||||||
|
// höhe und breite vom Screen nehmen und durch 2 teilen
|
||||||
|
Width = SystemParameters.PrimaryScreenWidth / 2;
|
||||||
|
Height = SystemParameters.PrimaryScreenWidth / 2;
|
||||||
|
|
||||||
|
AddClose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AddClose()
|
||||||
|
{
|
||||||
|
CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => RtfRueckgabe()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RtfRueckgabe()
|
||||||
|
{
|
||||||
|
RaiseCustomEvent(this, new CustomRTFWindowArgs(richEditControl.Text,richEditControl.RtfText));
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//TextBausteine Bereich
|
||||||
|
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
popup_textbausteine.IsOpen = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs<TextbausteinDC> e)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(richEditControl.Text))
|
||||||
|
{
|
||||||
|
richEditControl.Text = e.Data.Text;
|
||||||
|
richEditControl.Document.CaretPosition = richEditControl.Document.Range.End;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (richEditControl.Document.CaretPosition.ToInt() == 0)
|
||||||
|
{
|
||||||
|
richEditControl.Text = e.Data.Text + richEditControl.Text;
|
||||||
|
}
|
||||||
|
else if (richEditControl.Document.CaretPosition == richEditControl.Document.Range.End)
|
||||||
|
{
|
||||||
|
richEditControl.Text = richEditControl.Text + e.Data.Text;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var anzahlLeerzeichen = richEditControl.Document.CaretPosition.ToInt() - richEditControl.Text.Length;
|
||||||
|
|
||||||
|
var leerzeichen = String.Empty;
|
||||||
|
for (var i = 0; i < anzahlLeerzeichen; i++)
|
||||||
|
{
|
||||||
|
leerzeichen += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
var start = richEditControl.Text.Substring(0, (richEditControl.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
var ende = richEditControl.Text.Substring((richEditControl.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
|
||||||
|
richEditControl.Text = start + leerzeichen + e.Data.Text + ende;
|
||||||
|
}
|
||||||
|
|
||||||
|
richEditControl.Document.CaretPosition = richEditControl.Document.Range.End;
|
||||||
|
|
||||||
|
popup_textbausteine.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EditTextbausteineClick(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
VMFactory.CreateTextbausteinListVMAsync(
|
||||||
|
x => this.Dispatch(delegate
|
||||||
|
{
|
||||||
|
var tbv = new TextbausteinView(x) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
|
||||||
|
|
||||||
|
var rootGrid2 = (Grid)tbv.root.Content;
|
||||||
|
var zielGrid = (Grid)rootGrid2.Children[0];
|
||||||
|
var cb = new CheckBox
|
||||||
|
{
|
||||||
|
Content = "Nur für mich sichtbar",
|
||||||
|
Margin = new Thickness(3),
|
||||||
|
HorizontalAlignment = HorizontalAlignment.Left,
|
||||||
|
VerticalAlignment = VerticalAlignment.Center
|
||||||
|
};
|
||||||
|
|
||||||
|
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
|
||||||
|
{
|
||||||
|
cb.IsEnabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var IsOnlyForEmployeeBinding = new Binding("NewVM.IsOnlyForEmployee") { Source = tbv.ViewModel, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged };
|
||||||
|
BindingOperations.SetBinding(cb, ToggleButton.IsCheckedProperty, IsOnlyForEmployeeBinding);
|
||||||
|
|
||||||
|
Grid.SetColumn(cb, 0);
|
||||||
|
Grid.SetRow(cb, 2);
|
||||||
|
Grid.SetColumnSpan(cb, 4);
|
||||||
|
|
||||||
|
zielGrid.Children.Add(cb);
|
||||||
|
|
||||||
|
var stackPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right };
|
||||||
|
|
||||||
|
var speichernBtn = new Button
|
||||||
|
{
|
||||||
|
Content = "Speichern und schließen",
|
||||||
|
HorizontalAlignment = HorizontalAlignment.Right,
|
||||||
|
Margin = new Thickness(3),
|
||||||
|
VerticalAlignment = VerticalAlignment.Center
|
||||||
|
};
|
||||||
|
|
||||||
|
var abbrechenBtn = new Button
|
||||||
|
{
|
||||||
|
Content = "Abbrechen",
|
||||||
|
HorizontalAlignment = HorizontalAlignment.Right,
|
||||||
|
Margin = new Thickness(3),
|
||||||
|
VerticalAlignment = VerticalAlignment.Center
|
||||||
|
};
|
||||||
|
|
||||||
|
stackPanel.Children.Add(speichernBtn);
|
||||||
|
stackPanel.Children.Add(abbrechenBtn);
|
||||||
|
Grid.SetRow(stackPanel, 2);
|
||||||
|
|
||||||
|
rootGrid2.Children.Add(stackPanel);
|
||||||
|
tbv.root.Header = string.Empty;
|
||||||
|
var window = new BeWoWindow(tbv) { Width = 514, Height = 400, rootGroupBox = { Header = "Textbausteine" } };
|
||||||
|
|
||||||
|
speichernBtn.Click += (o, args) =>
|
||||||
|
{
|
||||||
|
tbv.Focus();
|
||||||
|
if (x.IsDirty || x.VMList.Any(vm => vm.IsDirty))
|
||||||
|
tbv.Save(() => { textbausteineSearchView.ServiceCategoryOid = textbausteineSearchView.ServiceCategoryOid; });
|
||||||
|
|
||||||
|
window.Close();
|
||||||
|
};
|
||||||
|
|
||||||
|
abbrechenBtn.Click += (o, args) =>
|
||||||
|
{
|
||||||
|
tbv.Focus();
|
||||||
|
tbv.DoSaveCheck();
|
||||||
|
|
||||||
|
window.Close();
|
||||||
|
};
|
||||||
|
|
||||||
|
window.Show();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CustomRTFWindowArgs : EventArgs
|
||||||
|
{
|
||||||
|
private string _text;
|
||||||
|
private string _rtfText;
|
||||||
|
|
||||||
|
|
||||||
|
public CustomRTFWindowArgs(string txt, string rtfTxt)
|
||||||
|
{
|
||||||
|
_text = txt;
|
||||||
|
_rtfText = rtfTxt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Text
|
||||||
|
{
|
||||||
|
get { return _text; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public string RtfText
|
||||||
|
{
|
||||||
|
get { return _rtfText;}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
||||||
xmlns:security="clr-namespace:BeWo.Security"
|
xmlns:security="clr-namespace:BeWo.Security"
|
||||||
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
||||||
|
xmlns:dxr="http://schemas.devexpress.com/winfx/2008/xaml/ribbon"
|
||||||
Height="Auto" Width="Auto" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch">
|
Height="Auto" Width="Auto" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch">
|
||||||
<localView:BeWoView.Resources>
|
<localView:BeWoView.Resources>
|
||||||
|
|
||||||
@@ -861,7 +862,7 @@
|
|||||||
|
|
||||||
<TabControl Grid.Column="0" Grid.Row="11" Grid.RowSpan="1" Grid.ColumnSpan="2" >
|
<TabControl Grid.Column="0" Grid.Row="11" Grid.RowSpan="1" Grid.ColumnSpan="2" >
|
||||||
|
|
||||||
<TabItem Header="Notice1" IsSelected="True" x:Name="TabItem1_Notice">
|
<TabItem Header="Notice1" x:Name="TabItem1_Notice" >
|
||||||
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
@@ -894,7 +895,64 @@
|
|||||||
|
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice2" x:Name="TabItem2_Notice">
|
<!--Hier Hidden Tabitem for RTF Gedönse-->
|
||||||
|
|
||||||
|
<TabItem Header="RTF1" x:Name="TabitemRtf1Note" Visibility="Collapsed">
|
||||||
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!--increas font size muss vllt raus-->
|
||||||
|
<DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
|
||||||
|
<Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollBildDokuButton_OnClick" />
|
||||||
|
<Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
|
||||||
|
<Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF1" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
|
||||||
|
<Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRTF1" Content="Textbausteine" Click="ButtonBase_OnClick" />
|
||||||
|
|
||||||
|
<!--<dxre:RichEditControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>-->
|
||||||
|
<dxb:BarManager x:Name="barManager1" ToolbarGlyphSize="Small" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox1" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar1" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl1" BarManager="{Binding ElementName=barManager1, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
|
<!-- ##################################### -->
|
||||||
|
|
||||||
|
<TabItem Header="Notice2" x:Name="TabItem2_Notice" >
|
||||||
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
@@ -926,7 +984,63 @@
|
|||||||
|
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice3" x:Name="TabItem3_Notice">
|
<!--Hier Hidden Tabitem for RTF Gedönse-->
|
||||||
|
|
||||||
|
<TabItem Header="RTF2" x:Name="TabitemRtf2Note" Visibility="Collapsed">
|
||||||
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!--increas font size muss vllt raus-->
|
||||||
|
<DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
|
||||||
|
<Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollBildDokuButton_OnClick" />
|
||||||
|
<Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
|
||||||
|
<Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF2" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
|
||||||
|
<Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRTF2" Content="Textbausteine" Click="ButtonBase_OnClick" />
|
||||||
|
|
||||||
|
<!--<dxre:RichEditControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>-->
|
||||||
|
<dxb:BarManager x:Name="barManager2" ToolbarGlyphSize="Small" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox2" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar2" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl2" BarManager="{Binding ElementName=barManager2, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
<!--#####################################-->
|
||||||
|
|
||||||
|
<TabItem Header="Notice3" x:Name="TabItem3_Notice" >
|
||||||
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
@@ -955,9 +1069,64 @@
|
|||||||
HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
|
HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
|
||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice4" x:Name="TabItem4_Notice">
|
<!--Hier Hidden Tabitem for RTF Gedönse-->
|
||||||
|
<TabItem Header="RTF3" x:Name="TabitemRtf3Note" Visibility="Collapsed">
|
||||||
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!--increas font size muss vllt raus-->
|
||||||
|
<DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
|
||||||
|
<Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollBildDokuButton_OnClick" />
|
||||||
|
<Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
|
||||||
|
<Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF3" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
|
||||||
|
<Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRTF3" Content="Textbausteine" Click="ButtonBase_OnClick" />
|
||||||
|
|
||||||
|
<!--<dxre:RichEditControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>-->
|
||||||
|
<dxb:BarManager x:Name="barManager3" ToolbarGlyphSize="Small" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox3" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar3" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl3" BarManager="{Binding ElementName=barManager3, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
<!--#####################################-->
|
||||||
|
|
||||||
|
<TabItem Header="Notice4" x:Name="TabItem4_Notice" >
|
||||||
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
@@ -988,7 +1157,62 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="Notice5" x:Name="TabItem5_Notice">
|
<!--Hier Hidden Tabitem for RTF Gedönse-->
|
||||||
|
<TabItem Header="RTF4" x:Name="TabitemRtf4Note" Visibility="Collapsed">
|
||||||
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!--increas font size muss vllt raus-->
|
||||||
|
<DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
|
||||||
|
<Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollBildDokuButton_OnClick" />
|
||||||
|
<Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
|
||||||
|
<Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF4" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
|
||||||
|
<Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRTF4" Content="Textbausteine" Click="ButtonBase_OnClick" />
|
||||||
|
|
||||||
|
<!--<dxre:RichEditControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>-->
|
||||||
|
<dxb:BarManager x:Name="barManager4" ToolbarGlyphSize="Small" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox4" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar4" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl4" BarManager="{Binding ElementName=barManager4, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
<!--#####################################-->
|
||||||
|
|
||||||
|
<TabItem Header="Notice5" x:Name="TabItem5_Notice" >
|
||||||
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
@@ -1018,6 +1242,65 @@
|
|||||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
|
<!--Hier Hidden Tabitem for RTF Gedönse-->
|
||||||
|
<TabItem Header="RTF5" IsSelected="True" x:Name="TabitemRtf5Note" Visibility="Collapsed">
|
||||||
|
<Grid Margin="0" Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!--increas font size muss vllt raus-->
|
||||||
|
<DockPanel Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left">
|
||||||
|
<Button Margin="3" Content="1" FontFamily="Webdings" Click="RTFVollBildDokuButton_OnClick" />
|
||||||
|
<Button Margin="3" Content="A+" HorizontalAlignment="Center" Click="IncreaseFontSizeBtn_Click" />
|
||||||
|
<Button Margin="3" Content="A-" Click="DecreaseFontSizeBtn_Click" />
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Button Grid.Row="0" Grid.Column="1" Margin="3" x:Name="TextbausteineBearbeitenButtonRTF5" Content="@" FontFamily="Webdings" Click="EditTextbausteineClick" ToolTip="Textbausteine bearbeiten" />
|
||||||
|
<Button Grid.Row="0" Grid.Column="2" Margin="3" x:Name="TextbausteineButtonRTF5" Content="Textbausteine" Click="ButtonBase_OnClick" />
|
||||||
|
|
||||||
|
<!--<dxre:RichEditControl Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3"/>-->
|
||||||
|
<dxb:BarManager x:Name="barManager5" ToolbarGlyphSize="Small" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3">
|
||||||
|
<dxb:BarManager.Resources>
|
||||||
|
<dxre:RichEditUICommand x:Key="commands"/>
|
||||||
|
</dxb:BarManager.Resources>
|
||||||
|
<DockPanel>
|
||||||
|
<dxr:RibbonStatusBarControl DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
|
||||||
|
<dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomComboBox5" CategoryName="Format" Command="{Binding ViewZoomPercent, Mode=OneTime, Source={StaticResource commands}}" EditWidth="70">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxre:ZoomComboBoxEditSettings/>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
<dxb:BarEditItem x:Name="biZoomTrackBar5" Content="" CategoryName="Format" Command="{Binding ViewZoom, Mode=OneTime, Source={StaticResource commands}}" EditWidth="150">
|
||||||
|
<dxb:BarEditItem.EditSettings>
|
||||||
|
<dxe:TrackBarEditSettings LargeStep="0.1" Maximum="5.0" Minimum="0.1" SmallStep="0.1">
|
||||||
|
<dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
<dxe:TrackBarZoomStyleSettings/>
|
||||||
|
</dxe:TrackBarEditSettings.StyleSettings>
|
||||||
|
</dxe:TrackBarEditSettings>
|
||||||
|
</dxb:BarEditItem.EditSettings>
|
||||||
|
</dxb:BarEditItem>
|
||||||
|
</dxr:RibbonStatusBarControl.RightItems>
|
||||||
|
</dxr:RibbonStatusBarControl>
|
||||||
|
|
||||||
|
<dxre:RichEditControl x:Name="richEditControl5" BarManager="{Binding ElementName=barManager5, Mode=OneTime}" HorizontalAlignment="Stretch" Margin="0" VerticalAlignment="Stretch"/>
|
||||||
|
|
||||||
|
</DockPanel>
|
||||||
|
</dxb:BarManager>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
|
|
||||||
|
<!--#####################################-->
|
||||||
|
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ using DevExpress.Xpf.Core;
|
|||||||
using DevExpress.Xpf.Docking;
|
using DevExpress.Xpf.Docking;
|
||||||
using DevExpress.Xpf.Docking.Platform;
|
using DevExpress.Xpf.Docking.Platform;
|
||||||
using DevExpress.Xpf.Editors;
|
using DevExpress.Xpf.Editors;
|
||||||
|
using DevExpress.Xpf.RichEdit;
|
||||||
using DevExpress.XtraPrinting.Native;
|
using DevExpress.XtraPrinting.Native;
|
||||||
using DevExpress.XtraRichEdit;
|
using DevExpress.XtraRichEdit;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
@@ -261,7 +262,13 @@ namespace BeWo.View.Detail
|
|||||||
|
|
||||||
SetStatisticsVisibility();
|
SetStatisticsVisibility();
|
||||||
|
|
||||||
ConfigureDocTypes();
|
if(BeWoApp.AppSettings.ShowRtfTextfeld){
|
||||||
|
ConfigureRTFDocTypes();
|
||||||
|
SetRTFFontSizeFromApp();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
ConfigureDocTypes();
|
||||||
|
}
|
||||||
|
|
||||||
ConfigureEndDate();
|
ConfigureEndDate();
|
||||||
|
|
||||||
@@ -273,6 +280,16 @@ namespace BeWo.View.Detail
|
|||||||
//richEdit.ActiveViewType = RichEditViewType.Simple;
|
//richEdit.ActiveViewType = RichEditViewType.Simple;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetRTFFontSizeFromApp()
|
||||||
|
{
|
||||||
|
var size = BeWoApp.AppSettings.DocumentationFontSize;
|
||||||
|
richEditControl1.FontSize = size;
|
||||||
|
richEditControl2.FontSize = size;
|
||||||
|
richEditControl3.FontSize = size;
|
||||||
|
richEditControl4.FontSize = size;
|
||||||
|
richEditControl5.FontSize = size;
|
||||||
|
}
|
||||||
|
|
||||||
private void ConfigureEndDate() {
|
private void ConfigureEndDate() {
|
||||||
|
|
||||||
var Settings = BeWoApp.AppSettings;
|
var Settings = BeWoApp.AppSettings;
|
||||||
@@ -360,11 +377,136 @@ namespace BeWo.View.Detail
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ConfigureRTFDocTypes()
|
||||||
|
{
|
||||||
|
//hier der Aufruf für die RTF GEdönse
|
||||||
|
TabitemRtf1Note.IsSelected = true;
|
||||||
|
|
||||||
|
TabItem1_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem2_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem3_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem4_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
TabItem5_Notice.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
TabitemRtf1Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Visible;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Visible;
|
||||||
|
|
||||||
|
int i = _ViewModel.AllDocTypes.Count;
|
||||||
|
DokumentationLabel.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
TabitemRtf1Note.Header = "Dokumentation";
|
||||||
|
head_Doku1.Header = "Dokumentation";
|
||||||
|
DokumentationLabel.Content = "";
|
||||||
|
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
head_Doku2.Visible = false;
|
||||||
|
head_Doku3.Visible = false;
|
||||||
|
head_Doku4.Visible = false;
|
||||||
|
head_Doku5.Visible = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
//DokumentationLabel.Content = "Dokumentation";
|
||||||
|
TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
|
||||||
|
TabitemRtf2Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
head_Doku2.Visible = false;
|
||||||
|
head_Doku3.Visible = false;
|
||||||
|
head_Doku4.Visible = false;
|
||||||
|
head_Doku5.Visible = false;
|
||||||
|
}
|
||||||
|
else if (i == 2)
|
||||||
|
{
|
||||||
|
DokumentationLabel.Content = "Dokumentation";
|
||||||
|
TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
|
||||||
|
TabitemRtf3Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
head_Doku3.Visible = false;
|
||||||
|
head_Doku4.Visible = false;
|
||||||
|
head_Doku5.Visible = false;
|
||||||
|
}
|
||||||
|
else if (i == 3)
|
||||||
|
{
|
||||||
|
DokumentationLabel.Content = "Dokumentation";
|
||||||
|
TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf2Note.Header = _ViewModel.AllDocTypes[2].ToString();
|
||||||
|
head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
head_Doku3.Header = _ViewModel.AllDocTypes[2].ToString();
|
||||||
|
|
||||||
|
TabitemRtf4Note.Visibility = Visibility.Collapsed;
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
head_Doku4.Visible = false;
|
||||||
|
head_Doku5.Visible = false;
|
||||||
|
}
|
||||||
|
else if (i == 4)
|
||||||
|
{
|
||||||
|
DokumentationLabel.Content = "Dokumentation";
|
||||||
|
|
||||||
|
TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf3Note.Header = _ViewModel.AllDocTypes[2].ToString();
|
||||||
|
TabitemRtf4Note.Header = _ViewModel.AllDocTypes[3].ToString();
|
||||||
|
|
||||||
|
head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
head_Doku3.Header = _ViewModel.AllDocTypes[2].ToString();
|
||||||
|
head_Doku4.Header = _ViewModel.AllDocTypes[3].ToString();
|
||||||
|
|
||||||
|
TabitemRtf5Note.Visibility = Visibility.Collapsed;
|
||||||
|
|
||||||
|
head_Doku5.Visible = false;
|
||||||
|
}
|
||||||
|
else if (i == 5)
|
||||||
|
{
|
||||||
|
DokumentationLabel.Content = "Dokumentation";
|
||||||
|
|
||||||
|
TabitemRtf1Note.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
TabitemRtf2Note.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
TabitemRtf3Note.Header = _ViewModel.AllDocTypes[2].ToString();
|
||||||
|
TabitemRtf4Note.Header = _ViewModel.AllDocTypes[3].ToString();
|
||||||
|
TabitemRtf5Note.Header = _ViewModel.AllDocTypes[4].ToString();
|
||||||
|
|
||||||
|
head_Doku1.Header = _ViewModel.AllDocTypes[0].ToString();
|
||||||
|
head_Doku2.Header = _ViewModel.AllDocTypes[1].ToString();
|
||||||
|
head_Doku3.Header = _ViewModel.AllDocTypes[2].ToString();
|
||||||
|
head_Doku4.Header = _ViewModel.AllDocTypes[3].ToString();
|
||||||
|
head_Doku5.Header = _ViewModel.AllDocTypes[4].ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void ConfigureDocTypes()
|
private void ConfigureDocTypes()
|
||||||
{
|
{
|
||||||
|
TabItem1_Notice.IsSelected = true;
|
||||||
//Tabs und Tabelle
|
//Tabs und Tabelle
|
||||||
int i = _ViewModel.AllDocTypes.Count;
|
int i = _ViewModel.AllDocTypes.Count;
|
||||||
DokumentationLabel.Visibility = System.Windows.Visibility.Collapsed;
|
DokumentationLabel.Visibility = Visibility.Collapsed;
|
||||||
if(i == 0)
|
if(i == 0)
|
||||||
{
|
{
|
||||||
TabItem1_Notice.Header = "Dokumentation";
|
TabItem1_Notice.Header = "Dokumentation";
|
||||||
@@ -1793,6 +1935,10 @@ namespace BeWo.View.Detail
|
|||||||
{
|
{
|
||||||
//var lValid = ValidationTrigger.Validate(root, new Collection<string> { "BedarfsmedikationsGrid" });
|
//var lValid = ValidationTrigger.Validate(root, new Collection<string> { "BedarfsmedikationsGrid" });
|
||||||
|
|
||||||
|
if (BeWoApp.AppSettings.ShowRtfTextfeld) {
|
||||||
|
SetRTFDaten();
|
||||||
|
}
|
||||||
|
|
||||||
var lValid = ValidationTrigger.Validate(root);
|
var lValid = ValidationTrigger.Validate(root);
|
||||||
|
|
||||||
if (lValid)
|
if (lValid)
|
||||||
@@ -1817,6 +1963,36 @@ namespace BeWo.View.Detail
|
|||||||
return lValid;
|
return lValid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetRTFDaten()
|
||||||
|
{
|
||||||
|
|
||||||
|
if (richEditControl1.Text != "")
|
||||||
|
{
|
||||||
|
ViewModel.PrototypeVM.Notice = richEditControl1.Text;
|
||||||
|
ViewModel.PrototypeVM.RTFNotice = richEditControl1.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl2.Text != "")
|
||||||
|
{
|
||||||
|
ViewModel.PrototypeVM.Notice2 = richEditControl2.Text;
|
||||||
|
ViewModel.PrototypeVM.RTFNotice2 = richEditControl2.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl3.Text != "")
|
||||||
|
{
|
||||||
|
ViewModel.PrototypeVM.Notice3 = richEditControl3.Text;
|
||||||
|
ViewModel.PrototypeVM.RTFNotice3 = richEditControl3.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl4.Text != "")
|
||||||
|
{
|
||||||
|
ViewModel.PrototypeVM.Notice4 = richEditControl4.Text;
|
||||||
|
ViewModel.PrototypeVM.RTFNotice4 = richEditControl4.RtfText;
|
||||||
|
}
|
||||||
|
if (richEditControl5.Text != "")
|
||||||
|
{
|
||||||
|
ViewModel.PrototypeVM.Notice5 = richEditControl5.Text;
|
||||||
|
ViewModel.PrototypeVM.RTFNotice5 = richEditControl5.RtfText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void SetRebookingButtonVisibility()
|
private void SetRebookingButtonVisibility()
|
||||||
{
|
{
|
||||||
if (Eintragumbuchunsbutton == null)
|
if (Eintragumbuchunsbutton == null)
|
||||||
@@ -2955,9 +3131,9 @@ namespace BeWo.View.Detail
|
|||||||
|
|
||||||
private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs<TextbausteinDC> e)
|
private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs<TextbausteinDC> e)
|
||||||
{
|
{
|
||||||
|
#region Tabitems
|
||||||
if (TabItem1_Notice.IsSelected)
|
if (TabItem1_Notice.IsSelected)
|
||||||
{
|
{
|
||||||
|
|
||||||
var caretIndex = dokumentationsTextBox.CaretIndex;
|
var caretIndex = dokumentationsTextBox.CaretIndex;
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(dokumentationsTextBox.Text))
|
if (string.IsNullOrEmpty(dokumentationsTextBox.Text))
|
||||||
@@ -3201,6 +3377,205 @@ namespace BeWo.View.Detail
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region RTFTabItems
|
||||||
|
if (TabitemRtf1Note.IsSelected)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(richEditControl1.Text))
|
||||||
|
{
|
||||||
|
richEditControl1.Text = e.Data.Text;
|
||||||
|
richEditControl1.Document.CaretPosition = richEditControl1.Document.Range.End;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (richEditControl1.Document.CaretPosition.ToInt() == 0)
|
||||||
|
{
|
||||||
|
richEditControl1.Text = e.Data.Text + richEditControl1.Text;
|
||||||
|
}
|
||||||
|
else if (richEditControl1.Document.CaretPosition == richEditControl1.Document.Range.End)
|
||||||
|
{
|
||||||
|
richEditControl1.Text = richEditControl1.Text + e.Data.Text;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var anzahlLeerzeichen = richEditControl1.Document.CaretPosition.ToInt() - richEditControl1.Text.Length;
|
||||||
|
|
||||||
|
var leerzeichen = String.Empty;
|
||||||
|
for (var i = 0; i < anzahlLeerzeichen; i++)
|
||||||
|
{
|
||||||
|
leerzeichen += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
var start = richEditControl1.Text.Substring(0, (richEditControl1.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
var ende = richEditControl1.Text.Substring((richEditControl1.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
|
||||||
|
richEditControl1.Text = start + leerzeichen + e.Data.Text + ende;
|
||||||
|
}
|
||||||
|
|
||||||
|
richEditControl1.Document.CaretPosition = richEditControl1.Document.Range.End;
|
||||||
|
|
||||||
|
popup_textbausteine.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TabitemRtf2Note.IsSelected)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(richEditControl2.Text))
|
||||||
|
{
|
||||||
|
richEditControl2.Text = e.Data.Text;
|
||||||
|
richEditControl2.Document.CaretPosition = richEditControl1.Document.Range.End;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (richEditControl2.Document.CaretPosition.ToInt() == 0)
|
||||||
|
{
|
||||||
|
richEditControl2.Text = e.Data.Text + richEditControl2.Text;
|
||||||
|
}
|
||||||
|
else if (richEditControl2.Document.CaretPosition == richEditControl2.Document.Range.End)
|
||||||
|
{
|
||||||
|
richEditControl2.Text = richEditControl2.Text + e.Data.Text;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var anzahlLeerzeichen = richEditControl2.Document.CaretPosition.ToInt() - richEditControl2.Text.Length;
|
||||||
|
|
||||||
|
var leerzeichen = String.Empty;
|
||||||
|
for (var i = 0; i < anzahlLeerzeichen; i++)
|
||||||
|
{
|
||||||
|
leerzeichen += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
var start = richEditControl2.Text.Substring(0, (richEditControl2.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
var ende = richEditControl2.Text.Substring((richEditControl2.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
|
||||||
|
richEditControl2.Text = start + leerzeichen + e.Data.Text + ende;
|
||||||
|
}
|
||||||
|
|
||||||
|
richEditControl2.Document.CaretPosition = richEditControl2.Document.Range.End;
|
||||||
|
|
||||||
|
popup_textbausteine.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TabitemRtf3Note.IsSelected)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(richEditControl3.Text))
|
||||||
|
{
|
||||||
|
richEditControl3.Text = e.Data.Text;
|
||||||
|
richEditControl3.Document.CaretPosition = richEditControl3.Document.Range.End;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (richEditControl3.Document.CaretPosition.ToInt() == 0)
|
||||||
|
{
|
||||||
|
richEditControl3.Text = e.Data.Text + richEditControl1.Text;
|
||||||
|
}
|
||||||
|
else if (richEditControl3.Document.CaretPosition == richEditControl3.Document.Range.End)
|
||||||
|
{
|
||||||
|
richEditControl3.Text = richEditControl3.Text + e.Data.Text;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var anzahlLeerzeichen = richEditControl3.Document.CaretPosition.ToInt() - richEditControl3.Text.Length;
|
||||||
|
|
||||||
|
var leerzeichen = String.Empty;
|
||||||
|
for (var i = 0; i < anzahlLeerzeichen; i++)
|
||||||
|
{
|
||||||
|
leerzeichen += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
var start = richEditControl3.Text.Substring(0, (richEditControl3.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
var ende = richEditControl3.Text.Substring((richEditControl3.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
|
||||||
|
richEditControl3.Text = start + leerzeichen + e.Data.Text + ende;
|
||||||
|
}
|
||||||
|
|
||||||
|
richEditControl3.Document.CaretPosition = richEditControl3.Document.Range.End;
|
||||||
|
|
||||||
|
popup_textbausteine.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TabitemRtf4Note.IsSelected)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(richEditControl4.Text))
|
||||||
|
{
|
||||||
|
richEditControl4.Text = e.Data.Text;
|
||||||
|
richEditControl4.Document.CaretPosition = richEditControl4.Document.Range.End;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (richEditControl4.Document.CaretPosition.ToInt() == 0)
|
||||||
|
{
|
||||||
|
richEditControl4.Text = e.Data.Text + richEditControl1.Text;
|
||||||
|
}
|
||||||
|
else if (richEditControl4.Document.CaretPosition == richEditControl4.Document.Range.End)
|
||||||
|
{
|
||||||
|
richEditControl4.Text = richEditControl4.Text + e.Data.Text;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var anzahlLeerzeichen = richEditControl4.Document.CaretPosition.ToInt() - richEditControl4.Text.Length;
|
||||||
|
|
||||||
|
var leerzeichen = String.Empty;
|
||||||
|
for (var i = 0; i < anzahlLeerzeichen; i++)
|
||||||
|
{
|
||||||
|
leerzeichen += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
var start = richEditControl4.Text.Substring(0, (richEditControl4.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
var ende = richEditControl4.Text.Substring((richEditControl4.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
|
||||||
|
richEditControl4.Text = start + leerzeichen + e.Data.Text + ende;
|
||||||
|
}
|
||||||
|
|
||||||
|
richEditControl4.Document.CaretPosition = richEditControl4.Document.Range.End;
|
||||||
|
|
||||||
|
popup_textbausteine.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (TabitemRtf5Note.IsSelected)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(richEditControl5.Text))
|
||||||
|
{
|
||||||
|
richEditControl5.Text = e.Data.Text;
|
||||||
|
richEditControl5.Document.CaretPosition = richEditControl5.Document.Range.End;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (richEditControl5.Document.CaretPosition.ToInt() == 0)
|
||||||
|
{
|
||||||
|
richEditControl5.Text = e.Data.Text + richEditControl5.Text;
|
||||||
|
}
|
||||||
|
else if (richEditControl5.Document.CaretPosition == richEditControl5.Document.Range.End)
|
||||||
|
{
|
||||||
|
richEditControl5.Text = richEditControl5.Text + e.Data.Text;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var anzahlLeerzeichen = richEditControl5.Document.CaretPosition.ToInt() - richEditControl5.Text.Length;
|
||||||
|
|
||||||
|
var leerzeichen = String.Empty;
|
||||||
|
for (var i = 0; i < anzahlLeerzeichen; i++)
|
||||||
|
{
|
||||||
|
leerzeichen += " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
var start = richEditControl5.Text.Substring(0, (richEditControl5.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
var ende = richEditControl5.Text.Substring((richEditControl5.Document.CaretPosition.ToInt() - anzahlLeerzeichen));
|
||||||
|
|
||||||
|
richEditControl5.Text = start + leerzeichen + e.Data.Text + ende;
|
||||||
|
}
|
||||||
|
|
||||||
|
richEditControl5.Document.CaretPosition = richEditControl5.Document.Range.End;
|
||||||
|
|
||||||
|
popup_textbausteine.IsOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Combobox_category_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
|
private void Combobox_category_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
@@ -3367,41 +3742,63 @@ namespace BeWo.View.Detail
|
|||||||
|
|
||||||
private void IncreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
|
private void IncreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
dokumentationsTextBox.FontSize++;
|
if (BeWoApp.AppSettings.ShowRtfTextfeld)
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
|
{
|
||||||
|
richEditControl1.FontSize++;
|
||||||
|
richEditControl2.FontSize++;
|
||||||
|
richEditControl3.FontSize++;
|
||||||
|
richEditControl4.FontSize++;
|
||||||
|
richEditControl5.FontSize++;
|
||||||
|
|
||||||
//für notize 2-5
|
BeWoApp.AppSettings.DocumentationFontSize = richEditControl1.FontSize;
|
||||||
dokumentationsTextBox2.FontSize++;
|
}
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox2.FontSize;
|
else
|
||||||
dokumentationsTextBox3.FontSize++;
|
{
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox3.FontSize;
|
dokumentationsTextBox.FontSize++;
|
||||||
dokumentationsTextBox4.FontSize++;
|
dokumentationsTextBox2.FontSize++;
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox4.FontSize;
|
dokumentationsTextBox3.FontSize++;
|
||||||
dokumentationsTextBox5.FontSize++;
|
dokumentationsTextBox4.FontSize++;
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox5.FontSize;
|
dokumentationsTextBox5.FontSize++;
|
||||||
|
|
||||||
|
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DecreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
|
private void DecreaseFontSizeBtn_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (dokumentationsTextBox.FontSize <= 1 || dokumentationsTextBox2.FontSize <= 1 || dokumentationsTextBox3.FontSize <= 1 ||
|
if (BeWoApp.AppSettings.ShowRtfTextfeld)
|
||||||
dokumentationsTextBox4.FontSize <= 1 || dokumentationsTextBox5.FontSize <= 1)
|
|
||||||
{
|
{
|
||||||
return;
|
if (richEditControl1.FontSize <= 1 || richEditControl2.FontSize <= 1 || richEditControl3.FontSize <= 1 ||
|
||||||
}
|
richEditControl4.FontSize <= 1 || richEditControl5.FontSize <= 1)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
dokumentationsTextBox.FontSize--;
|
richEditControl1.FontSize++;
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
|
richEditControl2.FontSize++;
|
||||||
dokumentationsTextBox2.FontSize--;
|
richEditControl3.FontSize++;
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox2.FontSize;
|
richEditControl4.FontSize++;
|
||||||
dokumentationsTextBox3.FontSize--;
|
richEditControl5.FontSize++;
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox3.FontSize;
|
|
||||||
dokumentationsTextBox4.FontSize--;
|
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox4.FontSize;
|
|
||||||
dokumentationsTextBox5.FontSize--;
|
|
||||||
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox5.FontSize;
|
|
||||||
|
|
||||||
|
BeWoApp.AppSettings.DocumentationFontSize = richEditControl1.FontSize;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (dokumentationsTextBox.FontSize <= 1 || dokumentationsTextBox2.FontSize <= 1 || dokumentationsTextBox3.FontSize <= 1 ||
|
||||||
|
dokumentationsTextBox4.FontSize <= 1 || dokumentationsTextBox5.FontSize <= 1)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
dokumentationsTextBox.FontSize--;
|
||||||
|
dokumentationsTextBox2.FontSize--;
|
||||||
|
dokumentationsTextBox3.FontSize--;
|
||||||
|
dokumentationsTextBox4.FontSize--;
|
||||||
|
dokumentationsTextBox5.FontSize--;
|
||||||
|
|
||||||
|
BeWoApp.AppSettings.DocumentationFontSize = dokumentationsTextBox.FontSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//private void ZeitraumauswahlwechselBtn_Click(object sender, RoutedEventArgs e)
|
//private void ZeitraumauswahlwechselBtn_Click(object sender, RoutedEventArgs e)
|
||||||
//{
|
//{
|
||||||
@@ -3782,7 +4179,88 @@ namespace BeWo.View.Detail
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private ServiceRecordRTFWindowView _rtfWindowView;
|
||||||
|
|
||||||
|
private void RTFVollBildDokuButton_OnClick(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
string stringtheorie = "";
|
||||||
|
string rtfStringTheorie = "";
|
||||||
|
|
||||||
|
if (TabitemRtf1Note.IsSelected)
|
||||||
|
{
|
||||||
|
stringtheorie = richEditControl1.Text;
|
||||||
|
rtfStringTheorie = richEditControl1.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf2Note.IsSelected)
|
||||||
|
{
|
||||||
|
stringtheorie = richEditControl2.Text;
|
||||||
|
rtfStringTheorie = richEditControl2.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf3Note.IsSelected)
|
||||||
|
{
|
||||||
|
stringtheorie = richEditControl3.Text;
|
||||||
|
rtfStringTheorie = richEditControl3.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf4Note.IsSelected)
|
||||||
|
{
|
||||||
|
stringtheorie = richEditControl4.Text;
|
||||||
|
rtfStringTheorie = richEditControl4.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf5Note.IsSelected)
|
||||||
|
{
|
||||||
|
stringtheorie = richEditControl5.Text;
|
||||||
|
rtfStringTheorie = richEditControl5.RtfText;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if (_rtfWindowView == null)
|
||||||
|
{
|
||||||
|
_rtfWindowView = new ServiceRecordRTFWindowView("Dokumentation", stringtheorie, rtfStringTheorie);
|
||||||
|
|
||||||
|
_rtfWindowView.RaiseCustomEvent += new EventHandler<CustomRTFWindowArgs>(NewWindow_RaiseRTFEvent);
|
||||||
|
_rtfWindowView.ShowDialog();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_rtfWindowView.Close();
|
||||||
|
_rtfWindowView = new ServiceRecordRTFWindowView("Dokumentation", stringtheorie, rtfStringTheorie);
|
||||||
|
|
||||||
|
_rtfWindowView.RaiseCustomEvent += new EventHandler<CustomRTFWindowArgs>(NewWindow_RaiseRTFEvent);
|
||||||
|
_rtfWindowView.ShowDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NewWindow_RaiseRTFEvent(object sender, CustomRTFWindowArgs e)
|
||||||
|
{
|
||||||
|
if (TabitemRtf1Note.IsSelected)
|
||||||
|
{
|
||||||
|
richEditControl1.Text = e.Text;
|
||||||
|
richEditControl1.RtfText = e.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf2Note.IsSelected)
|
||||||
|
{
|
||||||
|
richEditControl2.Text = e.Text;
|
||||||
|
richEditControl2.RtfText = e.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf3Note.IsSelected)
|
||||||
|
{
|
||||||
|
richEditControl3.Text = e.Text;
|
||||||
|
richEditControl3.RtfText = e.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf4Note.IsSelected)
|
||||||
|
{
|
||||||
|
richEditControl4.Text = e.Text;
|
||||||
|
richEditControl4.RtfText = e.RtfText;
|
||||||
|
}
|
||||||
|
else if (TabitemRtf5Note.IsSelected)
|
||||||
|
{
|
||||||
|
richEditControl5.Text = e.Text;
|
||||||
|
richEditControl5.RtfText = e.RtfText;
|
||||||
|
}
|
||||||
|
|
||||||
|
_rtfWindowView.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Bedarfsmedikation
|
// Bedarfsmedikation
|
||||||
@@ -4117,5 +4595,7 @@ namespace BeWo.View.Detail
|
|||||||
BeWoApp.SaveAppSettings();
|
BeWoApp.SaveAppSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View"
|
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:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||||
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2"
|
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
|
||||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch" Focusable="True">
|
VerticalAlignment="Stretch" Focusable="True">
|
||||||
|
|||||||
@@ -12,9 +12,9 @@
|
|||||||
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
|
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
|
||||||
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
|
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
|
||||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v12.1"
|
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1"
|
||||||
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
|
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
|
||||||
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v12.1.Core"
|
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v17.1.Core"
|
||||||
xmlns:converter="clr-namespace:BeWo.Converter"
|
xmlns:converter="clr-namespace:BeWo.Converter"
|
||||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
|
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
|
||||||
<localView:BeWoView.Resources>
|
<localView:BeWoView.Resources>
|
||||||
@@ -62,7 +62,8 @@
|
|||||||
Margin="0,0,0,0"
|
Margin="0,0,0,0"
|
||||||
x:Name="path2"
|
x:Name="path2"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
Fill="#FF555555">
|
Fill="#FF555555"
|
||||||
|
>
|
||||||
</Path>
|
</Path>
|
||||||
<Path Stretch="Fill"
|
<Path Stretch="Fill"
|
||||||
Fill="#FF555555"
|
Fill="#FF555555"
|
||||||
@@ -124,38 +125,39 @@
|
|||||||
<Border x:Name="glyph" Background="#00FFFEFE" Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center">
|
<Border x:Name="glyph" Background="#00FFFEFE" Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
<Grid Width="10" Height="9" Margin="0,1,0,0">
|
<Grid Width="10" Height="9" Margin="0,1,0,0">
|
||||||
<Path Stretch="Fill"
|
<Path Stretch="Fill"
|
||||||
Fill="#FF555555"
|
Fill="#FF555555"
|
||||||
x:Name="path"
|
x:Name="path"
|
||||||
Data="F1 M 1142,761.001L 1150,761.001L 1150,766L 1142,766L 1142,761.001 Z M 1143,763.001L 1143,765L 1149,765L 1149,763.001L 1143,763.001 Z "
|
Data="F1 M 1142,761.001L 1150,761.001L 1150,766L 1142,766L 1142,761.001 Z M 1143,763.001L 1143,765L 1149,765L 1149,763.001L 1143,763.001 Z "
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Margin="2,0.001,0,3.999"
|
Margin="2,0.001,0,3.999"
|
||||||
VerticalAlignment="Stretch">
|
|
||||||
</Path>
|
|
||||||
<Path Stretch="Fill"
|
|
||||||
Fill="#FF555555"
|
|
||||||
x:Name="path3"
|
|
||||||
Data="F1 M 1140,764.001L 1148,764L 1148,769L 1140,769.001L 1140,764.001 Z M 1141,766L 1141,768.001L 1147,768L 1147,766L 1141,766 Z "
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
Margin="0,3,2,1"
|
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
>
|
>
|
||||||
</Path>
|
</Path>
|
||||||
<Path Stretch="Fill"
|
<Path Stretch="Fill"
|
||||||
Fill="#FF555555"
|
Fill="#FF555555"
|
||||||
x:Name="path1"
|
x:Name="path3"
|
||||||
|
Data="F1 M 1140,764.001L 1148,764L 1148,769L 1140,769.001L 1140,764.001 Z M 1141,766L 1141,768.001L 1147,768L 1147,766L 1141,766 Z "
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
Margin="0,3,2,1"
|
||||||
|
VerticalAlignment="Stretch"
|
||||||
|
>
|
||||||
|
</Path>
|
||||||
|
<Path Stretch="Fill"
|
||||||
|
Fill="#FF555555"
|
||||||
|
x:Name="path1"
|
||||||
Data="F1 M 1142,761L 1150,761L 1150,762L 1142,762L 1142,761 Z "
|
Data="F1 M 1142,761L 1150,761L 1150,762L 1142,762L 1142,761 Z "
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Margin="2,0,0,0"
|
Margin="2,0,0,0"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Height="1" />
|
Height="1" />
|
||||||
<Path Stretch="Fill"
|
<Path Stretch="Fill"
|
||||||
x:Name="path6"
|
x:Name="path6"
|
||||||
Fill="#FF555555"
|
Fill="#FF555555"
|
||||||
Data="F1 M 1140,764L 1148,764L 1148,765L 1140,765L 1140,764 Z "
|
Data="F1 M 1140,764L 1148,764L 1148,765L 1140,765L 1140,764 Z "
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Margin="0,3,2,0"
|
Margin="0,3,2,0"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Height="1" />
|
Height="1" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -222,7 +224,7 @@
|
|||||||
<Style x:Key="customCellStyle"
|
<Style x:Key="customCellStyle"
|
||||||
BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=CellStyle}}"
|
BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=CellStyle}}"
|
||||||
TargetType="grid:CellContentPresenter">
|
TargetType="grid:CellContentPresenter">
|
||||||
<Setter Property="Background" >
|
<Setter Property="Background">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<MultiBinding Converter="{converter:CellColorConverter}">
|
<MultiBinding Converter="{converter:CellColorConverter}">
|
||||||
<Binding />
|
<Binding />
|
||||||
@@ -271,7 +273,7 @@
|
|||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,3,0,0" Grid.Column="1" Visibility="Collapsed" >
|
<StackPanel Orientation="Horizontal" Margin="0,3,0,0" Grid.Column="1" Visibility="Collapsed">
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid x:Name="customerSelectAndInfoGrid" Grid.Row="1" Grid.Column="1" Margin="0,3,0,0">
|
<Grid x:Name="customerSelectAndInfoGrid" Grid.Row="1" Grid.Column="1" Margin="0,3,0,0">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -344,7 +346,7 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
<Grid x:Name="GroupSelectionGrid" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" Margin="0,10,0,0">
|
<Grid x:Name="GroupSelectionGrid" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="5" Margin="0,10,0,0">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<localViewControls:MultiEmployeeSelectionControl Margin="5,3,0,0" Grid.Row="0"
|
<localViewControls:MultiEmployeeSelectionControl Margin="5,3,0,0" Grid.Row="0"
|
||||||
@@ -357,35 +359,35 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
<Button x:Name="button_ADadd" Click="button_ADadd_Click" FontWeight="Normal"
|
<Button x:Name="button_ADadd" Click="button_ADadd_Click" FontWeight="Normal"
|
||||||
Grid.Column="1" Grid.Row="6" Content="Buchen" Height="23"
|
Grid.Column="1" Grid.Row="6" Content="Buchen" Height="23"
|
||||||
BorderThickness="3" Margin="4" HorizontalAlignment="Right" />
|
BorderThickness="3" Margin="4" HorizontalAlignment="Right" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid x:Name="KalenderGrid" Grid.Row="2" Grid.Column="1" Margin="10,10,0,0">
|
<Grid x:Name="KalenderGrid" Grid.Row="2" Grid.Column="1" Margin="10,10,0,0">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*" />
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid Grid.Row="0">
|
<Grid Grid.Row="0">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button x:Name="FLSAnlegenBtn" Content="FLS anlegen" Grid.Column="0" Click="FLSAnlegenBtn_OnClick" />
|
<Button x:Name="FLSAnlegenBtn" Content="FLS anlegen" Grid.Column="0" Click="FLSAnlegenBtn_OnClick" />
|
||||||
<Label x:Name="MonatsLabel" Content="Monat" Grid.Column="1"/>
|
<Label x:Name="MonatsLabel" Content="Monat" Grid.Column="1" />
|
||||||
<ComboBox x:Name="MonatsCombobox" Grid.Column="2" MinWidth="90" ItemsSource="{Binding Source={StaticResource Monat}}" SelectedItem="{Binding Path=SelectedMonth}"/>
|
<ComboBox x:Name="MonatsCombobox" Grid.Column="2" MinWidth="90" ItemsSource="{Binding Source={StaticResource Monat}}" SelectedItem="{Binding Path=SelectedMonth}" />
|
||||||
<Label x:Name="JahresLabel" Content="Jahr" Grid.Column="3"/>
|
<Label x:Name="JahresLabel" Content="Jahr" Grid.Column="3" />
|
||||||
<ComboBox x:Name="JahresCombobox" Grid.Column="4" MinWidth="75" ItemsSource="{Binding Path=Years}" SelectedItem="{Binding Path=SelectedYear}"/>
|
<ComboBox x:Name="JahresCombobox" Grid.Column="4" MinWidth="75" ItemsSource="{Binding Path=Years}" SelectedItem="{Binding Path=SelectedYear}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="1" x:Name="P" Margin="0,5,0,0">
|
<Grid Grid.Row="1" x:Name="P" Margin="0,5,0,0">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid Grid.Row="0" VerticalAlignment="Top" Grid.Column="2" x:Name="FLSInfoGrid" Visibility="Collapsed">
|
<Grid Grid.Row="0" VerticalAlignment="Top" Grid.Column="2" x:Name="FLSInfoGrid" Visibility="Collapsed">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -402,7 +404,7 @@
|
|||||||
<TextBlock Margin="10 0 0 0" Grid.Column="2" Text="{Binding Path=FLSInformationStringContent,Mode=OneWay}"
|
<TextBlock Margin="10 0 0 0" Grid.Column="2" Text="{Binding Path=FLSInformationStringContent,Mode=OneWay}"
|
||||||
Foreground="{DynamicResource BigInfoTextBrush}" FontSize="14" />
|
Foreground="{DynamicResource BigInfoTextBrush}" FontSize="14" />
|
||||||
<StackPanel Grid.Column="3" Orientation="Horizontal" Visibility="{Binding Path=IsCustomerWarningActive, Converter={StaticResource BoolVisibilityConverter}}" VerticalAlignment="Top" Margin="8,-3,0,0">
|
<StackPanel Grid.Column="3" Orientation="Horizontal" Visibility="{Binding Path=IsCustomerWarningActive, Converter={StaticResource BoolVisibilityConverter}}" VerticalAlignment="Top" Margin="8,-3,0,0">
|
||||||
<Button Content="I" HorizontalAlignment="Left" Style="{DynamicResource WarningButton}" >
|
<Button Content="I" HorizontalAlignment="Left" Style="{DynamicResource WarningButton}">
|
||||||
<Button.ToolTip>
|
<Button.ToolTip>
|
||||||
<TextBlock Text="{Binding Path=CustomerWarning}" />
|
<TextBlock Text="{Binding Path=CustomerWarning}" />
|
||||||
</Button.ToolTip>
|
</Button.ToolTip>
|
||||||
@@ -484,7 +486,7 @@
|
|||||||
<TreeView.Resources>
|
<TreeView.Resources>
|
||||||
<Style x:Key="goal_treeitemstyle" TargetType="TreeViewItem">
|
<Style x:Key="goal_treeitemstyle" TargetType="TreeViewItem">
|
||||||
<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
|
<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Left"/>
|
<Setter Property="HorizontalContentAlignment" Value="Left" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="TreeViewItem">
|
<ControlTemplate TargetType="TreeViewItem">
|
||||||
@@ -493,21 +495,21 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Expander Name="ExpanderParent" IsExpanded="True">
|
<Expander Name="ExpanderParent" IsExpanded="True">
|
||||||
<Expander.Header>
|
<Expander.Header>
|
||||||
<ContentPresenter ContentSource="Header"
|
<ContentPresenter ContentSource="Header"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Visibility="Visible"/>
|
Visibility="Visible" />
|
||||||
</Expander.Header>
|
</Expander.Header>
|
||||||
<ItemsPresenter Margin="8,0,0,0"/>
|
<ItemsPresenter Margin="8,0,0,0" />
|
||||||
</Expander>
|
</Expander>
|
||||||
<ContentPresenter Name="CntPresChildren" ContentSource="Header"
|
<ContentPresenter Name="CntPresChildren" ContentSource="Header"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Visibility="Collapsed"/>
|
Visibility="Collapsed" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<!-- If the TreeViewItem has child items,
|
<!-- If the TreeViewItem has child items,
|
||||||
@@ -527,7 +529,7 @@
|
|||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
<HierarchicalDataTemplate x:Key="goal_treeitemtemplate" DataType="{x:Type shared:SupportConceptGoalDC}" ItemsSource="{Binding Path=Children}" >
|
<HierarchicalDataTemplate x:Key="goal_treeitemtemplate" DataType="{x:Type shared:SupportConceptGoalDC}" ItemsSource="{Binding Path=Children}">
|
||||||
<Grid HorizontalAlignment="Left">
|
<Grid HorizontalAlignment="Left">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
@@ -537,7 +539,7 @@
|
|||||||
Visibility="{Binding Path=HasParent, Converter={StaticResource BoolVisibilityConverter}}"
|
Visibility="{Binding Path=HasParent, Converter={StaticResource BoolVisibilityConverter}}"
|
||||||
Grid.Column="0" Margin="3 2" VerticalAlignment="Center" />
|
Grid.Column="0" Margin="3 2" VerticalAlignment="Center" />
|
||||||
<TextBlock x:Name="BdText" Tag="{Binding}" Grid.Column="1" Margin="3 2"
|
<TextBlock x:Name="BdText" Tag="{Binding}" Grid.Column="1" Margin="3 2"
|
||||||
Text="{Binding Path=Name}" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black" TextAlignment="Left"/>
|
Text="{Binding Path=Name}" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black" TextAlignment="Left" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</HierarchicalDataTemplate>
|
</HierarchicalDataTemplate>
|
||||||
</TreeView.Resources>
|
</TreeView.Resources>
|
||||||
@@ -565,11 +567,11 @@
|
|||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="60" />
|
<ColumnDefinition Width="60" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
|
<dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
|
||||||
EditValue="{Binding Mode=TwoWay, Path=PrototypeVM.StartTimeEditString, UpdateSourceTrigger=PropertyChanged}"
|
EditValue="{Binding Mode=TwoWay, Path=PrototypeVM.StartTimeEditString, UpdateSourceTrigger=PropertyChanged}"
|
||||||
x:Name="startTime" Height="23" Margin="3,0,3,3"/>
|
x:Name="startTime" Height="23" Margin="3,0,3,3" />
|
||||||
<Label Grid.Column="1" Content="Endzeit" />
|
<Label Grid.Column="1" Content="Endzeit" />
|
||||||
<dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
|
<dxe:TextEdit MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
|
||||||
EditValue="{Binding Mode=TwoWay, Path=PrototypeVM.EndTimeEditString, UpdateSourceTrigger=PropertyChanged}"
|
EditValue="{Binding Mode=TwoWay, Path=PrototypeVM.EndTimeEditString, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Grid.Column="2" x:Name="endTime" Height="23" Margin="3,0,3,3" />
|
Grid.Column="2" x:Name="endTime" Height="23" Margin="3,0,3,3" />
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -582,9 +584,9 @@
|
|||||||
<Label Content="Dauer (min)" Grid.Column="1" />
|
<Label Content="Dauer (min)" Grid.Column="1" />
|
||||||
<dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration"
|
<dxe:SpinEdit MinValue="0" Increment="5" IsFloatValue="False" AllowNullInput="False" x:Name="numerictb_duration"
|
||||||
EditValue="{Binding Path=PrototypeVM.Duration, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
|
EditValue="{Binding Path=PrototypeVM.Duration, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Grid.Column="2" Height="23" Margin="3,0,3,3"/>
|
Grid.Column="2" Height="23" Margin="3,0,3,3" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" MaxWidth="320" HorizontalAlignment="Left" Visibility="Collapsed" >
|
<StackPanel Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" MaxWidth="320" HorizontalAlignment="Left" Visibility="Collapsed">
|
||||||
<Label Content="{Binding Path=PrototypeVM.Date, Converter={StaticResource Date2CalendarWeekStringConverter}}" />
|
<Label Content="{Binding Path=PrototypeVM.Date, Converter={StaticResource Date2CalendarWeekStringConverter}}" />
|
||||||
<WrapPanel x:Name="wrapPanel_days" />
|
<WrapPanel x:Name="wrapPanel_days" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
@@ -608,7 +610,7 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</GroupBox>
|
</GroupBox>
|
||||||
<Grid x:Name="serviceRecordListContent" Margin="0,0,0,25" Grid.Column="2" Grid.Row="0" MinWidth="300" >
|
<Grid x:Name="serviceRecordListContent" Margin="0,0,0,25" Grid.Column="2" Grid.Row="0" MinWidth="300">
|
||||||
<ListBox x:Name="srListBox" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True"
|
<ListBox x:Name="srListBox" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True"
|
||||||
AlternationCount="-1" Background="{x:Null}" MouseDoubleClick="serviceRecordListBox_MouseDoubleClick"
|
AlternationCount="-1" Background="{x:Null}" MouseDoubleClick="serviceRecordListBox_MouseDoubleClick"
|
||||||
ItemTemplate="{DynamicResource serviceRecordListBoxItemTemplate}" Style="{DynamicResource ServiceRecordListStyle}"
|
ItemTemplate="{DynamicResource serviceRecordListBoxItemTemplate}" Style="{DynamicResource ServiceRecordListStyle}"
|
||||||
@@ -652,20 +654,22 @@
|
|||||||
MaxHeight="200" TextWrapping="Wrap" AutoWordSelection="True" IsReadOnly="True" GotFocus="TextBox_GotFocus" Tag="{Binding}"
|
MaxHeight="200" TextWrapping="Wrap" AutoWordSelection="True" IsReadOnly="True" GotFocus="TextBox_GotFocus" Tag="{Binding}"
|
||||||
IsEnabled="True" Focusable="True" />
|
IsEnabled="True" Focusable="True" />
|
||||||
<StackPanel Orientation="Horizontal" Grid.Column="2" Grid.ColumnSpan="3" Grid.Row="6" Margin="0,7,0,0">
|
<StackPanel Orientation="Horizontal" Grid.Column="2" Grid.ColumnSpan="3" Grid.Row="6" Margin="0,7,0,0">
|
||||||
<TextBlock Text="Ziele:" Visibility="{Binding Path=HasGoals, Converter={StaticResource BoolVisibilityConverter}}"/>
|
<TextBlock Text="Ziele:" Visibility="{Binding Path=HasGoals, Converter={StaticResource BoolVisibilityConverter}}" />
|
||||||
<TextBlock Text="{Binding Path=GoalString}" Margin="3,0,3,0" ToolTip="{Binding Path=GoalString}"/>
|
<TextBlock Text="{Binding Path=GoalString}" Margin="3,0,3,0" ToolTip="{Binding Path=GoalString}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Button x:Name="btnEdit" Grid.Column="0" Grid.Row="6" Width="32"
|
<Button x:Name="btnEdit" Grid.Column="0" Grid.Row="6" Width="32"
|
||||||
Height="22" HorizontalAlignment="Left" Margin="0,0,0,0"
|
Height="22" HorizontalAlignment="Left" Margin="0,0,0,0"
|
||||||
BorderThickness="1,1,1,1" Padding="1,1,1,1"
|
BorderThickness="1,1,1,1"
|
||||||
|
Padding="1,1,1,1"
|
||||||
Click="btnEdit_Click" Style="{DynamicResource GlassButton}"
|
Click="btnEdit_Click" Style="{DynamicResource GlassButton}"
|
||||||
Tag="{Binding}" Visibility="{Binding Path=EditAllowed, Converter={StaticResource BoolVisibilityConverter}}">
|
Tag="{Binding}" Visibility="{Binding Path=EditAllowed, Converter={StaticResource BoolVisibilityConverter}}">
|
||||||
<Image Source="..\..\Ressources\Icons\Symbol Edit.png" Stretch="Uniform" Margin="1,1,1,1" />
|
<Image Source="..\..\Ressources\Icons\Symbol Edit.png" Stretch="Uniform" Margin="1,1,1,1" />
|
||||||
</Button>
|
</Button>
|
||||||
<Button x:Name="btnDelete" Grid.Column="0" Grid.Row="6" Width="32"
|
<Button x:Name="btnDelete" Grid.Column="0" Grid.Row="6" Width="32"
|
||||||
Height="22" HorizontalAlignment="Left" Margin="35,0,0,0"
|
Height="22" HorizontalAlignment="Left" Margin="35,0,0,0"
|
||||||
Padding="1,1,1,1" BorderThickness="1,1,1,1"
|
Padding="1,1,1,1"
|
||||||
|
BorderThickness="1,1,1,1"
|
||||||
Click="btnDelete_Click" Style="{DynamicResource GlassButton}"
|
Click="btnDelete_Click" Style="{DynamicResource GlassButton}"
|
||||||
Tag="{Binding}" Visibility="{Binding Path=EditAllowed, Converter={StaticResource BoolVisibilityConverter}}">
|
Tag="{Binding}" Visibility="{Binding Path=EditAllowed, Converter={StaticResource BoolVisibilityConverter}}">
|
||||||
<Image Source="..\..\Ressources\Icons\Symbol Delete.png" Stretch="Uniform" Margin="1,1,1,1" />
|
<Image Source="..\..\Ressources\Icons\Symbol Delete.png" Stretch="Uniform" Margin="1,1,1,1" />
|
||||||
@@ -690,7 +694,7 @@
|
|||||||
Margin="5,0,5,3" Foreground="#FF2B508B" HorizontalAlignment="Left" FontSize="14" />
|
Margin="5,0,5,3" Foreground="#FF2B508B" HorizontalAlignment="Left" FontSize="14" />
|
||||||
<StackPanel x:Name="stackPanelInfoText" Orientation="Horizontal" Grid.Column="2" VerticalAlignment="Bottom" HorizontalAlignment="Right">
|
<StackPanel x:Name="stackPanelInfoText" Orientation="Horizontal" Grid.Column="2" VerticalAlignment="Bottom" HorizontalAlignment="Right">
|
||||||
<TextBlock x:Name="textblock_link_pdfexport" Margin="5,0,5,3" FontSize="14">
|
<TextBlock x:Name="textblock_link_pdfexport" Margin="5,0,5,3" FontSize="14">
|
||||||
<Hyperlink x:Name="linkPdfExport" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkPdfExport_OnRequestNavigate" >
|
<Hyperlink x:Name="linkPdfExport" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkPdfExport_OnRequestNavigate">
|
||||||
<Run Text="Drucken" />
|
<Run Text="Drucken" />
|
||||||
</Hyperlink>
|
</Hyperlink>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
@@ -700,8 +704,8 @@
|
|||||||
</Hyperlink>
|
</Hyperlink>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Grid x:Name="punktebogenRootGrid" Grid.Column="2" >
|
<Grid x:Name="punktebogenRootGrid" Grid.Column="2">
|
||||||
<Border Width="200" BorderBrush="Green"/>
|
<Border Width="200" BorderBrush="Green" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
<dxg:GridControl Grid.Row="1" x:Name="teilnahmeGrid" ItemsSource="{Binding TeilnehmerListe}">
|
<dxg:GridControl Grid.Row="1" x:Name="teilnahmeGrid" ItemsSource="{Binding TeilnehmerListe}">
|
||||||
@@ -720,45 +724,45 @@
|
|||||||
</Style>
|
</Style>
|
||||||
</dxg:GridControl.Resources>
|
</dxg:GridControl.Resources>
|
||||||
<dxg:GridControl.Columns>
|
<dxg:GridControl.Columns>
|
||||||
<dxg:GridColumn FieldName="Customer.LastNameFirstName" Header="Klient" AllowEditing="False"/>
|
<dxg:GridColumn FieldName="Customer.LastNameFirstName" Header="Klient" AllowEditing="False" />
|
||||||
<dxg:GridColumn x:Name="t0" FieldName="t0" Header="1." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t0" FieldName="t0" Header="1." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t1" FieldName="t1" Header="2." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t1" FieldName="t1" Header="2." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t2" FieldName="t2" Header="3." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t2" FieldName="t2" Header="3." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t3" FieldName="t3" Header="4." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t3" FieldName="t3" Header="4." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t4" FieldName="t4" Header="5." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t4" FieldName="t4" Header="5." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t5" FieldName="t5" Header="6." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t5" FieldName="t5" Header="6." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t6" FieldName="t6" Header="7." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t6" FieldName="t6" Header="7." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t7" FieldName="t7" Header="8." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t7" FieldName="t7" Header="8." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t8" FieldName="t8" Header="9." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t8" FieldName="t8" Header="9." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t9" FieldName="t9" Header="10." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t9" FieldName="t9" Header="10." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t10" FieldName="t10" Header="11." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t10" FieldName="t10" Header="11." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t11" FieldName="t11" Header="12." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t11" FieldName="t11" Header="12." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t12" FieldName="t12" Header="13." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t12" FieldName="t12" Header="13." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t13" FieldName="t13" Header="14." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t13" FieldName="t13" Header="14." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t14" FieldName="t14" Header="15." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t14" FieldName="t14" Header="15." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t15" FieldName="t15" Header="16." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t15" FieldName="t15" Header="16." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t16" FieldName="t16" Header="17." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t16" FieldName="t16" Header="17." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t17" FieldName="t17" Header="18." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t17" FieldName="t17" Header="18." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t18" FieldName="t18" Header="19." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t18" FieldName="t18" Header="19." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t19" FieldName="t19" Header="20." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t19" FieldName="t19" Header="20." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t20" FieldName="t20" Header="21." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t20" FieldName="t20" Header="21." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t21" FieldName="t21" Header="22." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t21" FieldName="t21" Header="22." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t22" FieldName="t22" Header="23." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t22" FieldName="t22" Header="23." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t23" FieldName="t23" Header="24." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t23" FieldName="t23" Header="24." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t24" FieldName="t24" Header="25." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t24" FieldName="t24" Header="25." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t25" FieldName="t25" Header="26." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t25" FieldName="t25" Header="26." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t26" FieldName="t26" Header="27." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t26" FieldName="t26" Header="27." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t27" FieldName="t27" Header="28." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t27" FieldName="t27" Header="28." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t28" FieldName="t28" Header="29." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t28" FieldName="t28" Header="29." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t29" FieldName="t29" Header="30." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t29" FieldName="t29" Header="30." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
<dxg:GridColumn x:Name="t30" FieldName="t30" Header="31." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
<dxg:GridColumn x:Name="t30" FieldName="t30" Header="31." Width="27" CellStyle="{StaticResource customCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||||
</dxg:GridControl.Columns>
|
</dxg:GridControl.Columns>
|
||||||
<dxg:GridControl.View>
|
<dxg:GridControl.View>
|
||||||
<dxg:TableView ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" NavigationStyle="Cell" ShownEditor="pg_ShownEditor" PreviewMouseDoubleClick="gridView1_DoubleClick" Tag="{Binding SelectedBookings}" />
|
<dxg:TableView ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" NavigationStyle="Cell" ShownEditor="pg_ShownEditor" PreviewMouseDoubleClick="gridView1_DoubleClick" Tag="{Binding SelectedBookings}" />
|
||||||
</dxg:GridControl.View>
|
</dxg:GridControl.View>
|
||||||
</dxg:GridControl>
|
</dxg:GridControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="2"><Button x:Name="saveBtn" Content="Speichern" HorizontalAlignment="Right" Click="SaveBookingChanges" Margin="4,4,0,4"/></Grid>
|
<Grid Grid.Row="2"><Button x:Name="saveBtn" Content="Speichern" HorizontalAlignment="Right" Click="SaveBookingChanges" Margin="4,4,0,4" /></Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<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" mc:Ignorable="d" x:Class="BeWo.View.Report.FLSReport.FLSOverviewChart" x:Name="UserControl" d:DesignWidth="640" d:DesignHeight="480">
|
<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"
|
||||||
|
mc:Ignorable="d" x:Class="BeWo.View.Report.FLSReport.FLSOverviewChart" x:Name="UserControl" d:DesignWidth="640" d:DesignHeight="480">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<LinearGradientBrush x:Key="BorderBrush" StartPoint="0,0" EndPoint="0,1">
|
<LinearGradientBrush x:Key="BorderBrush" StartPoint="0,0" EndPoint="0,1">
|
||||||
@@ -15,7 +17,7 @@
|
|||||||
<dxc:XYDiagram2D.AxisY>
|
<dxc:XYDiagram2D.AxisY>
|
||||||
<dxc:AxisY2D Brush="Black">
|
<dxc:AxisY2D Brush="Black">
|
||||||
<dxc:AxisY2D.Range>
|
<dxc:AxisY2D.Range>
|
||||||
<dxc:AxisRange dxc:AxisY.AlwaysShowZeroLevel="True" MaxValue="10" MinValue="0" />
|
<dxc:AxisRange dxc:AxisY2D.AlwaysShowZeroLevel="True" MaxValue="10" MinValue="0" />
|
||||||
</dxc:AxisY2D.Range>
|
</dxc:AxisY2D.Range>
|
||||||
<dxc:AxisY2D.Label>
|
<dxc:AxisY2D.Label>
|
||||||
<dxc:AxisLabel FontSize="10" Foreground="Black" />
|
<dxc:AxisLabel FontSize="10" Foreground="Black" />
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ using BeWo.ViewModel.ListViewModel;
|
|||||||
using BS.Shared;
|
using BS.Shared;
|
||||||
using BS.Shared.Core;
|
using BS.Shared.Core;
|
||||||
using BS.Shared.DataContracts;
|
using BS.Shared.DataContracts;
|
||||||
|
using BS.Shared.Extensions;
|
||||||
using DevExpress.Xpf.Editors.Helpers;
|
using DevExpress.Xpf.Editors.Helpers;
|
||||||
|
|
||||||
namespace BeWo.ViewModel
|
namespace BeWo.ViewModel
|
||||||
@@ -122,7 +122,7 @@ namespace BeWo.ViewModel
|
|||||||
{
|
{
|
||||||
var liste = Bargeldtransaktionen.VMList.OrderBy(o => o.Zahlungsdatum).ThenBy(t => t.DataContract.BargeldtransaktionOid);
|
var liste = Bargeldtransaktionen.VMList.OrderBy(o => o.Zahlungsdatum).ThenBy(t => t.DataContract.BargeldtransaktionOid);
|
||||||
|
|
||||||
liste.ForEach(f => f.Transaktionskassenbestand = 0);
|
liste.DoForEach(f => f.Transaktionskassenbestand = 0);
|
||||||
|
|
||||||
var vorherige = liste.FirstOrDefault();
|
var vorherige = liste.FirstOrDefault();
|
||||||
if (vorherige != null)
|
if (vorherige != null)
|
||||||
|
|||||||
@@ -66,6 +66,16 @@ namespace BeWo.ViewModel
|
|||||||
|
|
||||||
public static string PropertyName_Notice5 = "Notice5";
|
public static string PropertyName_Notice5 = "Notice5";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice = "RTFNotice";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice2 = "RTFNotice2";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice3 = "RTFNotice3";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice4 = "RTFNotice4";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice5 = "RTFNotice5";
|
||||||
|
|
||||||
public static string PropertyName_PossibleCostBearers = "PossibleCostBearers";
|
public static string PropertyName_PossibleCostBearers = "PossibleCostBearers";
|
||||||
|
|
||||||
public static string PropertyName_PossibleCustomers = "PossibleCustomers";
|
public static string PropertyName_PossibleCustomers = "PossibleCustomers";
|
||||||
@@ -170,6 +180,16 @@ namespace BeWo.ViewModel
|
|||||||
|
|
||||||
private string _Notice5;
|
private string _Notice5;
|
||||||
|
|
||||||
|
private string _RTFNotice;
|
||||||
|
|
||||||
|
private string _RTFNotice2;
|
||||||
|
|
||||||
|
private string _RTFNotice3;
|
||||||
|
|
||||||
|
private string _RTFNotice4;
|
||||||
|
|
||||||
|
private string _RTFNotice5;
|
||||||
|
|
||||||
private decimal _RoundedDuration;
|
private decimal _RoundedDuration;
|
||||||
|
|
||||||
private ObservableSortCollection<ValueListEntryDC> _SelectedGoals;
|
private ObservableSortCollection<ValueListEntryDC> _SelectedGoals;
|
||||||
@@ -1300,6 +1320,81 @@ namespace BeWo.ViewModel
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string RTFNotice
|
||||||
|
{
|
||||||
|
get { return _RTFNotice; }
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (AreDifferent(_RTFNotice, value))
|
||||||
|
{
|
||||||
|
_RTFNotice = value;
|
||||||
|
StoreDirtyInformation(AreDifferent(DataContract.RTFNotice1, value), PropertyName_RTFNotice);
|
||||||
|
FirePropertyChanged(PropertyName_RTFNotice);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string RTFNotice2
|
||||||
|
{
|
||||||
|
get { return _RTFNotice2; }
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (AreDifferent(_RTFNotice2, value))
|
||||||
|
{
|
||||||
|
_RTFNotice2 = value;
|
||||||
|
StoreDirtyInformation(AreDifferent(DataContract.RTFNotice2, value), PropertyName_RTFNotice2);
|
||||||
|
FirePropertyChanged(PropertyName_RTFNotice2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string RTFNotice3
|
||||||
|
{
|
||||||
|
get { return _RTFNotice3; }
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (AreDifferent(_RTFNotice3, value))
|
||||||
|
{
|
||||||
|
_RTFNotice3 = value;
|
||||||
|
StoreDirtyInformation(AreDifferent(DataContract.RTFNotice3, value), PropertyName_RTFNotice3);
|
||||||
|
FirePropertyChanged(PropertyName_RTFNotice3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string RTFNotice4
|
||||||
|
{
|
||||||
|
get { return _RTFNotice4; }
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (AreDifferent(_RTFNotice4, value))
|
||||||
|
{
|
||||||
|
_RTFNotice4 = value;
|
||||||
|
StoreDirtyInformation(AreDifferent(DataContract.RTFNotice4, value), PropertyName_RTFNotice4);
|
||||||
|
FirePropertyChanged(PropertyName_RTFNotice4);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string RTFNotice5
|
||||||
|
{
|
||||||
|
get { return _RTFNotice5; }
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (AreDifferent(_RTFNotice5, value))
|
||||||
|
{
|
||||||
|
_RTFNotice5 = value;
|
||||||
|
StoreDirtyInformation(AreDifferent(DataContract.RTFNotice5, value), PropertyName_RTFNotice5);
|
||||||
|
FirePropertyChanged(PropertyName_RTFNotice5);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public List<ServiceDescriptionDC> PossibleServiceDescriptions
|
public List<ServiceDescriptionDC> PossibleServiceDescriptions
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -1995,6 +2090,11 @@ namespace BeWo.ViewModel
|
|||||||
copy.Notice3 = Notice3;
|
copy.Notice3 = Notice3;
|
||||||
copy.Notice4 = Notice4;
|
copy.Notice4 = Notice4;
|
||||||
copy.Notice5 = Notice5;
|
copy.Notice5 = Notice5;
|
||||||
|
copy.RTFNotice = RTFNotice;
|
||||||
|
copy.RTFNotice2 = RTFNotice2;
|
||||||
|
copy.RTFNotice3 = RTFNotice3;
|
||||||
|
copy.RTFNotice4 = RTFNotice4;
|
||||||
|
copy.RTFNotice5 = RTFNotice5;
|
||||||
copy.StartTime = StartTime;
|
copy.StartTime = StartTime;
|
||||||
copy.EndTime = EndTime;
|
copy.EndTime = EndTime;
|
||||||
copy.Date = Date;
|
copy.Date = Date;
|
||||||
@@ -2113,6 +2213,11 @@ namespace BeWo.ViewModel
|
|||||||
_Notice3 = pDataContract.Notice3;
|
_Notice3 = pDataContract.Notice3;
|
||||||
_Notice4 = pDataContract.Notice4;
|
_Notice4 = pDataContract.Notice4;
|
||||||
_Notice5 = pDataContract.Notice5;
|
_Notice5 = pDataContract.Notice5;
|
||||||
|
_RTFNotice = pDataContract.RTFNotice1;
|
||||||
|
_RTFNotice2 = pDataContract.RTFNotice2;
|
||||||
|
_RTFNotice3 = pDataContract.RTFNotice3;
|
||||||
|
_RTFNotice4 = pDataContract.RTFNotice4;
|
||||||
|
_RTFNotice5 = pDataContract.RTFNotice5;
|
||||||
_ServiceDescription = pDataContract.ServiceDescription;
|
_ServiceDescription = pDataContract.ServiceDescription;
|
||||||
_Employee = pDataContract.Employee;
|
_Employee = pDataContract.Employee;
|
||||||
_Customer = pDataContract.Customer;
|
_Customer = pDataContract.Customer;
|
||||||
@@ -2279,6 +2384,13 @@ namespace BeWo.ViewModel
|
|||||||
pDataContract.Notice3 = _Notice3;
|
pDataContract.Notice3 = _Notice3;
|
||||||
pDataContract.Notice4 = _Notice4;
|
pDataContract.Notice4 = _Notice4;
|
||||||
pDataContract.Notice5 = _Notice5;
|
pDataContract.Notice5 = _Notice5;
|
||||||
|
|
||||||
|
pDataContract.RTFNotice1 = _RTFNotice;
|
||||||
|
pDataContract.RTFNotice2 = _RTFNotice2;
|
||||||
|
pDataContract.RTFNotice3 = _RTFNotice3;
|
||||||
|
pDataContract.RTFNotice4 = _RTFNotice4;
|
||||||
|
pDataContract.RTFNotice5 = _RTFNotice5;
|
||||||
|
|
||||||
pDataContract.ServiceRecordType = _ServiceRecordType;
|
pDataContract.ServiceRecordType = _ServiceRecordType;
|
||||||
pDataContract.DistanceInMeter = _DistanceInMeter;
|
pDataContract.DistanceInMeter = _DistanceInMeter;
|
||||||
|
|
||||||
|
|||||||
101
BeWo/app.config
101
BeWo/app.config
@@ -6,48 +6,75 @@
|
|||||||
<system.serviceModel>
|
<system.serviceModel>
|
||||||
<bindings>
|
<bindings>
|
||||||
<basicHttpBinding>
|
<basicHttpBinding>
|
||||||
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00"
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
receiveTimeout="00:10:00" sendTimeout="00:05: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" />
|
||||||
|
</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" />
|
||||||
|
</binding>
|
||||||
|
<binding name="QueryServiceEndpoint" closeTimeout="00:05:00"
|
||||||
|
openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05: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="8192" maxArrayLength="16384"
|
||||||
|
maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
||||||
<security mode="None">
|
<security mode="None">
|
||||||
<!--<transport>
|
<transport clientCredentialType="None" proxyCredentialType="None"
|
||||||
<extendedProtectionPolicy policyEnforcement="Never" />
|
realm="" />
|
||||||
</transport>-->
|
<message clientCredentialType="UserName" algorithmSuite="Default" />
|
||||||
</security>
|
|
||||||
</binding>
|
|
||||||
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" messageEncoding="Text" transferMode="StreamedRequest" useDefaultWebProxy="true">
|
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
|
||||||
<security mode="None">
|
|
||||||
<!--<transport>
|
|
||||||
<extendedProtectionPolicy policyEnforcement="Never" />
|
|
||||||
</transport>-->
|
|
||||||
</security>
|
|
||||||
</binding>
|
|
||||||
<binding name="QueryServiceEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
|
||||||
<security mode="None">
|
|
||||||
<transport clientCredentialType="None" proxyCredentialType="None" realm="">
|
|
||||||
<!--<extendedProtectionPolicy policyEnforcement="Never" />-->
|
|
||||||
</transport>
|
|
||||||
<message clientCredentialType="UserName" algorithmSuite="Default"/>
|
|
||||||
</security>
|
</security>
|
||||||
</binding>
|
</binding>
|
||||||
|
<binding name="QueryServiceEndpoint1" />
|
||||||
</basicHttpBinding>
|
</basicHttpBinding>
|
||||||
</bindings>
|
</bindings>
|
||||||
<client>
|
<client>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="QueryService.IQueryService" name="QueryServiceEndpoint"/>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint"
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint"/>
|
contract="QueryService.IQueryService" name="QueryServiceEndpoint" />
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint"/>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint"
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.ICustomerService" name="CustomerServiceEndpoint"/>
|
contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint" />
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IUserService" name="UserServiceEndpoint"/>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint"
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint"/>
|
contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint" />
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IDownloadService" name="DownloadServiceEndpoint"/>
|
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding"
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IResourceService" name="BeWoBasicEndpoint"/>
|
bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.ICustomerService"
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IOperationsService" name="OperationsServiceEndpoint"/>
|
name="CustomerServiceEndpoint" />
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAccountingService" name="AccountingServiceEndpoint"/>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint"
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAnalysisService" name="AnalysisServiceEndpoint"/>
|
contract="BeWo.ServiceProxy.IUserService" name="UserServiceEndpoint" />
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IMailService" name="MailServiceEndpoint"/>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint"
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IReportService" name="ReportServiceEndpoint"/>
|
contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint" />
|
||||||
</client>
|
<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 address="http://bib-pc3/Host/QueryService.svc" binding="basicHttpBinding"
|
||||||
|
bindingConfiguration="QueryServiceEndpoint1" contract="QueryService.IQueryService"
|
||||||
|
name="QueryServiceEndpoint1" />
|
||||||
|
</client>
|
||||||
<behaviors>
|
<behaviors>
|
||||||
<endpointBehaviors>
|
<endpointBehaviors>
|
||||||
<behavior name="BeWoServiceBehavior">
|
<behavior name="BeWoServiceBehavior">
|
||||||
@@ -57,5 +84,5 @@
|
|||||||
</behaviors>
|
</behaviors>
|
||||||
</system.serviceModel>
|
</system.serviceModel>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup>
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
|
||||||
</startup>
|
</startup>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
|
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWoChatServer</RootNamespace>
|
<RootNamespace>BeWoChatServer</RootNamespace>
|
||||||
<AssemblyName>BeWoChatServer</AssemblyName>
|
<AssemblyName>BeWoChatServer</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile />
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -22,6 +22,7 @@
|
|||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
@@ -31,6 +32,7 @@
|
|||||||
<DefineConstants>TRACE</DefineConstants>
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<StartupObject />
|
<StartupObject />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
|
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" requireReinstallation="true" />
|
||||||
</packages>
|
</packages>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWoPlanerAndroid</RootNamespace>
|
<RootNamespace>BeWoPlanerAndroid</RootNamespace>
|
||||||
<AssemblyName>BeWoPlanerAndroid</AssemblyName>
|
<AssemblyName>BeWoPlanerAndroid</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
<IISExpressAnonymousAuthentication />
|
<IISExpressAnonymousAuthentication />
|
||||||
@@ -30,6 +30,7 @@
|
|||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -38,6 +39,7 @@
|
|||||||
<DefineConstants>TRACE</DefineConstants>
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Antlr3.Runtime">
|
<Reference Include="Antlr3.Runtime">
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
|
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
|
||||||
</configSections>
|
</configSections>
|
||||||
<system.diagnostics>
|
<system.diagnostics>
|
||||||
<sources>
|
<sources>
|
||||||
<source name="System.ServiceModel" switchValue="All">
|
<source name="System.ServiceModel" switchValue="All">
|
||||||
<listeners>
|
<listeners>
|
||||||
<add type="System.Diagnostics.DefaultTraceListener" name="Default">
|
<add type="System.Diagnostics.DefaultTraceListener" name="Default">
|
||||||
<filter type="" />
|
<filter type=""/>
|
||||||
</add>
|
</add>
|
||||||
<add initializeData="logs\Traces.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="traceListener" traceOutputOptions="DateTime">
|
<add initializeData="logs\Traces.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="traceListener" traceOutputOptions="DateTime">
|
||||||
<filter type="" />
|
<filter type=""/>
|
||||||
</add>
|
</add>
|
||||||
</listeners>
|
</listeners>
|
||||||
</source>
|
</source>
|
||||||
@@ -19,117 +19,127 @@
|
|||||||
</system.diagnostics>
|
</system.diagnostics>
|
||||||
<log4net>
|
<log4net>
|
||||||
<appender name="logFile" type="log4net.Appender.RollingFileAppender,log4net">
|
<appender name="logFile" type="log4net.Appender.RollingFileAppender,log4net">
|
||||||
<param name="File" value="logs\android_soap_calls.txt" />
|
<param name="File" value="logs\android_soap_calls.txt"/>
|
||||||
<param name="AppendToFile" value="true" />
|
<param name="AppendToFile" value="true"/>
|
||||||
<param name="RollingStyle" value="Date" />
|
<param name="RollingStyle" value="Date"/>
|
||||||
<param name="DatePattern" value="dd.MM.yyyy" />
|
<param name="DatePattern" value="dd.MM.yyyy"/>
|
||||||
<param name="StaticLogFileName" value="true" />
|
<param name="StaticLogFileName" value="true"/>
|
||||||
<layout type="log4net.Layout.PatternLayout,log4net">
|
<layout type="log4net.Layout.PatternLayout,log4net">
|
||||||
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
|
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
|
||||||
</layout>
|
</layout>
|
||||||
</appender>
|
</appender>
|
||||||
<root>
|
<root>
|
||||||
<priority value="INFO" />
|
<priority value="INFO"/>
|
||||||
<appender-ref ref="logFile" />
|
<appender-ref ref="logFile"/>
|
||||||
</root>
|
</root>
|
||||||
</log4net>
|
</log4net>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
<add key="MultitenancyPath" value="F:\Projects\BeWo\Host\Multitenancy\" /> <!-- C:\Projekte\BeWo\Host\Multitenancy\-->
|
<add key="MultitenancyPath" value="F:\Projects\BeWo\Host\Multitenancy\"/>
|
||||||
<add key="BeWoPlanerAndroid.AndroidSoapService" value="http://localhost/AndroidSoapService.asmx" />
|
<!-- C:\Projekte\BeWo\Host\Multitenancy\-->
|
||||||
|
<add key="BeWoPlanerAndroid.AndroidSoapService" value="http://localhost/AndroidSoapService.asmx"/>
|
||||||
</appSettings>
|
</appSettings>
|
||||||
<system.serviceModel>
|
<system.serviceModel>
|
||||||
<behaviors>
|
<behaviors>
|
||||||
<endpointBehaviors>
|
<endpointBehaviors>
|
||||||
<behavior name="SecurityBehavior">
|
<behavior name="SecurityBehavior">
|
||||||
<MultitenancyExtension />
|
<MultitenancyExtension/>
|
||||||
<SecurityExtension />
|
<SecurityExtension/>
|
||||||
</behavior>
|
</behavior>
|
||||||
<behavior name="SecurityAndSessionBehavior">
|
<behavior name="SecurityAndSessionBehavior">
|
||||||
<!--wichtig: erst Mulittenancy dann session dann security!-->
|
<!--wichtig: erst Mulittenancy dann session dann security!-->
|
||||||
<MultitenancyExtension />
|
<MultitenancyExtension/>
|
||||||
<HibernateSessionExtension />
|
<HibernateSessionExtension/>
|
||||||
<SecurityExtension />
|
<SecurityExtension/>
|
||||||
</behavior>
|
</behavior>
|
||||||
</endpointBehaviors>
|
</endpointBehaviors>
|
||||||
<serviceBehaviors>
|
<serviceBehaviors>
|
||||||
<behavior name="returnFaults">
|
<behavior name="returnFaults">
|
||||||
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
|
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="false"/>
|
||||||
<serviceDebug includeExceptionDetailInFaults="true" />
|
<serviceDebug includeExceptionDetailInFaults="true"/>
|
||||||
<serviceThrottling maxConcurrentCalls="1000" maxConcurrentSessions="1000" />
|
<serviceThrottling maxConcurrentCalls="1000" maxConcurrentSessions="1000"/>
|
||||||
<dataContractSerializer maxItemsInObjectGraph="2147483647" />
|
<dataContractSerializer maxItemsInObjectGraph="2147483647"/>
|
||||||
</behavior>
|
</behavior>
|
||||||
</serviceBehaviors>
|
</serviceBehaviors>
|
||||||
</behaviors>
|
</behaviors>
|
||||||
<extensions>
|
<extensions>
|
||||||
<behaviorExtensions>
|
<behaviorExtensions>
|
||||||
<add name="MultitenancyExtension" type="BeWo.Service.Multitenancy.MultitenancyBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add name="MultitenancyExtension" type="BeWo.Service.Multitenancy.MultitenancyBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
<add name="SecurityExtension" type="BeWo.Service.Security.SecurityBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add name="SecurityExtension" type="BeWo.Service.Security.SecurityBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
<add name="HibernateSessionExtension" type="BeWo.Service.UnitOfWork.HibernateSessionBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add name="HibernateSessionExtension" type="BeWo.Service.UnitOfWork.HibernateSessionBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
</behaviorExtensions>
|
</behaviorExtensions>
|
||||||
</extensions>
|
</extensions>
|
||||||
<bindings>
|
<bindings>
|
||||||
<basicHttpBinding>
|
<basicHttpBinding>
|
||||||
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
||||||
<security mode="None" />
|
<security mode="None"/>
|
||||||
</binding>
|
</binding>
|
||||||
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" messageEncoding="Text" transferMode="StreamedRequest" useDefaultWebProxy="true">
|
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" messageEncoding="Text" transferMode="StreamedRequest" useDefaultWebProxy="true">
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
||||||
<security mode="None" />
|
<security mode="None"/>
|
||||||
</binding>
|
</binding>
|
||||||
<binding name="QueryServiceEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
<binding name="QueryServiceEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
||||||
<security mode="None">
|
<security mode="None">
|
||||||
<transport clientCredentialType="None" proxyCredentialType="None" realm="" />
|
<transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
|
||||||
<message clientCredentialType="UserName" algorithmSuite="Default" />
|
<message clientCredentialType="UserName" algorithmSuite="Default"/>
|
||||||
</security>
|
</security>
|
||||||
</binding>
|
</binding>
|
||||||
</basicHttpBinding>
|
</basicHttpBinding>
|
||||||
</bindings>
|
</bindings>
|
||||||
<client>
|
<client>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="QueryService.IQueryService" name="QueryServiceEndpoint" />
|
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="QueryService.IQueryService" name="QueryServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint" />
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint" />
|
<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 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.IUserService" name="UserServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint" />
|
<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.IDownloadService" name="DownloadServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IResourceService" name="BeWoBasicEndpoint" />
|
<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.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.IAccountingService" name="AccountingServiceEndpoint"/>
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAnalysisService" name="AnalysisServiceEndpoint" />
|
<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.IMailService" name="MailServiceEndpoint"/>
|
||||||
</client>
|
</client>
|
||||||
</system.serviceModel>
|
</system.serviceModel>
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<validation validateIntegratedModeConfiguration="false" />
|
<validation validateIntegratedModeConfiguration="false"/>
|
||||||
<modules>
|
<modules>
|
||||||
<add name="SoapHibernateSession" type="BeWoPlanerAndroid.Service.SoapHibernateSessionManager, BeWoPlanerAndroid, Version=1.0.0.0, Culture=neutral" />
|
<add name="SoapHibernateSession" type="BeWoPlanerAndroid.Service.SoapHibernateSessionManager, BeWoPlanerAndroid, Version=1.0.0.0, Culture=neutral"/>
|
||||||
</modules>
|
</modules>
|
||||||
<handlers>
|
<handlers>
|
||||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
|
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit"/>
|
||||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
|
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"/>
|
||||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
|
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
|
||||||
<add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
|
<add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0"/>
|
||||||
<add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
|
<add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0"/>
|
||||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
|
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||||
</handlers>
|
</handlers>
|
||||||
<directoryBrowse enabled="true" />
|
<directoryBrowse enabled="true"/>
|
||||||
</system.webServer>
|
</system.webServer>
|
||||||
|
<!--
|
||||||
|
Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.
|
||||||
|
|
||||||
|
Die folgenden Attribute können für die <httpRuntime>-Kennung festgelegt werden.
|
||||||
|
<system.Web>
|
||||||
|
<httpRuntime targetFramework="4.5" />
|
||||||
|
</system.Web>
|
||||||
|
-->
|
||||||
<system.web>
|
<system.web>
|
||||||
<compilation debug="true" defaultLanguage="c#" targetFramework="4.0">
|
<compilation debug="true" defaultLanguage="c#" targetFramework="4.5">
|
||||||
<assemblies>
|
<assemblies>
|
||||||
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
</assemblies>
|
</assemblies>
|
||||||
</compilation>
|
</compilation>
|
||||||
<!--<compilation debug="true" targetFramework="4.5" />
|
<!--<compilation debug="true" targetFramework="4.5" />
|
||||||
<httpRuntime targetFramework="4.5" />-->
|
<httpRuntime targetFramework="4.5" />-->
|
||||||
|
<pages controlRenderingCompatibilityVersion="4.0"/>
|
||||||
</system.web>
|
</system.web>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
|
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
|
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" requireReinstallation="true" />
|
||||||
</packages>
|
</packages>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWoPlanerMobil</RootNamespace>
|
<RootNamespace>BeWoPlanerMobil</RootNamespace>
|
||||||
<AssemblyName>BeWoPlanerMobil</AssemblyName>
|
<AssemblyName>BeWoPlanerMobil</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<MvcBuildViews>false</MvcBuildViews>
|
<MvcBuildViews>false</MvcBuildViews>
|
||||||
<UseIISExpress>true</UseIISExpress>
|
<UseIISExpress>true</UseIISExpress>
|
||||||
<IISExpressSSLPort />
|
<IISExpressSSLPort />
|
||||||
@@ -21,6 +21,7 @@
|
|||||||
<IISExpressWindowsAuthentication />
|
<IISExpressWindowsAuthentication />
|
||||||
<IISExpressUseClassicPipelineMode />
|
<IISExpressUseClassicPipelineMode />
|
||||||
<UseGlobalApplicationHostFile />
|
<UseGlobalApplicationHostFile />
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@@ -31,6 +32,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -39,6 +41,7 @@
|
|||||||
<DefineConstants>TRACE</DefineConstants>
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
||||||
@@ -60,6 +63,7 @@
|
|||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
<Reference Include="System.Data.Entity" />
|
<Reference Include="System.Data.Entity" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.ServiceModel" />
|
<Reference Include="System.ServiceModel" />
|
||||||
@@ -67,11 +71,8 @@
|
|||||||
<Reference Include="System.Web.Entity" />
|
<Reference Include="System.Web.Entity" />
|
||||||
<Reference Include="System.Web.ApplicationServices" />
|
<Reference Include="System.Web.ApplicationServices" />
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Web" />
|
|
||||||
<Reference Include="System.Web.Extensions" />
|
<Reference Include="System.Web.Extensions" />
|
||||||
|
<Reference Include="System.Web" />
|
||||||
<Reference Include="System.Web.Abstractions" />
|
<Reference Include="System.Web.Abstractions" />
|
||||||
<Reference Include="System.Web.Routing" />
|
<Reference Include="System.Web.Routing" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
@@ -132,6 +133,7 @@
|
|||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
|
<HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="WebGrease">
|
<Reference Include="WebGrease">
|
||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
<HintPath>..\packages\WebGrease.1.3.0\lib\WebGrease.dll</HintPath>
|
<HintPath>..\packages\WebGrease.1.3.0\lib\WebGrease.dll</HintPath>
|
||||||
|
|||||||
@@ -1,189 +1,186 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
|
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/>
|
||||||
</configSections>
|
</configSections>
|
||||||
|
<system.diagnostics>
|
||||||
<system.diagnostics>
|
<sources>
|
||||||
<sources>
|
<source name="System.ServiceModel" switchValue="All">
|
||||||
<source name="System.ServiceModel" switchValue="All">
|
<listeners>
|
||||||
<listeners>
|
<add type="System.Diagnostics.DefaultTraceListener" name="Default">
|
||||||
<add type="System.Diagnostics.DefaultTraceListener" name="Default">
|
<filter type=""/>
|
||||||
<filter type="" />
|
</add>
|
||||||
</add>
|
<add initializeData="logs\Traces.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="traceListener" traceOutputOptions="DateTime">
|
||||||
<add initializeData="logs\Traces.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="traceListener" traceOutputOptions="DateTime">
|
<filter type=""/>
|
||||||
<filter type="" />
|
</add>
|
||||||
</add>
|
</listeners>
|
||||||
</listeners>
|
</source>
|
||||||
</source>
|
</sources>
|
||||||
</sources>
|
</system.diagnostics>
|
||||||
</system.diagnostics>
|
<log4net debug="true">
|
||||||
|
<appender name="logFile" type="log4net.Appender.RollingFileAppender,log4net">
|
||||||
<log4net debug="true">
|
<param name="File" value="logs\mobilelog.txt"/>
|
||||||
<appender name="logFile" type="log4net.Appender.RollingFileAppender,log4net">
|
<param name="AppendToFile" value="true"/>
|
||||||
<param name="File" value="logs\mobilelog.txt" />
|
<param name="RollingStyle" value="Date"/>
|
||||||
<param name="AppendToFile" value="true" />
|
<param name="DatePattern" value="dd.MM.yyyy"/>
|
||||||
<param name="RollingStyle" value="Date" />
|
<param name="StaticLogFileName" value="true"/>
|
||||||
<param name="DatePattern" value="dd.MM.yyyy" />
|
<layout type="log4net.Layout.PatternLayout,log4net">
|
||||||
<param name="StaticLogFileName" value="true" />
|
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
|
||||||
<layout type="log4net.Layout.PatternLayout,log4net">
|
</layout>
|
||||||
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
|
</appender>
|
||||||
</layout>
|
<root>
|
||||||
</appender>
|
<priority value="INFO"/>
|
||||||
<root>
|
<appender-ref ref="logFile"/>
|
||||||
<priority value="INFO" />
|
</root>
|
||||||
<appender-ref ref="logFile" />
|
</log4net>
|
||||||
</root>
|
<system.webServer>
|
||||||
</log4net>
|
<validation validateIntegratedModeConfiguration="false"/>
|
||||||
|
<modules>
|
||||||
<system.webServer>
|
<add name="ASPHibernateSession" type="BeWoPlanerMobil.Service.ASPHibernateSessionManager, BeWoPlanerMobil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
<validation validateIntegratedModeConfiguration="false" />
|
</modules>
|
||||||
<modules>
|
<handlers>
|
||||||
<add name="ASPHibernateSession" type="BeWoPlanerMobil.Service.ASPHibernateSessionManager, BeWoPlanerMobil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit"/>
|
||||||
</modules>
|
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"/>
|
||||||
<handlers>
|
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
|
||||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
|
<add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0"/>
|
||||||
<remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
|
<add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0"/>
|
||||||
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
|
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
|
||||||
<add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
|
</handlers>
|
||||||
<add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
|
<directoryBrowse enabled="true"/>
|
||||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
|
</system.webServer>
|
||||||
</handlers>
|
<system.serviceModel>
|
||||||
<directoryBrowse enabled="true" />
|
<behaviors>
|
||||||
</system.webServer>
|
<endpointBehaviors>
|
||||||
|
<behavior name="SecurityBehavior">
|
||||||
|
<MultitenancyExtension/>
|
||||||
<system.serviceModel>
|
<SecurityExtension/>
|
||||||
<behaviors>
|
</behavior>
|
||||||
<endpointBehaviors>
|
<behavior name="SecurityAndSessionBehavior">
|
||||||
<behavior name="SecurityBehavior">
|
<!--wichtig: erst Mulittenancy dann session dann security!-->
|
||||||
<MultitenancyExtension />
|
<MultitenancyExtension/>
|
||||||
<SecurityExtension />
|
<HibernateSessionExtension/>
|
||||||
</behavior>
|
<SecurityExtension/>
|
||||||
<behavior name="SecurityAndSessionBehavior">
|
</behavior>
|
||||||
<!--wichtig: erst Mulittenancy dann session dann security!-->
|
</endpointBehaviors>
|
||||||
<MultitenancyExtension />
|
<serviceBehaviors>
|
||||||
<HibernateSessionExtension />
|
<behavior name="returnFaults">
|
||||||
<SecurityExtension />
|
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="false"/>
|
||||||
</behavior>
|
<serviceDebug includeExceptionDetailInFaults="true"/>
|
||||||
</endpointBehaviors>
|
<serviceThrottling maxConcurrentCalls="1000" maxConcurrentSessions="1000"/>
|
||||||
<serviceBehaviors>
|
<dataContractSerializer maxItemsInObjectGraph="2147483647"/>
|
||||||
<behavior name="returnFaults">
|
</behavior>
|
||||||
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
|
</serviceBehaviors>
|
||||||
<serviceDebug includeExceptionDetailInFaults="true" />
|
</behaviors>
|
||||||
<serviceThrottling maxConcurrentCalls="1000" maxConcurrentSessions="1000" />
|
<extensions>
|
||||||
<dataContractSerializer maxItemsInObjectGraph="2147483647" />
|
<behaviorExtensions>
|
||||||
</behavior>
|
<add name="MultitenancyExtension" type="BeWo.Service.Multitenancy.MultitenancyBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
</serviceBehaviors>
|
<add name="SecurityExtension" type="BeWo.Service.Security.SecurityBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
</behaviors>
|
<add name="HibernateSessionExtension" type="BeWo.Service.UnitOfWork.HibernateSessionBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
<extensions>
|
</behaviorExtensions>
|
||||||
<behaviorExtensions>
|
</extensions>
|
||||||
<add name="MultitenancyExtension" type="BeWo.Service.Multitenancy.MultitenancyBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<bindings>
|
||||||
<add name="SecurityExtension" type="BeWo.Service.Security.SecurityBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<basicHttpBinding>
|
||||||
<add name="HibernateSessionExtension" type="BeWo.Service.UnitOfWork.HibernateSessionBehaviorExtension, BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
||||||
</behaviorExtensions>
|
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
||||||
</extensions>
|
<security mode="None"/>
|
||||||
<bindings>
|
</binding>
|
||||||
<basicHttpBinding>
|
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" messageEncoding="Text" transferMode="StreamedRequest" useDefaultWebProxy="true">
|
||||||
<binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
<security mode="None"/>
|
||||||
<security mode="None"></security>
|
</binding>
|
||||||
</binding>
|
<binding name="QueryServiceEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
||||||
<binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" messageEncoding="Text" transferMode="StreamedRequest" useDefaultWebProxy="true">
|
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
<security mode="None">
|
||||||
<security mode="None"></security>
|
<transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
|
||||||
</binding>
|
<message clientCredentialType="UserName" algorithmSuite="Default"/>
|
||||||
<binding name="QueryServiceEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="2147483647" maxBufferPoolSize="524288" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
|
</security>
|
||||||
<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
|
</binding>
|
||||||
<security mode="None">
|
</basicHttpBinding>
|
||||||
<transport clientCredentialType="None" proxyCredentialType="None" realm=""></transport>
|
</bindings>
|
||||||
<message clientCredentialType="UserName" algorithmSuite="Default" />
|
<client>
|
||||||
</security>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="QueryService.IQueryService" name="QueryServiceEndpoint"/>
|
||||||
</binding>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint"/>
|
||||||
</basicHttpBinding>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint"/>
|
||||||
</bindings>
|
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.ICustomerService" name="CustomerServiceEndpoint"/>
|
||||||
<client>
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IUserService" name="UserServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="QueryServiceEndpoint" contract="QueryService.IQueryService" name="QueryServiceEndpoint" />
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoStreamingEndpoint" contract="BeWo.ServiceProxy.IStreamingService" name="StreamingServiceEndpoint" />
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IDownloadService" name="DownloadServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IEmployeeService" name="EmployeeServiceEndpoint" />
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IResourceService" name="BeWoBasicEndpoint"/>
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.ICustomerService" name="CustomerServiceEndpoint" />
|
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IOperationsService" name="OperationsServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IUserService" name="UserServiceEndpoint" />
|
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAccountingService" name="AccountingServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IValueListService" name="ValueListServiceEndpoint" />
|
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAnalysisService" name="AnalysisServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IDownloadService" name="DownloadServiceEndpoint" />
|
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IMailService" name="MailServiceEndpoint"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IResourceService" name="BeWoBasicEndpoint" />
|
</client>
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IOperationsService" name="OperationsServiceEndpoint" />
|
</system.serviceModel>
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAccountingService" name="AccountingServiceEndpoint" />
|
<appSettings>
|
||||||
<endpoint behaviorConfiguration="BeWoServiceBehavior" binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IAnalysisService" name="AnalysisServiceEndpoint" />
|
<add key="webpages:Version" value="2.0.0.0"/>
|
||||||
<endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWo.ServiceProxy.IMailService" name="MailServiceEndpoint" />
|
<add key="webpages:Enabled" value="false"/>
|
||||||
</client>
|
<add key="PreserveLoginUrl" value="true"/>
|
||||||
</system.serviceModel>
|
<add key="ClientValidationEnabled" value="true"/>
|
||||||
|
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
|
||||||
<appSettings>
|
<add key="MultitenancyPath" value="C:\Projekte\BeWo\Host\Multitenancy\"/>
|
||||||
<add key="webpages:Version" value="2.0.0.0" />
|
|
||||||
<add key="webpages:Enabled" value="false" />
|
|
||||||
<add key="PreserveLoginUrl" value="true" />
|
|
||||||
<add key="ClientValidationEnabled" value="true" />
|
|
||||||
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
|
|
||||||
<add key="MultitenancyPath" value="C:\Projekte\BeWo\Host\Multitenancy\" />
|
|
||||||
<!--<add key="MultitenancyPath" value="..\Host\Multitenancy"/>-->
|
<!--<add key="MultitenancyPath" value="..\Host\Multitenancy"/>-->
|
||||||
</appSettings>
|
</appSettings>
|
||||||
|
<!--
|
||||||
|
Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.
|
||||||
|
|
||||||
<system.web>
|
Die folgenden Attribute können für die <httpRuntime>-Kennung festgelegt werden.
|
||||||
<!--<httpModules>
|
<system.Web>
|
||||||
<add name="ASPHibernateSession" type="BeWoPlanerMobil.Service.ASPHibernateSessionManager, BeWoPlanerMobil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<httpRuntime targetFramework="4.5" />
|
||||||
</httpModules>-->
|
</system.Web>
|
||||||
|
-->
|
||||||
|
<system.web>
|
||||||
|
<!--<httpModules>
|
||||||
|
<add name="ASPHibernateSession" type="BeWoPlanerMobil.Service.ASPHibernateSessionManager, BeWoPlanerMobil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||||
|
</httpModules>-->
|
||||||
<!-- ggf. wieder auskomentieren//ergebnis: auskommentieren weil lohnt nicht
|
<!-- ggf. wieder auskomentieren//ergebnis: auskommentieren weil lohnt nicht
|
||||||
<sessionState timeout="525600"/>-->
|
<sessionState timeout="525600"/>-->
|
||||||
<compilation debug="true" defaultLanguage="c#" targetFramework="4.0">
|
<compilation debug="true" defaultLanguage="c#" targetFramework="4.5">
|
||||||
<assemblies>
|
<assemblies>
|
||||||
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null"/>
|
||||||
</assemblies>
|
</assemblies>
|
||||||
</compilation>
|
</compilation>
|
||||||
<pages>
|
<pages controlRenderingCompatibilityVersion="4.0">
|
||||||
<namespaces>
|
<namespaces>
|
||||||
<add namespace="System.Web.Helpers" />
|
<add namespace="System.Web.Helpers"/>
|
||||||
<add namespace="System.Web.Mvc" />
|
<add namespace="System.Web.Mvc"/>
|
||||||
<add namespace="System.Web.Mvc.Ajax" />
|
<add namespace="System.Web.Mvc.Ajax"/>
|
||||||
<add namespace="System.Web.Mvc.Html" />
|
<add namespace="System.Web.Mvc.Html"/>
|
||||||
<add namespace="System.Web.Optimization" />
|
<add namespace="System.Web.Optimization"/>
|
||||||
<add namespace="System.Web.Routing" />
|
<add namespace="System.Web.Routing"/>
|
||||||
<add namespace="System.Web.WebPages" />
|
<add namespace="System.Web.WebPages"/>
|
||||||
</namespaces>
|
</namespaces>
|
||||||
</pages>
|
</pages>
|
||||||
|
<authentication mode="Forms">
|
||||||
|
<forms loginUrl="~/Login"/>
|
||||||
<authentication mode="Forms">
|
</authentication>
|
||||||
<forms loginUrl="~/Login" />
|
</system.web>
|
||||||
</authentication>
|
<runtime>
|
||||||
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
</system.web>
|
<dependentAssembly>
|
||||||
|
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
|
||||||
<runtime>
|
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
|
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
|
||||||
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
<bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
|
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
|
||||||
<bindingRedirect oldVersion="1.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
|
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
|
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
|
||||||
<bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
|
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
</assemblyBinding>
|
||||||
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
|
</runtime>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
|
|
||||||
</dependentAssembly>
|
|
||||||
</assemblyBinding>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="EntityFramework" version="5.0.0" targetFramework="net40" />
|
<package id="EntityFramework" version="5.0.0" targetFramework="net40" requireReinstallation="true" />
|
||||||
<package id="jQuery" version="1.8.2" targetFramework="net40" />
|
<package id="jQuery" version="1.8.2" targetFramework="net40" />
|
||||||
<package id="jQuery.UI.Combined" version="1.8.24" targetFramework="net40" />
|
<package id="jQuery.UI.Combined" version="1.8.24" targetFramework="net40" />
|
||||||
<package id="jQuery.Validation" version="1.10.0" targetFramework="net40" />
|
<package id="jQuery.Validation" version="1.10.0" targetFramework="net40" />
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
|
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
|
||||||
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.30116.0" targetFramework="net40" />
|
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.30116.0" targetFramework="net40" />
|
||||||
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.30116.0" targetFramework="net40" />
|
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.30116.0" targetFramework="net40" />
|
||||||
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
|
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" requireReinstallation="true" />
|
||||||
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
|
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
|
||||||
<package id="Modernizr" version="2.6.2" targetFramework="net40" />
|
<package id="Modernizr" version="2.6.2" targetFramework="net40" />
|
||||||
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
|
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" requireReinstallation="true" />
|
||||||
<package id="WebGrease" version="1.3.0" targetFramework="net40" />
|
<package id="WebGrease" version="1.3.0" targetFramework="net40" />
|
||||||
</packages>
|
</packages>
|
||||||
@@ -10,11 +10,12 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWo.Controls</RootNamespace>
|
<RootNamespace>BeWo.Controls</RootNamespace>
|
||||||
<AssemblyName>BeWo.Controls</AssemblyName>
|
<AssemblyName>BeWo.Controls</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
<TargetFrameworkProfile>
|
||||||
|
</TargetFrameworkProfile>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<OldToolsVersion>3.5</OldToolsVersion>
|
<OldToolsVersion>3.5</OldToolsVersion>
|
||||||
@@ -44,6 +45,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -53,6 +55,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@@ -69,15 +72,17 @@
|
|||||||
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
||||||
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
||||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.Xpf.Mvvm.v13.2, Version=13.2.13.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.Xpf.Core.v13.2, Version=13.2.13.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.Printing.v13.2, Version=13.2.13.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.v13.2.Core, Version=13.2.13.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.Grid.v13.2, Version=13.2.13.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="PresentationFramework.Aero">
|
<Reference Include="PresentationFramework.Aero">
|
||||||
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
2
Controls/Properties/Resources.Designer.cs
generated
2
Controls/Properties/Resources.Designer.cs
generated
@@ -1,7 +1,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.225
|
// Laufzeitversion:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
|
|||||||
4
Controls/Properties/Settings.Designer.cs
generated
4
Controls/Properties/Settings.Designer.cs
generated
@@ -1,7 +1,7 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// Dieser Code wurde von einem Tool generiert.
|
// Dieser Code wurde von einem Tool generiert.
|
||||||
// Laufzeitversion:4.0.30319.225
|
// Laufzeitversion:4.0.30319.42000
|
||||||
//
|
//
|
||||||
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
|
||||||
// der Code erneut generiert wird.
|
// der Code erneut generiert wird.
|
||||||
@@ -12,7 +12,7 @@ namespace BeWo.Controls.Properties {
|
|||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWo.Data</RootNamespace>
|
<RootNamespace>BeWo.Data</RootNamespace>
|
||||||
<AssemblyName>BeWo.Data</AssemblyName>
|
<AssemblyName>BeWo.Data</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
@@ -42,6 +42,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -51,6 +52,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@@ -68,6 +70,7 @@
|
|||||||
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
||||||
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
|
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
|
||||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
||||||
|
|||||||
@@ -14,14 +14,6 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
public static string PropertyName_Notice = "Notice";
|
public static string PropertyName_Notice = "Notice";
|
||||||
|
|
||||||
public static string PropertyName_Notice2 = "Notice2";
|
|
||||||
|
|
||||||
public static string PropertyName_Notice3 = "Notice3";
|
|
||||||
|
|
||||||
public static string PropertyName_Notice4 = "Notice4";
|
|
||||||
|
|
||||||
public static string PropertyName_Notice5 = "Notice5";
|
|
||||||
|
|
||||||
public static string PropertyName_Oid = "Oid";
|
public static string PropertyName_Oid = "Oid";
|
||||||
|
|
||||||
public static string PropertyName_SystemEntryID = "SystemEntryID";
|
public static string PropertyName_SystemEntryID = "SystemEntryID";
|
||||||
@@ -36,14 +28,6 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
protected string _Notice;
|
protected string _Notice;
|
||||||
|
|
||||||
protected string _Notice2;
|
|
||||||
|
|
||||||
protected string _Notice3;
|
|
||||||
|
|
||||||
protected string _Notice4;
|
|
||||||
|
|
||||||
protected string _Notice5;
|
|
||||||
|
|
||||||
protected long? _Oid;
|
protected long? _Oid;
|
||||||
|
|
||||||
protected TableID _Tid;
|
protected TableID _Tid;
|
||||||
@@ -120,70 +104,6 @@ namespace BeWo.Data.Entities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual string Notice2
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._Notice2;
|
|
||||||
}
|
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (this.AreDifferent(this._Notice2, value))
|
|
||||||
{
|
|
||||||
this._Notice2 = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual string Notice3
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._Notice3;
|
|
||||||
}
|
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (this.AreDifferent(this._Notice3, value))
|
|
||||||
{
|
|
||||||
this._Notice3 = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual string Notice4
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._Notice4;
|
|
||||||
}
|
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (this.AreDifferent(this._Notice4, value))
|
|
||||||
{
|
|
||||||
this._Notice4 = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual string Notice5
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this._Notice5;
|
|
||||||
}
|
|
||||||
|
|
||||||
set
|
|
||||||
{
|
|
||||||
if (this.AreDifferent(this._Notice5, value))
|
|
||||||
{
|
|
||||||
this._Notice5 = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual long? Oid
|
public virtual long? Oid
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|||||||
@@ -22,15 +22,23 @@ namespace BeWo.Data.Entities
|
|||||||
public static string PropertyName_Subject = "Subject";
|
public static string PropertyName_Subject = "Subject";
|
||||||
public static string PropertyName_Type = "Type";
|
public static string PropertyName_Type = "Type";
|
||||||
public static string PropertyName_FormerBookingSequenceOid = "FormerBookingSequenceOid";
|
public static string PropertyName_FormerBookingSequenceOid = "FormerBookingSequenceOid";
|
||||||
|
public static string PropertyName_Notice2 = "Notice2";
|
||||||
|
public static string PropertyName_Notice3 = "Notice3";
|
||||||
|
public static string PropertyName_Notice4 = "Notice4";
|
||||||
|
public static string PropertyName_Notice5 = "Notice5";
|
||||||
|
|
||||||
private IList<Employee2SchedulerAppointment> _EmployeeList;
|
private IList<Employee2SchedulerAppointment> _EmployeeList;
|
||||||
private IList<Customer> _CustomerList;
|
private IList<Customer> _CustomerList;
|
||||||
private IList<Resource> _ResourceList;
|
private IList<Resource> _ResourceList;
|
||||||
private bool _IsPrivate;
|
private bool _IsPrivate;
|
||||||
private Employee _Originator;
|
private Employee _Originator;
|
||||||
private long? _FormerBookingSequenceOid;
|
private long? _FormerBookingSequenceOid;
|
||||||
|
private string _Notice2;
|
||||||
|
private string _Notice3;
|
||||||
|
private string _Notice4;
|
||||||
|
private string _Notice5;
|
||||||
|
|
||||||
public SchedulerAppointment()
|
public SchedulerAppointment()
|
||||||
{
|
{
|
||||||
_Tid = TableID.NewSchedulerAppointment;
|
_Tid = TableID.NewSchedulerAppointment;
|
||||||
}
|
}
|
||||||
@@ -104,5 +112,70 @@ namespace BeWo.Data.Entities
|
|||||||
_FormerBookingSequenceOid = value;
|
_FormerBookingSequenceOid = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public virtual string Notice2
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice2;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice2, value))
|
||||||
|
{
|
||||||
|
this._Notice2 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice3
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice3;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice3, value))
|
||||||
|
{
|
||||||
|
this._Notice3 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice4
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice4;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice4, value))
|
||||||
|
{
|
||||||
|
this._Notice4 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice5
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice5;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice5, value))
|
||||||
|
{
|
||||||
|
this._Notice5 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,6 +50,24 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
public static string PropertyName_ServiceRecordFormat = "ServiceRecordFormat";
|
public static string PropertyName_ServiceRecordFormat = "ServiceRecordFormat";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice1 = "RTFNotice1";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice2 = "RTFNotice2";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice3 = "RTFNotice3";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice4 = "RTFNotice4";
|
||||||
|
|
||||||
|
public static string PropertyName_RTFNotice5 = "RTFNotice5";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice2 = "Notice2";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice3 = "Notice3";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice4 = "Notice4";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice5 = "Notice5";
|
||||||
|
|
||||||
private long? _WohnheimbuchungsOid;
|
private long? _WohnheimbuchungsOid;
|
||||||
|
|
||||||
private bool _isCreatedInMobileClient;
|
private bool _isCreatedInMobileClient;
|
||||||
@@ -102,8 +120,26 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
private ServiceRecordFormate? _ServiceRecordFormat;
|
private ServiceRecordFormate? _ServiceRecordFormat;
|
||||||
|
|
||||||
|
private string _RTFNotice1;
|
||||||
|
|
||||||
public virtual bool IsCreatedInMobileClient
|
private string _RTFNotice2;
|
||||||
|
|
||||||
|
private string _RTFNotice3;
|
||||||
|
|
||||||
|
private string _RTFNotice4;
|
||||||
|
|
||||||
|
private string _RTFNotice5;
|
||||||
|
|
||||||
|
private string _Notice2;
|
||||||
|
|
||||||
|
private string _Notice3;
|
||||||
|
|
||||||
|
private string _Notice4;
|
||||||
|
|
||||||
|
private string _Notice5;
|
||||||
|
|
||||||
|
|
||||||
|
public virtual bool IsCreatedInMobileClient
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -588,6 +624,149 @@ namespace BeWo.Data.Entities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual string RTFNotice1
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._RTFNotice1;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._RTFNotice1, value))
|
||||||
|
{
|
||||||
|
this._RTFNotice1 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string RTFNotice2
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._RTFNotice2;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._RTFNotice2, value))
|
||||||
|
{
|
||||||
|
this._RTFNotice2 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string RTFNotice3
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._RTFNotice3;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._RTFNotice3, value))
|
||||||
|
{
|
||||||
|
this._RTFNotice3 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string RTFNotice4
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._RTFNotice4;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._RTFNotice4, value))
|
||||||
|
{
|
||||||
|
this._RTFNotice4 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string RTFNotice5
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._RTFNotice5;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._RTFNotice5, value))
|
||||||
|
{
|
||||||
|
this._RTFNotice5 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice2
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice2;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice2, value))
|
||||||
|
{
|
||||||
|
this._Notice2 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice3
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice3;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice3, value))
|
||||||
|
{
|
||||||
|
this._Notice3 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice4
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice4;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice4, value))
|
||||||
|
{
|
||||||
|
this._Notice4 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice5
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice5;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice5, value))
|
||||||
|
{
|
||||||
|
this._Notice5 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,6 +17,14 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
public static string PropertyName_StartDate = "StartDate";
|
public static string PropertyName_StartDate = "StartDate";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice2 = "Notice2";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice3 = "Notice3";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice4 = "Notice4";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice5 = "Notice5";
|
||||||
|
|
||||||
private int _CustomerCount;
|
private int _CustomerCount;
|
||||||
|
|
||||||
private int _EmployeeCount;
|
private int _EmployeeCount;
|
||||||
@@ -29,6 +37,14 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
private DateTime? _StartDate;
|
private DateTime? _StartDate;
|
||||||
|
|
||||||
|
private string _Notice2;
|
||||||
|
|
||||||
|
private string _Notice3;
|
||||||
|
|
||||||
|
private string _Notice4;
|
||||||
|
|
||||||
|
private string _Notice5;
|
||||||
|
|
||||||
public virtual int CustomerCount
|
public virtual int CustomerCount
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
@@ -124,5 +140,71 @@ namespace BeWo.Data.Entities
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual string Notice2
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice2;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice2, value))
|
||||||
|
{
|
||||||
|
this._Notice2 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice3
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice3;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice3, value))
|
||||||
|
{
|
||||||
|
this._Notice3 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice4
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice4;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice4, value))
|
||||||
|
{
|
||||||
|
this._Notice4 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice5
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice5;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice5, value))
|
||||||
|
{
|
||||||
|
this._Notice5 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -57,8 +57,16 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
public static string PropertyName_IsCreatedInMobileClient = "IsCreatedInMobileClient";
|
public static string PropertyName_IsCreatedInMobileClient = "IsCreatedInMobileClient";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice2 = "Notice2";
|
||||||
|
|
||||||
private bool _IsCreatedInMobileClient;
|
public static string PropertyName_Notice3 = "Notice3";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice4 = "Notice4";
|
||||||
|
|
||||||
|
public static string PropertyName_Notice5 = "Notice5";
|
||||||
|
|
||||||
|
|
||||||
|
private bool _IsCreatedInMobileClient;
|
||||||
|
|
||||||
public virtual bool IsCreatedInMobileClient
|
public virtual bool IsCreatedInMobileClient
|
||||||
{
|
{
|
||||||
@@ -126,6 +134,14 @@ namespace BeWo.Data.Entities
|
|||||||
|
|
||||||
private long _ServiceRecordVersion;
|
private long _ServiceRecordVersion;
|
||||||
|
|
||||||
|
private string _Notice2;
|
||||||
|
|
||||||
|
private string _Notice3;
|
||||||
|
|
||||||
|
private string _Notice4;
|
||||||
|
|
||||||
|
private string _Notice5;
|
||||||
|
|
||||||
|
|
||||||
public virtual CostBearer2SupportConcept CostBearer2SupportConcept
|
public virtual CostBearer2SupportConcept CostBearer2SupportConcept
|
||||||
{
|
{
|
||||||
@@ -572,5 +588,70 @@ namespace BeWo.Data.Entities
|
|||||||
{
|
{
|
||||||
this._Tid = TableID.ServiceRecordHistory;
|
this._Tid = TableID.ServiceRecordHistory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public virtual string Notice2
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice2;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice2, value))
|
||||||
|
{
|
||||||
|
this._Notice2 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice3
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice3;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice3, value))
|
||||||
|
{
|
||||||
|
this._Notice3 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice4
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice4;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice4, value))
|
||||||
|
{
|
||||||
|
this._Notice4 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public virtual string Notice5
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return this._Notice5;
|
||||||
|
}
|
||||||
|
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (this.AreDifferent(this._Notice5, value))
|
||||||
|
{
|
||||||
|
this._Notice5 = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -38,7 +38,11 @@
|
|||||||
<property column="Notice5" type="String" name="Notice5" length="1024" />
|
<property column="Notice5" type="String" name="Notice5" length="1024" />
|
||||||
<property column="DurationInStunden" type="BS.Shared.ZeiterfassungsDauer, BS.Shared" name="DurationInStunden" />
|
<property column="DurationInStunden" type="BS.Shared.ZeiterfassungsDauer, BS.Shared" name="DurationInStunden" />
|
||||||
<property column="ServiceRecordFormat" type="BS.Shared.ServiceRecordFormate, BS.Shared" name="ServiceRecordFormat" />
|
<property column="ServiceRecordFormat" type="BS.Shared.ServiceRecordFormate, BS.Shared" name="ServiceRecordFormat" />
|
||||||
|
<property column="RTFNotice1" type="String" name="RTFNotice1" length="1024" />
|
||||||
|
<property column="RTFNotice2" type="String" name="RTFNotice2" length="1024" />
|
||||||
|
<property column="RTFNotice3" type="String" name="RTFNotice3" length="1024" />
|
||||||
|
<property column="RTFNotice4" type="String" name="RTFNotice4" length="1024" />
|
||||||
|
<property column="RTFNotice5" type="String" name="RTFNotice5" length="1024" />
|
||||||
|
|
||||||
<many-to-one name="Group" column="GroupOid" class="BeWo.Data.Entities.ServiceRecordGroup,BeWo.Data" cascade="none" />
|
<many-to-one name="Group" column="GroupOid" class="BeWo.Data.Entities.ServiceRecordGroup,BeWo.Data" cascade="none" />
|
||||||
<many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee,BeWo.Data" cascade="none" />
|
<many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee,BeWo.Data" cascade="none" />
|
||||||
|
|||||||
16
Host/DX.aspx
16
Host/DX.aspx
@@ -1,15 +1,11 @@
|
|||||||
<%@ Page Title="" Language="C#" AutoEventWireup="true" CodeBehind="DX.aspx.cs" Inherits="Host.DX" %>
|
<%@ Page Title="" Language="C#" AutoEventWireup="true" CodeBehind="DX.aspx.cs" Inherits="Host.DX" %>
|
||||||
|
|
||||||
<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
<%@ Register Assembly="DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||||
Namespace="DevExpress.Web.ASPxRoundPanel" TagPrefix="dx" %>
|
Namespace="DevExpress.Web" TagPrefix="dx" %>
|
||||||
<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
|
||||||
Namespace="DevExpress.Web.ASPxPanel" TagPrefix="dx" %>
|
|
||||||
<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
|
||||||
Namespace="DevExpress.Web.ASPxEditors" TagPrefix="dx" %>
|
|
||||||
<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
|
||||||
Namespace="DevExpress.Web.ASPxLoadingPanel" TagPrefix="dx" %>
|
|
||||||
<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
|
||||||
Namespace="DevExpress.Web.ASPxDataView" TagPrefix="dx" %>
|
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head id="Head1" runat="server">
|
<head id="Head1" runat="server">
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Web.UI;
|
using System.Web.UI;
|
||||||
|
|
||||||
using DevExpress.Web.ASPxClasses;
|
using DevExpress.Web;
|
||||||
|
|
||||||
namespace Host
|
namespace Host
|
||||||
{
|
{
|
||||||
|
|||||||
10
Host/DX.aspx.designer.cs
generated
10
Host/DX.aspx.designer.cs
generated
@@ -38,7 +38,7 @@ namespace Host {
|
|||||||
/// Auto-generated field.
|
/// Auto-generated field.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::DevExpress.Web.ASPxRoundPanel.ASPxRoundPanel ASPxRoundPanel1;
|
protected global::DevExpress.Web.ASPxRoundPanel ASPxRoundPanel1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ASPxComboBox1 control.
|
/// ASPxComboBox1 control.
|
||||||
@@ -47,7 +47,7 @@ namespace Host {
|
|||||||
/// Auto-generated field.
|
/// Auto-generated field.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::DevExpress.Web.ASPxEditors.ASPxComboBox ASPxComboBox1;
|
protected global::DevExpress.Web.ASPxComboBox ASPxComboBox1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ASPxComboBox2 control.
|
/// ASPxComboBox2 control.
|
||||||
@@ -56,7 +56,7 @@ namespace Host {
|
|||||||
/// Auto-generated field.
|
/// Auto-generated field.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::DevExpress.Web.ASPxEditors.ASPxComboBox ASPxComboBox2;
|
protected global::DevExpress.Web.ASPxComboBox ASPxComboBox2;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ASPxDataView1 control.
|
/// ASPxDataView1 control.
|
||||||
@@ -65,7 +65,7 @@ namespace Host {
|
|||||||
/// Auto-generated field.
|
/// Auto-generated field.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::DevExpress.Web.ASPxDataView.ASPxDataView ASPxDataView1;
|
protected global::DevExpress.Web.ASPxDataView ASPxDataView1;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ASPxLoadingPanel1 control.
|
/// ASPxLoadingPanel1 control.
|
||||||
@@ -74,6 +74,6 @@ namespace Host {
|
|||||||
/// Auto-generated field.
|
/// Auto-generated field.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// To modify move field declaration from designer file to code-behind file.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::DevExpress.Web.ASPxLoadingPanel.ASPxLoadingPanel ASPxLoadingPanel1;
|
protected global::DevExpress.Web.ASPxLoadingPanel ASPxLoadingPanel1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Host</RootNamespace>
|
<RootNamespace>Host</RootNamespace>
|
||||||
<AssemblyName>Host</AssemblyName>
|
<AssemblyName>Host</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
<OldToolsVersion>4.0</OldToolsVersion>
|
<OldToolsVersion>4.0</OldToolsVersion>
|
||||||
@@ -35,6 +35,7 @@
|
|||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -47,24 +48,29 @@
|
|||||||
<PackageAsSingleFile>false</PackageAsSingleFile>
|
<PackageAsSingleFile>false</PackageAsSingleFile>
|
||||||
<PublishDatabases>false</PublishDatabases>
|
<PublishDatabases>false</PublishDatabases>
|
||||||
<FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
|
<FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.Office.v13.2.Core, Version=13.2.13.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.RichEdit.v13.2.Core, Version=13.2.13.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.Web.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraPivotGrid.v13.2, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.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.XtraReports.v13.2.Web, Version=13.2.13.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.XtraScheduler.v13.2.Core, Version=13.2.13.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.XtraScheduler.v13.2.Reporting, Version=13.2.13.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.Web.Resources.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DevExpress.XtraReports.v17.1.Web, 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.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="MySql.Data, Version=6.3.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
|
<Reference Include="MySql.Data, Version=6.3.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\Lib\MySql.Data.dll</HintPath>
|
<HintPath>..\Lib\MySql.Data.dll</HintPath>
|
||||||
@@ -82,9 +88,9 @@
|
|||||||
<Reference Include="System.Web.ApplicationServices" />
|
<Reference Include="System.Web.ApplicationServices" />
|
||||||
<Reference Include="System.Web.DynamicData" />
|
<Reference Include="System.Web.DynamicData" />
|
||||||
<Reference Include="System.Web.Entity" />
|
<Reference Include="System.Web.Entity" />
|
||||||
<Reference Include="System.Web.Extensions" />
|
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.Web" />
|
<Reference Include="System.Web" />
|
||||||
|
<Reference Include="System.Web.Extensions" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="System.Configuration" />
|
<Reference Include="System.Configuration" />
|
||||||
<Reference Include="System.Web.Services" />
|
<Reference Include="System.Web.Services" />
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReportView.aspx.cs" Inherits="Host.ReportView" %>
|
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReportView.aspx.cs" Inherits="Host.ReportView" %>
|
||||||
|
|
||||||
<%@ Register assembly="DevExpress.XtraReports.v13.2.Web, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraReports.Web" tagprefix="dxxr" %>
|
<%@ Register assembly="DevExpress.XtraReports.v17.1.Web, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraReports.Web" tagprefix="dxxr" %>
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configSections>
|
<configSections>
|
||||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
|
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
|
||||||
<sectionGroup name="devExpress">
|
<sectionGroup name="devExpress">
|
||||||
<section name="themes" type="DevExpress.Web.ASPxClasses.ThemesConfigurationSection, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
<section name="themes" type="DevExpress.Web.ThemesConfigurationSection, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||||
<section name="compression" type="DevExpress.Web.ASPxClasses.CompressionConfigurationSection, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
<section name="compression" type="DevExpress.Web.CompressionConfigurationSection, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||||
<section name="settings" type="DevExpress.Web.ASPxClasses.SettingsConfigurationSection, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
<section name="settings" type="DevExpress.Web.SettingsConfigurationSection, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||||
<section name="errors" type="DevExpress.Web.ASPxClasses.ErrorsConfigurationSection, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
<section name="errors" type="DevExpress.Web.ErrorsConfigurationSection, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
</configSections>
|
</configSections>
|
||||||
<system.diagnostics>
|
<system.diagnostics>
|
||||||
@@ -39,19 +39,27 @@
|
|||||||
<appender-ref ref="logFile" />
|
<appender-ref ref="logFile" />
|
||||||
</root>
|
</root>
|
||||||
</log4net>
|
</log4net>
|
||||||
|
<!--
|
||||||
|
Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.
|
||||||
|
|
||||||
|
Die folgenden Attribute können für die <httpRuntime>-Kennung festgelegt werden.
|
||||||
|
<system.Web>
|
||||||
|
<httpRuntime targetFramework="4.5" />
|
||||||
|
</system.Web>
|
||||||
|
-->
|
||||||
<system.web>
|
<system.web>
|
||||||
<compilation debug="true" defaultLanguage="c#" targetFramework="4.0">
|
<compilation debug="true" defaultLanguage="c#" targetFramework="4.5">
|
||||||
<assemblies>
|
<assemblies>
|
||||||
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||||
<add assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.Printing.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.Data.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.Utils.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.XtraPrinting.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.XtraReports.v13.2.Web, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.XtraReports.v17.1.Web, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.Charts.v13.2.Core, Version=13.2.13.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add assembly="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||||
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
@@ -59,33 +67,34 @@
|
|||||||
<add assembly="System.Data.Services.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
<add assembly="System.Data.Services.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
<add assembly="System.Data.Services.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
<add assembly="System.Data.Services.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
<add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||||
<add assembly="DevExpress.RichEdit.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /></assemblies>
|
<add assembly="DevExpress.RichEdit.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
|
<add assembly="DevExpress.Web.Resources.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /></assemblies>
|
||||||
</compilation>
|
</compilation>
|
||||||
<httpRuntime maxRequestLength="65536" executionTimeout="300" />
|
<httpRuntime maxRequestLength="65536" executionTimeout="300" />
|
||||||
<!--IIS 6-->
|
<!--IIS 6-->
|
||||||
<!--<httpModules>
|
<!--<httpModules>
|
||||||
<add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||||
|
|
||||||
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
</httpModules>-->
|
</httpModules>-->
|
||||||
<!-- ### -->
|
<!-- ### -->
|
||||||
<!--<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />-->
|
<!--<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />-->
|
||||||
<httpHandlers>
|
<httpHandlers>
|
||||||
<add type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" validate="false" />
|
<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" validate="false" />
|
||||||
</httpHandlers>
|
</httpHandlers>
|
||||||
|
<httpModules>
|
||||||
|
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
<httpModules>
|
</httpModules>
|
||||||
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<pages controlRenderingCompatibilityVersion="4.0" />
|
||||||
</httpModules>
|
</system.web>
|
||||||
</system.web>
|
|
||||||
<!--IIS 7-->
|
<!--IIS 7-->
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<modules>
|
<modules>
|
||||||
<add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||||
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
</modules>
|
</modules>
|
||||||
</system.webServer>
|
|
||||||
|
</system.webServer>
|
||||||
<!-- ### -->
|
<!-- ### -->
|
||||||
<system.serviceModel>
|
<system.serviceModel>
|
||||||
<bindings>
|
<bindings>
|
||||||
@@ -144,9 +153,9 @@
|
|||||||
<service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.MailServiceImp">
|
<service behaviorConfiguration="returnFaults" name="BeWo.Service.ServiceImplementations.MailServiceImp">
|
||||||
<endpoint behaviorConfiguration="SecurityAndSessionBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="MailServiceEndpoint" contract="BeWo.Service.ServiceContracts.IMailService" />
|
<endpoint behaviorConfiguration="SecurityAndSessionBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="MailServiceEndpoint" contract="BeWo.Service.ServiceContracts.IMailService" />
|
||||||
</service>
|
</service>
|
||||||
<service behaviorConfiguration="returnFaults" name="ReportingService.ServiceImplementations.ReportServiceImp">
|
<service behaviorConfiguration="returnFaults" name="ReportingService.ServiceImplementations.ReportServiceImp">
|
||||||
<endpoint behaviorConfiguration="SecurityAndSessionBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="ReportServiceEndpoint" contract="ReportingService.ServiceContracts.IReportService" />
|
<endpoint behaviorConfiguration="SecurityAndSessionBehavior" binding="basicHttpBinding" bindingConfiguration="TransportSecurity" name="ReportServiceEndpoint" contract="ReportingService.ServiceContracts.IReportService" />
|
||||||
</service>
|
</service>
|
||||||
</services>
|
</services>
|
||||||
<behaviors>
|
<behaviors>
|
||||||
<endpointBehaviors>
|
<endpointBehaviors>
|
||||||
@@ -180,12 +189,12 @@
|
|||||||
</system.serviceModel>
|
</system.serviceModel>
|
||||||
<system.webServer>
|
<system.webServer>
|
||||||
<!--<modules>
|
<!--<modules>
|
||||||
<add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<add name="ASPHibernateSession" type="BeWo.Data.ASPHibernateSessionManager, BeWo.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||||
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||||
</modules>-->
|
</modules>-->
|
||||||
<validation validateIntegratedModeConfiguration="false" />
|
<validation validateIntegratedModeConfiguration="false" />
|
||||||
<handlers>
|
<handlers>
|
||||||
<add type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" name="ASPxHttpHandlerModule" preCondition="integratedMode" />
|
<add type="DevExpress.Web.ASPxHttpHandlerModule, DevExpress.Web.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" name="ASPxHttpHandlerModule" preCondition="integratedMode" />
|
||||||
</handlers>
|
</handlers>
|
||||||
</system.webServer>
|
</system.webServer>
|
||||||
<appSettings>
|
<appSettings>
|
||||||
@@ -194,15 +203,15 @@
|
|||||||
<add key="SmtpUser" value="bewoplaner.support@beyondsoft.de" />
|
<add key="SmtpUser" value="bewoplaner.support@beyondsoft.de" />
|
||||||
<add key="SmtpPassword" value="G57ojFhgZ" />
|
<add key="SmtpPassword" value="G57ojFhgZ" />
|
||||||
<add key="Recipient" value="error@bewoplaner.de" />
|
<add key="Recipient" value="error@bewoplaner.de" />
|
||||||
<add key="SupportEMail" value="support@bewoplaner.de" />
|
<add key="SupportEMail" value="support@bewoplaner.de" />
|
||||||
<add key="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
|
<add key="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
|
||||||
<add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?k=[TENANT]" />
|
<add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?k=[TENANT]" />
|
||||||
<add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
|
<add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
|
||||||
<add key="ContractStateUrl" value="https://support.bewoplaner.de/api/getcontractstate.php?CustomerID=[TENANT]" />
|
<add key="ContractStateUrl" value="https://support.bewoplaner.de/api/getcontractstate.php?CustomerID=[TENANT]" />
|
||||||
<!--<add key="MaxDocumentSize" value="20971520" />-->
|
<!--<add key="MaxDocumentSize" value="20971520" />-->
|
||||||
<add key="MaxDocumentSize" value="20971520" />
|
<add key="MaxDocumentSize" value="20971520" />
|
||||||
<add key="RssFeedUrl" value="http://188.40.45.85/news_rss.php?ClientOID=236180486&CategoryOID=2002858128" />
|
<add key="RssFeedUrl" value="http://188.40.45.85/news_rss.php?ClientOID=236180486&CategoryOID=2002858128" />
|
||||||
<add key="ICD10File" value="icd10.xml" />
|
<add key="ICD10File" value="icd10.xml" />
|
||||||
</appSettings>
|
</appSettings>
|
||||||
<devExpress>
|
<devExpress>
|
||||||
<themes enableThemesAssembly="true" styleSheetTheme="" theme="" />
|
<themes enableThemesAssembly="true" styleSheetTheme="" theme="" />
|
||||||
|
|||||||
11
Model/Changes_2017_07_26.txt
Normal file
11
Model/Changes_2017_07_26.txt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
ALTER TABLE `1234567890`.`servicerecord`
|
||||||
|
|
||||||
|
ADD COLUMN `RTFNotice1` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `ServiceRecordFormat`,
|
||||||
|
|
||||||
|
ADD COLUMN `RTFNotice2` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice1`,
|
||||||
|
|
||||||
|
ADD COLUMN `RTFNotice3` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice2`,
|
||||||
|
|
||||||
|
ADD COLUMN `RTFNotice4` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice3`,
|
||||||
|
|
||||||
|
ADD COLUMN `RTFNotice5` MEDIUMTEXT NULL DEFAULT NULL COMMENT '' AFTER `RTFNotice4`;
|
||||||
@@ -1 +1 @@
|
|||||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>BeWo.Report</RootNamespace>
|
<RootNamespace>BeWo.Report</RootNamespace>
|
||||||
<AssemblyName>BeWo.Report</AssemblyName>
|
<AssemblyName>BeWo.Report</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<FileUpgradeFlags>
|
<FileUpgradeFlags>
|
||||||
</FileUpgradeFlags>
|
</FileUpgradeFlags>
|
||||||
@@ -43,6 +43,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@@ -53,6 +54,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugRemote|AnyCPU'">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@@ -69,32 +71,38 @@
|
|||||||
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
||||||
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
|
||||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Charts.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.Office.v13.2.Core, Version=13.2.13.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.RichEdit.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
<Reference Include="DevExpress.XtraCharts.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="DevExpress.XtraEditors.v13.2, Version=13.2.13.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.v13.2, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraPivotGrid.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.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.XtraScheduler.v13.2.Reporting.Extensions, Version=13.2.13.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.XtraScheduler.v13.2, Version=13.2.13.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.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraScheduler.v17.1.Reporting.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraScheduler.v13.2.Reporting, Version=13.2.13.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.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.XtraScheduler.v17.1.Reporting, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="PresentationCore">
|
<Reference Include="PresentationCore">
|
||||||
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
|
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0" />
|
<bindingRedirect oldVersion="0.0.0.0-2.5.1.0" newVersion="2.5.1.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,19 +31,24 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraPivotGrid.v13.2, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -54,20 +54,25 @@
|
|||||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraPivotGrid.v13.2, Version=13.2.13.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.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core">
|
<Reference Include="System.Core">
|
||||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -68,19 +68,24 @@
|
|||||||
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Printing.v13.2.Core, Version=13.2.13.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.Data.v13.2, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraPivotGrid.v13.2, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraPivotGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Sparkline.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core">
|
<Reference Include="System.Core">
|
||||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
@@ -31,18 +31,23 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="DevExpress.Data.v13.2, Version=13.2.13.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.Printing.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.Charts.v13.2.Core, Version=13.2.13.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.v13.2.Wizard, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Charts.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraCharts.v17.1.Wizard, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.PivotGrid.v13.2.Core, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.Utils.v17.1.UI, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraReports.v17.1.Extensions, 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.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.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user