edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-09-27 15:03:57 +02:00
parent ca05ecb9fd a8e346d71a
commit 892a07805e
13 changed files with 107 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Aviso/Anhänge/frmSendungAnhangImport.vb
View File

@@ -1431,7 +1431,8 @@ Public Class frmSendungAnhangImport
da_id = DS.da_id
destPath = DS.GET_TOP1_PATH
fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName)
Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, Art, Typ, SendungsId)
Dim fi As New FileInfo(sourcePath)
Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, Art, Typ, SendungsId,, fi.Length)
If Not ANH.SAVE Then MsgBox("Fehler beim Anhang speichern!") : Return False
anhId = ANH.anh_id
Return True

13
Aviso/Aviso.vbproj
View File

@@ -40,7 +40,7 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineDebug>true</DefineDebug>
@@ -86,13 +86,13 @@
<ManifestKeyFile>Aviso_1_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
<GenerateManifests>false</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
@@ -102,10 +102,11 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
<OutputPath>bin\Debug\</OutputPath>
<OutputPath>bin\x64\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Aviso_1_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
@@ -1328,7 +1329,6 @@
<EmbeddedResource Include="GVMS\frmGVMSNew.resx">
<DependentUpon>frmGVMSNew.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
<CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -1555,6 +1555,7 @@
<None Include="Resources\AMB.png" />
<None Include="Resources\sprinter.png" />
<None Include="Resources\sprinter_white.png" />
<None Include="Resources\FO.bmp" />
<Content Include="Resources\FO.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>

10
Aviso/My Project/Resources.Designer.vb generated
View File

@@ -638,16 +638,6 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property FO() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("FO", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

3
Aviso/My Project/Resources.resx
View File

@@ -214,9 +214,6 @@
<data name="del2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FO" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>F:\Grafik\VERAG\VERAG_Akten\eigAkt\FO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lorry_ummelden" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Diverses\lorry_ummelden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

2
Aviso/My Project/licenses.licx
View File

@@ -1,2 +0,0 @@
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff

BIN
Aviso/Resources/FO.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

34
Aviso/frmATEZ_NCTS.vb
View File

@@ -85,14 +85,14 @@ Public Class frmATEZ_NCTS
atez.setJsonPDF(atez_data, dgvAnhaenge)
Dim data As New DataObject()
data.SetData(DataFormats.Text, atez_data.json)
Clipboard.SetDataObject(data)
Me.Cursor = Cursors.Default
data.SetData(DataFormats.Text, atez_data.json)
Clipboard.SetDataObject(data)
Me.Cursor = Cursors.Default
MsgBox("JSON-Daten in Zwischenablage gespeichert")
Exit Sub
End If
End If
If atez_data.status = "Sent" Then
If atez_data.status = "Sent" Then
Exit Sub
End If
@@ -193,10 +193,22 @@ Public Class frmATEZ_NCTS
Return False
End If
atezData.sessionId = atez.sessionID
If Not atez.setJson(atezData) Then MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!")
If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then MsgBox("Fehler beim Erstellen der PDF-Daten, kein Anhang ausgewählt!" & vbNewLine & "Vorgang abgebrochen!")
If Not atez.setJson(atezData) Then
MsgBox("Fehler beim Erstellen der Daten" & vbNewLine & "Vorgang abgebrochen!")
atezData.status = "Failure"
atezData.fehlerbeschreibung = "Fehler beim Erstellen der Daten"
Return atezData.SAVE
End If
If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then
MsgBox("Fehler beim Erstellen der PDF-Daten!" & vbNewLine & "Vorgang abgebrochen!")
atezData.status = "Failure"
atezData.fehlerbeschreibung = "Fehler beim Erstellen der PDF-Daten!"
Return atezData.SAVE
End If
Dim azetId = atez.SendRequestWithAuthHeader("application/json", failreDesc)
@@ -222,12 +234,16 @@ Public Class frmATEZ_NCTS
Else
If azetId = "-1" Then atezData.fehlerbeschreibung = "Request has been sent, but no header received!"
If azetId = "-1" Then
atezData.fehlerbeschreibung = "Request has been sent, but no header received!"
Else
atezData.fehlerbeschreibung = ""
End If
atezData.status = "Sent"
atezData.atezId = IIf(azetId IsNot Nothing, azetId, "")
Return atezData.SAVE()
End If
End If
End Function

3
Aviso/frmEssensbestellungenAdministration.vb
View File

@@ -372,6 +372,9 @@ Public Class frmEssensbestellungenAdministration
bestellung.eb_storniert_am = DBNull.Value
End If
bestellung.eb_preis = 0
bestellung.SAVE()

13
Aviso/frmGesamtsicherheitenNEU.vb
View File

@@ -554,6 +554,7 @@ Public Class frmGesamtsicherheitenNEU
' alle anderen Eingaben unterdrücken
e.Handled = True
End Select
End Sub
@@ -590,6 +591,8 @@ Public Class frmGesamtsicherheitenNEU
End If
If checkNothingValue(txtSicherheitSicherheitsbetrag.Text, "Double") IsNot Nothing Then
Dim sichBetr As Double = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
If checkSaldo(sichBetr, True) = False Then Exit Sub
@@ -599,6 +602,14 @@ Public Class frmGesamtsicherheitenNEU
Dim limit As Integer = Integer.Parse(setNullToZero(txtAnzahlPos.Text))
If (limit > 10) Then
Dim result As MsgBoxResult = MsgBox("Sollen wirklich " & limit & "Positionen angelegt werden?", vbYesNoCancel)
If result <> vbYes Then
txtAnzahlPos.Focus()
Exit Sub
End If
End If
For count As Integer = 1 To limit
attachPosNrToExistingATB = False
@@ -805,7 +816,7 @@ Public Class frmGesamtsicherheitenNEU
Public Function DateTimeString2DateTimeKonvertinator(datum As String, uhrzeit As String) As DateTime
Try
Dim a As Date = Date.ParseExact(datum, "dd.MM.yyyy", System.Globalization.DateTimeFormatInfo.InvariantInfo)
Dim b As Date = Date.ParseExact(uhrzeit, "HH:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
Dim b As Date = Date.ParseExact(uhrzeit, "H:mm", System.Globalization.DateTimeFormatInfo.InvariantInfo)
Dim ab As Date = a.AddHours(b.Hour).AddMinutes(b.Minute)
Return ab

3
Aviso/frmSendungsdetailsNEU.vb
View File

@@ -6401,6 +6401,7 @@ Public Class frmSendungsdetailsNEU
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy"))
frmAttilaATEZNCTS.Show(Me)
Me.Refresh()
initdgvATEZ()
End If
@@ -6415,7 +6416,7 @@ Public Class frmSendungsdetailsNEU
Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp
If e.KeyCode = Keys.Delete Then
If dgvATEZNCTS.SelectedRows.Count > 0 Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If dgvATEZNCTS.SelectedRows(0).Cells("Status").Value = "Sent" Then
MsgBox("Bereits gesendete Request können nicht gelöscht werden!")
Exit Sub

47
Aviso/usrcntlAktDetailsATILLANeu.Designer.vb generated
View File

@@ -54,6 +54,7 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.tbcntr = New System.Windows.Forms.TabControl()
Me.tbVermerke = New System.Windows.Forms.TabPage()
Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
Me.tbZollanmeldungen = New System.Windows.Forms.TabPage()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.dgvZollAnmeldungen = New System.Windows.Forms.DataGridView()
@@ -68,6 +69,7 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.tbAnhaenge = New System.Windows.Forms.TabPage()
Me.dgvanhaenge = New System.Windows.Forms.DataGridView()
Me.Panel5 = New System.Windows.Forms.Panel()
Me.btnImportAssi = New System.Windows.Forms.Button()
Me.btnQuckScan = New System.Windows.Forms.Button()
Me.Button11 = New System.Windows.Forms.Button()
Me.Button4 = New System.Windows.Forms.Button()
@@ -156,7 +158,6 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla()
Me.pnlDetailsRechts.SuspendLayout()
Me.Panel3.SuspendLayout()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -276,6 +277,17 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.tbVermerke.Text = "Vermerk eintragen"
Me.tbVermerke.UseVisualStyleBackColor = True
'
'UsrCntlVermerkeATilla1
'
Me.UsrCntlVermerkeATilla1.AutoScroll = True
Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
Me.UsrCntlVermerkeATilla1.TabIndex = 0
'
'tbZollanmeldungen
'
Me.tbZollanmeldungen.Controls.Add(Me.Panel1)
@@ -549,6 +561,7 @@ Partial Class usrcntlAktDetailsATILLANeu
'
'Panel5
'
Me.Panel5.Controls.Add(Me.btnImportAssi)
Me.Panel5.Controls.Add(Me.btnQuckScan)
Me.Panel5.Controls.Add(Me.Button11)
Me.Panel5.Controls.Add(Me.Button4)
@@ -559,6 +572,22 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.Panel5.Size = New System.Drawing.Size(561, 38)
Me.Panel5.TabIndex = 112
'
'btnImportAssi
'
Me.btnImportAssi.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnImportAssi.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnImportAssi.Image = CType(resources.GetObject("btnImportAssi.Image"), System.Drawing.Image)
Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnImportAssi.Location = New System.Drawing.Point(1, 1)
Me.btnImportAssi.Name = "btnImportAssi"
Me.btnImportAssi.Size = New System.Drawing.Size(93, 37)
Me.btnImportAssi.TabIndex = 112
Me.btnImportAssi.Text = "Import-Assistent"
Me.btnImportAssi.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnImportAssi.UseVisualStyleBackColor = True
Me.btnImportAssi.Visible = False
'
'btnQuckScan
'
Me.btnQuckScan.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -579,9 +608,9 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button11.Image = CType(resources.GetObject("Button11.Image"), System.Drawing.Image)
Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button11.Location = New System.Drawing.Point(97, 1)
Me.Button11.Location = New System.Drawing.Point(90, 1)
Me.Button11.Name = "Button11"
Me.Button11.Size = New System.Drawing.Size(76, 37)
Me.Button11.Size = New System.Drawing.Size(83, 37)
Me.Button11.TabIndex = 111
Me.Button11.Text = "CMR"
Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1725,17 +1754,6 @@ Partial Class usrcntlAktDetailsATILLANeu
Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30)
Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)"
'
'UsrCntlVermerkeATilla1
'
Me.UsrCntlVermerkeATilla1.AutoScroll = True
Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control
Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3)
Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1"
Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151)
Me.UsrCntlVermerkeATilla1.TabIndex = 0
'
'usrcntlAktDetailsATILLANeu
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1914,4 +1932,5 @@ Partial Class usrcntlAktDetailsATILLANeu
Friend WithEvents Panel10 As Panel
Friend WithEvents Label12 As Label
Friend WithEvents Button12 As Button
Friend WithEvents btnImportAssi As Button
End Class

8
Aviso/usrcntlAktDetailsATILLANeu.resx
View File

@@ -132,6 +132,14 @@
kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnImportAssi.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V
kEEKgCAQRfVKeaaOEXSL6hbRNrC9dQ3PUd/IxagLGcZFA48PjjyYrzCd1vqWAC7TTog8wFiBTUUR7Igw
fK6ZIRVFsGsolKCtEFl7cmneGpBEuIGeyZoJJSBCpAcXE18Sindow4LJngklIELk8j1wmEpC8Q5PMDNx
mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnQuckScan.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

17
Aviso/usrcntlAktDetailsATILLANeu.vb
View File

@@ -505,7 +505,7 @@ Public Class usrcntlAktDetailsATILLANeu
Sub initAnhaenge()
Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge]
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0
ORDER BY
case
when [anh_Art] = 'ATR-EUR1' then 0
@@ -1678,6 +1678,7 @@ Public Class usrcntlAktDetailsATILLANeu
Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy"))
frmAttilaATEZNCTS.Show(Me)
Me.Refresh()
initdgvATEZ()
End If
@@ -1690,7 +1691,7 @@ Public Class usrcntlAktDetailsATILLANeu
Private Sub dgvATEZNCTS_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvATEZNCTS.KeyUp
If e.KeyCode = Keys.Delete Then
If dgvATEZNCTS.SelectedRows.Count > 0 Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Or IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If Not IsDBNull(dgvATEZNCTS.SelectedRows(0).Cells("Status").Value) Then
If dgvATEZNCTS.SelectedRows(0).Cells("Status").Value = "Sent" Then
MsgBox("Bereits gesendete Request können nicht gelöscht werden!")
Exit Sub
@@ -1702,7 +1703,19 @@ Public Class usrcntlAktDetailsATILLANeu
End If
End If
End If
End If
End Sub
Private Sub btnImportAssi_Click(sender As Object, e As EventArgs) Handles btnImportAssi.Click
'loadDataInLIST()
'SAVE_ME()
Dim f As New frmSendungAnhangImport(AvisoID, SENDUNG_LIST(0).tblSnd_SendungID)
f.ShowDialog(Me)
'VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AvisoID) 'LÄDT alle SENDUNGSDATEN
reload(AvisoID)
'initDataBinding()
End Sub
End Class