diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index c8603bbe..5b48b558 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -1,4 +1,5 @@ Imports java.awt.print +Imports VERAG_PROG_ALLGEMEIN Public Class ustCntlUSTV_AntragPosition Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing @@ -26,6 +27,9 @@ Public Class ustCntlUSTV_AntragPosition End Sub Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender) + + + gridAktiv = False picSave.Visible = False Me.Antrag_LandKz = Antrag_LandKz @@ -91,11 +95,11 @@ Public Class ustCntlUSTV_AntragPosition Function save() getValues(UStV_POS) - MsgBox("TEST") - Return UStV_POS.save + 'MsgBox("TEST") + Return UStV_POS.SAVE End Function - Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged, cboLeistungsgeber.SelectedIndexChanged, + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged, txtLeistungsbezeichnung.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetragEUR.TextChanged ', cbxAPI.CheckedChanged, cboSchnittstellennr.SelectedIndexChanged If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub @@ -105,8 +109,8 @@ Public Class ustCntlUSTV_AntragPosition ' If Not PROG.checkSDLNrPartnerKdNr(kdNr, SDLNr) Then MsgBox("Bitte geben Sie die Partner-Kundennummer im Kundenblatt oder im FM-ZOLL ein!") 'End If - If sender Is cboLeistungsgeber Then - UStV_POS.UStVPo_Leistender = cboLeistungsgeber.Text + If sender Is cboLeistungsgeber AndAlso cboLeistungsgeber.SelectedItem <> "" Then + UStV_POS.UStVPo_Leistender = cboLeistungsgeber.SelectedItem End If values_changed() @@ -122,6 +126,7 @@ Public Class ustCntlUSTV_AntragPosition Private Sub loadChangedDSToPanel(enablePanel As Boolean, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender) pnlAdresse.Enabled = True 'enablePanel 'immer änderbar! + 'cboLeistungsgeber._value = If(UStV_Leitender.UStV_Leistender, "") txtStrasse.Text = If(UStV_Leitender.UstV_Leistender_Strasse, "") txtStrassenNr.Text = If(UStV_Leitender.UstV_Leistender_StrasseNr, "") txtPLZ.Text = If(UStV_Leitender.UstV_Leistender_PLZ, "") @@ -134,6 +139,9 @@ Public Class ustCntlUSTV_AntragPosition If TypeOf (c) Is TextBox Then AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged End If + If TypeOf (c) Is MyComboBox Then + AddHandler CType(c, MyComboBox).TextChanged, AddressOf SomethingChanged + End If Next End Sub @@ -164,4 +172,15 @@ Public Class ustCntlUSTV_AntragPosition End If End Sub + + Private Sub cboLeistungsgeber_Enter(sender As Object, e As EventArgs) Handles cboLeistungsgeber.Enter + + End Sub + + Private Sub cboLeistungsgeber_DropDown(sender As Object, e As EventArgs) Handles cboLeistungsgeber.DropDown + cboLeistungsgeber.Items.Clear() + cboLeistungsgeber.fillWithSQL("select top 100 UStV_Leistender from tblUStVLeistender Where 1= 1 " & IIf(cboLeistungsgeber.Text <> "", "AND UStV_Leistender like '" & cboLeistungsgeber.Text & "%'", ""), False, "FMZOLL", True) + cboLeistungsgeber.changeItem(If(cboLeistungsgeber.Text, "")) + + End Sub End Class diff --git a/SDL/frmMain.Designer.vb b/SDL/frmMain.Designer.vb index 7427efb0..95d6c46d 100644 --- a/SDL/frmMain.Designer.vb +++ b/SDL/frmMain.Designer.vb @@ -316,13 +316,13 @@ Partial Class frmMain ' Me.FakturierungToolStripMenuItem.Enabled = False Me.FakturierungToolStripMenuItem.Name = "FakturierungToolStripMenuItem" - Me.FakturierungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FakturierungToolStripMenuItem.Size = New System.Drawing.Size(163, 22) Me.FakturierungToolStripMenuItem.Text = "Fakturierung" ' 'RechnungsdatenToolStripMenuItem ' Me.RechnungsdatenToolStripMenuItem.Name = "RechnungsdatenToolStripMenuItem" - Me.RechnungsdatenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.RechnungsdatenToolStripMenuItem.Size = New System.Drawing.Size(163, 22) Me.RechnungsdatenToolStripMenuItem.Text = "Rechnungsdaten" ' 'mnueBuchhaltung @@ -896,7 +896,7 @@ Partial Class frmMain Me.KdSearchBox1._display_Name1 = False Me.KdSearchBox1._displayAVISO_Email = False Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._displayWoelflKd = True Me.KdSearchBox1._hideIfListEmpty = True Me.KdSearchBox1._loadKdData = False Me.KdSearchBox1._searchName1 = True diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb index 98e2e851..e60f493a 100644 --- a/SDL/frmdynMailvorlage.Designer.vb +++ b/SDL/frmdynMailvorlage.Designer.vb @@ -54,6 +54,11 @@ Partial Class frmdynMailvorlage Me.Label3 = New System.Windows.Forms.Label() Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.cbSendungsvermerk = New System.Windows.Forms.CheckBox() + Me.txtSendungsvermerk = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.cbxSendungsvermerk = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label10 = New System.Windows.Forms.Label() Me.mainPanel.SuspendLayout() Me.pnlTop.SuspendLayout() CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit() @@ -64,6 +69,11 @@ Partial Class frmdynMailvorlage Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.mainPanel.Controls.Add(Me.cbxSendungsvermerk) + Me.mainPanel.Controls.Add(Me.Label10) + Me.mainPanel.Controls.Add(Me.txtSendungsvermerk) + Me.mainPanel.Controls.Add(Me.Label9) + Me.mainPanel.Controls.Add(Me.cbSendungsvermerk) Me.mainPanel.Controls.Add(Me.TextBox2) Me.mainPanel.Controls.Add(Me.btn) Me.mainPanel.Controls.Add(Me.lblWordcount) @@ -84,7 +94,7 @@ Partial Class frmdynMailvorlage Me.mainPanel.Controls.Add(Me.Label1) Me.mainPanel.Location = New System.Drawing.Point(0, 425) Me.mainPanel.Name = "mainPanel" - Me.mainPanel.Size = New System.Drawing.Size(1283, 449) + Me.mainPanel.Size = New System.Drawing.Size(1283, 457) Me.mainPanel.TabIndex = 101 ' 'TextBox2 @@ -416,6 +426,57 @@ Partial Class frmdynMailvorlage Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365) Me.dgvMailvorlagen.TabIndex = 104 ' + 'cbSendungsvermerk + ' + Me.cbSendungsvermerk.AutoSize = True + Me.cbSendungsvermerk.Location = New System.Drawing.Point(678, 394) + Me.cbSendungsvermerk.Name = "cbSendungsvermerk" + Me.cbSendungsvermerk.Size = New System.Drawing.Size(211, 17) + Me.cbSendungsvermerk.TabIndex = 35 + Me.cbSendungsvermerk.Text = "Sendungsvermerk beim Senden setzen" + Me.cbSendungsvermerk.UseVisualStyleBackColor = True + ' + 'txtSendungsvermerk + ' + Me.txtSendungsvermerk.Location = New System.Drawing.Point(791, 436) + Me.txtSendungsvermerk.Name = "txtSendungsvermerk" + Me.txtSendungsvermerk.Size = New System.Drawing.Size(290, 20) + Me.txtSendungsvermerk.TabIndex = 37 + Me.txtSendungsvermerk.Visible = False + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(788, 419) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(93, 13) + Me.Label9.TabIndex = 36 + Me.Label9.Text = "Sendungsvermerk" + Me.Label9.Visible = False + ' + 'cbxSendungsvermerk + ' + Me.cbxSendungsvermerk._allowedValuesFreiText = Nothing + Me.cbxSendungsvermerk._allowFreiText = False + Me.cbxSendungsvermerk._value = "" + Me.cbxSendungsvermerk.DropDownWidth = 250 + Me.cbxSendungsvermerk.FormattingEnabled = True + Me.cbxSendungsvermerk.Location = New System.Drawing.Point(678, 435) + Me.cbxSendungsvermerk.Name = "cbxSendungsvermerk" + Me.cbxSendungsvermerk.Size = New System.Drawing.Size(100, 21) + Me.cbxSendungsvermerk.TabIndex = 39 + Me.cbxSendungsvermerk.Visible = False + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(675, 419) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(107, 13) + Me.Label10.TabIndex = 38 + Me.Label10.Text = "Sendungsvermerk-ID" + Me.Label10.Visible = False + ' 'frmdynMailvorlage ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -468,4 +529,9 @@ Partial Class frmdynMailvorlage Friend WithEvents cbxSpracheSelected As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label8 As Label Friend WithEvents TextBox2 As TextBox + Friend WithEvents cbxSendungsvermerk As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label10 As Label + Friend WithEvents txtSendungsvermerk As TextBox + Friend WithEvents Label9 As Label + Friend WithEvents cbSendungsvermerk As CheckBox End Class diff --git a/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb index 358c3ab4..a54c8a3f 100644 --- a/SDL/frmdynMailvorlage.vb +++ b/SDL/frmdynMailvorlage.vb @@ -37,6 +37,8 @@ Public Class frmdynMailvorlage cbxFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + cbxSendungsvermerk.fillWithSQL("SELECT VermerkCodeId,Bezeichnung FROM [VermerkeCodes]", True, "AVISO", True) + cbxFirma.Enabled = editall btnDelete.Enabled = editall @@ -94,6 +96,9 @@ Public Class frmdynMailvorlage .Columns("txt_letzteAenderung").Width = 100 .Columns("txt_letzteAenderungUser").HeaderText = "letzte Änderung durch" .Columns("txt_letzteAenderungUser").Width = 75 + .Columns("txt_sendungsvermerk").HeaderText = "Sendungsvermerk" + .Columns("txt_sendungsvermerkId").Visible = False + .Columns("txt_sendungsvermerkText").Visible = False End With @@ -204,6 +209,10 @@ Public Class frmdynMailvorlage cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig) cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA) + cbSendungsvermerk.Checked = txtkonserve.txt_sendungsvermerk + cbxSendungsvermerk.changeItem(txtkonserve.txt_sendungsvermerkId) + txtSendungsvermerk.Text = txtkonserve.txt_sendungsvermerkText + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -230,6 +239,11 @@ Public Class frmdynMailvorlage txtKS.txt_letzteAenderung = DateTime.Now txtKS.txt_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + txtKS.txt_sendungsvermerk = cbSendungsvermerk.Checked + txtKS.txt_sendungsvermerkId = cbxSendungsvermerk._value + txtKS.txt_sendungsvermerkText = txtSendungsvermerk.Text + + txtKS.SAVE() dgvMailvorlagen.GetOrder() @@ -358,6 +372,12 @@ Public Class frmdynMailvorlage End Function + Private Sub cbSendungsvermerk_CheckedChanged(sender As Object, e As EventArgs) Handles cbSendungsvermerk.CheckedChanged + txtSendungsvermerk.Visible = cbSendungsvermerk.Checked + cbxSendungsvermerk.Visible = cbSendungsvermerk.Checked + Label10.Visible = cbSendungsvermerk.Checked + Label9.Visible = cbSendungsvermerk.Checked + End Sub End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb index fd3f4841..a4a7a1ef 100644 --- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb +++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb @@ -2383,13 +2383,15 @@ Public Class cAvisoTV Property FixeZeile3 As String Property Standort As String Property Art As String + Property Special As String End Class Public Class cAvisoTVDAL - Public Function LesenAvisoTV(hID As Integer, wherehSQL As String, Standort As String, Special As String) As cAvisoTV + Public Function LesenAvisoTV(hID As Integer, wherehSQL As String, Standort As String, Special As String, Optional ByRef list As List(Of cAvisoTV) = Nothing) As cAvisoTV 'falls ID mitgegeben, dann diese laden, ansonsten den anderen Wert suchen Dim sql As String + If list IsNot Nothing Then list.Clear() sql = "SELECT * FROM AvisoTV WHERE 1=1 " If hID > 0 Then sql &= String.Format(" AND TVID = {0}", hID) @@ -2421,6 +2423,21 @@ Public Class cAvisoTVDAL daten.FixeZeile3 = VarToStr(dr.Item("FixeZeile3")) daten.Standort = VarToStr(dr.Item("Standort")) daten.Art = VarToStr(dr.Item("Art")) + daten.Special = VarToStr(dr.Item("Special")) + + For Each ds In dr + Dim avisoTv = New cAvisoTV() + avisoTv.TVID = VarToInt(ds.Item("TVID")) + avisoTv.FixeZeile1 = VarToStr(ds.Item("FixeZeile1")) + avisoTv.FixeZeile2 = VarToStr(ds.Item("FixeZeile2")) + avisoTv.FixeZeile3 = VarToStr(ds.Item("FixeZeile3")) + avisoTv.Standort = VarToStr(ds.Item("Standort")) + avisoTv.Art = VarToStr(ds.Item("Art")) + avisoTv.Special = VarToStr(ds.Item("Special")) + If list IsNot Nothing Then list.Add(avisoTv) + Next + + End If dr.Close() End Using diff --git a/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb b/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb index 1b948d09..f3ad3563 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/Berechtigungen/cBerechtigungsObjekte.vb @@ -13,8 +13,8 @@ Public Class cBerechtigungsObjekte_List LOAD_LIST() End Sub - Sub New(progID) - LOAD_LIST(progID) + Sub New(progID, searchparam) + LOAD_LIST(progID, searchparam) End Sub Public Sub CLEAR() @@ -54,11 +54,11 @@ Public Class cBerechtigungsObjekte_List MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) End Try End Sub - Public Sub LOAD_LIST(bero_progId) + Public Sub LOAD_LIST(bero_progId, searchparam) Try LIST.Clear() Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN() - Using cmd As New SqlCommand("SELECT * FROM tblBerechtigungsObjekte WHERE bero_progId=@bero_progId", conn) + Using cmd As New SqlCommand("SELECT * FROM tblBerechtigungsObjekte WHERE bero_progId=@bero_progId" & searchparam, conn) cmd.Parameters.AddWithValue("@bero_progId", bero_progId) Dim dr = cmd.ExecuteReader() While dr.Read diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb index d0201512..a761c7d2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb @@ -44,7 +44,7 @@ Public Class cTextkonserve_LIST Try SPRACHENLIST.Clear() - For Each r In SQL.loadDgvBySql("Select distinct(txt_sprache) FROM [tblTextkonserve] WHERE txt_FIRMA = '" & txt_FIRMA & "' order by txt_sprache", "FMZOLL").Rows + For Each r In SQL.loadDgvBySql("Select distinct(txt_sprache) FROM [tblTextkonserve] WHERE txt_FIRMA = '" & txt_FIRMA & "' and txt_dynMailvorlage = 1 order by txt_sprache", "FMZOLL").Rows SPRACHENLIST.Add(r("txt_sprache")) Next @@ -71,6 +71,11 @@ Public Class cTextkonserve Property txt_letzteAenderungUser As String Property txt_letzteAenderung As DateTime + Property txt_sendungsvermerk As Boolean + Property txt_sendungsvermerkId As Integer + Property txt_sendungsvermerkText As String + + Public hasEntry As Boolean = False @@ -110,6 +115,9 @@ Public Class cTextkonserve list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_dynMailvorlage", txt_dynMailvorlage)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_letzteAenderungUser", txt_letzteAenderungUser)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_letzteAenderung", txt_letzteAenderung)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerk", txt_sendungsvermerk)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerkId", txt_sendungsvermerkId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerkText", txt_sendungsvermerkText)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb index baf7cbe3..084459a1 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmUeberstundenauszahlen 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUeberstundenauszahlen)) Me.dtpMonat = New System.Windows.Forms.DateTimePicker() Me.lblMonat = New System.Windows.Forms.Label() @@ -39,7 +40,6 @@ Partial Class frmUeberstundenauszahlen Me.txt50x15 = New System.Windows.Forms.TextBox() Me.txtAusz100 = New System.Windows.Forms.TextBox() Me.txtAusz50 = New System.Windows.Forms.TextBox() - Me.CheckVatTestService1 = New VERAG_PROG_ALLGEMEIN.eu.europa.ec.checkVatTestService() Me.cbxabwDatum = New System.Windows.Forms.CheckBox() Me.lblBis = New System.Windows.Forms.Label() Me.dtpBis = New System.Windows.Forms.DateTimePicker() @@ -71,6 +71,7 @@ Partial Class frmUeberstundenauszahlen Me.cbx100 = New System.Windows.Forms.CheckBox() Me.txtberAusz25 = New System.Windows.Forms.TextBox() Me.cbxoverwrite = New System.Windows.Forms.CheckBox() + Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label8 = New System.Windows.Forms.Label() Me.txt50x1 = New System.Windows.Forms.TextBox() Me.cbxTeilzeit = New System.Windows.Forms.CheckBox() @@ -79,20 +80,28 @@ Partial Class frmUeberstundenauszahlen Me.Label5 = New System.Windows.Forms.Label() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() - Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Label69 = New System.Windows.Forms.Label() CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.picShow, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabControl1.SuspendLayout() + Me.TabPage1.SuspendLayout() + Me.TabPage2.SuspendLayout() + CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'dtpMonat ' Me.dtpMonat.CustomFormat = "yyyy/MM" Me.dtpMonat.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpMonat.Location = New System.Drawing.Point(15, 41) + Me.dtpMonat.Location = New System.Drawing.Point(6, 42) Me.dtpMonat.Name = "dtpMonat" Me.dtpMonat.Size = New System.Drawing.Size(81, 20) Me.dtpMonat.TabIndex = 0 @@ -100,7 +109,7 @@ Partial Class frmUeberstundenauszahlen 'lblMonat ' Me.lblMonat.AutoSize = True - Me.lblMonat.Location = New System.Drawing.Point(12, 25) + Me.lblMonat.Location = New System.Drawing.Point(3, 26) Me.lblMonat.Name = "lblMonat" Me.lblMonat.Size = New System.Drawing.Size(37, 13) Me.lblMonat.TabIndex = 1 @@ -170,7 +179,7 @@ Partial Class frmUeberstundenauszahlen 'lblMA ' Me.lblMA.AutoSize = True - Me.lblMA.Location = New System.Drawing.Point(236, 25) + Me.lblMA.Location = New System.Drawing.Point(227, 26) Me.lblMA.Name = "lblMA" Me.lblMA.Size = New System.Drawing.Size(56, 13) Me.lblMA.TabIndex = 10 @@ -179,7 +188,7 @@ Partial Class frmUeberstundenauszahlen 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(236, 45) + Me.Label7.Location = New System.Drawing.Point(227, 46) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(65, 13) Me.Label7.TabIndex = 11 @@ -231,16 +240,10 @@ Partial Class frmUeberstundenauszahlen Me.txtAusz50.TabIndex = 17 Me.txtAusz50.Text = "0" ' - 'CheckVatTestService1 - ' - Me.CheckVatTestService1.Credentials = Nothing - Me.CheckVatTestService1.Url = "http://ec.europa.eu/taxation_customs/vies/services/checkVatTestService" - Me.CheckVatTestService1.UseDefaultCredentials = False - ' 'cbxabwDatum ' Me.cbxabwDatum.AutoSize = True - Me.cbxabwDatum.Location = New System.Drawing.Point(15, 5) + Me.cbxabwDatum.Location = New System.Drawing.Point(6, 6) Me.cbxabwDatum.Name = "cbxabwDatum" Me.cbxabwDatum.Size = New System.Drawing.Size(129, 17) Me.cbxabwDatum.TabIndex = 18 @@ -250,7 +253,7 @@ Partial Class frmUeberstundenauszahlen 'lblBis ' Me.lblBis.AutoSize = True - Me.lblBis.Location = New System.Drawing.Point(134, 25) + Me.lblBis.Location = New System.Drawing.Point(125, 26) Me.lblBis.Name = "lblBis" Me.lblBis.Size = New System.Drawing.Size(20, 13) Me.lblBis.TabIndex = 20 @@ -261,7 +264,7 @@ Partial Class frmUeberstundenauszahlen ' Me.dtpBis.CustomFormat = "yyyy/MM/dd" Me.dtpBis.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.dtpBis.Location = New System.Drawing.Point(137, 41) + Me.dtpBis.Location = New System.Drawing.Point(128, 42) Me.dtpBis.Name = "dtpBis" Me.dtpBis.Size = New System.Drawing.Size(81, 20) Me.dtpBis.TabIndex = 19 @@ -384,7 +387,7 @@ Partial Class frmUeberstundenauszahlen Me.Panel1.Controls.Add(Me.txt50x15) Me.Panel1.Controls.Add(Me.txtAusz100) Me.Panel1.Controls.Add(Me.txtAusz50) - Me.Panel1.Location = New System.Drawing.Point(15, 67) + Me.Panel1.Location = New System.Drawing.Point(6, 68) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(619, 258) Me.Panel1.TabIndex = 30 @@ -565,6 +568,20 @@ Partial Class frmUeberstundenauszahlen Me.cbxoverwrite.Text = "max. auszahlbar" Me.cbxoverwrite.UseVisualStyleBackColor = True ' + 'dgvUeberstunden + ' + Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvUeberstunden.AllowUserToAddRows = False + Me.dgvUeberstunden.AllowUserToDeleteRows = False + Me.dgvUeberstunden.BackgroundColor = System.Drawing.Color.White + Me.dgvUeberstunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUeberstunden.Location = New System.Drawing.Point(538, 11) + Me.dgvUeberstunden.Name = "dgvUeberstunden" + Me.dgvUeberstunden.ReadOnly = True + Me.dgvUeberstunden.Size = New System.Drawing.Size(70, 117) + Me.dgvUeberstunden.TabIndex = 13 + Me.dgvUeberstunden.Visible = False + ' 'Label8 ' Me.Label8.AutoSize = True @@ -586,7 +603,7 @@ Partial Class frmUeberstundenauszahlen 'cbxTeilzeit ' Me.cbxTeilzeit.AutoSize = True - Me.cbxTeilzeit.Location = New System.Drawing.Point(239, 5) + Me.cbxTeilzeit.Location = New System.Drawing.Point(230, 6) Me.cbxTeilzeit.Name = "cbxTeilzeit" Me.cbxTeilzeit.Size = New System.Drawing.Size(59, 17) Me.cbxTeilzeit.TabIndex = 31 @@ -597,7 +614,7 @@ Partial Class frmUeberstundenauszahlen ' Me.PictureBox1.BackgroundImage = CType(resources.GetObject("PictureBox1.BackgroundImage"), System.Drawing.Image) Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox1.Location = New System.Drawing.Point(189, 5) + Me.PictureBox1.Location = New System.Drawing.Point(180, 6) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(29, 26) Me.PictureBox1.TabIndex = 38 @@ -607,7 +624,7 @@ Partial Class frmUeberstundenauszahlen ' Me.lblWarning.AutoSize = True Me.lblWarning.ForeColor = System.Drawing.Color.Red - Me.lblWarning.Location = New System.Drawing.Point(304, 5) + Me.lblWarning.Location = New System.Drawing.Point(295, 6) Me.lblWarning.Name = "lblWarning" Me.lblWarning.Size = New System.Drawing.Size(0, 13) Me.lblWarning.TabIndex = 39 @@ -616,7 +633,7 @@ Partial Class frmUeberstundenauszahlen ' Me.Label5.AutoSize = True Me.Label5.ForeColor = System.Drawing.Color.Red - Me.Label5.Location = New System.Drawing.Point(378, 45) + Me.Label5.Location = New System.Drawing.Point(369, 46) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(0, 13) Me.Label5.TabIndex = 40 @@ -625,7 +642,7 @@ Partial Class frmUeberstundenauszahlen ' Me.PictureBox5.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.blue_question_mark_hi Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox5.Location = New System.Drawing.Point(596, 5) + Me.PictureBox5.Location = New System.Drawing.Point(587, 6) Me.PictureBox5.Name = "PictureBox5" Me.PictureBox5.Size = New System.Drawing.Size(38, 36) Me.PictureBox5.TabIndex = 130 @@ -634,7 +651,7 @@ Partial Class frmUeberstundenauszahlen 'LinkLabel1 ' Me.LinkLabel1.AutoSize = True - Me.LinkLabel1.Location = New System.Drawing.Point(473, 47) + Me.LinkLabel1.Location = New System.Drawing.Point(464, 48) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(161, 13) Me.LinkLabel1.TabIndex = 131 @@ -642,39 +659,85 @@ Partial Class frmUeberstundenauszahlen Me.LinkLabel1.Text = "zu unterschreibende Dokumente" Me.LinkLabel1.Visible = False ' - 'dgvUeberstunden + 'TabControl1 ' - Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvUeberstunden.AllowUserToAddRows = False - Me.dgvUeberstunden.AllowUserToDeleteRows = False - Me.dgvUeberstunden.BackgroundColor = System.Drawing.Color.White - Me.dgvUeberstunden.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUeberstunden.Location = New System.Drawing.Point(538, 11) - Me.dgvUeberstunden.Name = "dgvUeberstunden" - Me.dgvUeberstunden.ReadOnly = True - Me.dgvUeberstunden.Size = New System.Drawing.Size(70, 117) - Me.dgvUeberstunden.TabIndex = 13 - Me.dgvUeberstunden.Visible = False + Me.TabControl1.Controls.Add(Me.TabPage1) + Me.TabControl1.Controls.Add(Me.TabPage2) + Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Left + Me.TabControl1.Location = New System.Drawing.Point(0, 0) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(699, 397) + Me.TabControl1.TabIndex = 132 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.cbxabwDatum) + Me.TabPage1.Controls.Add(Me.LinkLabel1) + Me.TabPage1.Controls.Add(Me.dtpMonat) + Me.TabPage1.Controls.Add(Me.PictureBox5) + Me.TabPage1.Controls.Add(Me.lblMonat) + Me.TabPage1.Controls.Add(Me.Label5) + Me.TabPage1.Controls.Add(Me.lblMA) + Me.TabPage1.Controls.Add(Me.lblWarning) + Me.TabPage1.Controls.Add(Me.Label7) + Me.TabPage1.Controls.Add(Me.PictureBox1) + Me.TabPage1.Controls.Add(Me.dtpBis) + Me.TabPage1.Controls.Add(Me.cbxTeilzeit) + Me.TabPage1.Controls.Add(Me.lblBis) + Me.TabPage1.Controls.Add(Me.Panel1) + Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Name = "TabPage1" + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(691, 371) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "Überstunden" + Me.TabPage1.UseVisualStyleBackColor = True + ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.dgvUberstundenauszahlungen) + Me.TabPage2.Controls.Add(Me.Label69) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(691, 346) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "bereits ausgezahlt" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'dgvUberstundenauszahlungen + ' + Me.dgvUberstundenauszahlungen.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvUberstundenauszahlungen.AllowUserToAddRows = False + Me.dgvUberstundenauszahlungen.AllowUserToDeleteRows = False + Me.dgvUberstundenauszahlungen.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.ColumnHeader + Me.dgvUberstundenauszahlungen.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllHeaders + Me.dgvUberstundenauszahlungen.BackgroundColor = System.Drawing.Color.White + Me.dgvUberstundenauszahlungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUberstundenauszahlungen.Location = New System.Drawing.Point(8, 20) + Me.dgvUberstundenauszahlungen.Name = "dgvUberstundenauszahlungen" + Me.dgvUberstundenauszahlungen.ReadOnly = True + Me.dgvUberstundenauszahlungen.Size = New System.Drawing.Size(677, 320) + Me.dgvUberstundenauszahlungen.TabIndex = 138 + ' + 'Label69 + ' + Me.Label69.AutoSize = True + Me.Label69.Cursor = System.Windows.Forms.Cursors.Default + Me.Label69.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label69.Location = New System.Drawing.Point(1, 2) + Me.Label69.Name = "Label69" + Me.Label69.Size = New System.Drawing.Size(190, 16) + Me.Label69.TabIndex = 137 + Me.Label69.Text = "Überstundenauszahlungen" ' 'frmUeberstundenauszahlen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(646, 337) - Me.Controls.Add(Me.LinkLabel1) - Me.Controls.Add(Me.PictureBox5) - Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.lblWarning) - Me.Controls.Add(Me.PictureBox1) - Me.Controls.Add(Me.cbxTeilzeit) - Me.Controls.Add(Me.Panel1) - Me.Controls.Add(Me.lblBis) - Me.Controls.Add(Me.dtpBis) - Me.Controls.Add(Me.cbxabwDatum) - Me.Controls.Add(Me.Label7) - Me.Controls.Add(Me.lblMA) - Me.Controls.Add(Me.lblMonat) - Me.Controls.Add(Me.dtpMonat) + Me.ClientSize = New System.Drawing.Size(705, 397) + Me.Controls.Add(Me.TabControl1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmUeberstundenauszahlen" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -683,11 +746,16 @@ Partial Class frmUeberstundenauszahlen Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.picShow, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvUeberstunden, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabControl1.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) + Me.TabPage1.PerformLayout() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() + CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) - Me.PerformLayout() End Sub @@ -708,7 +776,6 @@ Partial Class frmUeberstundenauszahlen Friend WithEvents txt50x15 As Windows.Forms.TextBox Friend WithEvents txtAusz100 As Windows.Forms.TextBox Friend WithEvents txtAusz50 As Windows.Forms.TextBox - Friend WithEvents CheckVatTestService1 As eu.europa.ec.checkVatTestService Friend WithEvents cbxabwDatum As Windows.Forms.CheckBox Friend WithEvents lblBis As Windows.Forms.Label Friend WithEvents dtpBis As Windows.Forms.DateTimePicker @@ -748,4 +815,9 @@ Partial Class frmUeberstundenauszahlen Friend WithEvents Label12 As Windows.Forms.Label Friend WithEvents PictureBox5 As Windows.Forms.PictureBox Friend WithEvents LinkLabel1 As Windows.Forms.LinkLabel + Friend WithEvents TabControl1 As Windows.Forms.TabControl + Friend WithEvents TabPage1 As Windows.Forms.TabPage + Friend WithEvents TabPage2 As Windows.Forms.TabPage + Friend WithEvents dgvUberstundenauszahlungen As MyDatagridview + Friend WithEvents Label69 As Windows.Forms.Label End Class diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx index 2103de71..55eef140 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index 164c2156..067e7242 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -494,6 +494,27 @@ Public Class frmUeberstundenauszahlen Process.Start(webAddress) End Sub + Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged + If TabControl1.SelectedIndex = 1 Then + Try + + Dim dtbereitsausgezahlteUE As DataTable + Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am + FROM [ADMIN].[dbo].[tblUeberstunden] + where uest_deleted = 0 and uest_timasId = " & MA.mit_timasId & " + Order by uest_date" + + dtbereitsausgezahlteUE = SQL.loadDgvBySql(bereitsgezahlteueberstunden, "ADMIN", 100, True) + + dgvUberstundenauszahlungen.DataSource = dtbereitsausgezahlteUE + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End If + End Sub + Private Sub txtAusz_hhmm_KeyPress(sender As Object, e As KeyPressEventArgs) Select Case Asc(e.KeyChar) Case 48 To 57, 8, 44, 46, 58 @@ -880,7 +901,7 @@ Public Class frmUeberstundenauszahlen 'wenn berechneter Saldo negativ, dann ist im Regelfall das aktuelle MOnat noch nicht abgeschlossen!, daher anstatt den berechneten Saldo in overallBalance laden! - txtlfdSaldo.Text = timas.getTimeSaldo(MA.mit_timasId, "", "overallBalance") + txtlfdSaldo.Text = timas.getTimeSaldo(MA.mit_timasId, "", "dailyBalanceYesterday") stunden100auszbere = RoundOfDigits(stunden100ausz * faktor100Zuschlag / 100, 2) stunden50auszbere = RoundOfDigits(stunden50ausz * faktor50Zuschlag / 100, 2) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb index e5f369b2..5a466dce 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb @@ -165,7 +165,7 @@ Public Class cCreditSafeAPI Else If (rest.ResponseStatusCode <> 200) Then - failureDesc = rest.ResponseStatusText + failureDesc = rest.ResponseStatusText & IIf(responseJson <> "", vbNewLine & responseJson, "") Return failureDesc Else diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index 65ff1f44..0fc6baf4 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -63,7 +63,7 @@ Public Class cTimasAPI End Function - Public Function getTimeSaldo(maid As Integer, ByRef info As String, kindofbalance As String, ByRef Optional isEndpointRunning As Boolean = True) As Double + Public Function getTimeSaldo(maid As Integer, ByRef info As String, kindofbalance As String, ByRef Optional isEndpointRunning As Boolean = True, Optional datetimeformat As String = "seconds") As Double Try Dim returnText As String = "" Dim failureText As String = "" @@ -80,8 +80,10 @@ Public Class cTimasAPI Dim success As Boolean + rest.ClearAllQueryParams() rest.IdleTimeoutMs = 5000 + rest.AddQueryParam("format", datetimeformat) Dim responseJson As String = rest.FullRequestNoBody("GET", "/rest/web-api/employees/" & maid & "/balance") If (rest.LastMethodSuccess <> True) Then Debug.WriteLine(rest.LastErrorText) @@ -92,7 +94,6 @@ Public Class cTimasAPI If (rest.ResponseStatusCode <> 200) Then Debug.WriteLine(rest.ResponseHeader) - 'lblTimas.Text = rest.ResponseStatusCode & " " & rest.ResponseStatusText Return timesaldo End If @@ -107,11 +108,6 @@ Public Class cTimasAPI Debug.WriteLine(json) - '"overallBalance" 101580, - '"dailyBalance": -17340, - '"monthlyBalance": -328380, - '"actualTimeOfDay": 4260, - If kindofbalance = "" Then info = "kindOfBalance nicht definiert! " Return timesaldo @@ -119,13 +115,29 @@ Public Class cTimasAPI Dim saldo = json.StringOf(kindofbalance) 'Tagessaldo (gestern) in Sekunden If saldo IsNot Nothing Then Dim saldoAsDouble = CDbl(saldo) - saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2) Dim infoBuilder As New StringBuilder - 'infoBuilder.Append("Vortag ") - infoBuilder.Append(saldoAsDouble) - infoBuilder.Append(" h") - info = infoBuilder.ToString() - timesaldo = saldoAsDouble + Select Case datetimeformat + Case "seconds" + saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2) + infoBuilder.Append(saldoAsDouble) + infoBuilder.Append(" h") + info = infoBuilder.ToString() + timesaldo = saldoAsDouble + Case "minutes" + saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2) + infoBuilder.Append(saldoAsDouble) + infoBuilder.Append(" min") + info = infoBuilder.ToString() + timesaldo = saldoAsDouble + + Case "time" + infoBuilder.Append(saldoAsDouble) + infoBuilder.Append(" Zeit") + info = infoBuilder.ToString() + timesaldo = saldoAsDouble + + End Select + Return timesaldo End If Return timesaldo @@ -1005,8 +1017,8 @@ Public Class cTimasAPI R("Ausweis-Nr") = employee.IntOf("card") R("Info") = employee.StringOf("info") dt.Rows.Add(R) - j = j + 1 - End While + j = j + 1 + End While Catch ex As WebException @@ -1194,9 +1206,9 @@ Public Class cTimasAPI jsonArr.AddObjectAt(-1) Dim Json As Chilkat.JsonObject = jsonArr.ObjectAt(jsonArr.Size - 1) Json.UpdateInt("accountid", ae.Item("accountid")) - json.UpdateInt("employeeid", mitarbeiter.mit_timasId) - json.UpdateString("date", accountdate.ToString("yyyy-MM-dd")) - json.UpdateString("value", ae.Item("value")) + Json.UpdateInt("employeeid", mitarbeiter.mit_timasId) + Json.UpdateString("date", accountdate.ToString("yyyy-MM-dd")) + Json.UpdateString("value", ae.Item("value")) Next