diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index 353e4d6..1cb8e67 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -227,61 +227,6 @@ Public Class frmGesamtsicherheitenMenuNEU End Try End Sub - 'Private Sub FlatButton2_Click(sender As Object, e As EventArgs) - ' txtDatVon.Text = Date.Parse("01.01.1970") - ' txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy") - 'End Sub - - Private Sub ExportCSVToolStripMenuItem_Click(sender As Object, e As EventArgs) - csvexport(dgvListe) - End Sub - - Public Shared Function csvexport(quelldgv As DataGridView) - Dim savefiledialog As New SaveFileDialog - Dim firstin As String - Dim out As String - Dim in2 As String - Dim header As String - - savefiledialog.Filter = "CSV files (*.csv)|*.CSV" - savefiledialog.InitialDirectory = "C:\Verag" - savefiledialog.ShowDialog() - - Try - For r As Integer = 0 To quelldgv.Rows.Count - 1 - For c As Integer = 0 To quelldgv.Columns.Count - 'test &= r & c & vbCrLf - Try - 'test &= Replace(quelldgv.Rows(r).Cells(c).Value.ToString, vbCrLf, "vbCrlLf") - firstin = quelldgv.Rows(r).Cells(c).Value.ToString - 'in2 = """" & firstin & """" & ";" - in2 = firstin & ";" - out &= Replace(in2, vbCrLf, "##vbCrLf##") - out = Replace(out, "€", "") - Catch ex As Exception - out &= "" - End Try - - Next - - out &= "nZ" - Next - For c As Integer = 0 To quelldgv.Columns.Count - 1 - header &= quelldgv.Columns(c).Name & ";" - Next - out = Replace(out, "nZ", vbCrLf) - 'MsgBox(out) - Using sw As New IO.StreamWriter(savefiledialog.FileName) - sw.WriteLine(header) - sw.WriteLine(out) - End Using - - Catch ex As Exception - MsgBox(ex.Message) - End Try - End Function - - Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) Dim TAG As Date = CDate(Now.ToShortDateString) Dim JAHR As Date = CDate("01.01." & Now.Year) @@ -436,7 +381,9 @@ Public Class frmGesamtsicherheitenMenuNEU End Function Private Sub ExportCSVToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ExportCSVToolStripMenuItem.Click - csvexport(dgvListe) + + SDL.cProgramFunctions.genExcelFromDGV_NEW(dgvListe) + End Sub Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportCSV2ToolStripMenuItem.Click @@ -454,7 +401,6 @@ Public Class frmGesamtsicherheitenMenuNEU SDL.cProgramFunctions.genExcelFromDGV_NEW(frm.dgvGesamtsicherheit) - 'csvexport(frm.dgvGesamtsicherheit) End If End Sub End Class