Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts: # BeWo/ServiceProxy/Generated.cs
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DevExpress.Xpf.LayoutControl.ScrollBox, DevExpress.Xpf.LayoutControl.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -49,9 +49,10 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Core.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="devexpress.xpf.layoutcontrol.v13.1, Version=13.1.7.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.Xpf.Mvvm.v13.2, Version=13.2.13.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.xpf.layoutcontrol.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
<Reference Include="System.Data" />
|
||||
|
||||
139
BeWo/BeWo.csproj
139
BeWo/BeWo.csproj
@@ -16,10 +16,10 @@
|
||||
<EnableSecurityDebugging>true</EnableSecurityDebugging>
|
||||
<TargetZone>Internet</TargetZone>
|
||||
<GenerateManifests>true</GenerateManifests>
|
||||
<SignManifests>false</SignManifests>
|
||||
<SignManifests>true</SignManifests>
|
||||
<ManifestKeyFile>
|
||||
</ManifestKeyFile>
|
||||
<ManifestCertificateThumbprint>64EE47D8851B4F38E5242B6A4D6FBA33D8B493BA</ManifestCertificateThumbprint>
|
||||
<ManifestCertificateThumbprint>D9ACF3EBC5E47956B8D786361F7061E3F6D6F286</ManifestCertificateThumbprint>
|
||||
<IsWebBootstrapper>true</IsWebBootstrapper>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
<ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
|
||||
@@ -42,12 +42,12 @@
|
||||
<TargetCulture>de-DE</TargetCulture>
|
||||
<ProductName>BeWoPlaner</ProductName>
|
||||
<PublisherName>beyondSoft GmbH</PublisherName>
|
||||
<MinimumRequiredVersion>2.0.1.122</MinimumRequiredVersion>
|
||||
<MinimumRequiredVersion>2.0.1.124</MinimumRequiredVersion>
|
||||
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
||||
<WebPage>publish.htm</WebPage>
|
||||
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
|
||||
<TrustUrlParameters>true</TrustUrlParameters>
|
||||
<ApplicationRevision>123</ApplicationRevision>
|
||||
<ApplicationRevision>125</ApplicationRevision>
|
||||
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||
@@ -91,32 +91,35 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lib\Blacklight.Wpf.Controls.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Mvvm.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Core.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Charts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Docking.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Grid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Grid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Layout.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Printing.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Scheduler.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Themes.LightGray.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Themes.Office2007Black.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Themes.Office2010Black.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraEditors.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1.Reporting, Version=13.1.7.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.Printing.v13.2.Core, Version=13.2.13.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.RichEdit.v13.2.Core, Version=13.2.13.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.Xpf.Mvvm.v13.2, Version=13.2.13.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.Xpf.Charts.v13.2, Version=13.2.13.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.Grid.v13.2.Core, Version=13.2.13.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.Layout.v13.2.Core, Version=13.2.13.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.RichEdit.v13.2, Version=13.2.13.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.Themes.LightGray.v13.2, Version=13.2.13.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.Xpf.Themes.Office2010Black.v13.2, Version=13.2.13.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.XtraPivotGrid.v13.2, Version=13.2.13.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.XtraCharts.v13.2, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.XtraScheduler.v13.2.Reporting.Extensions, Version=13.2.13.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.XtraScheduler.v13.2.Core, Version=13.2.13.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="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
@@ -2040,7 +2043,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Charts.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Charts.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2050,7 +2053,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Data.v13.1">
|
||||
<PublishFile Include="DevExpress.Data.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2060,7 +2063,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Data.v13.1.Linq">
|
||||
<PublishFile Include="DevExpress.Data.v13.2.Linq">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2070,7 +2073,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Office.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Office.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2080,7 +2083,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.PivotGrid.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.PivotGrid.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2090,7 +2093,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Printing.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Printing.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2100,7 +2103,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.RichEdit.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.RichEdit.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2110,7 +2113,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Sparkline.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Sparkline.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2120,7 +2123,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Utils.v13.1">
|
||||
<PublishFile Include="DevExpress.Utils.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2130,7 +2133,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Charts.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Charts.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2140,7 +2143,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Core.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Core.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2150,7 +2153,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Docking.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Docking.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2160,7 +2163,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Grid.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Grid.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2170,7 +2173,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Grid.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Xpf.Grid.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2180,7 +2183,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Layout.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Xpf.Layout.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2190,7 +2193,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Mvvm.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Mvvm.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2200,7 +2203,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Printing.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Printing.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2210,7 +2213,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Printing.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.Xpf.Printing.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2220,7 +2223,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Ribbon.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Ribbon.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2230,7 +2233,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Scheduler.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Scheduler.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2240,7 +2243,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Themes.LightGray.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2250,7 +2253,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Themes.Office2007Black.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2260,7 +2263,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v13.1">
|
||||
<PublishFile Include="DevExpress.Xpf.Themes.Office2010Black.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2270,7 +2273,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraBars.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraBars.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2280,7 +2283,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraCharts.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraCharts.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2290,7 +2293,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraEditors.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraEditors.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2300,7 +2303,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraNavBar.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraNavBar.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2310,7 +2313,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraPivotGrid.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraPivotGrid.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2320,7 +2323,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraPrinting.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraPrinting.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2330,7 +2333,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraReports.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraReports.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2340,7 +2343,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraScheduler.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraScheduler.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2350,7 +2353,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraScheduler.v13.1.Core">
|
||||
<PublishFile Include="DevExpress.XtraScheduler.v13.2.Core">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2360,7 +2363,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraScheduler.v13.1.Reporting">
|
||||
<PublishFile Include="DevExpress.XtraScheduler.v13.2.Reporting">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2370,7 +2373,7 @@
|
||||
<IncludeHash>True</IncludeHash>
|
||||
<FileType>Assembly</FileType>
|
||||
</PublishFile>
|
||||
<PublishFile Include="DevExpress.XtraTreeList.v13.1">
|
||||
<PublishFile Include="DevExpress.XtraTreeList.v13.2">
|
||||
<Visible>False</Visible>
|
||||
<Group>
|
||||
</Group>
|
||||
@@ -2487,15 +2490,15 @@
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
<!--Target Name="SignOutput" AfterTargets="CoreCompile">
|
||||
<!-- Target Name="SignOutput" AfterTargets="CoreCompile">
|
||||
<PropertyGroup>
|
||||
<TimestampServerUrl>http://tsa.startssl.com/rfc3161</TimestampServerUrl>
|
||||
<TimestampServerUrl>http://timestamp.globalsign.com/?signature=sha2</TimestampServerUrl>
|
||||
<ApplicationDescription>BeWoPlaner</ApplicationDescription>
|
||||
<SigningCertificateCriteria>/sha1 64ee47d8851b4f38e5242b6a4d6fba33d8b493ba</SigningCertificateCriteria>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<SignableFiles Include="$(ProjectDir)obj\$(ConfigurationName)\$(TargetName)$(TargetExt)" />
|
||||
</ItemGroup>
|
||||
<Exec Command=""$(ProjectDir)\SignTool" sign $(SigningCertificateCriteria) /d "$(ApplicationDescription)" /tr "$(TimestampServerUrl)" "%(SignableFiles.Identity)"" />
|
||||
</Target-->
|
||||
<Exec Command=""$(ProjectDir)\SignTool" sign /a /tr "$(TimestampServerUrl)" /td SHA256 "%(SignableFiles.Identity)"" />
|
||||
</Target -->
|
||||
</Project>
|
||||
@@ -454,7 +454,7 @@ namespace BeWo
|
||||
String url = ServerAddress.ToLower();
|
||||
|
||||
#if DEBUG
|
||||
url = String.Format("http://localhost/Host");
|
||||
url = String.Format("http://localhost:3777/Host");
|
||||
//url = String.Format("app1.bewoplaner.de/service");
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1658,24 +1658,39 @@ namespace BeWo.Core
|
||||
}
|
||||
break;
|
||||
case ServiceRecordValidationResult.ApprovedFLSOverspending:
|
||||
String klient = "diesen Hilfeplan";
|
||||
if (!String.IsNullOrEmpty(result.CustomerName))
|
||||
{
|
||||
klient = "Klient/in " + result.CustomerName;
|
||||
}
|
||||
String msg =
|
||||
String.Format(
|
||||
"Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).",
|
||||
result.ApprovedHours, result.HoursNew, klient);
|
||||
|
||||
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved))
|
||||
{
|
||||
MessageBox.Show("Die für diesen Hilfeplan genehmigten FLS (" + (result.ApprovedHours).ToString("N") + ") werden mit diesem Eintrag überschritten. (" + (result.HoursNew).ToString("N") + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
|
||||
MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
|
||||
lValid = false;
|
||||
}
|
||||
else if (MessageBox.Show("Die für diesen Hilfeplan genehmigten FLS (" + (result.ApprovedHours).ToString("N") + ") werden mit diesem Eintrag überschritten. (" + (result.HoursNew).ToString("N") + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
|
||||
else if (MessageBox.Show(msg + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
|
||||
{
|
||||
lValid = false;
|
||||
exitLoop = true;
|
||||
}
|
||||
break;
|
||||
case ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting:
|
||||
String klient2 = "diesen Hilfeplan";
|
||||
if (!String.IsNullOrEmpty(result.CustomerName))
|
||||
{
|
||||
klient2 = "Klient/in " + result.CustomerName;
|
||||
}
|
||||
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
|
||||
{
|
||||
MessageBox.Show("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für diesen Hilfeplan erstellt wurde.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
lValid = false;
|
||||
}
|
||||
else if (MessageBox.Show("Es existiert bereits eine Spitzabrechnung. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
|
||||
else if (MessageBox.Show(String.Format("Es existiert bereits eine Spitzabrechnung für {0}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", klient2), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
|
||||
{
|
||||
lValid = false;
|
||||
exitLoop = true;
|
||||
|
||||
@@ -315,6 +315,7 @@ namespace BeWo.Core.Service
|
||||
relDC.RequestedStartDate = cbDC.RequestedStartDate;
|
||||
relDC.Status = cbDC.SupportConceptStatus;
|
||||
relDC.SupportConcept = dc;
|
||||
relDC.AuswahlBezeichnung = cbDC.Bezeichnung;
|
||||
|
||||
treeNode.SupportConceptCostBearerRelDC = relDC;
|
||||
treeNode.CostBearer = orgDC;
|
||||
|
||||
@@ -380,7 +380,7 @@ namespace BeWo
|
||||
//Nur Testdaten. Weiß gar nicht mehr so genau wofür das gut war…
|
||||
//https://bewoplaner.beyondsoft.de/getcontractstate.php?CustomerID=1234567890
|
||||
|
||||
String url = String.Format("https://bewoplaner.beyondsoft.de/getserver.php?CustomerID={0}", tenant);
|
||||
String url = String.Format("https://support.bewoplaner.de/api/getserver.php?k={0}", tenant);
|
||||
using (WebClient client = new WebClient())
|
||||
{
|
||||
//MessageBox.Show(hostAddress);
|
||||
|
||||
@@ -247,7 +247,7 @@
|
||||
|
||||
<!-- #Neuer Bereich Kinder Betreuungs gedoense Content=Schulbegleitender Dienst################ -->
|
||||
|
||||
<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
|
||||
<!--<localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View"
|
||||
ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_SchulbegleitenderDienst"
|
||||
Click="Button_SchulbegleitenderDienst_OnClick" Style="{StaticResource NavBarButton}"
|
||||
Content="SBD" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
|
||||
@@ -261,7 +261,7 @@
|
||||
<TranslateTransform X="0" Y="0" />
|
||||
</TransformGroup>
|
||||
</Button.RenderTransform>
|
||||
</localView:ImageButton>
|
||||
</localView:ImageButton>-->
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.Xpf.Editors.SpinEdit, DevExpress.Xpf.Core.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
</Grid.RowDefinitions>
|
||||
<dxg:GridControl DataSource="{Binding Verfuegbarkeiten}">
|
||||
<dxg:GridControl.Columns>
|
||||
<dxg:GridColumn FieldName="Mitarbeiter" Header="Mitarbeiter" />
|
||||
<dxg:GridColumn FieldName="Ueberstunden" Header="Überstunden">
|
||||
<dxg:GridColumn FieldName="Mitarbeiter" Header="Mitarbeiter" AllowEditing="False" />
|
||||
<dxg:GridColumn FieldName="Ueberstunden" Header="Überstunden" AllowEditing="False">
|
||||
<dxg:GridColumn.EditSettings>
|
||||
<dxe:TextEditSettings MaskUseAsDisplayFormat="True" Mask="########0.00" MaskType="Numeric" />
|
||||
</dxg:GridColumn.EditSettings>
|
||||
|
||||
@@ -14,7 +14,7 @@ namespace BeWo.Scheduler.View
|
||||
InitializeComponent();
|
||||
root.DataContext = this;
|
||||
|
||||
rootGroupBox.Header = String.Format("Mitarbeiterverfügbarkeiten für den Zeitraum vom {0} bis {1}", pStart.ToString("dd.MM.yyyy hh:mm"), pEnde.ToString("dd.MM.yyyy hh:mm"));
|
||||
rootGroupBox.Header = String.Format("Verfügbarkeit vom {0} bis {1}", pStart.ToString("dd.MM.yy HH:mm"), pEnde.ToString("dd.MM.yy HH:mm"));
|
||||
|
||||
Verfuegbarkeiten = new List<MitarbeiterVerfuegbarkeitsstruct>();
|
||||
pMitarbeiterZuUeberstunden.DoForEach(kvp => Verfuegbarkeiten.Add(new MitarbeiterVerfuegbarkeitsstruct(kvp.Key, kvp.Value)));
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||
xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
|
||||
xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
|
||||
xmlns: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.v13.2"
|
||||
xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
|
||||
xmlns:view="clr-namespace:BeWo.Scheduler.View"
|
||||
xmlns:converter="clr-namespace:BeWo.Converter"
|
||||
@@ -80,7 +80,7 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<converter:StringBrushConverter x:Key="StringBrushConverter"/>
|
||||
<converter:StringBrushConverter x:Key="StringBrushConverter" />
|
||||
<view:ViewInfo2CustomFieldsConverter x:Key="TestConverter" />
|
||||
<view:CustomField2VisibilityConverter x:Key="CustomField2VisibilityConverter" />
|
||||
<view:AppointmentToolTipConverter x:Key="AppointmentToolTipConverter" />
|
||||
@@ -133,7 +133,8 @@
|
||||
</ToolTip>
|
||||
</ToolTipService.ToolTip>
|
||||
<!-- Endregion -->
|
||||
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
|
||||
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
|
||||
Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
|
||||
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="2" ViewInfo="{TemplateBinding ViewInfo}" Background="#c0ffd0" BorderThickness="1" DefaultBorderThickness="1">
|
||||
<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
|
||||
<Grid>
|
||||
@@ -146,17 +147,17 @@
|
||||
<Border.Background>
|
||||
<MultiBinding Converter="{StaticResource EmployeeBrushConverter}">
|
||||
<Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}"/>
|
||||
<Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged"/>
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
|
||||
<Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
|
||||
</MultiBinding>
|
||||
</Border.Background>
|
||||
</Border>
|
||||
<Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1"/>
|
||||
<Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1" />
|
||||
<Border Width="10" CornerRadius="0,4,4,0" HorizontalAlignment="Right" SnapsToDevicePixels="True" Grid.Column="2">
|
||||
<Border.Background>
|
||||
<MultiBinding Converter="{StaticResource DickbuttConverter}">
|
||||
<Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}"/>
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
|
||||
</MultiBinding>
|
||||
</Border.Background>
|
||||
</Border>
|
||||
@@ -168,7 +169,8 @@
|
||||
<ContentPresenter x:Name="PART_Content" Grid.Column="0" Margin="5,4,5,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||
</Grid>
|
||||
<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}}" />
|
||||
<!--ResizingHitTest Obere und untere Kanten-->
|
||||
<Rectangle Fill="Transparent" Height="5" VerticalAlignment="Top" HorizontalAlignment="Stretch"
|
||||
@@ -202,7 +204,7 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Grid.Row="0" Text="{Binding Subject}" TextWrapping="NoWrap" Margin="6,0,0,3" Foreground="Black" />
|
||||
<TextBlock Grid.Row="0" Text="{Binding Subject}" TextWrapping="NoWrap" Margin="6,0,0,3" Foreground="Black" />
|
||||
<TextBlock Grid.Row="1" Text="{Binding Location}" TextWrapping="Wrap" Margin="6,0,0,3" Foreground="Black" />
|
||||
</Grid>
|
||||
<dxschint:AppointmentImagesControl Grid.Column="1" ViewInfo="{Binding}" Orientation="Vertical" SnapsToDevicePixels="True" />
|
||||
@@ -214,7 +216,7 @@
|
||||
<!-- HorizontalAppointmentTemplate -->
|
||||
<ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentTemplate, IsThemeIndependent=true}"
|
||||
TargetType="{x:Type dxschint:VisualHorizontalAppointmentControl}">
|
||||
<dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" SnapsToDevicePixels="True" ControlColor="#c0ffd0" >
|
||||
<dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" SnapsToDevicePixels="True" ControlColor="#c0ffd0">
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup x:Name="DraggedStates">
|
||||
<VisualState x:Name="NotDragged">
|
||||
@@ -250,7 +252,8 @@
|
||||
Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
|
||||
</ToolTip>
|
||||
</ToolTipService.ToolTip>
|
||||
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
|
||||
<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
|
||||
Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
|
||||
<dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}" Background="#c0ffd0" DefaultBorderThickness="1">
|
||||
<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
|
||||
<Grid>
|
||||
@@ -263,17 +266,17 @@
|
||||
<Border.Background>
|
||||
<MultiBinding Converter="{StaticResource EmployeeBrushConverter}">
|
||||
<Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}"/>
|
||||
<Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged"/>
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
|
||||
<Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
|
||||
</MultiBinding>
|
||||
</Border.Background>
|
||||
</Border>
|
||||
<Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1"/>
|
||||
<Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1" />
|
||||
<Border Width="10" CornerRadius="0,4,4,0" HorizontalAlignment="Right" SnapsToDevicePixels="True" Grid.Column="2">
|
||||
<Border.Background>
|
||||
<MultiBinding Converter="{StaticResource DickbuttConverter}">
|
||||
<Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}"/>
|
||||
<Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
|
||||
</MultiBinding>
|
||||
</Border.Background>
|
||||
</Border>
|
||||
@@ -285,18 +288,21 @@
|
||||
<ContentPresenter x:Name="PART_Content" Grid.Row="0" Margin="3,0,3,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
|
||||
</Grid>
|
||||
<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
||||
DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
|
||||
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}}" />
|
||||
<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Left"
|
||||
Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
|
||||
IsHitTestVisible="True" dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
|
||||
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}" Cursor="SizeWE">
|
||||
IsHitTestVisible="True"
|
||||
dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
|
||||
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
|
||||
Cursor="SizeWE">
|
||||
</Rectangle>
|
||||
<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Right" IsHitTestVisible="True"
|
||||
Visibility="{Binding Path=ViewInfo.CanResizeEnd, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
|
||||
dxsch:SchedulerControl.HitTestType="AppointmentResizingRightEdge"
|
||||
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}" Cursor="SizeWE">
|
||||
dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
|
||||
Cursor="SizeWE">
|
||||
</Rectangle>
|
||||
</Grid>
|
||||
</dxschint:AppointmentColorConvertControl>
|
||||
@@ -383,7 +389,7 @@
|
||||
</StackPanel>
|
||||
<TextBlock Grid.Column="1" Text="{Binding Path=Subject}" TextWrapping="Wrap" MaxWidth="{Binding ElementName=Scheduler, Path=ActualWidth}" />
|
||||
</Grid>
|
||||
<Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Trennstrich}"/>
|
||||
<Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Trennstrich}" />
|
||||
|
||||
<TextBlock Margin="0,0,3,0" Grid.Row="2" Grid.Column="0" Text="Ressourcen:" Visibility="{Binding Path=CustomViewInfo, Converter={StaticResource CustomField2VisibilityConverter}, ConverterParameter=Ressourcen}" />
|
||||
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
|
||||
@@ -587,8 +593,8 @@
|
||||
<StackPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Bottom" MinWidth="239">
|
||||
<StackPanel.Width>
|
||||
<MultiBinding Converter="{StaticResource WidthAdditionMultiConverter}">
|
||||
<Binding ElementName="AuswahlGrid" Path="ActualWidth"/>
|
||||
<Binding ElementName="LeftExpanderButton" Path="ActualWidth"/>
|
||||
<Binding ElementName="AuswahlGrid" Path="ActualWidth" />
|
||||
<Binding ElementName="LeftExpanderButton" Path="ActualWidth" />
|
||||
</MultiBinding>
|
||||
</StackPanel.Width>
|
||||
<Button Style="{x:Null}" Margin="0,1,1,1" Height="24" Width="24" ToolTip="Tagesansicht" Click="ButtonDayView_Click">
|
||||
@@ -624,11 +630,11 @@
|
||||
<ControlTemplate TargetType="{x:Type Button}">
|
||||
<Grid>
|
||||
<Image x:Name="imgDisabled" Source="..\..\Ressources\Icons\SymbolRefresh32Disabled.png" />
|
||||
<Image x:Name="imgEnabled" Source="..\..\Ressources\Icons\SymbolRefresh32.png" Opacity="0"/>
|
||||
<Image x:Name="imgEnabled" Source="..\..\Ressources\Icons\SymbolRefresh32.png" Opacity="0" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="true">
|
||||
<Setter Property="Opacity" TargetName="imgEnabled" Value="1"/>
|
||||
<Setter Property="Opacity" TargetName="imgEnabled" Value="1" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -653,7 +659,7 @@
|
||||
<CheckBox Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Content="Nur private Termine anzeigen" x:Name="ShowPrivateAppointmentsCheckBox" Click="ShowPrivateAppointmentsCheckBox_OnClick" />
|
||||
</Grid>
|
||||
<Border Grid.Row="0" Grid.Column="3" Width="{Binding ElementName=RightExpanderButton, Path=ActualWidth}" />
|
||||
<Border Grid.Row="0" Grid.Column="4" Width="{Binding ElementName=DateNavigator, Path=ActualWidth}" >
|
||||
<Border Grid.Row="0" Grid.Column="4" Width="{Binding ElementName=DateNavigator, Path=ActualWidth}">
|
||||
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
<Hyperlink NavigateUri="#" RequestNavigate="PrintCalendar">
|
||||
<TextBlock>Drucken</TextBlock>
|
||||
@@ -677,7 +683,7 @@
|
||||
<CheckBox x:Name="ZeigeNurMeineTermineCheckBox" Grid.Row="0" Content="Nur meine Termine anzeigen" Margin="3, 3, 3, 3" IsChecked="{Binding Path=ZeigeNurMeineTermine, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Checked="NurMeineTermineEinAusCheckBox_OnChecked" Unchecked="NurMeineTermineEinAusCheckBox_OnChecked" />
|
||||
<UniformGrid Grid.Column="0" x:Name="AuswahlGrid" Rows="2" Columns="1" Width="270" Grid.Row="1">
|
||||
<TabControl SelectionChanged="Selector_OnSelectionChanged" x:Name="TabControl">
|
||||
<TabItem Header="Mitarbeiter" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbieterTabItem">
|
||||
<TabItem Header="Mitarbeiter" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbieterTabItem">
|
||||
<Grid x:Name="MitarbeiterTabGrid">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
@@ -688,7 +694,7 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<CheckBox Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleMitarbeiterCB" Click="AlleMitarbeiterCB_OnClick"/>
|
||||
<CheckBox Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleMitarbeiterCB" Click="AlleMitarbeiterCB_OnClick" />
|
||||
<ToggleButton Margin="3" Grid.Row="0" Grid.Column="1" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB" Checked="MeinTB_OnChecked" Unchecked="MeinTB_OnChecked" />
|
||||
<Grid x:Name="MitarbeiterSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="2" Background="Black" Grid.Row="1" Visibility="Collapsed">
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -940,24 +946,24 @@
|
||||
</ListBox.Template>
|
||||
</ListBox>
|
||||
</GroupBox>
|
||||
<Button Grid.Row="1" Content="Auswahl aufheben" Height="23" HorizontalAlignment="Stretch" Click="AuswahlAufhebenClick" Margin="30,0,5,0"/>
|
||||
<Button Grid.Row="1" Content="Auswahl aufheben" Height="23" HorizontalAlignment="Stretch" Click="AuswahlAufhebenClick" Margin="30,0,5,0" />
|
||||
</Grid>
|
||||
</UniformGrid>
|
||||
</Grid>
|
||||
<StackPanel x:Name="FilterCheckBoxenStackPanel" Orientation="Vertical" Grid.Column="1" HorizontalAlignment="Center">
|
||||
<CheckBox x:Name="MitarbeiterEbenenCheckBox" Content="Nur Mitarbeiter" SnapsToDevicePixels="True" Margin="0,3,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False">
|
||||
<CheckBox.LayoutTransform>
|
||||
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270"/>
|
||||
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
|
||||
</CheckBox.LayoutTransform>
|
||||
</CheckBox>
|
||||
<CheckBox x:Name="KlientenEbenenCheckBox" Content="Nur Klienten" SnapsToDevicePixels="True" Margin="0,0,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False">
|
||||
<CheckBox.LayoutTransform>
|
||||
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270"/>
|
||||
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
|
||||
</CheckBox.LayoutTransform>
|
||||
</CheckBox>
|
||||
<CheckBox x:Name="RessourcenEbenenCheckBox" Content="Nur Ressourcen" SnapsToDevicePixels="True" Margin="0,0,0,3" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" IsThreeState="False">
|
||||
<CheckBox.LayoutTransform>
|
||||
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270"/>
|
||||
<RotateTransform CenterX="0.5" CenterY="0.5" Angle="270" />
|
||||
</CheckBox.LayoutTransform>
|
||||
</CheckBox>
|
||||
</StackPanel>
|
||||
@@ -1007,7 +1013,7 @@
|
||||
ReminderInfo="ReminderInfo"
|
||||
Location="Location"
|
||||
Type="EventType"
|
||||
Status="Status"/>
|
||||
Status="Status" />
|
||||
</dxsch:AppointmentStorage.Mappings>
|
||||
</dxsch:AppointmentStorage>
|
||||
</dxsch:SchedulerStorage.AppointmentStorage>
|
||||
@@ -1053,7 +1059,7 @@
|
||||
</dxb:AddBarItemAction>
|
||||
<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.StatusSubMenu}" />
|
||||
<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.LabelSubMenu}" />
|
||||
<dxb:BarSubItem x:Name="TeilnahmeMenue" Content="Teilnahmestatus ändern" >
|
||||
<dxb:BarSubItem x:Name="TeilnahmeMenue" Content="Teilnahmestatus ändern">
|
||||
<dxb:BarSubItem.ItemLinks>
|
||||
<dxb:BarButtonItemLink BarItemName="ZusagenButtonItem" />
|
||||
<dxb:BarButtonItemLink BarItemName="MitVorbehaltButtonItem" />
|
||||
@@ -1064,7 +1070,7 @@
|
||||
<dxb:BarButtonItemLink BarItemName="MitarbeiterVerfuegbarkeitPruefenButtonItem2" />
|
||||
</dxsch:SchedulerControl.AppointmentMenuCustomizations>
|
||||
</dxsch:SchedulerControl>
|
||||
<dxsch:DXSchedulerControlPrintAdapter Grid.Column="0" x:Name="printAdapter" SchedulerControl="{Binding ElementName=Scheduler}"/>
|
||||
<dxsch:DXSchedulerControlPrintAdapter Grid.Column="0" x:Name="printAdapter" SchedulerControl="{Binding ElementName=Scheduler}" />
|
||||
<ToggleButton Grid.Column="3" Style="{StaticResource VerticalRightExpanderLookAlikeToggleBotton}" Width="23" Height="23" Margin="3" Click="RightExpanderClick" x:Name="RightExpanderButton" />
|
||||
<dxe:DateNavigator Grid.Column="4" Name="DateNavigator" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black" SelectedDatesChanged="DateNavigator_OnSelectedDatesChanged">
|
||||
<dxe:DateNavigator.StyleSettings>
|
||||
|
||||
@@ -1753,7 +1753,7 @@ namespace BeWo.Scheduler.View
|
||||
|
||||
popup_content.Child = mviv;
|
||||
popup_content.Height = 400;
|
||||
popup_content.Width = 400;
|
||||
popup_content.Width = 450;
|
||||
popup_content.Visibility = Visibility.Visible;
|
||||
})));
|
||||
}
|
||||
|
||||
@@ -59,10 +59,10 @@ namespace BeWo.Scheduler.ViewModel
|
||||
ServiceFacade.DoEmployeeServiceSync(es => allEmps = new List<CompactEmployeeDC> { es.LoadCompactEmployee(BeWoApp.LoggedOnEmployee.EmployeeOid.Value) });
|
||||
}
|
||||
|
||||
if (mAllCats2ResInDic == null)
|
||||
{
|
||||
//if (mAllCats2ResInDic == null)
|
||||
//{
|
||||
ServiceFacade.DoResourceServiceSync(s => mAllCats2ResInDic = s.GetAllCategories2ResourcesInDictionary());
|
||||
}
|
||||
//}
|
||||
|
||||
var start = intervalStart - NewSchedulerView.FetchPadding;
|
||||
var end = intervalEnd + NewSchedulerView.FetchPadding;
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
<TreeView Grid.Row="1" Margin="5,3,2,5" PreviewMouseDown="TreeViewItem_PreviewMouseRightButtonDown" x:Name="treeview" MinWidth="200" ItemTemplate="{StaticResource test}" ItemsSource="{Binding}"></TreeView>
|
||||
|
||||
<dxg:GridControl Grid.Row="1" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview, diagnostics:PresentationTraceSources.TraceLevel=High}" x:Name="datagrid_documents" Grid.Column="1">
|
||||
<dxg:GridControl Grid.Row="1" Margin="2,3,5,5" DataSource="{Binding SelectedItem.Files, ElementName=treeview, diagnostics:PresentationTraceSources.TraceLevel=High}" x:Name="datagrid_documents" Grid.Column="1" ItemsSourceChanged="Datagrid_documents_OnItemsSourceChanged">
|
||||
<dxg:GridControl.Columns>
|
||||
<dxg:GridColumn FieldName="FileName" Header="" FixedWidth="True" Width="24" ReadOnly="True">
|
||||
<dxg:GridColumn.CellTemplate>
|
||||
@@ -91,7 +91,7 @@
|
||||
<dxg:GridColumn FieldName="InsertedBy" AllowEditing="False" Header="hinterlegt von" Width="150" />
|
||||
<dxg:GridColumn FieldName="FileName" AllowEditing="False" Header="Dateiname" Width="180" />
|
||||
<dxg:GridColumn FieldName="Description" AllowEditing="False" Header="Beschreibung" Width="180" />
|
||||
<dxg:GridColumn FieldName="URL" Header="" Width="100">
|
||||
<dxg:GridColumn FieldName="URL" Header="" Width="100" MinWidth="90" x:Name="ColumnDownload">
|
||||
<dxg:GridColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock>
|
||||
@@ -104,7 +104,7 @@
|
||||
</dxg:GridColumn>
|
||||
</dxg:GridControl.Columns>
|
||||
<dxg:GridControl.View>
|
||||
<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
|
||||
<dxg:TableView AutoWidth="false" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" x:Name="DocumentTableView" />
|
||||
</dxg:GridControl.View>
|
||||
</dxg:GridControl>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ using BS.Shared.DataContracts;
|
||||
using BS.Shared.Extensions;
|
||||
using BS.Shared;
|
||||
using BS.Shared.Core;
|
||||
|
||||
using DevExpress.Xpf.Grid;
|
||||
using Microsoft.Win32;
|
||||
|
||||
namespace BeWo.View
|
||||
@@ -98,9 +98,11 @@ namespace BeWo.View
|
||||
// vm.SubFolders[i].Files.Add(new FileAttachmentVM(new FileAttachmentDC()) { FileName = "File " + i + " " + j, Folder = vm.SubFolders[i] });
|
||||
// }
|
||||
//}
|
||||
|
||||
|
||||
|
||||
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsDownloadAll))
|
||||
{
|
||||
ColumnDownload.Visible = false;
|
||||
ColumnDownload.ShowInColumnChooser = false;
|
||||
}
|
||||
PreviewMouseLeftButtonDown += treeview_PreviewMouseLeftButtonDown;
|
||||
PreviewMouseLeftButtonUp += treeview_PreviewMouseLeftButtonUp;
|
||||
PreviewMouseMove += treeview_PreviewMouseMove;
|
||||
@@ -122,6 +124,8 @@ namespace BeWo.View
|
||||
{
|
||||
DataContext = value;
|
||||
_ViewModel = value;
|
||||
|
||||
DocumentTableView.BestFitColumns();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -703,5 +707,15 @@ namespace BeWo.View
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void DocumentTableView_OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
//DocumentTableView.BestFitColumns();
|
||||
}
|
||||
|
||||
private void Datagrid_documents_OnItemsSourceChanged(object sender, ItemsSourceChangedEventArgs e)
|
||||
{
|
||||
DocumentTableView.BestFitColumns();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v13.1"
|
||||
xmlns:dx="clr-namespace:DevExpress.Xpf.Core;assembly=DevExpress.Xpf.Core.v13.2"
|
||||
xmlns:shared="clr-namespace:BeWo.Core"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="300" d:DesignWidth="300">
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
|
||||
xmlns:shared2="clr-namespace:BS.Shared;assembly=BS.Shared"
|
||||
xmlns:sys="clr-namespace:System;assembly=mscorlib"
|
||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.1"
|
||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2"
|
||||
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
|
||||
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.1.Core"
|
||||
xmlns:grid="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2.Core"
|
||||
xmlns:converter="clr-namespace:BeWo.Converter"
|
||||
xmlns:detail="clr-namespace:BeWo.View.Detail"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" x:Name="_this">
|
||||
@@ -669,7 +669,7 @@
|
||||
</dxg:GridControl.Resources>
|
||||
<dxg:GridControl.Columns>
|
||||
<dxg:GridColumn FieldName="Customer.LastNameFirstName" Header="Klient" AllowEditing="False" />
|
||||
<dxg:GridColumn FieldName="t0" Header="1." Width="27" CellStyle="{StaticResource CustomCellStyle}" EditSettings="{dxe:CheckSettings}"/>
|
||||
<dxg:GridColumn FieldName="t0" Header="1." Width="27" CellStyle="{StaticResource CustomCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||
<dxg:GridColumn FieldName="t1" Header="2." Width="27" CellStyle="{StaticResource CustomCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||
<dxg:GridColumn FieldName="t2" Header="3." Width="27" CellStyle="{StaticResource CustomCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||
<dxg:GridColumn FieldName="t3" Header="4." Width="27" CellStyle="{StaticResource CustomCellStyle}" EditSettings="{dxe:CheckSettings}" />
|
||||
|
||||
@@ -776,7 +776,7 @@
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Label x:Name="lbl_medication" Margin="3" Grid.Row="1" VerticalAlignment="Top" Content="Medikation" />
|
||||
<TextBox x:Name="tb_medication" Margin="3" Height="100" Grid.Column="1" Grid.Row="1"
|
||||
<TextBox x:Name="tb_medication" Margin="3" MinHeight="40" MaxHeight="200" Grid.Column="1" Grid.Row="1"
|
||||
VerticalScrollBarVisibility="Auto" AcceptsReturn="True"
|
||||
Text="{Binding Path=Medication, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
|
||||
<Label x:Name="lbl_diag" Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Top"
|
||||
@@ -894,7 +894,7 @@
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="0" Content="Aust. Vers. -amt" VerticalAlignment="Center" HorizontalAlignment="Left" />
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Width="100" Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
|
||||
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Width="150" Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="1" Content="Ausweis unbefristet gültig" VerticalAlignment="Center" />
|
||||
<CheckBox Grid.Column="1" Grid.Row="1" Margin="3,5,3,1" Height="23" x:Name="AusweisUnbefristetCheckBox"
|
||||
@@ -903,29 +903,29 @@
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="2" Content="Ausweis gültig von" VerticalAlignment="Center" />
|
||||
<dxe:DateEdit Grid.Column="1" Grid.Row="2" AllowNullInput="True" Height="23" Margin="3"
|
||||
Width="100" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
|
||||
Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
|
||||
EditValue="{Binding Path=AusweisGueltigVon, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
|
||||
|
||||
<Label Grid.Column="0" Grid.Row="3" Content="Ausweis gültig bis" VerticalAlignment="Center" />
|
||||
<dxe:DateEdit Grid.Column="1" Grid.Row="3" AllowNullInput="True" Height="23" Margin="3"
|
||||
Width="100" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
|
||||
Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
|
||||
EditValue="{Binding Path=AusweisGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
|
||||
IsEnabled="{Binding ElementName=AusweisUnbefristetCheckBox, Path=IsChecked, Converter={StaticResource BoolReverseConverter}}" />
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="0" Content="Beiblatt gültig bis" VerticalAlignment="Center" />
|
||||
<dxe:DateEdit Grid.Column="3" Grid.Row="0" AllowNullInput="True" Height="23" Margin="3"
|
||||
EditValue="{Binding Path=BeiblattGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
|
||||
Width="100" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
|
||||
Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="1" Content="Grad der Behinderung" VerticalAlignment="Center" />
|
||||
<ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="100" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
|
||||
<ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="150" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
|
||||
|
||||
<Label Grid.Column="2" Grid.Row="2" Content="Merkzeichen" VerticalAlignment="Center" />
|
||||
<uc:PopUpEdit IsReadOnly="True"
|
||||
DeleteButtonVisibility="Collapsed"
|
||||
PopUpClick="popupedit_merkzeichen_PopUpClick"
|
||||
HorizontalAlignment="Stretch"
|
||||
HorizontalContentAlignment="Stretch" Height="23" Width="100" Grid.Column="3" Grid.Row="2" Margin="3"
|
||||
HorizontalContentAlignment="Stretch" Height="23" Width="150" Grid.Column="3" Grid.Row="2" Margin="3"
|
||||
Text="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
|
||||
ToolTip="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
|
||||
Cursor="Arrow" />
|
||||
@@ -935,13 +935,13 @@
|
||||
DeleteButtonVisibility="Collapsed"
|
||||
PopUpClick="popupedit_behinderungsarten_PopUpClick"
|
||||
HorizontalAlignment="Stretch"
|
||||
HorizontalContentAlignment="Stretch" Height="23" Width="100" Grid.Column="3" Grid.Row="3" Margin="3"
|
||||
HorizontalContentAlignment="Stretch" Height="23" Width="150" Grid.Column="3" Grid.Row="3" Margin="3"
|
||||
Text="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
|
||||
ToolTip="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
|
||||
Cursor="Arrow" />
|
||||
|
||||
<Label Grid.Column="4" Grid.Row="0" Content="Pflegegrad" VerticalAlignment="Center" />
|
||||
<uc:NullItemComboBox Grid.Column="5" Grid.Row="0" Margin="3" Height="23" Width="100"
|
||||
<uc:NullItemComboBox Grid.Column="5" Grid.Row="0" Margin="3" Height="23" Width="150"
|
||||
ItemsSource="{x:Static core:EnumTranslations.PflegegradTranslations}"
|
||||
SelectedValue="{Binding Path=Pflegegrad}" DisplayMemberPath="Value"
|
||||
SelectedValuePath="Key" />
|
||||
@@ -963,7 +963,7 @@
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<GroupBox x:Name="groupbox_customerCareType" Header="Betreuung" Style="{StaticResource ObjectEditGroupBox}">
|
||||
<Grid>
|
||||
<Grid IsSharedSizeScope="True">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
@@ -1012,9 +1012,9 @@
|
||||
|
||||
|
||||
<Label Content="Betreuungsart" Grid.Column="2"/>
|
||||
<ListBox Grid.Row="1" Grid.RowSpan="3" Grid.Column="2" IsSynchronizedWithCurrentItem="True" x:Name="customerCareTypeList"
|
||||
Margin="3" Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200"
|
||||
MinHeight="20" MaxHeight="65" />
|
||||
<ListBox Grid.Row="1" Grid.RowSpan="4" Grid.Column="2" IsSynchronizedWithCurrentItem="True" x:Name="customerCareTypeList"
|
||||
Margin="3" Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200" VerticalAlignment="Top"
|
||||
MinHeight="52" MaxHeight="65" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3">
|
||||
<Label Content="Vermittlung" />
|
||||
@@ -1032,10 +1032,10 @@
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<ListBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="3" IsSynchronizedWithCurrentItem="True"
|
||||
<ListBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="4" IsSynchronizedWithCurrentItem="True"
|
||||
x:Name="placementListBox" ItemsSource="{Binding Path=PlacementList.VMList, Mode=OneWay}" Margin="3"
|
||||
Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200"
|
||||
MinHeight="20" MaxHeight="65">
|
||||
MinHeight="20" MaxHeight="200">
|
||||
<ListBox.ItemContainerStyle>
|
||||
<Style TargetType="{x:Type ListBoxItem}">
|
||||
<Setter Property="Margin" Value="2" />
|
||||
@@ -1045,11 +1045,11 @@
|
||||
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid x:Name="ItemGrid" Grid.Row="2" Grid.ColumnSpan="2">
|
||||
<Grid x:Name="ItemGrid" Grid.Row="2" Grid.ColumnSpan="2" >
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" SharedSizeGroup="VermittlungComboBox"/>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
@@ -1061,7 +1061,7 @@
|
||||
Height="23" Grid.Row="0" Width="100" />
|
||||
|
||||
<ComboBox x:Name="comboBox_PlacementObjectives" Loaded="comboBox_PlacementObjectives_Loaded"
|
||||
Margin="2,0,0,0" Grid.Column="2" MinWidth="100" MaxWidth="140" Height="23"
|
||||
Margin="2,0,0,0" Grid.Column="2" MinWidth="100" Height="23"
|
||||
SelectedValue="{Binding Path=Objective, Mode=TwoWay}" />
|
||||
|
||||
<Button x:Name="button_deletePlacement" Grid.Column="3" Grid.Row="1" Width="20" Height="20"
|
||||
|
||||
@@ -938,8 +938,14 @@ namespace BeWo.View.Detail.Report
|
||||
// progressbar_upload.Value = e.Data;
|
||||
// text_progress.Content = string.Format("Bitte warten... {0:00}%", e.Data * 100);
|
||||
// }));
|
||||
long oid = 0;
|
||||
|
||||
var lUlPackage = new UploadPackage(null, 0, _UploadFileName, null, 0, 0, upload);
|
||||
var lQuery = combo_query.SelectedItem as QueryDC;
|
||||
if (lQuery != null)
|
||||
{
|
||||
oid = lQuery.Oid;
|
||||
}
|
||||
var lUlPackage = new UploadPackage(null, 0, _UploadFileName, null, oid, (int)TableID.Query, upload);
|
||||
|
||||
ServiceFacade.DoStreamingServiceAsync(
|
||||
s => s.UploadImportFile(lUlPackage),
|
||||
@@ -948,9 +954,9 @@ namespace BeWo.View.Detail.Report
|
||||
{
|
||||
|
||||
|
||||
_UploadFileName = null;
|
||||
button_uploadDocument.IsEnabled = false;
|
||||
popupedit_file.Text = string.Empty;
|
||||
//_UploadFileName = null;
|
||||
//button_uploadDocument.IsEnabled = false;
|
||||
//popupedit_file.Text = string.Empty;
|
||||
|
||||
upload.Dispose();
|
||||
if (r != null && !String.IsNullOrEmpty(r.ResultMessage))
|
||||
|
||||
@@ -7,7 +7,7 @@ using System.Windows.Controls;
|
||||
using System.Windows.Navigation;
|
||||
using BeWo.Core;
|
||||
using BeWo.ServiceProxy;
|
||||
|
||||
using BeWo.View.Search;
|
||||
using BS.Shared;
|
||||
using BS.Shared.Core;
|
||||
using BS.Shared.DataContracts;
|
||||
@@ -37,11 +37,21 @@ namespace BeWo.View.Detail.Report
|
||||
|
||||
if (!DarfAlleMitarbeiterSehen)
|
||||
{
|
||||
checkbox_allEmployees.IsEnabled = false;
|
||||
checkbox_allEmployees.IsChecked = false;
|
||||
if (DarfTeamsSehen)
|
||||
{
|
||||
employeeSearchView.SearchMode = SearchMode.OnlyTeamMember;
|
||||
}
|
||||
else
|
||||
{
|
||||
checkbox_allEmployees.IsEnabled = false;
|
||||
checkbox_allEmployees.IsChecked = false;
|
||||
|
||||
popupedit_employee.Text = String.Format("{0}, {1}", BeWoApp.LoggedOnEmployee.LastName,
|
||||
popupedit_employee.Text = String.Format("{0}, {1}", BeWoApp.LoggedOnEmployee.LastName,
|
||||
BeWoApp.LoggedOnEmployee.FirstName);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
ChangeReportType();
|
||||
@@ -342,6 +352,8 @@ namespace BeWo.View.Detail.Report
|
||||
//checkbox_all.Visibility = Visibility.Collapsed;
|
||||
//popupedit_employee.Visibility = Visibility.Collapsed;
|
||||
|
||||
List<CompactEmployeeDC> mitarbeiterAllerTeams = new List<CompactEmployeeDC>();
|
||||
|
||||
var ol = teamSearchView.ObjectList;
|
||||
if (ol != null)
|
||||
{
|
||||
@@ -359,6 +371,13 @@ namespace BeWo.View.Detail.Report
|
||||
}
|
||||
|
||||
teamSearchView.ObjectList = teams;
|
||||
|
||||
//foreach (var t in teams)
|
||||
//{
|
||||
// var t = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllTeamMember())
|
||||
|
||||
// var emps = t.
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,13 +9,19 @@
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
|
||||
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
|
||||
xmlns:dxre="http://schemas.devexpress.com/winfx/2008/xaml/richedit"
|
||||
xmlns:ve="http://schemas.devexpress.com/winfx/2008/xaml/docking/visualelements"
|
||||
xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
|
||||
xmlns:detail="clr-namespace:BeWo.View.Detail"
|
||||
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
|
||||
xmlns:security="clr-namespace:BeWo.Security"
|
||||
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
|
||||
Height="Auto" Width="Auto" VerticalAlignment="Stretch" Focusable="True" HorizontalAlignment="Stretch">
|
||||
<localView:BeWoView.Resources>
|
||||
|
||||
<dxre:RichEditUICommand x:Key="commands" />
|
||||
|
||||
|
||||
<Style TargetType="{x:Type Button}" x:Key="DockPanelMaximizeButtonStyle">
|
||||
<Style.Setters>
|
||||
<Setter Property="Template">
|
||||
@@ -882,6 +888,8 @@
|
||||
AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
|
||||
HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap"
|
||||
AutoWordSelection="True" Visibility="Visible" Language="de-DE" SpellCheck.IsEnabled="True" />
|
||||
|
||||
|
||||
</Grid>
|
||||
|
||||
</TabItem>
|
||||
|
||||
@@ -37,7 +37,7 @@ using DevExpress.Xpf.Docking;
|
||||
using DevExpress.Xpf.Docking.Platform;
|
||||
using DevExpress.Xpf.Editors;
|
||||
using DevExpress.XtraPrinting.Native;
|
||||
|
||||
using DevExpress.XtraRichEdit;
|
||||
using Microsoft.Win32;
|
||||
|
||||
using VerticalAlignment = System.Windows.VerticalAlignment;
|
||||
@@ -266,7 +266,11 @@ namespace BeWo.View.Detail
|
||||
ConfigureEndDate();
|
||||
|
||||
UnterschriftenHeader.Visible = BeWoApp.AppSettings.ShowSignatures;
|
||||
|
||||
//richEdit.HorizontalRulerVisibility = Visibility.Collapsed;
|
||||
//richEdit.VerticalRulerVisibility = Visibility.Collapsed;
|
||||
|
||||
//richEdit.ActiveViewType = RichEditViewType.Simple;
|
||||
}
|
||||
|
||||
private void ConfigureEndDate() {
|
||||
@@ -1748,7 +1752,9 @@ namespace BeWo.View.Detail
|
||||
|
||||
private bool SaveServiceRecord()
|
||||
{
|
||||
var lValid = ValidationTrigger.Validate(root, new Collection<string> { "BedarfsmedikationsGrid" });
|
||||
//var lValid = ValidationTrigger.Validate(root, new Collection<string> { "BedarfsmedikationsGrid" });
|
||||
|
||||
var lValid = ValidationTrigger.Validate(root);
|
||||
|
||||
if (lValid)
|
||||
{
|
||||
|
||||
@@ -328,11 +328,12 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<!--<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1"
|
||||
Text="Bezeichnung in Auswahl" />
|
||||
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="1"
|
||||
Text="Bezeichnung" />
|
||||
<TextBox Grid.Column="1" Grid.Row="1" Margin="3"
|
||||
Height="23"
|
||||
Text="{val:ValidationBinding Path=AuswahlBezeichnung, UpdateSourceTrigger=PropertyChanged}" />-->
|
||||
Text="{val:ValidationBinding Path=AuswahlBezeichnung, UpdateSourceTrigger=PropertyChanged}"/>
|
||||
|
||||
<TextBlock VerticalAlignment="Center" Margin="3" Grid.Row="2"
|
||||
Text="Aktenzeichen Klient" />
|
||||
<TextBox Grid.Column="1" Grid.Row="2" Margin="3"
|
||||
@@ -1129,7 +1130,7 @@
|
||||
Cursor="Arrow" />
|
||||
|
||||
<StackPanel Orientation="Horizontal" Grid.Row="1" x:Name="RadioAbsolPro" Visibility="Collapsed" Margin="3">
|
||||
<RadioButton GroupName="ProAbso" Content="Prozentual" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsProzentual}" Click="ToggledProz_OnChecked"/>
|
||||
<RadioButton x:Name="RadioProzent" GroupName="ProAbso" Content="Prozentual" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsProzentual}" Click="ToggledProz_OnChecked"/>
|
||||
<RadioButton GroupName="ProAbso" Content="Absolut" IsChecked="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.IsAbsolut}" Margin="5,0,0,0" Click="ToggledAbsol_OnChecked"/>
|
||||
</StackPanel>
|
||||
|
||||
@@ -1139,7 +1140,7 @@
|
||||
EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
|
||||
|
||||
<Label Content="Anteil an der Betreuung (Minuten)" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" x:Name="LabelAbsolut"/>
|
||||
<dxe:SpinEdit IsFloatValue="False" MinValue="0" Increment="1" Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
|
||||
<dxe:SpinEdit IsFloatValue="False" MinValue="0" Increment="1" Grid.Column="1" Grid.Row="2" Margin="3" Height="23" MaskUseAsDisplayFormat="True" Mask="########0" MaskType="Numeric"
|
||||
Grid.ColumnSpan="2" Visibility="Collapsed" x:Name="editAbsolut"
|
||||
EditValue="{Binding Path=SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type view:SupportConceptView}, Mode=FindAncestor}}" />
|
||||
|
||||
|
||||
@@ -280,13 +280,43 @@ namespace BeWo.View.Detail
|
||||
return;
|
||||
}
|
||||
|
||||
var mehrAlsHundertProzentBetreuungsschluessel = ViewModel.CostBearerRelations.VMList.Any(a => a.ApprovalPeriodList.VMList.Any(a2 => a2.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel) > 100));
|
||||
if (mehrAlsHundertProzentBetreuungsschluessel)
|
||||
foreach (var cbr in ViewModel.CostBearerRelations.VMList)
|
||||
{
|
||||
MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
return;
|
||||
foreach (var ap in cbr.ApprovalPeriodList.VMList)
|
||||
{
|
||||
bool isAbsolute = false;
|
||||
decimal summe = 0;
|
||||
foreach (var ape in ap.SupportConceptApprovalEmployeeRelations.VMList)
|
||||
{
|
||||
summe += ape.Betreuungsschluessel;
|
||||
|
||||
isAbsolute = ape.IsAbsolut;
|
||||
}
|
||||
|
||||
if (isAbsolute)
|
||||
{
|
||||
if (ap.ApprovedBEPerInterval.HasValue && summe > (ap.ApprovedBEPerInterval.Value*60))
|
||||
{
|
||||
MessageBox.Show(String.Format("Die Summe der Anteile liegt bei über {0:0} Minuten. Speichern nicht möglich.", (ap.ApprovedBEPerInterval.Value * 60)), "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (summe > 100)
|
||||
{
|
||||
MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Speichern nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//var mehrAlsHundertProzentBetreuungsschluessel = ViewModel.CostBearerRelations.VMList.Any(a => a.ApprovalPeriodList.VMList.Any(a2 => a2.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel) > 100));
|
||||
//if (mehrAlsHundertProzentBetreuungsschluessel)
|
||||
//{
|
||||
// MessageBox.Show("Die Summe der Anteile liegt bei über 100%. Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
// return;
|
||||
//}
|
||||
|
||||
|
||||
var lDataContract = ViewModel.CommitToDataContract();
|
||||
|
||||
var recordOutOfConcept = true;
|
||||
@@ -1145,7 +1175,7 @@ namespace BeWo.View.Detail
|
||||
|
||||
var gridControlVisibilityBinding = new Binding("SupportConceptApprovalEmployeeRelations.GridVisibility") { UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged, Source = grid.DataContext };
|
||||
gridControl.SetBinding(VisibilityProperty, gridControlVisibilityBinding);
|
||||
|
||||
gridControl.IsVisibleChanged += GridControl_IsVisibleChanged;
|
||||
var deleteColumn = new GridColumn {Header = "", FixedWidth = true, Width = 24, ReadOnly = true, CellTemplate = (DataTemplate) Resources["DeleteBtnBetreuungsschluesselDataTemplate"]};
|
||||
|
||||
gridControl.Columns.Add(deleteColumn);
|
||||
@@ -1153,18 +1183,47 @@ namespace BeWo.View.Detail
|
||||
var employeeColumn = new GridColumn {Header = "Mitarbeiter", FieldName = "EmployeeString", AllowEditing = DefaultBoolean.False, Width = 250};
|
||||
|
||||
var allowEditingBetreuungsschluesselColumn = BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.EditAll, UserRightType.Betreuungsschluessel_Edit }) ? DefaultBoolean.True : DefaultBoolean.False;
|
||||
var betreuungsschluesselColumn = new GridColumn { Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
|
||||
var betreuungsschluesselColumn = new GridColumn { Name = "ColumnBSProzent", Header = "Anteil an der Betreuung", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0.00" } };
|
||||
//var betreuungsschluesselColumnAbsolut = new GridColumn { Name = "ColumnBSAbsolut", Header = "Betreuung in Minuten", FieldName = "Betreuungsschluessel", AllowEditing = allowEditingBetreuungsschluesselColumn, Width = 170, EditSettings = new TextEditSettings { MaskUseAsDisplayFormat = true, MaskType = MaskType.Numeric, Mask = "########0" } };
|
||||
//betreuungsschluesselColumnAbsolut.Visible = false;
|
||||
|
||||
gridControl.Columns.Add(employeeColumn);
|
||||
gridControl.Columns.Add(betreuungsschluesselColumn);
|
||||
//gridControl.Columns.Add(betreuungsschluesselColumnAbsolut);
|
||||
|
||||
gridControl.View = new TableView {AutoWidth = false, ShowGroupPanel = false, ShowGroupedColumns = false, ShowTotalSummary = false, NavigationStyle = GridViewNavigationStyle.Cell};
|
||||
gridControl.View = new TableView {AutoWidth = false, ShowGroupPanel = false, ShowGroupedColumns = false, ShowTotalSummary = false, NavigationStyle = GridViewNavigationStyle.Cell};
|
||||
|
||||
|
||||
grid.Children.Add(gridControl);
|
||||
}
|
||||
|
||||
private void ChangeCostbearerBtn_Click(object sender, RoutedEventArgs e)
|
||||
private void GridControl_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if ((bool) e.NewValue)
|
||||
{
|
||||
GridControl gc = sender as GridControl;
|
||||
|
||||
var list = gc.ItemsSource as BindingList<SupportConceptApprovalPeriodEmployeeRelVM>;
|
||||
|
||||
bool isAbsolute = false;
|
||||
if (list != null && list.Count > 0)
|
||||
{
|
||||
isAbsolute = list[0].IsAbsolut;
|
||||
}
|
||||
if (isAbsolute)
|
||||
{
|
||||
gc.Columns[2].Header = "Betreuung in Minuten";
|
||||
((TextEditSettings) gc.Columns[2].EditSettings).Mask = "########0";
|
||||
}
|
||||
else
|
||||
{
|
||||
gc.Columns[2].Header = "Anteil an der Betreuung (%)";
|
||||
((TextEditSettings)gc.Columns[2].EditSettings).Mask = "########0.00";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void ChangeCostbearerBtn_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
supportConceptCostBearerRel2Change = (SupportConceptCostBearerRelVM) ((Button) sender).Tag;
|
||||
isChangingCostbearer = true;
|
||||
@@ -1269,47 +1328,49 @@ namespace BeWo.View.Detail
|
||||
|
||||
if (SelectedApprovalPeriodVM != null)
|
||||
{
|
||||
bool isabsolute = false;
|
||||
|
||||
if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Count == 0)
|
||||
{
|
||||
RadioAbsolPro.Visibility = Visibility.Visible;
|
||||
RadioAbsolPro.Visibility = Visibility.Visible;
|
||||
RadioProzent.IsChecked = true;
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
RadioAbsolPro.Visibility = Visibility.Collapsed;
|
||||
if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Last().IsAbsolut)
|
||||
{
|
||||
LabelProzentual.Visibility = Visibility.Collapsed;
|
||||
LabelAbsolut.Visibility = Visibility.Visible;
|
||||
|
||||
editProzentual.Visibility = Visibility.Collapsed;
|
||||
editAbsolut.Visibility = Visibility.Visible;
|
||||
|
||||
|
||||
if (SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Last().IsAbsolut)
|
||||
{
|
||||
isabsolute = true;
|
||||
|
||||
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = true;
|
||||
|
||||
var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
|
||||
var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
|
||||
|
||||
editAbsolut.MaxValue = actual.ApprovedBEPerInterval;
|
||||
decimal max = 0;
|
||||
if (actual.ApprovedBEPerInterval.HasValue)
|
||||
{
|
||||
max = actual.ApprovedBEPerInterval.Value * 60;
|
||||
editAbsolut.MaxValue = max;
|
||||
}
|
||||
|
||||
|
||||
var alt =
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(
|
||||
s => s.Betreuungsschluessel);
|
||||
|
||||
if (alt > actual.ApprovedBEPerInterval)
|
||||
alt = actual.ApprovedBEPerInterval ?? 0;
|
||||
if (alt > max)
|
||||
alt = max;
|
||||
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = Math.Round((actual.ApprovedBEPerInterval ?? 0) - alt,2);
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = (int)(max - alt);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelProzentual.Visibility = Visibility.Visible;
|
||||
LabelAbsolut.Visibility = Visibility.Collapsed;
|
||||
|
||||
editProzentual.Visibility = Visibility.Visible;
|
||||
editAbsolut.Visibility = Visibility.Collapsed;
|
||||
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
|
||||
|
||||
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
|
||||
@@ -1319,8 +1380,23 @@ namespace BeWo.View.Detail
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100 - alt;
|
||||
}
|
||||
}
|
||||
if (isabsolute)
|
||||
{
|
||||
LabelProzentual.Visibility = Visibility.Collapsed;
|
||||
LabelAbsolut.Visibility = Visibility.Visible;
|
||||
|
||||
|
||||
editProzentual.Visibility = Visibility.Collapsed;
|
||||
editAbsolut.Visibility = Visibility.Visible;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
LabelProzentual.Visibility = Visibility.Visible;
|
||||
LabelAbsolut.Visibility = Visibility.Collapsed;
|
||||
|
||||
editProzentual.Visibility = Visibility.Visible;
|
||||
editAbsolut.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1332,12 +1408,16 @@ namespace BeWo.View.Detail
|
||||
{
|
||||
var alt = SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.VMList.Sum(s => s.Betreuungsschluessel);
|
||||
|
||||
|
||||
if (alt + SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel > editAbsolut.MaxValue)
|
||||
if (editAbsolut.MaxValue.HasValue)
|
||||
{
|
||||
MessageBox.Show("Die Summe der Anteile liegt bei über " + Math.Round(editAbsolut.MaxValue ?? 0,2) + ". Hinzufügen nicht möglich.", "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
return;
|
||||
}
|
||||
if (alt +
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel >
|
||||
editAbsolut.MaxValue)
|
||||
{
|
||||
MessageBox.Show(String.Format("Die Summe der Anteile liegt bei über {0:0} Minuten. Hinzufügen nicht möglich.", editAbsolut.MaxValue), "Fehler", MessageBoxButton.OK, MessageBoxImage.Warning);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1430,6 +1510,7 @@ namespace BeWo.View.Detail
|
||||
editProzentual.Visibility = Visibility.Visible;
|
||||
editAbsolut.Visibility = Visibility.Collapsed;
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.IsAbsolut = false;
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = 100;
|
||||
}
|
||||
|
||||
private void ToggledAbsol_OnChecked(object sender, RoutedEventArgs e)
|
||||
@@ -1437,9 +1518,13 @@ namespace BeWo.View.Detail
|
||||
var cbRelVM = this.tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
|
||||
var actual = cbRelVM.ApprovalPeriodList.VMList.OrderByDescending(i => i.StartDate).FirstOrDefault();
|
||||
|
||||
editAbsolut.MaxValue = actual.ApprovedBEPerInterval;
|
||||
|
||||
if (actual.ApprovedBEPerInterval.HasValue)
|
||||
{
|
||||
editAbsolut.MaxValue = actual.ApprovedBEPerInterval * 60;
|
||||
|
||||
}
|
||||
|
||||
SelectedApprovalPeriodVM.SupportConceptApprovalEmployeeRelations.NewVM.Betreuungsschluessel = editAbsolut.MaxValue ?? 0;
|
||||
LabelProzentual.Visibility = Visibility.Collapsed;
|
||||
LabelAbsolut.Visibility = Visibility.Visible;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:localView="clr-namespace:BeWo.View"
|
||||
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
|
||||
xmlns:localViewModel="clr-namespace:BeWo.ViewModel"
|
||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.1"
|
||||
xmlns:dxg="clr-namespace:DevExpress.Xpf.Grid;assembly=DevExpress.Xpf.Grid.v13.2"
|
||||
xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"
|
||||
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch" Focusable="True">
|
||||
|
||||
@@ -619,7 +619,7 @@ namespace BeWo.ViewModel.ListViewModel
|
||||
{
|
||||
SupportConceptTreeNodeDetailInfoDC info = _CostBearer2SupportConceptOid2BookingInfoDict[relDc.CostBearer2SupportConceptOid.Value];
|
||||
|
||||
if (info.CustomerAbsenceTimes != null)
|
||||
if (info != null && info.CustomerAbsenceTimes != null)
|
||||
{
|
||||
return info.CustomerAbsenceTimes.Where(
|
||||
at => at.AbsenceSpan.ContainsDate(dt)).ToList();
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
<IISExpressAnonymousAuthentication />
|
||||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
|
||||
|
||||
@@ -18,7 +18,6 @@ namespace BeWoPlanerMobil.Controllers
|
||||
[HttpPost]
|
||||
public ActionResult Index()
|
||||
{
|
||||
|
||||
ViewData[loginErrorIndex] = string.Empty;
|
||||
|
||||
if (MobileSessionFacade.IsUserLoggedIn())
|
||||
@@ -35,7 +34,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
FormsAuthentication.SetAuthCookie(MobileSessionFacade.LoggedInUser.LoginName, true);
|
||||
ViewData[loginErrorIndex] = string.Empty;
|
||||
|
||||
var keks = new HttpCookie("tenantKeks") {Value = MobileSessionFacade.Tenant, Expires = DateTime.Now.AddDays(1)};
|
||||
var keks = new HttpCookie("tenantKeks") { Value = MobileSessionFacade.Tenant, Expires = DateTime.Now.AddDays(1) };
|
||||
HttpContext.Response.SetCookie(keks);
|
||||
|
||||
var brauser = Request.Browser;
|
||||
@@ -52,14 +51,15 @@ namespace BeWoPlanerMobil.Controllers
|
||||
|
||||
return RedirectToActionPermanent("Main", "Main");
|
||||
}
|
||||
log.Info(String.Format("LoginController.Index(): Login failed! Tenant = {0}", MobileSessionFacade.Tenant));
|
||||
|
||||
log.Info(string.Format("LoginController.Index(): Login failed! Tenant = {0}", MobileSessionFacade.Tenant));
|
||||
|
||||
ViewData[loginErrorIndex] = "Die Anmeldung ist fehlgeschlagen. Bitte überprüfen Sie Benutzername und Passwort.";
|
||||
return View("Index");
|
||||
}
|
||||
|
||||
public ActionResult Index(string tenant, string returnUrl)
|
||||
{
|
||||
{
|
||||
if (returnUrl != null)
|
||||
{
|
||||
return RedirectToAction("Index", new {tenant = MobileSessionFacade.Tenant});
|
||||
@@ -68,12 +68,17 @@ namespace BeWoPlanerMobil.Controllers
|
||||
if (tenant == null && returnUrl == null)
|
||||
{
|
||||
var keks = HttpContext.Request.Cookies.Get("tenantKeks");
|
||||
|
||||
if(keks != null)
|
||||
tenant = keks.Value;
|
||||
{
|
||||
tenant = keks.Value;
|
||||
}
|
||||
}
|
||||
|
||||
if (MobileSessionFacade.IsUserLoggedIn())
|
||||
return RedirectToActionPermanent("Main", "Main");
|
||||
{
|
||||
return RedirectToActionPermanent("Main", "Main");
|
||||
}
|
||||
|
||||
MobileSessionFacade.Tenant = tenant;
|
||||
return View("Index");
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
private const String MainModelSessionKey = "MainModel";
|
||||
private const string MainModelSessionKey = "MainModel";
|
||||
|
||||
private Dictionary<long, ValueListEntryDC> ParentGoals;
|
||||
|
||||
@@ -147,7 +147,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public String LoadGoals(long pCostbearer2SupportConceptOid)
|
||||
public string LoadGoals(long pCostbearer2SupportConceptOid)
|
||||
{
|
||||
if (Model == null)
|
||||
{
|
||||
@@ -315,7 +315,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public String LoadKalender(String newtoday)
|
||||
public string LoadKalender(string newtoday)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -390,7 +390,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
public void SaveKalender(String day, String startZeit, String endZeit, String betreff, String notice)
|
||||
public void SaveKalender(string day, string startZeit, string endZeit, string betreff, string notice)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -425,7 +425,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public string LoadKalenderTask(String newtoday)
|
||||
public string LoadKalenderTask(string newtoday)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -449,7 +449,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
public void SaveUnterschrift(String breitengrad, String langengrad, String blob, String zeitstempel, long? ServiceRecord)
|
||||
public void SaveUnterschrift(string breitengrad, string langengrad, string blob, string zeitstempel, long? ServiceRecord)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -501,18 +501,44 @@ namespace BeWoPlanerMobil.Controllers
|
||||
{
|
||||
if (Model != null)
|
||||
{
|
||||
var scm = Model.ServiceCategories.FirstOrDefault(s => s.ServiceCategoryOid.Value == pServiceCategoryOid);
|
||||
var scm = Model.ServiceCategories.FirstOrDefault(s => s.ServiceCategoryOid.Value == pServiceCategoryOid);
|
||||
if (scm != null)
|
||||
{
|
||||
return SerializeObject(scm.ServiceDescriptions);
|
||||
}
|
||||
}
|
||||
return SerializeObject(new List<ServiceDescriptionDC>());
|
||||
|
||||
return SerializeObject(new List<ServiceDescriptionDC>());
|
||||
}
|
||||
|
||||
|
||||
public string LoadTextbausteineForServiceCategory(long pServiceCategoryOid)
|
||||
{
|
||||
if (!MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen) && !MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var textbausteine = OperationsService.GetTextbausteineByServiceCategory(pServiceCategoryOid);
|
||||
|
||||
if(MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen))
|
||||
{
|
||||
textbausteine = textbausteine.Where(w => w.Employee.EmployeeOid == Model.Employee.EmployeeOid).ToList();
|
||||
}
|
||||
|
||||
Model.Textbausteine = textbausteine.ToList();
|
||||
|
||||
return SerializeObject(textbausteine.Select(s => new TextbausteinDisplayItem(s.TextbausteinOid.Value, s.Name)));
|
||||
}
|
||||
|
||||
public string LoadCompleteTextbausteinByOid(long pTextbausteinOid)
|
||||
{
|
||||
var abc = Model.Textbausteine.FirstOrDefault(f => f.TextbausteinOid.Value == pTextbausteinOid);
|
||||
|
||||
return abc.Text;
|
||||
}
|
||||
|
||||
// ajax call zur anzeige ob beim nach saven ein fehler aufgetreten ist.
|
||||
public void ErrorZeiterfassungAnzeigen(int errorwert)
|
||||
public void ErrorZeiterfassungAnzeigen(int errorwert)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -1072,7 +1098,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
|
||||
public class GoalTreeItem
|
||||
{
|
||||
public String Header { get; set; }
|
||||
public string Header { get; set; }
|
||||
public bool IsLeaf { get; set; }
|
||||
public List<GoalTreeItem> Children { get; set; }
|
||||
public long? ParentOid { get; set; }
|
||||
@@ -1088,6 +1114,9 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
|
||||
Model.SelectedServiceDescriptionOid = pServiceDescriptionOid;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
@@ -1151,7 +1180,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
public String GetSelectedRecordInformation()
|
||||
public string GetSelectedRecordInformation()
|
||||
{
|
||||
var result = String.Empty;
|
||||
|
||||
@@ -1163,7 +1192,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
return result;
|
||||
}
|
||||
|
||||
public String GetSelectedRecordInformationWithOid(long oid)
|
||||
public string GetSelectedRecordInformationWithOid(long oid)
|
||||
{
|
||||
var result = String.Empty;
|
||||
LoadRecordsToModel();
|
||||
@@ -1172,7 +1201,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
return result;
|
||||
}
|
||||
|
||||
private static String SerializeObject(object obj)
|
||||
private static string SerializeObject(object obj)
|
||||
{
|
||||
return JsonConvert.SerializeObject(obj, Formatting.Indented, new JsonSerializerSettings { ContractResolver = new ShouldSerializeContractResolver(), ReferenceLoopHandling = ReferenceLoopHandling.Ignore });
|
||||
}
|
||||
@@ -1332,7 +1361,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
return result;
|
||||
}
|
||||
|
||||
public String CheckRights(String von, String bis, bool inEditMode, String dateString, String startString, String endString)
|
||||
public string CheckRights(String von, String bis, bool inEditMode, String dateString, String startString, String endString)
|
||||
{
|
||||
if (Model == null)
|
||||
{
|
||||
@@ -1625,11 +1654,11 @@ namespace BeWoPlanerMobil.Controllers
|
||||
return dt;
|
||||
}
|
||||
|
||||
struct ValidationStruct
|
||||
private struct ValidationStruct
|
||||
{
|
||||
public List<ServiceRecordValidationResultDC> ValidationResults { get; set; }
|
||||
public Dictionary<int, bool> Rights { get; set; }
|
||||
public String MaxDaysEditServiceRecordsAllowed { get; set; }
|
||||
public string MaxDaysEditServiceRecordsAllowed { get; set; }
|
||||
}
|
||||
|
||||
public void SetViewMode()
|
||||
@@ -1644,12 +1673,12 @@ namespace BeWoPlanerMobil.Controllers
|
||||
Model.SelectedCustomerOid = null;
|
||||
}
|
||||
|
||||
public String GetSelectedSupportConceptCustomer()
|
||||
public string GetSelectedSupportConceptCustomer()
|
||||
{
|
||||
return Model.SelectedSupportConcept == null ? "NoSupportConceptSelected" : SerializeObject(Model.SelectedSupportConcept.Customer.CustomerOid);
|
||||
}
|
||||
|
||||
public String GetSelectedCustomer(long customerOid)
|
||||
public string GetSelectedCustomer(long customerOid)
|
||||
{
|
||||
if (Model == null)
|
||||
{
|
||||
@@ -1691,27 +1720,27 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
class JSONCustomer
|
||||
internal class JSONCustomer
|
||||
{
|
||||
public String Vorname { get; set; }
|
||||
public String Nachname { get; set; }
|
||||
public String Geburtstag { get; set; }
|
||||
public String Geschlecht { get; set; }
|
||||
public string Vorname { get; set; }
|
||||
public string Nachname { get; set; }
|
||||
public string Geburtstag { get; set; }
|
||||
public string Geschlecht { get; set; }
|
||||
|
||||
public String Adresszusatz { get; set; }
|
||||
public String Strasse { get; set; }
|
||||
public String Postleitzahl { get; set; }
|
||||
public String Ort { get; set; }
|
||||
public string Adresszusatz { get; set; }
|
||||
public string Strasse { get; set; }
|
||||
public string Postleitzahl { get; set; }
|
||||
public string Ort { get; set; }
|
||||
|
||||
public String RechnungsadresseName { get; set; }
|
||||
public String RechnungsadresseStrasse { get; set; }
|
||||
public String RechnungsadressePostleitzahl { get; set; }
|
||||
public String RechnungsadresseOrt { get; set; }
|
||||
public string RechnungsadresseName { get; set; }
|
||||
public string RechnungsadresseStrasse { get; set; }
|
||||
public string RechnungsadressePostleitzahl { get; set; }
|
||||
public string RechnungsadresseOrt { get; set; }
|
||||
|
||||
public String EMail { get; set; }
|
||||
public String Fax { get; set; }
|
||||
public String Telefon { get; set; }
|
||||
public String Handy { get; set; }
|
||||
public string EMail { get; set; }
|
||||
public string Fax { get; set; }
|
||||
public string Telefon { get; set; }
|
||||
public string Handy { get; set; }
|
||||
|
||||
public List<Umfeldsperson> Umfeldpersonen { get; set; }
|
||||
|
||||
@@ -1765,18 +1794,18 @@ namespace BeWoPlanerMobil.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
class Umfeldsperson
|
||||
internal class Umfeldsperson
|
||||
{
|
||||
public String Vorname { get; set; }
|
||||
public String Nachname { get; set; }
|
||||
public String StrNameNr { get; set; }
|
||||
public String PLZOrt { get; set; }
|
||||
public String TelNr { get; set; }
|
||||
public String Mobil { get; set; }
|
||||
public String EMail { get; set; }
|
||||
public String Fax { get; set; }
|
||||
public String Rolle { get; set; }
|
||||
public String Titel { get; set; }
|
||||
public string Vorname { get; set; }
|
||||
public string Nachname { get; set; }
|
||||
public string StrNameNr { get; set; }
|
||||
public string PLZOrt { get; set; }
|
||||
public string TelNr { get; set; }
|
||||
public string Mobil { get; set; }
|
||||
public string EMail { get; set; }
|
||||
public string Fax { get; set; }
|
||||
public string Rolle { get; set; }
|
||||
public string Titel { get; set; }
|
||||
|
||||
public Umfeldsperson(CustomerPersonRelationDC umfeldspersonDC)
|
||||
{
|
||||
@@ -1786,7 +1815,7 @@ namespace BeWoPlanerMobil.Controllers
|
||||
Vorname = person.FirstName;
|
||||
Nachname = person.LastName;
|
||||
StrNameNr = person.Street;
|
||||
PLZOrt = String.Format("{0} {1}", person.PostalCode, person.Town);
|
||||
PLZOrt = string.Format("{0} {1}", person.PostalCode, person.Town);
|
||||
TelNr = person.Communication1;
|
||||
Mobil = person.Communication2;
|
||||
EMail = person.Communication3;
|
||||
@@ -1794,4 +1823,16 @@ namespace BeWoPlanerMobil.Controllers
|
||||
Titel = person.Title;
|
||||
}
|
||||
}
|
||||
|
||||
internal class TextbausteinDisplayItem
|
||||
{
|
||||
public string Name { get; set; }
|
||||
public long Oid { get; set; }
|
||||
|
||||
public TextbausteinDisplayItem(long pOid, string pName)
|
||||
{
|
||||
Oid = pOid;
|
||||
Name = pName;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Linq;
|
||||
using System.Net.Mime;
|
||||
using System.Web.Mvc;
|
||||
|
||||
using BeWoPlanerMobil.Service;
|
||||
@@ -33,7 +34,6 @@ namespace BeWoPlanerMobil.Models
|
||||
|
||||
public bool SaveSignature { get; set; }
|
||||
|
||||
//######### neuer wert zur überprüfung
|
||||
public int ErrorWert { get; set; }
|
||||
|
||||
public bool ShowSignature { get; set; }
|
||||
@@ -43,6 +43,8 @@ namespace BeWoPlanerMobil.Models
|
||||
public List<SupportConceptDC> SupportConcepts { get; set; }
|
||||
public List<ServiceCategoryModel> ServiceCategories { get; set; }
|
||||
|
||||
public List<TextbausteinDC> Textbausteine { get; set; }
|
||||
|
||||
private List<ServiceRecordDC> serviceRecords;
|
||||
|
||||
public List<ServiceRecordDC> ServiceRecords
|
||||
@@ -107,6 +109,15 @@ namespace BeWoPlanerMobil.Models
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsTextbausteineVisible
|
||||
{
|
||||
get
|
||||
{
|
||||
return MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) ||
|
||||
MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
|
||||
}
|
||||
}
|
||||
|
||||
public MainModel()
|
||||
{
|
||||
NewServiceRecord = new ServiceRecordDC();
|
||||
@@ -143,6 +154,24 @@ namespace BeWoPlanerMobil.Models
|
||||
}
|
||||
}
|
||||
|
||||
[Display(Name = "Textbaustein")]
|
||||
public long? SelectedTextbausteinOid { get; set; }
|
||||
|
||||
public IEnumerable<SelectListItem> TextbausteinListItems
|
||||
{
|
||||
get
|
||||
{
|
||||
var result = new List<SelectListItem>();
|
||||
|
||||
if (Textbausteine != null)
|
||||
{
|
||||
result.AddRange(Textbausteine.Select(item => new SelectListItem { Value = item.TextbausteinOid.Value.ToString(), Text = item.Name }).ToList());
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
public List<CustomerDC> Customers { get; set; }
|
||||
|
||||
public List<CompactEmployeeDC> Employees { get; set; }
|
||||
|
||||
@@ -6,14 +6,15 @@ $(document).ready(function () {
|
||||
|
||||
toggleErrorPopup2('errorPopupDiv2');
|
||||
|
||||
$("#leistungen_select,#kategorien_select,#recordLoader_select").prop("disabled", false);
|
||||
$("#leistungen_select,#kategorien_select,#recordLoader_select,#textbausteine_select").prop("disabled", false);
|
||||
|
||||
toggleSelectClassesForElement("#kategorien_select", "#kategorien-select-container");
|
||||
toggleSelectClassesForElement("#leistungen_select", "#leistungen-select-container");
|
||||
toggleSelectClassesForElement("#recordLoader_select", "#record-loader-select-container");
|
||||
toggleSelectClassesForElement("#textbausteine_select", "#textbausteine-select-container");
|
||||
|
||||
//Lade Dokumentationsreiter aus Bewo
|
||||
checkDokuReiter();
|
||||
//Lade Dokumentationsreiter aus Bewo
|
||||
initializeDocumentationTextareas();
|
||||
|
||||
//ist EndDate Gewünscht
|
||||
checkEndDate();
|
||||
@@ -55,18 +56,18 @@ $(document).ready(function () {
|
||||
ko.applyBindings(vm);
|
||||
|
||||
loadSettingsAccordingToBWP();
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
function initBeWoMobile(actionPath) {
|
||||
try {
|
||||
$("#recordLoader_select,#kategorien_select,#leistungen_select").prop("disabled", true);
|
||||
$("#recordLoader_select, #kategorien_select, #leistungen_select, #textbausteine_select").prop("disabled", true);
|
||||
|
||||
toggleSelectClassesForElement("#kategorien_select", "#kategorien-select-container");
|
||||
toggleSelectClassesForElement("#leistungen_select", "#leistungen-select-container");
|
||||
toggleSelectClassesForElement("#recordLoader_select", "#record-loader-select-container");
|
||||
toggleSelectClassesForElement("#textbausteine_select", "#textbausteine-select-container");
|
||||
|
||||
var selectedSC = $($("#scDropDown")).find(":selected").val();
|
||||
|
||||
@@ -78,17 +79,12 @@ function initBeWoMobile(actionPath) {
|
||||
}
|
||||
|
||||
$("#datum_textbox").val(getDateStringWithLeadingZeros(new Date()));
|
||||
|
||||
// $("#enddatum_textbox").val($("#datum_textbox").val());
|
||||
}
|
||||
|
||||
$(".not-required-input").on(
|
||||
"click blur change focus",
|
||||
$(".not-required-input").on("click blur change focus",
|
||||
function () {
|
||||
var v = $(this).attr("id");
|
||||
setTimeout(function () {
|
||||
toggleLabel(v);
|
||||
}, 1);
|
||||
setTimeout(function () { toggleLabel(v); }, 1);
|
||||
}
|
||||
);
|
||||
|
||||
@@ -117,14 +113,6 @@ function initBeWoMobile(actionPath) {
|
||||
|
||||
});
|
||||
|
||||
//$("#ende_textbox").on("input", function () {
|
||||
// validateTimeField("#ende_textbox");
|
||||
//});
|
||||
|
||||
//$("#start_textbox").on("input", function () {
|
||||
// validateTimeField("#start_textbox");
|
||||
//});
|
||||
|
||||
$("#duration_textbox").on("blur", function () {
|
||||
var startHasValue = $("#start_textbox").val() != "";
|
||||
var endHasValue = $("#ende_textbox").val() != "";
|
||||
@@ -242,112 +230,79 @@ function checkEndDate() {
|
||||
});
|
||||
}
|
||||
|
||||
function checkDokuReiter() {
|
||||
function initializeDocumentationTextareas() {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: CheckDokuReiterUrl,
|
||||
success: function (json) {
|
||||
|
||||
var s = $.parseJSON(json);
|
||||
|
||||
|
||||
console.log(json);
|
||||
|
||||
var x = s.length;
|
||||
|
||||
|
||||
if (x == 0) {
|
||||
document.getElementById('tddokureiter').style.display = 'none';
|
||||
document.getElementById('trnormalDoku').style.display = 'table-row';//block
|
||||
document.getElementById('notiz_textbox').style.width = '100%'; //795 || 200
|
||||
$("#tddokureiter").css("display", "none");
|
||||
$("#trnormalDoku").css("display", "table-row");
|
||||
$("#notiz_textbox").css("width", "100%");
|
||||
focusedDokuTextarea = $("#notiz_textbox");
|
||||
} else {
|
||||
focusedDokuTextarea = $("#notiz_textbox1");
|
||||
}
|
||||
|
||||
if (x == 1) {
|
||||
document.getElementById('tddokureiter').style.display = 'none';
|
||||
document.getElementById('trnormalDoku').style.display = 'table-row';
|
||||
document.getElementById('notiz_textbox').style.width = '100%'; // 765
|
||||
document.getElementById('trnormalDokuLabel').textContent = s[0].TypeDescription;
|
||||
|
||||
$("#tddokureiter").css("display", "none");
|
||||
$("#trnormalDoku").css("display", "table-row");
|
||||
$("#notiz_textbox").css("width", "100%");
|
||||
$("#trnormalDokuLabel").text(s[0].TypeDescription);
|
||||
}
|
||||
|
||||
if (x == 2) {
|
||||
document.getElementById('DokName1').textContent = s[0].TypeDescription;
|
||||
document.getElementById('DokName2').textContent = s[1].TypeDescription;
|
||||
|
||||
$("#DokName1").text(s[0].TypeDescription);
|
||||
$("#DokName2").text(s[1].TypeDescription);
|
||||
|
||||
document.getElementById('notiz_textbox1').style.width = '40%';//100%
|
||||
document.getElementById('notiz_textbox2').style.width = '40%';
|
||||
|
||||
document.getElementById('Dokumentation1').style.display = 'block'; // block
|
||||
document.getElementById('Dokumentation2').style.display = 'block';
|
||||
$("#notiz_textbox1, #notiz_textbox2").css("width", "40%");
|
||||
|
||||
document.getElementById('Dokumentation1').style = 'width: 250%'; //247.5% || 250
|
||||
document.getElementById('Dokumentation2').style = 'width: 250%';
|
||||
$("#Dokumentation1, #Dokumentation2").css("display", "block");
|
||||
$("#Dokumentation1, #Dokumentation2").css("width","250%");
|
||||
}
|
||||
if (x == 3) {
|
||||
document.getElementById('DokName1').textContent = s[0].TypeDescription;
|
||||
document.getElementById('DokName2').textContent = s[1].TypeDescription;
|
||||
document.getElementById('DokName3').textContent = s[2].TypeDescription;
|
||||
|
||||
$("#DokName1").text(s[0].TypeDescription);
|
||||
$("#DokName2").text(s[1].TypeDescription);
|
||||
$("#DokName3").text(s[2].TypeDescription);
|
||||
|
||||
document.getElementById('notiz_textbox1').style.width = '50%';
|
||||
document.getElementById('notiz_textbox2').style.width = '50%';
|
||||
document.getElementById('notiz_textbox3').style.width = '50%';
|
||||
$("#notiz_textbox1, #notiz_textbox2, #notiz_textbox3").css("width", "50%");
|
||||
|
||||
document.getElementById('Dokumentation1').style.display = 'block';
|
||||
document.getElementById('Dokumentation2').style.display = 'block';
|
||||
document.getElementById('Dokumentation3').style.display = 'block';
|
||||
|
||||
document.getElementById('Dokumentation1').style = 'width: 200%'; //133.3% || 165%
|
||||
document.getElementById('Dokumentation2').style = 'width: 200%';
|
||||
document.getElementById('Dokumentation3').style = 'width: 200%';
|
||||
$("#Dokumentation1, #Dokumentation2, #Dokumentation3").css("display", "block");
|
||||
$("#Dokumentation1, #Dokumentation2, #Dokumentation3").css("width", "250%");
|
||||
}
|
||||
if (x == 4) {
|
||||
document.getElementById('DokName1').textContent = s[0].TypeDescription;
|
||||
document.getElementById('DokName2').textContent = s[1].TypeDescription;
|
||||
document.getElementById('DokName3').textContent = s[2].TypeDescription;
|
||||
document.getElementById('DokName4').textContent = s[3].TypeDescription;
|
||||
|
||||
document.getElementById('notiz_textbox1').style.width = '76.9%';
|
||||
document.getElementById('notiz_textbox2').style.width = '76.9%';
|
||||
document.getElementById('notiz_textbox3').style.width = '76.9%';
|
||||
document.getElementById('notiz_textbox4').style.width = '76.9%';
|
||||
$("#DokName1").text(s[0].TypeDescription);
|
||||
$("#DokName2").text(s[1].TypeDescription);
|
||||
$("#DokName3").text(s[2].TypeDescription);
|
||||
$("#DokName4").text(s[3].TypeDescription);
|
||||
|
||||
document.getElementById('Dokumentation1').style.display = 'block';
|
||||
document.getElementById('Dokumentation2').style.display = 'block';
|
||||
document.getElementById('Dokumentation3').style.display = 'block';
|
||||
document.getElementById('Dokumentation4').style.display = 'block';
|
||||
|
||||
document.getElementById('Dokumentation1').style = 'width: 130%';
|
||||
document.getElementById('Dokumentation2').style = 'width: 130%';
|
||||
document.getElementById('Dokumentation3').style = 'width: 130%';
|
||||
document.getElementById('Dokumentation4').style = 'width: 130%';
|
||||
|
||||
|
||||
$("#notiz_textbox1, #notiz_textbox2, #notiz_textbox3, #notiz_textbox4").css("width", "76.9%");
|
||||
|
||||
$("#Dokumentation1, #Dokumentation2, #Dokumentation3, #Dokumentation4, #Dokumentation5").css("display", "block");
|
||||
$("#Dokumentation1, #Dokumentation2, #Dokumentation3, #Dokumentation4, #Dokumentation5").css("width", "130%");
|
||||
}
|
||||
if (x == 5) {
|
||||
document.getElementById('DokName1').textContent = s[0].TypeDescription;
|
||||
document.getElementById('DokName2').textContent = s[1].TypeDescription;
|
||||
document.getElementById('DokName3').textContent = s[2].TypeDescription;
|
||||
document.getElementById('DokName4').textContent = s[3].TypeDescription;
|
||||
document.getElementById('DokName5').textContent = s[4].TypeDescription;
|
||||
$("#DokName1").text(s[0].TypeDescription);
|
||||
$("#DokName2").text(s[1].TypeDescription);
|
||||
$("#DokName3").text(s[2].TypeDescription);
|
||||
$("#DokName4").text(s[3].TypeDescription);
|
||||
$("#DokName5").text(s[4].TypeDescription);
|
||||
|
||||
document.getElementById('notiz_textbox1').style.width = '101%';
|
||||
document.getElementById('notiz_textbox2').style.width = '101%';
|
||||
document.getElementById('notiz_textbox3').style.width = '101%';
|
||||
document.getElementById('notiz_textbox4').style.width = '101%';
|
||||
document.getElementById('notiz_textbox5').style.width = '101%';
|
||||
$("#notiz_textbox1, #notiz_textbox2, #notiz_textbox3, #notiz_textbox4, #notiz_textbox5").css("width", "101%");
|
||||
|
||||
document.getElementById('Dokumentation1').style.display = 'block';
|
||||
document.getElementById('Dokumentation2').style.display = 'block';
|
||||
document.getElementById('Dokumentation3').style.display = 'block';
|
||||
document.getElementById('Dokumentation4').style.display = 'block';
|
||||
document.getElementById('Dokumentation5').style.display = 'block';
|
||||
|
||||
document.getElementById('Dokumentation1').style = 'width: 99%';
|
||||
document.getElementById('Dokumentation2').style = 'width: 99%';
|
||||
document.getElementById('Dokumentation3').style = 'width: 99%';
|
||||
document.getElementById('Dokumentation4').style = 'width: 99%';
|
||||
document.getElementById('Dokumentation5').style = 'width: 99%';
|
||||
$("#Dokumentation1, #Dokumentation2, #Dokumentation3, #Dokumentation4, #Dokumentation5").css("display", "block");
|
||||
$("#Dokumentation1, #Dokumentation2, #Dokumentation3, #Dokumentation4, #Dokumentation5").css("width", "99%");
|
||||
}
|
||||
|
||||
if (x > 0) {
|
||||
document.getElementById('DokName1').click();
|
||||
$("#DokName1").click();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -85,11 +85,13 @@ function loadServiceCategoriesOnSuccess(json) {
|
||||
return;
|
||||
}
|
||||
|
||||
var liste = $.parseJSON(json);
|
||||
var liste = $.parseJSON(json);
|
||||
|
||||
$("#leistungen_select").empty();
|
||||
$("#leistungen_select").val("");
|
||||
$("#leistungen_select").val("");
|
||||
|
||||
$.each(liste, function(index, leistung) {
|
||||
$("#leistungen_select").append('<option value="' + leistung.ServiceDescriptionOid + '">' + leistung.Name + '</option>');
|
||||
$("#leistungen_select").append('<option value="' + leistung.ServiceDescriptionOid + '">' + leistung.Name + "</option>");
|
||||
});
|
||||
|
||||
if (liste[0] !== undefined) {
|
||||
@@ -213,9 +215,52 @@ function toggleMenu() {
|
||||
}
|
||||
|
||||
function loadServiceDescriptions() {
|
||||
var selectedCategory = $("#kategorien_select").find(":selected").val();
|
||||
var selectedCategory = $("#kategorien_select").find(":selected").val();
|
||||
|
||||
makeAjaxCall("GET", loadServiceCategoriesUrl, loadServiceCategoriesOnSuccess, { pServiceCategoryOid: selectedCategory }, null);
|
||||
makeAjaxCall("GET", loadServiceCategoriesUrl, loadServiceCategoriesOnSuccess, { pServiceCategoryOid: selectedCategory }, null);
|
||||
|
||||
loadTextbausteineForServiceCategory(selectedCategory);
|
||||
}
|
||||
|
||||
function loadTextbausteineForServiceCategory(serviceCategoryOid) {
|
||||
makeAjaxCall("GET", loadTextbausteineForCategoryUrl, loadTextbausteineForCategoryOnSuccess, { pServiceCategoryOid: serviceCategoryOid }, null);
|
||||
}
|
||||
|
||||
function loadTextbausteineForCategoryOnSuccess(json) {
|
||||
if (json == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
var liste = $.parseJSON(json);
|
||||
$("#textbausteine_select").empty();
|
||||
$("#textbausteine_select").val("");
|
||||
|
||||
$("#textbausteine_select").append('<option value="-1">Textbausteine</option>');
|
||||
|
||||
$.each(liste, function(index, textbaustein) {
|
||||
$("#textbausteine_select").append('<option value="' + textbaustein.Oid + '">' + textbaustein.Name + '</option>');
|
||||
});
|
||||
}
|
||||
|
||||
function setTextbaustein() {
|
||||
var selectedTextbausteinOid = $("#textbausteine_select").find(":selected").val();
|
||||
|
||||
if (selectedTextbausteinOid > 0) {
|
||||
makeAjaxCall("GET", loadCompleteTextbausteinByOidUrl, loadTextbausteinContentOnSuccess, { pTextbausteinOid: selectedTextbausteinOid }, null);
|
||||
}
|
||||
}
|
||||
|
||||
function loadTextbausteinContentOnSuccess(textbausteintext) {
|
||||
if (focusedDokuTextarea != null) {
|
||||
var cursorPosition = focusedDokuTextarea.prop('selectionStart');
|
||||
var v = focusedDokuTextarea.val();
|
||||
var textBefore = v.substring(0, cursorPosition);
|
||||
var textAfter = v.substring(cursorPosition, v.length);
|
||||
|
||||
focusedDokuTextarea.val(textBefore + textbausteintext + textAfter);
|
||||
} else {
|
||||
console.log("focusedDokuTextarea ist null!");
|
||||
}
|
||||
}
|
||||
|
||||
function updateGoals(cbId) {
|
||||
@@ -229,7 +274,7 @@ function setServiceDescription() {
|
||||
|
||||
function selectServiceRecord(oid) {
|
||||
$("#versteckt").val("Speichern");
|
||||
$('html, body').animate({ scrollTop: 0 }, 'fast');
|
||||
$("html, body").animate({ scrollTop: 0 }, "fast");
|
||||
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
@@ -337,6 +382,7 @@ function selectServiceRecord(oid) {
|
||||
toggleSelectClassesForElement("#kategorien_select", "#kategorien-select-container");
|
||||
toggleSelectClassesForElement("#leistungen_select", "#leistungen-select-container");
|
||||
toggleSelectClassesForElement("#recordLoader_select", "#record-loader-select-container");
|
||||
toggleSelectClassesForElement("#textbausteine_select", "#textbausteine-select-container");
|
||||
|
||||
$("#abbrechenBtn").prop("disabled", false);
|
||||
|
||||
@@ -363,10 +409,11 @@ function selectServiceRecord(oid) {
|
||||
function activateForm(actionPath) {
|
||||
$("input").prop("disabled", false);
|
||||
$("textarea").prop("disabled", false);
|
||||
$("#kategorien_select, #leistungen_select, #recordLoader_select").prop("disabled", false);
|
||||
$("#kategorien_select, #leistungen_select, #recordLoader_select, #textbausteine_select").prop("disabled", false);
|
||||
toggleSelectClassesForElement("#kategorien_select", "#kategorien-select-container");
|
||||
toggleSelectClassesForElement("#leistungen_select", "#leistungen-select-container");
|
||||
toggleSelectClassesForElement("#recordLoader_select", "#record-loader-select-container");
|
||||
toggleSelectClassesForElement("#recordLoader_select", "#record-loader-select-container");
|
||||
toggleSelectClassesForElement("#textbausteine_select", "#textbausteine-select-container");
|
||||
|
||||
loadGoals(actionPath);
|
||||
|
||||
@@ -1012,7 +1059,7 @@ function showUsAendern() {
|
||||
|
||||
function showUsVerwerfen() {
|
||||
if ($("#AenderePopupDivSchalter").val() == 'true') {
|
||||
ÄndereTerminPoppup("Wollen sie wirklich abbrechen und ihre Änderungen verwerfen?");
|
||||
AendereTerminPopup("Wollen sie wirklich abbrechen und ihre Änderungen verwerfen?");
|
||||
$("#AenderePopupDivSchalter").val("false");
|
||||
} else {
|
||||
selectServiceKalender(4);
|
||||
@@ -1112,7 +1159,7 @@ function selectServiceKalender(i, array1) {
|
||||
$("#TerminNotiz").prop('readonly', false);
|
||||
|
||||
$("#TerminSpeichern").val("Speichern");
|
||||
$("#TerminSpeichern").css("width", "100");
|
||||
$("#TerminSpeichern").css("width", "100%");
|
||||
$("#TerminSpeichernAbbrechen").val("Abbrechen");
|
||||
$("#TerminSpeichern").css("display", "inline");
|
||||
|
||||
@@ -1997,7 +2044,7 @@ function toggleSuccessPopup(message, i) {
|
||||
}
|
||||
|
||||
|
||||
function ÄndereTerminPoppup(message) {
|
||||
function AendereTerminPopup(message) {
|
||||
var isDisplayNone = $("#AendernPopupDiv").css("display") == "none";
|
||||
var displayValue = isDisplayNone ? "block" : "none";
|
||||
|
||||
@@ -2017,7 +2064,6 @@ function ÄndereTerminPoppup(message) {
|
||||
|
||||
h += t + u + v + w + x;
|
||||
|
||||
//höhe des Hintergrundes
|
||||
$("#AendernPopupDiv").css("height", h + "px");
|
||||
|
||||
$("#AendernPopupDiv").css("top", window.pageYOffset + window.innerHeight / 2 - h / 2);
|
||||
@@ -2403,27 +2449,32 @@ function getEndDateObj() {
|
||||
function focusOnTab(x) {
|
||||
if (x == 1) {
|
||||
setTimeout(function () {
|
||||
document.getElementById("notiz_textbox1").focus();
|
||||
$("#notiz_textbox1").focus();
|
||||
focusedDokuTextarea = $("#notiz_textbox1");
|
||||
}, 100);
|
||||
}
|
||||
if (x == 2) {
|
||||
setTimeout(function () {
|
||||
document.getElementById("notiz_textbox2").focus();
|
||||
$("#notiz_textbox2").focus();
|
||||
focusedDokuTextarea = $("#notiz_textbox2");
|
||||
}, 100);
|
||||
}
|
||||
if (x == 3) {
|
||||
setTimeout(function () {
|
||||
document.getElementById("notiz_textbox3").focus();
|
||||
$("#notiz_textbox3").focus();
|
||||
focusedDokuTextarea = $("#notiz_textbox3");
|
||||
}, 100);
|
||||
}
|
||||
if (x == 4) {
|
||||
setTimeout(function () {
|
||||
document.getElementById("notiz_textbox4").focus();
|
||||
$("#notiz_textbox4").focus();
|
||||
focusedDokuTextarea = $("#notiz_textbox4");
|
||||
}, 100);
|
||||
}
|
||||
if (x == 5) {
|
||||
setTimeout(function () {
|
||||
document.getElementById("notiz_textbox5").focus();
|
||||
$("#notiz_textbox5").focus();
|
||||
focusedDokuTextarea = $("#notiz_textbox5");
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,7 +43,5 @@
|
||||
|
||||
<script>
|
||||
loadGoalsUrl = '';
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
@@ -153,21 +153,31 @@
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr @(MainModel.IsTextbausteineVisible ? Html.Raw("style='display: table-row;'") : Html.Raw("style='display: none;'"))>
|
||||
<td colspan="2" >
|
||||
<div class="combobox-label-parent cell-content">
|
||||
<label for="textbausteine_select">Textbausteine</label>
|
||||
<div class="styled-select-div" id="textbausteine-select-container">
|
||||
<select class="dropdownlist-for" id="textbausteine_select" onchange="setTextbaustein()"></select>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="trnormalDoku" style="display:none;">
|
||||
<td colspan="2">
|
||||
<div class="input-wrapper cell-content" id="divtrnormalDoku">
|
||||
<textarea class="floating-label-input" id="notiz_textbox" name="Dokumentation6" required disabled></textarea>
|
||||
<textarea class="floating-label-input" id="notiz_textbox" name="Dokumentation6" required disabled></textarea>
|
||||
<label class="floating-label" for="notiz_textbox" id="trnormalDokuLabel">Dokumentation</label>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<!--####################################### Dokutabs ##################################################-->
|
||||
<tr>
|
||||
<td colspan="2" id="tddokureiter" >
|
||||
<div class="input-wrapper cell-content" style="height: 90px;"> <!--80px-->
|
||||
<td colspan="2" id="tddokureiter">
|
||||
<div class="input-wrapper cell-content" style="height: 90px;">
|
||||
<article class="infobox">
|
||||
<section id="Dokumentation1" style="display:none;" >
|
||||
<h2><a href="#Dokumentation1" onfocus="focusOnTab(1);" id="DokName1">Dok1</a></h2>
|
||||
<h2><a href="#Dokumentation1" onfocus="focusOnTab(1);" id="DokName1">Dok1</a></h2>
|
||||
<textarea id="notiz_textbox1" name="Dokumentation" disabled></textarea>
|
||||
</section>
|
||||
<section id="Dokumentation2" style="display:none;">
|
||||
@@ -228,10 +238,10 @@
|
||||
<div class="styled-select-div" id="record-loader-select-container">
|
||||
<select class="dropdownlist-for" id="recordLoader_select" onchange="showSanduhr();$('#serviceRecords').empty();this.form.submit();" name="Records">
|
||||
<option value="-1"></option>
|
||||
<option value="7" @{if (Model.Zeitraum == 7) { @Html.Raw("selected") }}>Letzte 7 Tage</option>
|
||||
<option value="7" @{if (Model.Zeitraum == 7) { @Html.Raw("selected") }}>Letzte 7 Tage</option>
|
||||
<option value="30" @{if (Model.Zeitraum == 30) { @Html.Raw("selected") }}>Letzte 30 Tage</option>
|
||||
<option value="90" @{if (Model.Zeitraum == 90) { @Html.Raw("selected") }}>Letzte 90 Tage</option>
|
||||
<option value="0" @{if (Model.Zeitraum == 0) { @Html.Raw("selected") }}>Alle</option>
|
||||
<option value="0" @{if (Model.Zeitraum == 0) { @Html.Raw("selected") }}>Alle</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -479,8 +489,8 @@
|
||||
<div id="AendernPopupDiv" style="display:none">
|
||||
<p id="AendernPopupText" class="center-aligned-text-element"></p>
|
||||
<div id="AendernPopupBtnDiv" class="center-aligned-text-element">
|
||||
<input type="button" class="AendernPopupOkBtn" value="Ja" onclick="ÄndereTerminPoppup(''), selectServiceKalender(4)" />
|
||||
<input type="button" class="AendernPopupUSchrift" value="Nein" onclick="ÄndereTerminPoppup('')" />
|
||||
<input type="button" class="AendernPopupOkBtn" value="Ja" onclick="AendereTerminPopup(''), selectServiceKalender(4)" />
|
||||
<input type="button" class="AendernPopupUSchrift" value="Nein" onclick="AendereTerminPopup('')" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -529,15 +539,15 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="customer-td">Straße:</td>
|
||||
<td class="contentTd" id="KlientStrasse" data-bind="text: strasse" id="adressfeld"></td>
|
||||
<td class="contentTd" data-bind="text: strasse" id="adressfeld"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="customer-td">PLZ:</td>
|
||||
<td class="contentTd" id="KlientPlz" data-bind="text: plz" id="plzfeld"></td>
|
||||
<td class="contentTd" data-bind="text: plz" id="plzfeld"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="customer-td">Ort:</td>
|
||||
<td class="contentTd" id="KlientOrt" data-bind="text: ort" id="ortfeld"></td>
|
||||
<td class="contentTd" data-bind="text: ort" id="ortfeld"></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
@@ -763,9 +773,9 @@
|
||||
<canvas id="sketchpad" height="150" style="cursor: default; border-color: black" width="325"></canvas>
|
||||
</div>
|
||||
<p id="Geologie"></p>
|
||||
<input type="button" style="width: 100px;" onclick=' loescheUnterschrift(canvas, ctx)' value="Neu" />
|
||||
<input type="button" style="width: 100px;" onclick=' speichereUnterschrift()' value="Speichern" />
|
||||
<input type="button" style="width: 100px;" onclick='backToZeiterfassung()' value="Abbrechen" />
|
||||
<input type="button" style="width: 100px;" onclick="loescheUnterschrift(canvas, ctx)" value="Neu" />
|
||||
<input type="button" style="width: 100px;" onclick="speichereUnterschrift()" value="Speichern" />
|
||||
<input type="button" style="width: 100px;" onclick="backToZeiterfassung()" value="Abbrechen" />
|
||||
</div>
|
||||
|
||||
<div id="SupportStatistik" style="display: none" align="center" >
|
||||
@@ -797,30 +807,22 @@
|
||||
</table>
|
||||
|
||||
<div>
|
||||
<input type="button" value="Zurück" onclick='goBackToZeiterfassung(), location.reload()' style="width: 100px; float:left; " />
|
||||
<input type="button" value="Zurück" onclick="goBackToZeiterfassung(), location.reload()" style="width: 100px; float:left;" />
|
||||
|
||||
<div style=" width: 65%; float:right; zoom:0.75; -moz-transform: scale(0.75); margin: 2px;">
|
||||
<fieldset>
|
||||
<fieldset>
|
||||
<legend>Legende</legend>
|
||||
<hr style="width: 5%; height: 30px; margin: 1px; color: green; background: #4cff00; float:left;" /> <input type="text" style="width:90%; float:right; height:35px; text-align:center;" id="LegendStatistic1" readonly>
|
||||
<br />
|
||||
<br />
|
||||
<hr style="width: 5%; height: 30px; margin: 1px; color: red; background: red; float:left;"/> <input type="text" style="width:90%; float:right; height:35px; text-align:center;" id="LegendStatistic2" readonly>
|
||||
</fieldset>
|
||||
</div>
|
||||
<hr style="width: 5%; height: 30px; margin: 1px; color: green; background: #4cff00; float:left;" /><input type="text" style="width:90%; float:right; height:35px; text-align:center;" id="LegendStatistic1" readonly>
|
||||
<br />
|
||||
<br />
|
||||
<hr style="width: 5%; height: 30px; margin: 1px; color: red; background: red; float:left;" /><input type="text" style="width:90%; float:right; height:35px; text-align:center;" id="LegendStatistic2" readonly>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
<canvas id="myChart" scaleheight="50%" scalewidth="50%" ></canvas>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
getSelectedRecordInformationUrl = '@Url.Action("GetSelectedRecordInformation")';
|
||||
setSelectedServiceRecordUrl = '@Url.Action("SetSelectedServiceRecord")';
|
||||
@@ -851,8 +853,27 @@
|
||||
LoadSessionSettingsFromBWPUrl = '@Url.Action("LoadBWPSettings")';
|
||||
CheckEndDateUrl = '@Url.Action("CheckEndDate")';
|
||||
CheckDokuReiterUrl = '@Url.Action("CheckDokuReiter")';
|
||||
SetSaveSignatureUrl = '@Url.Action("SetSaveSignature")';
|
||||
SetSaveSignatureUrl = '@Url.Action("SetSaveSignature")';
|
||||
loadTextbausteineForCategoryUrl = '@Url.Action("LoadTextbausteineForServiceCategory")';
|
||||
loadCompleteTextbausteinByOidUrl = '@Url.Action("LoadCompleteTextbausteinByOid")';
|
||||
|
||||
focusedDokuTextarea = null;
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: CheckDokuReiterUrl,
|
||||
success: function (json) {
|
||||
|
||||
var s = $.parseJSON(json);
|
||||
|
||||
var x = s.length;
|
||||
|
||||
if (x == 0) {
|
||||
focusedDokuTextarea = $("#notiz_textbox");
|
||||
} else {
|
||||
focusedDokuTextarea = $("#notiz_textbox1");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
$(".toggle-btn").click(function () {
|
||||
toggleOnclick(this);
|
||||
|
||||
@@ -71,13 +71,13 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Mvvm.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Core.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Printing.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Grid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Xpf.Grid.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.Xpf.Core.v13.2, Version=13.2.13.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.v13.2.Core, Version=13.2.13.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="PresentationFramework.Aero">
|
||||
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
|
||||
10
Host/DX.aspx
10
Host/DX.aspx
@@ -1,14 +1,14 @@
|
||||
<%@ Page Title="" Language="C#" AutoEventWireup="true" CodeBehind="DX.aspx.cs" Inherits="Host.DX" %>
|
||||
|
||||
<%@ Register Assembly="DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||
<%@ Register Assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||
Namespace="DevExpress.Web.ASPxRoundPanel" TagPrefix="dx" %>
|
||||
<%@ Register Assembly="DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||
<%@ 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.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||
<%@ 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.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||
<%@ 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.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"
|
||||
<%@ 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">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
||||
@@ -18,12 +18,13 @@
|
||||
<OldToolsVersion>4.0</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<UseIISExpress>false</UseIISExpress>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
<TargetFrameworkProfile />
|
||||
<IISExpressSSLPort />
|
||||
<IISExpressAnonymousAuthentication />
|
||||
<IISExpressWindowsAuthentication />
|
||||
<IISExpressUseClassicPipelineMode />
|
||||
<UseGlobalApplicationHostFile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -48,22 +49,22 @@
|
||||
<FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Office.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.RichEdit.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Web, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1.Reporting, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.RichEdit.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2, Version=13.2.13.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.v13.2, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.v13.2.Web, Version=13.2.13.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.v13.2.Reporting, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="MySql.Data, Version=6.3.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lib\MySql.Data.dll</HintPath>
|
||||
@@ -292,7 +293,7 @@
|
||||
<AutoAssignPort>False</AutoAssignPort>
|
||||
<DevelopmentServerPort>3766</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/Host</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost/Host</IISUrl>
|
||||
<IISUrl>http://localhost:3777/Host</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
||||
<PropertyGroup>
|
||||
<NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
|
||||
<UseIISExpress>true</UseIISExpress>
|
||||
</PropertyGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReportView.aspx.cs" Inherits="Host.ReportView" %>
|
||||
|
||||
<%@ Register assembly="DevExpress.XtraReports.v13.1.Web, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraReports.Web" tagprefix="dxxr" %>
|
||||
<%@ Register assembly="DevExpress.XtraReports.v13.2.Web, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraReports.Web" tagprefix="dxxr" %>
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
<configSections>
|
||||
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
|
||||
<sectionGroup name="devExpress">
|
||||
<section name="themes" type="DevExpress.Web.ASPxClasses.ThemesConfigurationSection, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||
<section name="compression" type="DevExpress.Web.ASPxClasses.CompressionConfigurationSection, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||
<section name="settings" type="DevExpress.Web.ASPxClasses.SettingsConfigurationSection, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||
<section name="errors" type="DevExpress.Web.ASPxClasses.ErrorsConfigurationSection, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||
<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="compression" type="DevExpress.Web.ASPxClasses.CompressionConfigurationSection, DevExpress.Web.v13.2, Version=13.2.13.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="errors" type="DevExpress.Web.ASPxClasses.ErrorsConfigurationSection, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<system.diagnostics>
|
||||
@@ -43,15 +43,15 @@
|
||||
<compilation debug="true" defaultLanguage="c#" targetFramework="4.0">
|
||||
<assemblies>
|
||||
<add assembly="BeWo.Service, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||
<add assembly="DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraReports.v13.1.Web, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Printing.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Data.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Utils.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraPrinting.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraReports.v13.2.Web, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.Charts.v13.2.Core, Version=13.2.13.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<add assembly="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=Neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
<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.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
@@ -59,7 +59,7 @@
|
||||
<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.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
|
||||
<add assembly="DevExpress.RichEdit.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /></assemblies>
|
||||
<add assembly="DevExpress.RichEdit.v13.2.Core, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" /></assemblies>
|
||||
</compilation>
|
||||
<httpRuntime maxRequestLength="65536" executionTimeout="300" />
|
||||
<!--IIS 6-->
|
||||
@@ -71,15 +71,19 @@
|
||||
<!-- ### -->
|
||||
<!--<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />-->
|
||||
<httpHandlers>
|
||||
<add type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" validate="false" />
|
||||
<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" />
|
||||
</httpHandlers>
|
||||
|
||||
</system.web>
|
||||
|
||||
<httpModules>
|
||||
<add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
</httpModules>
|
||||
</system.web>
|
||||
<!--IIS 7-->
|
||||
<system.webServer>
|
||||
<modules>
|
||||
<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.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
|
||||
</modules>
|
||||
</system.webServer>
|
||||
<!-- ### -->
|
||||
@@ -181,7 +185,7 @@
|
||||
</modules>-->
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
<handlers>
|
||||
<add type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" verb="GET,POST" path="DX.ashx" name="ASPxHttpHandlerModule" preCondition="integratedMode" />
|
||||
<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" />
|
||||
</handlers>
|
||||
</system.webServer>
|
||||
<appSettings>
|
||||
|
||||
@@ -1 +1 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -71,29 +71,30 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Office.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.RichEdit.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.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.Printing.v13.2.Core, Version=13.2.13.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.Office.v13.2.Core, Version=13.2.13.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.Utils.v13.2, Version=13.2.13.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">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||
<Reference Include="DevExpress.XtraCharts.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
</Reference>
|
||||
<Reference Include="DevExpress.XtraEditors.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraScheduler.v13.1.Reporting, Version=13.1.7.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.XtraPrinting.v13.2, Version=13.2.13.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.v13.2, Version=13.2.13.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.Sparkline.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2, Version=13.2.13.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.XtraScheduler.v13.2, Version=13.2.13.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.v13.2.Reporting, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="PresentationCore">
|
||||
<RequiredTargetFramework>3.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -30,11 +30,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,19 +31,19 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -54,20 +54,20 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Sparkline.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -68,19 +68,19 @@
|
||||
<CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,18 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,18 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,18 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -69,20 +69,20 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Sparkline.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -70,19 +70,19 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,11 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,18 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -70,19 +70,19 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -70,19 +70,19 @@
|
||||
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPivotGrid.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.Data.v13.2, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.XtraReports.v13.2.Extensions, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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="System" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
@@ -31,18 +31,18 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="DevExpress.Data.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Printing.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraPrinting.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Charts.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1.Wizard, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraCharts.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.PivotGrid.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Sparkline.v13.1.Core, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.Utils.v13.1.UI, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1.Extensions, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="DevExpress.XtraReports.v13.1, Version=13.1.7.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.v13.2.Core, Version=13.2.13.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.XtraPrinting.v13.2, Version=13.2.13.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.XtraCharts.v13.2.Wizard, Version=13.2.13.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.PivotGrid.v13.2.Core, Version=13.2.13.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.Utils.v13.2.UI, Version=13.2.13.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.v13.2, Version=13.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v13.1, Version=13.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user