This commit is contained in:
2020-11-27 22:57:00 +01:00
parent fa670231f7
commit 14a7113144
22 changed files with 872 additions and 58 deletions

View File

@@ -71,7 +71,16 @@ Namespace My.Resources
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 1.3.3 ähnelt.
''' Sucht eine lokalisierte Zeichenfolge, die ähnelt.
'''</summary>
Friend ReadOnly Property sdfsdfsdf3sdfsdf() As String
Get
Return ResourceManager.GetString("sdfsdfsdf3sdfsdf", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 1.3.6 ähnelt.
'''</summary>
Friend ReadOnly Property version() As String
Get

View File

@@ -118,10 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="version" xml:space="preserve">
<value>1.3.3</value>
<value>1.3.6</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sdfsdfsdf3sdfsdf" xml:space="preserve">
<value />
</data>
</root>

View File

@@ -401,6 +401,8 @@ Public Class cBrgDb
Return False
End Function
Public Function insertBrgAufschubEinzahlung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean
Try
Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
@@ -510,7 +512,8 @@ Public Class cBrgDb
Dim tmp_sub As String = getBrgSumFromFMZOLL_Zabis_SUBEN(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Dim tmp_sbg As String = getBrgSumFromFMZOLL_Zabis_SALZBURG(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Dim tmp_DY As String = getBrgSumFrom_DAKOSY(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Return CDbl(tmp_sub) + CDbl(tmp_sbg) + CDbl(tmp_DY)
'Dim tmp_nctsTR As String = getBrgSumFrom_NCTS_TR(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
Return CDbl(tmp_sub) + CDbl(tmp_sbg) + CDbl(tmp_DY) ' + CDbl(tmp_nctsTR)
End Function

View File

@@ -35,7 +35,7 @@ Public Class frmMain
ico = icoVERAGMonitoring
AddHandler ico.BalloonTipClicked, AddressOf showMe
If Not BRG.checkUser(System.Environment.MachineName, Environment.UserName) Then MsgBox("Sie sind für das Monitoring-Programm nicht freigeschaltet!") : Application.Exit()
If Not (BRG.checkUser(System.Environment.MachineName, Environment.UserName) Or BRG.checkUser("SERVER", Environment.UserName)) Then MsgBox("Sie sind für das Monitoring-Programm nicht freigeschaltet!") : Application.Exit()
' If allowEinzahlung Then btnEinzahlung.Visible = True
If allowEinzahlung Then btnZusBel.Visible = True
If brgusr_allowBelaustungAufheben Then btnBelastungAufheben.Visible = True
@@ -97,6 +97,21 @@ Public Class frmMain
Button2.Visible = False
Button4.Enabled = False
Case "VERIMEX"
'cbxBrg_at_VeragAG.Enabled = False
'cbxBrg_de2_VeragAG.Enabled = False
'cbxBrg_at_VeragAG.Checked = False
'cbxBrg_de2_VeragAG.Checked = False
cbxAufschub_de_VeragAG.Checked = False
cbxAufschub_at_VeragAG.Checked = False
cbxAufschub_at_VeragCS.Checked = False
cbxAufschub_at_VeragZS.Checked = False
cbxAufschub_de_VeragAG.Enabled = False
cbxAufschub_at_VeragAG.Enabled = False
cbxAufschub_at_VeragCS.Enabled = False
cbxAufschub_at_VeragZS.Enabled = False
Button2.Visible = False
Button4.Enabled = False
End Select
@@ -210,7 +225,7 @@ Public Class frmMain
'TELOTEC AT WOCHE
Dim AtWoche_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT)
'AT WOCHE
Dim woche_at As Double = AtWoche_atlas + AtWoche_zolaris + AtWoche_TELOTEC
Dim woche_at As Double = AtWoche_atlas + AtWoche_zolaris + AtWoche_TELOTEC + AtWoche_nctsTR
setLabel(lblAtWoche, String.Format("{0:C}", CDbl(woche_at)))
'ZOLARIS AT TAG
@@ -985,6 +1000,14 @@ Public Class frmMain
Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now)
frmShowData.Show()
End Sub
Private Sub cbxBrg_at_Atilla_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBrg_at_Atilla.CheckedChanged
End Sub
Private Sub cbxBrg_at_Imex_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBrg_at_Imex.CheckedChanged
End Sub
End Class