From 80a6662f58926f6f3057d8d322b17049fe57f768 Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Wed, 18 Oct 2023 16:16:03 +0200
Subject: [PATCH] Parkzeit Bugfix

---
 Parkzeit/App.config              | 16 ++++++++++++----
 Parkzeit/Parkzeit.vbproj         | 13 +++++++++----
 Parkzeit/packages.config         |  5 +++++
 Parkzeit/rptAbrechnungVERAG.rdlc | 14 +++++++-------
 4 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 Parkzeit/packages.config

diff --git a/Parkzeit/App.config b/Parkzeit/App.config
index 53b150a..74177c7 100644
--- a/Parkzeit/App.config
+++ b/Parkzeit/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Parkzeit.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="Parkzeit.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
     </startup>
     <userSettings>
         <Parkzeit.My.MySettings>
@@ -20,8 +20,16 @@
     </userSettings>
   <connectionStrings>
 
-    <add name="PROD" connectionString="Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient"/>
+    <add name="PROD" connectionString="Data Source=BUCHHALTUNG\SQLEXPRESS;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956;" providerName="System.Data.SqlClient" />
     <!--<add name="blaLong" connectionString="server=myserver;database=aaa;User ID=eee;Password=qqq;Connection LifeTime=600;Max Pool Size=150;Min Pool Size=10;" providerName="System.Data.SqlClient" />-->
 
   </connectionStrings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.ReportViewer.Common" publicKeyToken="89845dcd8080cc91" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Parkzeit/Parkzeit.vbproj b/Parkzeit/Parkzeit.vbproj
index bbf0602..dea1d53 100644
--- a/Parkzeit/Parkzeit.vbproj
+++ b/Parkzeit/Parkzeit.vbproj
@@ -90,10 +90,14 @@
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\Microsoft.ReportViewer.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.ReportViewer.DataVisualization, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.DataVisualization.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.ProcessingObjectModel.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -245,6 +249,7 @@
   <ItemGroup>
     <Content Include="parkzeit.ico" />
     <Content Include="Resources\Parkschild.ico" />
+    <None Include="packages.config" />
     <None Include="Resources\Verag-AG-Logo.jpg" />
     <None Include="Resources\parkzeit.ico" />
     <None Include="ParkzeitDataSet.xsc">
diff --git a/Parkzeit/packages.config b/Parkzeit/packages.config
new file mode 100644
index 0000000..6139f91
--- /dev/null
+++ b/Parkzeit/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.ReportViewer.Runtime.Common" version="12.0.2402.15" targetFramework="net47" />
+  <package id="Microsoft.ReportViewer.WinForms.v12" version="12.0.0.1" targetFramework="net47" />
+</packages>
\ No newline at end of file
diff --git a/Parkzeit/rptAbrechnungVERAG.rdlc b/Parkzeit/rptAbrechnungVERAG.rdlc
index 4ac4f12..6b4d530 100644
--- a/Parkzeit/rptAbrechnungVERAG.rdlc
+++ b/Parkzeit/rptAbrechnungVERAG.rdlc
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
+<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2008/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
   <AutoRefresh>0</AutoRefresh>
   <DataSources>
     <DataSource Name="ParkzeitDataSet">
@@ -56,8 +56,8 @@
       </rd:DataSetInfo>
     </DataSet>
   </DataSets>
-  <ReportSections>
-    <ReportSection>
+  <!--<ReportSections>
+    <ReportSection>-->
       <Body>
         <ReportItems>
           <Tablix Name="Tablix1">
@@ -900,8 +900,8 @@
         <ColumnSpacing>0.13cm</ColumnSpacing>
         <Style />
       </Page>
-    </ReportSection>
-  </ReportSections>
+    <!--</ReportSection>
+  </ReportSections>-->
   <ReportParameters>
     <ReportParameter Name="Titel">
       <DataType>String</DataType>
@@ -928,7 +928,7 @@
       <Prompt>ReportParameter1</Prompt>
     </ReportParameter>
   </ReportParameters>
-  <ReportParametersLayout>
+  <!--<ReportParametersLayout>
     <GridLayoutDefinition>
       <NumberOfColumns>2</NumberOfColumns>
       <NumberOfRows>3</NumberOfRows>
@@ -965,7 +965,7 @@
         </CellDefinition>
       </CellDefinitions>
     </GridLayoutDefinition>
-  </ReportParametersLayout>
+  </ReportParametersLayout>-->
   <Code>Public Function GetText(druckText As String, stornoText As String) As String
 	Dim text As String = druckText
 	If stornoText &lt;&gt; "" Then