Rebase Develop

This commit is contained in:
2021-04-07 11:23:42 +02:00
parent 8a700d7162
commit 11a8d4b6af
67 changed files with 608 additions and 429 deletions
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.17929
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
+2 -2
View File
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.17929
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My.Resources
'''<summary>
''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+3 -3
View File
@@ -1,7 +1,7 @@
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.17929
' Runtime Version:4.0.30319.42000
'
' Changes to this file may cause incorrect behavior and will be lost if
' the code is regenerated.
@@ -15,7 +15,7 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -29,7 +29,7 @@ Namespace My
Private Shared addedHandlerLockObject As New Object
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
If My.Application.SaveMySettingsOnExit Then
My.Settings.Save()
End If
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -20,7 +20,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>4.0</OldToolsVersion>
@@ -11,135 +11,9 @@
Option Strict On
Option Explicit On
Imports System
Imports System.Runtime.Serialization
Namespace MNBArfolyamService
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="GetCurrenciesRequestBody", [Namespace]:="http://www.mnb.hu/webservices/"), _
System.SerializableAttribute()> _
Partial Public Class GetCurrenciesRequestBody
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<Global.System.ComponentModel.BrowsableAttribute(false)> _
Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
Get
Return Me.extensionDataField
End Get
Set
Me.extensionDataField = value
End Set
End Property
Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
Protected Sub RaisePropertyChanged(ByVal propertyName As String)
Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
If (Not (propertyChanged) Is Nothing) Then
propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
End If
End Sub
End Class
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="GetCurrentExchangeRatesRequestBody", [Namespace]:="http://www.mnb.hu/webservices/"), _
System.SerializableAttribute()> _
Partial Public Class GetCurrentExchangeRatesRequestBody
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<Global.System.ComponentModel.BrowsableAttribute(false)> _
Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
Get
Return Me.extensionDataField
End Get
Set
Me.extensionDataField = value
End Set
End Property
Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
Protected Sub RaisePropertyChanged(ByVal propertyName As String)
Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
If (Not (propertyChanged) Is Nothing) Then
propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
End If
End Sub
End Class
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="GetDateIntervalRequestBody", [Namespace]:="http://www.mnb.hu/webservices/"), _
System.SerializableAttribute()> _
Partial Public Class GetDateIntervalRequestBody
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<Global.System.ComponentModel.BrowsableAttribute(false)> _
Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
Get
Return Me.extensionDataField
End Get
Set
Me.extensionDataField = value
End Set
End Property
Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
Protected Sub RaisePropertyChanged(ByVal propertyName As String)
Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
If (Not (propertyChanged) Is Nothing) Then
propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
End If
End Sub
End Class
<System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="GetInfoRequestBody", [Namespace]:="http://www.mnb.hu/webservices/"), _
System.SerializableAttribute()> _
Partial Public Class GetInfoRequestBody
Inherits Object
Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
<System.NonSerializedAttribute()> _
Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
<Global.System.ComponentModel.BrowsableAttribute(false)> _
Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
Get
Return Me.extensionDataField
End Get
Set
Me.extensionDataField = value
End Set
End Property
Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
Protected Sub RaisePropertyChanged(ByVal propertyName As String)
Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
If (Not (propertyChanged) Is Nothing) Then
propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
End If
End Sub
End Class
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"), _
System.ServiceModel.ServiceContractAttribute([Namespace]:="http://www.mnb.hu/webservices/", ConfigurationName:="MNBArfolyamService.MNBArfolyamServiceSoap")> _
Public Interface MNBArfolyamServiceSoap
@@ -184,13 +58,13 @@ Namespace MNBArfolyamService
Partial Public Class GetCurrenciesRequest
<System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://www.mnb.hu/webservices/", Order:=0)> _
Public GetCurrencies As MNBArfolyamService.GetCurrenciesRequestBody
Public GetCurrencies As SISBusiness.[Module].MNBArfolyamService.GetCurrenciesRequestBody
Public Sub New()
MyBase.New
End Sub
Public Sub New(ByVal GetCurrencies As MNBArfolyamService.GetCurrenciesRequestBody)
Public Sub New(ByVal GetCurrencies As SISBusiness.[Module].MNBArfolyamService.GetCurrenciesRequestBody)
MyBase.New
Me.GetCurrencies = GetCurrencies
End Sub
@@ -260,13 +134,13 @@ Namespace MNBArfolyamService
Partial Public Class GetCurrentExchangeRatesRequest
<System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://www.mnb.hu/webservices/", Order:=0)> _
Public GetCurrentExchangeRates As MNBArfolyamService.GetCurrentExchangeRatesRequestBody
Public GetCurrentExchangeRates As SISBusiness.[Module].MNBArfolyamService.GetCurrentExchangeRatesRequestBody
Public Sub New()
MyBase.New
End Sub
Public Sub New(ByVal GetCurrentExchangeRates As MNBArfolyamService.GetCurrentExchangeRatesRequestBody)
Public Sub New(ByVal GetCurrentExchangeRates As SISBusiness.[Module].MNBArfolyamService.GetCurrentExchangeRatesRequestBody)
MyBase.New
Me.GetCurrentExchangeRates = GetCurrentExchangeRates
End Sub
@@ -298,13 +172,13 @@ Namespace MNBArfolyamService
Partial Public Class GetDateIntervalRequest
<System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://www.mnb.hu/webservices/", Order:=0)> _
Public GetDateInterval As MNBArfolyamService.GetDateIntervalRequestBody
Public GetDateInterval As SISBusiness.[Module].MNBArfolyamService.GetDateIntervalRequestBody
Public Sub New()
MyBase.New
End Sub
Public Sub New(ByVal GetDateInterval As MNBArfolyamService.GetDateIntervalRequestBody)
Public Sub New(ByVal GetDateInterval As SISBusiness.[Module].MNBArfolyamService.GetDateIntervalRequestBody)
MyBase.New
Me.GetDateInterval = GetDateInterval
End Sub
@@ -374,13 +248,13 @@ Namespace MNBArfolyamService
Partial Public Class GetInfoRequest
<System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://www.mnb.hu/webservices/", Order:=0)> _
Public GetInfo As MNBArfolyamService.GetInfoRequestBody
Public GetInfo As SISBusiness.[Module].MNBArfolyamService.GetInfoRequestBody
Public Sub New()
MyBase.New
End Sub
Public Sub New(ByVal GetInfo As MNBArfolyamService.GetInfoRequestBody)
Public Sub New(ByVal GetInfo As SISBusiness.[Module].MNBArfolyamService.GetInfoRequestBody)
MyBase.New
Me.GetInfo = GetInfo
End Sub
@@ -441,7 +315,7 @@ Namespace MNBArfolyamService
Return MyBase.Channel.GetCurrencies(request)
End Function
Public Function GetCurrencies(ByVal GetCurrencies1 As MNBArfolyamService.GetCurrenciesRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetCurrenciesResponseBody
Public Function GetCurrencies(ByVal GetCurrencies1 As SISBusiness.[Module].MNBArfolyamService.GetCurrenciesRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetCurrenciesResponseBody
Dim inValue As MNBArfolyamService.GetCurrenciesRequest = New MNBArfolyamService.GetCurrenciesRequest()
inValue.GetCurrencies = GetCurrencies1
Dim retVal As MNBArfolyamService.GetCurrenciesResponse = CType(Me,MNBArfolyamService.MNBArfolyamServiceSoap).GetCurrencies(inValue)
@@ -465,7 +339,7 @@ Namespace MNBArfolyamService
Return MyBase.Channel.GetCurrentExchangeRates(request)
End Function
Public Function GetCurrentExchangeRates(ByVal GetCurrentExchangeRates1 As MNBArfolyamService.GetCurrentExchangeRatesRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetCurrentExchangeRatesResponseBody
Public Function GetCurrentExchangeRates(ByVal GetCurrentExchangeRates1 As SISBusiness.[Module].MNBArfolyamService.GetCurrentExchangeRatesRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetCurrentExchangeRatesResponseBody
Dim inValue As MNBArfolyamService.GetCurrentExchangeRatesRequest = New MNBArfolyamService.GetCurrentExchangeRatesRequest()
inValue.GetCurrentExchangeRates = GetCurrentExchangeRates1
Dim retVal As MNBArfolyamService.GetCurrentExchangeRatesResponse = CType(Me,MNBArfolyamService.MNBArfolyamServiceSoap).GetCurrentExchangeRates(inValue)
@@ -477,7 +351,7 @@ Namespace MNBArfolyamService
Return MyBase.Channel.GetDateInterval(request)
End Function
Public Function GetDateInterval(ByVal GetDateInterval1 As MNBArfolyamService.GetDateIntervalRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetDateIntervalResponseBody
Public Function GetDateInterval(ByVal GetDateInterval1 As SISBusiness.[Module].MNBArfolyamService.GetDateIntervalRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetDateIntervalResponseBody
Dim inValue As MNBArfolyamService.GetDateIntervalRequest = New MNBArfolyamService.GetDateIntervalRequest()
inValue.GetDateInterval = GetDateInterval1
Dim retVal As MNBArfolyamService.GetDateIntervalResponse = CType(Me,MNBArfolyamService.MNBArfolyamServiceSoap).GetDateInterval(inValue)
@@ -501,7 +375,7 @@ Namespace MNBArfolyamService
Return MyBase.Channel.GetInfo(request)
End Function
Public Function GetInfo(ByVal GetInfo1 As MNBArfolyamService.GetInfoRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetInfoResponseBody
Public Function GetInfo(ByVal GetInfo1 As SISBusiness.[Module].MNBArfolyamService.GetInfoRequestBody) As SISBusiness.[Module].MNBArfolyamService.GetInfoResponseBody
Dim inValue As MNBArfolyamService.GetInfoRequest = New MNBArfolyamService.GetInfoRequest()
inValue.GetInfo = GetInfo1
Dim retVal As MNBArfolyamService.GetInfoResponse = CType(Me,MNBArfolyamService.MNBArfolyamServiceSoap).GetInfo(inValue)
+10 -12
View File
@@ -4,20 +4,20 @@
<add key="Modules" value="" />
<add key="NewVersionServer" value="" />
<add key="EnableDiagnosticActions" value="False" />
<add key="Languages" value="hu;en" />
<add key="Languages" value="en;hu" />
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings>
<connectionStrings>
<add name="ConnectionString" connectionString="Integrated Security=SSPI;Pooling=false;Data Source=SISNBOOK7\SIS;Initial Catalog=FETOOLS" />
<add name="ConnectionString" connectionString="Integrated Security=SSPI;Pooling=false;Data Source=SISNBOOK7\SIS;Initial Catalog=FETOOLS"/>
</connectionStrings>
<system.diagnostics>
<switches>
<!-- Use the one of predefined values: 0-Off, 1-Errors, 2-Warnings, 3-Info, 4-Verbose. The default value is 3. -->
<add name="eXpressAppFramework" value="3" />
<add name="eXpressAppFramework" value="3"/>
<!--
<add name="XPO" value="3" />
-->
<add name="AllowDebugXtraReportScripts" value="False" />
<add name="AllowDebugXtraReportScripts" value="False"/>
</switches>
</system.diagnostics>
<!--
@@ -28,28 +28,26 @@
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="BasicHttpBinding_MNBArfolyamServiceSoap" />
<binding name="BasicHttpBinding_MNBArfolyamServiceSoap"/>
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://www.mnb.hu/arfolyamok.asmx" binding="basicHttpBinding"
bindingConfiguration="BasicHttpBinding_MNBArfolyamServiceSoap"
contract="MNBArfolyamService.MNBArfolyamServiceSoap" name="BasicHttpBinding_MNBArfolyamServiceSoap" />
<endpoint address="http://www.mnb.hu/arfolyamok.asmx" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_MNBArfolyamServiceSoap" contract="MNBArfolyamService.MNBArfolyamServiceSoap" name="BasicHttpBinding_MNBArfolyamServiceSoap"/>
</client>
</system.serviceModel>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
</providers>
</roleManager>
</system.web>
</configuration>
</configuration>
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" />
<package id="Npgsql" version="2.2.7" targetFramework="net40" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" requireReinstallation="true" />
<package id="Npgsql" version="2.2.7" targetFramework="net40" requireReinstallation="true" />
</packages>