edv/Parkzeit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Parkzeit Bugfix

Browse Source
This commit is contained in:
d.breimaier
2023-10-18 16:16:03 +02:00
parent d94f96cf59
commit 80a6662f58
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Parkzeit/App.config
View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <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> </sectionGroup>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
</startup> </startup>
<userSettings> <userSettings>
<Parkzeit.My.MySettings> <Parkzeit.My.MySettings>
@@ -20,8 +20,16 @@
</userSettings> </userSettings>
<connectionStrings> <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" />--> <!--<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> </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> </configuration>

13
Parkzeit/Parkzeit.vbproj
View File

@@ -90,10 +90,14 @@
<OutputPath>bin\x64\Release\</OutputPath> <OutputPath>bin\x64\Release\</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> <Reference Include="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <HintPath>..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.Common.dll</HintPath>
<HintPath>bin\Debug\Microsoft.ReportViewer.Common.dll</HintPath> </Reference>
<Private>True</Private> <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>
<Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> <Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@@ -245,6 +249,7 @@
<ItemGroup> <ItemGroup>
<Content Include="parkzeit.ico" /> <Content Include="parkzeit.ico" />
<Content Include="Resources\Parkschild.ico" /> <Content Include="Resources\Parkschild.ico" />
<None Include="packages.config" />
<None Include="Resources\Verag-AG-Logo.jpg" /> <None Include="Resources\Verag-AG-Logo.jpg" />
<None Include="Resources\parkzeit.ico" /> <None Include="Resources\parkzeit.ico" />
<None Include="ParkzeitDataSet.xsc"> <None Include="ParkzeitDataSet.xsc">

5
Parkzeit/packages.config Normal file
View File

@@ -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>

14
Parkzeit/rptAbrechnungVERAG.rdlc
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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> <AutoRefresh>0</AutoRefresh>
<DataSources> <DataSources>
<DataSource Name="ParkzeitDataSet"> <DataSource Name="ParkzeitDataSet">
@@ -56,8 +56,8 @@
</rd:DataSetInfo> </rd:DataSetInfo>
</DataSet> </DataSet>
</DataSets> </DataSets>
<ReportSections> <!--<ReportSections>
<ReportSection> <ReportSection>-->
<Body> <Body>
<ReportItems> <ReportItems>
<Tablix Name="Tablix1"> <Tablix Name="Tablix1">
@@ -900,8 +900,8 @@
<ColumnSpacing>0.13cm</ColumnSpacing> <ColumnSpacing>0.13cm</ColumnSpacing>
<Style /> <Style />
</Page> </Page>
</ReportSection> <!--</ReportSection>
</ReportSections> </ReportSections>-->
<ReportParameters> <ReportParameters>
<ReportParameter Name="Titel"> <ReportParameter Name="Titel">
<DataType>String</DataType> <DataType>String</DataType>
@@ -928,7 +928,7 @@
<Prompt>ReportParameter1</Prompt> <Prompt>ReportParameter1</Prompt>
</ReportParameter> </ReportParameter>
</ReportParameters> </ReportParameters>
<ReportParametersLayout> <!--<ReportParametersLayout>
<GridLayoutDefinition> <GridLayoutDefinition>
<NumberOfColumns>2</NumberOfColumns> <NumberOfColumns>2</NumberOfColumns>
<NumberOfRows>3</NumberOfRows> <NumberOfRows>3</NumberOfRows>
@@ -965,7 +965,7 @@
</CellDefinition> </CellDefinition>
</CellDefinitions> </CellDefinitions>
</GridLayoutDefinition> </GridLayoutDefinition>
</ReportParametersLayout> </ReportParametersLayout>-->
<Code>Public Function GetText(druckText As String, stornoText As String) As String <Code>Public Function GetText(druckText As String, stornoText As String) As String
Dim text As String = druckText Dim text As String = druckText
If stornoText &lt;&gt; "" Then If stornoText &lt;&gt; "" Then