diff --git a/VERAGMonitoring/My Project/AssemblyInfo.vb b/VERAGMonitoring/My Project/AssemblyInfo.vb index bc56376..1639f37 100644 --- a/VERAGMonitoring/My Project/AssemblyInfo.vb +++ b/VERAGMonitoring/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/VERAGMonitoring/frmMain.Designer.vb b/VERAGMonitoring/frmMain.Designer.vb index e388e23..f69ca59 100644 --- a/VERAGMonitoring/frmMain.Designer.vb +++ b/VERAGMonitoring/frmMain.Designer.vb @@ -32,6 +32,7 @@ Partial Class frmMain Me.lblAtTagVERAG_CS = New System.Windows.Forms.Label() Me.lblAt_woche_StatusVERAG_CS = New System.Windows.Forms.Label() Me.lblAt_tag_StatusVERAG_CS = New System.Windows.Forms.Label() + Me.lblVersion = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.lblAufschubBrgEUST_de_UNISPEDDE_oE = New System.Windows.Forms.Label() Me.cbxAufschubEUST_de_UnispedDE = New System.Windows.Forms.CheckBox() @@ -163,7 +164,6 @@ Partial Class frmMain Me.icoVERAGMonitoring = New System.Windows.Forms.NotifyIcon(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.Timer = New System.Windows.Forms.Timer(Me.components) - Me.lblVersion = New System.Windows.Forms.Label() Me.Panel2.SuspendLayout() Me.Panel1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -389,6 +389,18 @@ Partial Class frmMain Me.lblAt_tag_StatusVERAG_CS.TabIndex = 92 Me.lblAt_tag_StatusVERAG_CS.Text = "OK" ' + 'lblVersion + ' + Me.lblVersion.BackColor = System.Drawing.Color.Transparent + Me.lblVersion.Cursor = System.Windows.Forms.Cursors.Default + Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.lblVersion.ForeColor = System.Drawing.Color.Black + Me.lblVersion.Location = New System.Drawing.Point(6, 607) + Me.lblVersion.Name = "lblVersion" + Me.lblVersion.Size = New System.Drawing.Size(106, 18) + Me.lblVersion.TabIndex = 12 + Me.lblVersion.Text = "Version 1.0.0.0" + ' 'Button3 ' Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -646,9 +658,9 @@ Partial Class frmMain Me.Label33lblBrg_at_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label33lblBrg_at_UNISPED.Location = New System.Drawing.Point(24, 144) Me.Label33lblBrg_at_UNISPED.Name = "Label33lblBrg_at_UNISPED" - Me.Label33lblBrg_at_UNISPED.Size = New System.Drawing.Size(181, 13) + Me.Label33lblBrg_at_UNISPED.Size = New System.Drawing.Size(262, 13) Me.Label33lblBrg_at_UNISPED.TabIndex = 62 - Me.Label33lblBrg_at_UNISPED.Text = "DE - gVV - HZA München UNISPED" + Me.Label33lblBrg_at_UNISPED.Text = "DE - gVV - HZA München UNISPED (8.000.000,00 €)" ' 'lblAtWocheUNISPED ' @@ -1907,18 +1919,6 @@ Partial Class frmMain ' Me.Timer.Interval = 1200000 ' - 'lblVersion - ' - Me.lblVersion.BackColor = System.Drawing.Color.Transparent - Me.lblVersion.Cursor = System.Windows.Forms.Cursors.Default - Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.lblVersion.ForeColor = System.Drawing.Color.Black - Me.lblVersion.Location = New System.Drawing.Point(6, 607) - Me.lblVersion.Name = "lblVersion" - Me.lblVersion.Size = New System.Drawing.Size(106, 18) - Me.lblVersion.TabIndex = 12 - Me.lblVersion.Text = "Version 1.0.0.0" - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/VERAGMonitoring/frmMain.vb b/VERAGMonitoring/frmMain.vb index f1c49bd..d92377d 100644 --- a/VERAGMonitoring/frmMain.vb +++ b/VERAGMonitoring/frmMain.vb @@ -119,6 +119,14 @@ Public Class frmMain allowCBX(cbxAufschub_at_IMEX, True) allowCBX(cbxAufschubEUST_de_Global, True) + + allowCBX(cbxAufschubEUST_de_Unisped, True) + allowCBX(cbxAufschub_de_Unisped, True) + allowCBX(cbxBrg_at_UNISPED, True) + allowCBX(cbxBrg_at_VERAG_CS, True) + allowCBX(cbxAufschubEUST_de_UnispedDE, True) + allowCBX(cbxAufschub_de_UnispedDE, True) + Else Select Case Me.firma Case "ATILLA" @@ -400,7 +408,7 @@ Public Class frmMain 'NCTS_TR AT TAG Dim DetTag_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_DE_NEU) - + Dim saldo = tag_de2 + DetTag_nctsTR setLabel(lblDe2Tag, String.Format("{0:C}", CDbl(tag_de2 + DetTag_nctsTR + DE_DIFFERENZ))) Else @@ -1183,6 +1191,7 @@ Public Class frmMain If cbxBrg_de2_VeragAG.Checked Then lblBrg_de2_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe2_summe) & ")" lblBrg_at_Imex.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_imex_de_summe) & ")" lblBrg_at_Atilla.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe) & ")" + 'Label33lblBrg_at_UNISPED.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.unis) & ")" lblAufschub_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_aufschub_AG_de_summe) & ")"