neu
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
''' <summary>
|
||||
''' Gibt das Datum für den Ostersonntag zurück.
|
||||
''' </summary>
|
||||
Public ReadOnly Property Ostersonntag() As Date
|
||||
Public ReadOnly Property Ostersonntag_OLD() As Date
|
||||
Get
|
||||
If _Ostern.Ticks = 0 Then
|
||||
' Datum des ersten Vollmondes nach Frühlingsanfang
|
||||
@@ -48,6 +48,54 @@
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Function Ostersonntag() As Date
|
||||
Dim _month As Integer
|
||||
Dim _day As Integer
|
||||
Dim _moon As Integer
|
||||
Dim _epact As Integer
|
||||
Dim _sunday As Integer
|
||||
Dim _gold As Integer
|
||||
Dim _century As Integer
|
||||
Dim _corx As Integer
|
||||
Dim _corz As Integer
|
||||
' The Golden Number of the year in the 19 year Metonic Cycle:
|
||||
_gold = (_Year Mod 19) + 1
|
||||
' Calculate the Century:
|
||||
_century = (_Year \ 100) + 1
|
||||
' Number of years in which leap year was dropped in order
|
||||
' to keep in step with the sun:
|
||||
_corx = (3 * _century) \ 4 - 12
|
||||
' Special correction to syncronize Easter with moon's orbit:
|
||||
_corz = (8 * _century + 5) \ 25 - 5
|
||||
' Find Sunday:
|
||||
_sunday = (5 * _Year) \ 4 - _corx - 10
|
||||
' ^ evtl. long To prevent overflow at year 6554
|
||||
' Set Epact - specifies occurrence of full moon:
|
||||
_epact = (11 * _gold + 20 + _corz - _corx) Mod 30
|
||||
If _epact < 0 Then
|
||||
_epact += 30
|
||||
End If
|
||||
If (((_epact = 25) AndAlso (_gold > 11)) OrElse (_epact = 24)) Then
|
||||
_epact += 1
|
||||
End If
|
||||
' Find Full Moon:
|
||||
_moon = 44 - _epact
|
||||
If _moon < 21 Then
|
||||
_moon += 30
|
||||
End If
|
||||
' Advance to Sunday:
|
||||
_moon += 7 - ((_sunday + _moon) Mod 7)
|
||||
If (_moon > 31) Then
|
||||
_month = 4
|
||||
_day = _moon - 31
|
||||
Else
|
||||
_month = 3
|
||||
_day = _moon
|
||||
End If
|
||||
Return New DateTime(_Year, _month, _day)
|
||||
End Function
|
||||
|
||||
|
||||
''' <summary>
|
||||
''' Gibt das Datum für den Ostermontag zurück.
|
||||
''' </summary>
|
||||
@@ -137,8 +185,10 @@
|
||||
If datum = CDate("01.11." & _Year) Then Return True
|
||||
If datum = CDate("25.12." & _Year) Then Return True
|
||||
If datum = CDate("26.12." & _Year) Then Return True
|
||||
|
||||
|
||||
If datum = Ostermontag Then Return True
|
||||
If datum = Ostersonntag Then Return True
|
||||
If datum = Ostersonntag() Then Return True
|
||||
If datum = Himmelfahrt Then Return True
|
||||
If datum = Pfingstmontag Then Return True
|
||||
If datum = Pfingstsonntag Then Return True
|
||||
@@ -158,5 +208,35 @@
|
||||
End Select
|
||||
Return False
|
||||
End Function
|
||||
'Public Function isFeiertag(datum As Date, land As String) As Boolean
|
||||
' If datum = CDate("01.01." & _Year) Then Return True
|
||||
' If datum = CDate("06.01." & _Year) Then Return True
|
||||
' If datum = CDate("15.08." & _Year) Then Return True
|
||||
' If datum = CDate("01.11." & _Year) Then Return True
|
||||
' If datum = CDate("25.12." & _Year) Then Return True
|
||||
' If datum = CDate("26.12." & _Year) Then Return True
|
||||
|
||||
|
||||
' If datum = Ostermontag Then MsgBox("Ostermontag") : Return True
|
||||
' If datum = Ostersonntag() Then MsgBox("Ostersonntag") : Return True
|
||||
' If datum = Himmelfahrt Then MsgBox("Himmelfahrt") : Return True
|
||||
' If datum = Pfingstmontag Then MsgBox("Pfingstmontag") : Return True
|
||||
' If datum = Pfingstsonntag Then MsgBox("Pfingstsonntag") : Return True
|
||||
' If datum = Fronleichnam Then MsgBox("Fronleichnam") : Return True
|
||||
|
||||
' Select Case land
|
||||
' Case "AT"
|
||||
' If datum = CDate("26.10." & _Year) Then Return True
|
||||
' If datum = CDate("08.12." & _Year) Then Return True
|
||||
' If datum = CDate("01.05." & _Year) Then Return True 'Staatsfeiertag
|
||||
' Case "DE" 'BAYERN
|
||||
' If datum = CDate("03.10." & _Year) Then Return True ' Tag der Deutschen Einheit
|
||||
' If datum = BussUndBettag Then MsgBox("BussUndBettag") : Return True ' Buß- und Bettag '!!!!ABEWEICHEND
|
||||
' If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest
|
||||
' If datum = CDate("01.05." & _Year) Then Return True ' Maifeiertag
|
||||
' If datum = Karfreitag Then MsgBox("Karfreitag") : Return True
|
||||
' End Select
|
||||
' Return False
|
||||
'End Function
|
||||
|
||||
End Class
|
||||
@@ -2328,8 +2328,32 @@ Public Class frmDienstplanVariabel
|
||||
End Sub
|
||||
|
||||
|
||||
Public Function GetWeekStartDate(weekNumber As Integer, year As Integer) As Date
|
||||
Dim datum = New DateTime(year, 1, 1)
|
||||
Dim firstDayOfYear = datum.DayOfWeek
|
||||
Dim result = datum.AddDays(weekNumber * 7)
|
||||
If firstDayOfYear = DayOfWeek.Monday Then Return result.Date
|
||||
If firstDayOfYear = DayOfWeek.Tuesday Then Return result.AddDays(-1).Date
|
||||
If firstDayOfYear = DayOfWeek.Wednesday Then Return result.AddDays(-2).Date
|
||||
If firstDayOfYear = DayOfWeek.Thursday Then Return result.AddDays(-3).Date
|
||||
If firstDayOfYear = DayOfWeek.Friday Then Return result.AddDays(-4).Date
|
||||
If firstDayOfYear = DayOfWeek.Saturday Then Return result.AddDays(-5).Date
|
||||
Return result.AddDays(-6).Date
|
||||
End Function
|
||||
|
||||
Private Function GetWeekStartDate(weekNumber As Integer, year As Integer) As Date
|
||||
|
||||
'Private Function GetWeekStartDate3(weekNumber As Integer, year As Integer) As Date
|
||||
' Dim calendar As Calendar = CultureInfo.CurrentCulture.Calendar
|
||||
' Dim jan1 As DateTime = New DateTime(year, 1, 1)
|
||||
' Dim daysOffset As Integer = DayOfWeek.Monday - jan1.DayOfWeek
|
||||
' Dim firstMonday As DateTime = jan1.AddDays(daysOffset)
|
||||
' Dim firstMondayWeekNum As Integer = calendar.GetWeekOfYear(firstMonday, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday)
|
||||
' Dim firstWeekDay As DateTime = firstMonday.AddDays((weekNumber - firstMondayWeekNum) * 7)
|
||||
' Return firstWeekDay
|
||||
'End Function
|
||||
|
||||
|
||||
Private Function GetWeekStartDate2(weekNumber As Integer, year As Integer) As Date
|
||||
Dim startDate As New DateTime(year, 1, 1)
|
||||
Dim weekDate As DateTime = DateAdd(DateInterval.WeekOfYear, weekNumber - 1, startDate)
|
||||
Return DateAdd(DateInterval.Day, (-weekDate.DayOfWeek) + 1, weekDate)
|
||||
@@ -2342,6 +2366,7 @@ Public Class frmDienstplanVariabel
|
||||
aktDate = GetWeekStartDate(txtKW.Text, txtKWYear.Text)
|
||||
aktWoche = DateToWeek(aktDate).Substring(4, 2)
|
||||
aktJahr = DateToWeek(aktDate).Substring(0, 4)
|
||||
|
||||
initWeekInfo()
|
||||
initDienstplan()
|
||||
Me.Cursor = Cursors.Default
|
||||
|
||||
@@ -327,7 +327,7 @@ Public Class usrCntlMitarbeiter
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim frmMitarbDetails As New frmMitarbDetails
|
||||
frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value
|
||||
frmMitarbDetails.ShowDialog(Me)
|
||||
frmMitarbDetails.Show(Me)
|
||||
sender.RELOAD()
|
||||
Me.Cursor = Cursors.Default
|
||||
' AddHandler frmMitarbDetails.FormClosing, AddressOf handleClose
|
||||
|
||||
30
UID/My Project/Resources.Designer.vb
generated
30
UID/My Project/Resources.Designer.vb
generated
@@ -22,7 +22,7 @@ Namespace My.Resources
|
||||
'''<summary>
|
||||
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
|
||||
'''</summary>
|
||||
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _
|
||||
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"), _
|
||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
|
||||
@@ -201,7 +201,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property connStringAdmin() As String
|
||||
Get
|
||||
@@ -210,7 +210,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property connStringAdmin_DEF() As String
|
||||
Get
|
||||
@@ -219,16 +219,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=VERAG-ATILLA2;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property connStringAtilla() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("connStringAtilla", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property connStringFMZOLL() As String
|
||||
Get
|
||||
@@ -237,7 +228,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956; ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property connStringFMZOLL_DEV() As String
|
||||
Get
|
||||
@@ -525,15 +516,6 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property sfsdf3sdfsdf3sdfsdfsdf() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("sfsdf3sdfsdf3sdfsdfsdf", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
@@ -664,7 +646,7 @@ Namespace My.Resources
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.1 ähnelt.
|
||||
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.2 ähnelt.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property Version() As String
|
||||
Get
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
<value>..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="connStringFMZOLL_DEV" xml:space="preserve">
|
||||
<value>Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
|
||||
<value>Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
|
||||
</data>
|
||||
<data name="cmr_logo_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\cmr-logo_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -185,16 +185,16 @@
|
||||
<value>..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="connStringAdmin" xml:space="preserve">
|
||||
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
|
||||
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
|
||||
</data>
|
||||
<data name="Version" xml:space="preserve">
|
||||
<value>2.0.1</value>
|
||||
<value>2.0.2</value>
|
||||
</data>
|
||||
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="connStringAdmin_DEF" xml:space="preserve">
|
||||
<value>Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
|
||||
<value>Data Source=192.168.0.90\DEVSQL;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
|
||||
</data>
|
||||
<data name="refresh1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -212,7 +212,7 @@
|
||||
<value>..\Resources\admin_monitoring1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="connStringFMZOLL" xml:space="preserve">
|
||||
<value>Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
|
||||
<value>Data Source=192.168.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
|
||||
</data>
|
||||
<data name="urlaub" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\urlaub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -247,9 +247,6 @@
|
||||
<data name="dispo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\dispo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="connStringAtilla" xml:space="preserve">
|
||||
<value>Data Source=VERAG-ATILLA2;Initial Catalog=AVISO_ATILLA;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
|
||||
</data>
|
||||
<data name="dp_tv" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\dp_tv.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -304,7 +301,4 @@
|
||||
<data name="personGray_w" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="sfsdf3sdfsdf3sdfsdfsdf" xml:space="preserve">
|
||||
<value />
|
||||
</data>
|
||||
</root>
|
||||
13
UID/Programme/usrCntlProgramme.Designer.vb
generated
13
UID/Programme/usrCntlProgramme.Designer.vb
generated
@@ -100,6 +100,7 @@ Partial Class usrCntlProgramme
|
||||
Me.Button11 = New System.Windows.Forms.Button()
|
||||
Me.Label17 = New System.Windows.Forms.Label()
|
||||
Me.PictureBox14 = New System.Windows.Forms.PictureBox()
|
||||
Me.Button12 = New System.Windows.Forms.Button()
|
||||
CType(Me.PictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
@@ -815,11 +816,22 @@ Partial Class usrCntlProgramme
|
||||
Me.PictureBox14.TabIndex = 106
|
||||
Me.PictureBox14.TabStop = False
|
||||
'
|
||||
'Button12
|
||||
'
|
||||
Me.Button12.Location = New System.Drawing.Point(76, 491)
|
||||
Me.Button12.Name = "Button12"
|
||||
Me.Button12.Size = New System.Drawing.Size(100, 23)
|
||||
Me.Button12.TabIndex = 109
|
||||
Me.Button12.Text = "Parameter"
|
||||
Me.Button12.UseVisualStyleBackColor = True
|
||||
Me.Button12.Visible = False
|
||||
'
|
||||
'usrCntlProgramme
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
|
||||
Me.Controls.Add(Me.Button12)
|
||||
Me.Controls.Add(Me.Button11)
|
||||
Me.Controls.Add(Me.Label17)
|
||||
Me.Controls.Add(Me.PictureBox14)
|
||||
@@ -994,4 +1006,5 @@ Partial Class usrCntlProgramme
|
||||
Friend WithEvents Button11 As Button
|
||||
Friend WithEvents Label17 As Label
|
||||
Friend WithEvents PictureBox14 As PictureBox
|
||||
Friend WithEvents Button12 As Button
|
||||
End Class
|
||||
|
||||
@@ -37,24 +37,23 @@ Public Class cProgramFunctions
|
||||
' MsgBox(datvon.ToShortDateString & " - " & datbis.ToShortDateString)
|
||||
While datvon <= datbis
|
||||
' MsgBox(datvon.ToShortDateString)
|
||||
Dim AtWoche_atlas As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT)
|
||||
AtWoche_atlas += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS DAKOSY/ZODIAK EINLESEN
|
||||
Dim DeWoche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE)
|
||||
'DeWoche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE)
|
||||
Dim De2Woche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU)
|
||||
De2Woche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU) ' DATEN AUS DAKOSY/ZODIAK EINLESEN
|
||||
Dim AtWoche_atlas As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT)
|
||||
AtWoche_atlas += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS DAKOSY/ZODIAK EINLESEN
|
||||
AtWoche_atlas += BRG.getBrgSumFrom_NCTS_TR(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS DAKOSY/ZODIAK EINLESEN
|
||||
Dim DeWoche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE)
|
||||
'DeWoche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE)
|
||||
Dim De2Woche As String = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU)
|
||||
De2Woche += BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU) ' DATEN AUS DAKOSY/ZODIAK EINLESEN
|
||||
De2Woche += BRG.getBrgSumFrom_NCTS_TR(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU) ' DATEN AUS DAKOSY/ZODIAK EINLESEN
|
||||
|
||||
|
||||
' MsgBox(BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU))
|
||||
' Dim test As Double = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_DE_NEU)
|
||||
' MsgBox(BRG.getBrgSumFromFMZOLL_Zodiak(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU))
|
||||
' Dim test As Double = BRG.getBrgSumFromFMZOLL_Zabis(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_DE_NEU)
|
||||
|
||||
|
||||
Dim AtWoche_zolaris As String = BRG.getBrgSumFromFMZOLL_Zolaris(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT)
|
||||
AtWoche_zolaris += BRG.getBrgSumFromFMZOLL_TELOTEC(datvon.ToShortDateString, datbis.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS TELOTEC EINLESEN
|
||||
|
||||
|
||||
Dim AtWoche_zolaris As String = BRG.getBrgSumFromFMZOLL_Zolaris(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT)
|
||||
AtWoche_zolaris += BRG.getBrgSumFromFMZOLL_TELOTEC(datvon.ToShortDateString, datvon.ToShortDateString, "50", "60", brg_AT) ' DATEN AUS TELOTEC EINLESEN
|
||||
' MsgBox(datvon.ToShortDateString & " AtWoche_atlas: " & AtWoche_atlas)
|
||||
' MsgBox(datvon.ToShortDateString & ": " & AtWoche_atlas & " - " & DeWoche & " - " & AtWoche_zolaris)
|
||||
'UPDATE
|
||||
Dim buergschaft As cBuergschaft
|
||||
buergschaft = BRG.getBrgbyDate(datvon)
|
||||
@@ -78,11 +77,15 @@ Public Class cProgramFunctions
|
||||
|
||||
If datvon.ToShortDateString = Now.ToShortDateString Then
|
||||
buergschaft.brg_de2_tag_atlas =
|
||||
BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) + BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU)
|
||||
BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) +
|
||||
BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU) +
|
||||
BRG.getBrgSumFrom_NCTS_TR(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE_NEU)
|
||||
|
||||
buergschaft.brg_de_tag_atlas = BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_DE)
|
||||
buergschaft.brg_at_tag_atlas =
|
||||
BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) + BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT)
|
||||
BRG.getBrgSumFromFMZOLL_Zabis(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) +
|
||||
BRG.getBrgSumFromFMZOLL_Zodiak(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT) +
|
||||
BRG.getBrgSumFrom_NCTS_TR(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT)
|
||||
|
||||
|
||||
buergschaft.brg_at_tag_zolaris = BRG.getBrgSumFromFMZOLL_Zolaris(datvon.AddMonths(-3).ToShortDateString, datvon.ToShortDateString, "50", "50", brg_AT, " AND DatumBestimmungErreicht IS NULL ")
|
||||
|
||||
@@ -154,6 +154,39 @@ Public Class cBrgDb
|
||||
Return Nothing
|
||||
End Function
|
||||
|
||||
|
||||
|
||||
Public Function getBrgSumFrom_NCTS_TR(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String
|
||||
'Return Nothing
|
||||
Dim sql As String = "SELECT sum(nctsSA_AbgabenBetrag)"
|
||||
sql &= " from tblNCTS_TR_Sicherheitsangaben inner join [tblNCTS_TR] on ncts_Id = nctsSA_NctsId"
|
||||
sql &= " where [ncts_Eroeffnung] BETWEEN '" & datumVon.ToShortDateString & " 00:00:00' AND '" & datumBis.ToShortDateString & " 23:23:59' AND ncts_Status BETWEEN '" & statusVon & "' AND '" & statusBis & "' AND nctsSA_GRN = '" & buergschaft & "' " & where
|
||||
'MsgBox(sql)
|
||||
Dim dr As SqlDataReader
|
||||
Dim daten As New List(Of cBuergschaft)
|
||||
Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
|
||||
Using cmd As New SqlCommand(sql, conn)
|
||||
dr = cmd.ExecuteReader()
|
||||
Try
|
||||
Dim cnt As Integer = 0
|
||||
If dr.Read Then
|
||||
If Not dr.GetValue(0) Is DBNull.Value Then
|
||||
' MsgBox(dr.GetValue(0))
|
||||
Return dr.GetValue(0)
|
||||
|
||||
End If
|
||||
End If
|
||||
Return "0"
|
||||
Catch ex As Exception
|
||||
MsgBox(System.Reflection.MethodInfo.GetCurrentMethod.Name & ": Fehler mit der Datenbankverbindung:" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Datenbankfehler")
|
||||
Finally
|
||||
dr.Close()
|
||||
End Try
|
||||
End Using
|
||||
End Using
|
||||
Return Nothing
|
||||
End Function
|
||||
|
||||
Public Function getBrgSumFromFMZOLL_Zabis(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As Double
|
||||
|
||||
Dim sql As String = "SELECT ISNULL(SUM(veoerz_sicbtg),0) " &
|
||||
@@ -218,6 +251,7 @@ Public Class cBrgDb
|
||||
Return Nothing
|
||||
End Function
|
||||
|
||||
|
||||
Public Function getBrgSumFromFMZOLL_TELOTEC(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As Double
|
||||
|
||||
' Dim sql As String = "SELECT ISNULL(SUM(veoerz_sicbtg),0) " &
|
||||
|
||||
Reference in New Issue
Block a user