diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index 14540c12..2be23e1c 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1241,8 +1241,7 @@ Public Class usrCntlMDMAuswertungen Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim frm As New Form - Dim dgv As New DataGridView() + Dim dt As DataTable = SQL.loadDgvBySql("SELECT PKFileName, FileCreationDate, @@ -1256,19 +1255,81 @@ Public Class usrCntlMDMAuswertungen GROUP BY PKFileName, FileCreationDate, Abrechnungsdatum, VATRate ORDER BY PKFileName", "ASFINAG") - dgv.DataSource = dt - If dgv IsNot Nothing Then - frm.Size = New Size(1400, 1000) - dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) - dgv.Dock = DockStyle.Fill - dgv.Anchor = AnchorStyles.Left - dgv.Anchor = AnchorStyles.Top - dgv.ReadOnly = True - frm.Controls.Add(dgv) - frm.StartPosition = FormStartPosition.CenterScreen - frm.ShowDialog() + If dt.Rows.Count = 0 Then + MsgBox("keine Daten vorhanden!") + Exit Sub End If + Dim print As New frmPrintLayout + print.Text = "ASFINAG" + + Dim rpt As New rptASFINAG_TransaktionenSumary + + rpt.DataSource = dt + + + + + + Dim sum = 0 + rpt.lblUeberschrift.Text = "ASFINAG Transaktionssummen " & CDate(dat_Sum_Bis.Value.ToShortDateString) + rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME + + rpt.Label10.Visible = False + Label1.Text = "Dateiname" + Label8.Text = "Erstellungsdatum" + 'Dim cnt As Integer = 0 + rpt.lblDat.Text = Now.ToLongDateString + + + + + + Dim sumNetto As Double = 0 + Dim sumMWST As Double = 0 + Dim sumBrutto As Double = 0 + + Dim sumperKdNrNetto As Double = 0 + Dim sumperKdNrMWST As Double = 0 + Dim sumperKdNrBrutto As Double = 0 + + + AddHandler rpt.Detail.Format, Sub() + + + rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("PKFileName").Value, "") + rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("FileCreationDate").Value, "") + rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Abrechnungsdatum").Value, "") + + rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 2, "") + rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 2, "") + rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 2, "") + + + rpt.lblSumNet.Visible = False + rpt.lblSumVat.Visible = False + rpt.lblSumBrt.Visible = False + + sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Nettobetrag").Value, 4, 0) + sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Umsatzsteuer").Value, 4, 0) + sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Bruttobetrag").Value, 4, 0) + + + End Sub + + + AddHandler rpt.ReportFooter1.Format, Sub() + + rpt.lblSumNetto.Text = sumNetto.ToString("N2") + rpt.lblSumMwst.Text = sumMWST.ToString("N2") + rpt.lblSumBrutto.Text = sumBrutto.ToString("N2") + + End Sub + + print.Viewer.LoadDocument(rpt) + print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous + print.Show() + Catch ex As System.Exception diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index 792e877a..b20449af 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -338,6 +338,7 @@ Public Class frmMitarbeitersuche Case Else timestp = timestp.AddMinutes(1) 'NICHT ERLAUBT End Select + Else timestp = timestp.AddMinutes(1) 'NICHT ERLAUBT End If @@ -350,7 +351,23 @@ Public Class frmMitarbeitersuche End If ElseIf art = "akten" Then - Dim aktengang As DateTime = Now().AddMinutes(-10) + + Dim minutesBeforeStart As Integer = 1 + + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung <> "" Then + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + Case "SUB" : minutesBeforeStart = 10 + Case "NKN" : minutesBeforeStart = 45 + Case Else + minutesBeforeStart = 1 'NICHT ERLAUBT + End Select + Else + + minutesBeforeStart = 1 'NICHT ERLAUBT + End If + + + Dim aktengang As DateTime = Now().AddMinutes(-minutesBeforeStart) Dim askPost As MsgBoxResult = MsgBox("Aktengang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & aktengang.ToString(), vbYesNo) If askPost = vbYes Then Dim info @@ -360,7 +377,7 @@ Public Class frmMitarbeitersuche Dim isOnline = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting) If Not timeEntryExisting AndAlso Not isOnline Then timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 10) 'Start 10 Aktengang - timestp = timestp.AddMinutes(10) + timestp = timestp.AddMinutes(minutesBeforeStart) timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 10) 'Ende 10 Aktengang timestp = timestp.AddMinutes(1) timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 0) ' Start