diff --git a/UID/DISPO.vbproj b/UID/DISPO.vbproj
index 5f0ae55..9f3f2ff 100644
--- a/UID/DISPO.vbproj
+++ b/UID/DISPO.vbproj
@@ -32,7 +32,7 @@
false
- AnyCPU
+ x64
true
full
true
@@ -57,7 +57,7 @@
On
- Binary
+ Text
Off
@@ -72,7 +72,7 @@
My Project\app.manifest
- true
+ false
4BDC042C7E79547CFC124EDDCBA8A805E84C6BDB
@@ -92,56 +92,81 @@
-
- False
- bin\Debug\DISPO.exe.GrapeCity.Licenses.dll
+
+ ..\..\SDL\SDL\SDL\bin\Debug\Dynamsoft.Forms.Viewer.dll
+
+
+ ..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\Dynamsoft.ImageCore.dll
+
+
+ ..\..\dll\Dynamsoft\8.0.0\Dynamsoft.PDF.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\Dynamsoft.Twain.dll
-
-
-
-
False
..\..\AVISO\AVISO\Gemeinsames\bin\Debug\Gemeinsames.dll
-
-
-
-
-
-
-
-
-
-
-
-
+
+ F:\PROGRAMMIERUNG\dll\Ghostscript.NET.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.dll
+
+
+ ..\..\dll\GrapeCity.ActiveReports.ArsClient.v12.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Chart.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Core.Document.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Design.Win.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Document.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Export.Pdf.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Viewer.Common.dll
+
+
+ ..\..\SDL\SDL\SDL\bin\Debug\GrapeCity.ActiveReports.Viewer.Win.dll
+
+
+ ..\..\dll\itextsharp.dll
+
False
- ..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.Common.dll
+ ..\..\dll\Report\Microsoft.ReportViewer.Common.dll
False
- ..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.DataVisualization.dll
+ ..\..\dll\Microsoft.ReportViewer.DataVisualization.dll
False
- ..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.Design.dll
+ ..\..\dll\Microsoft.ReportViewer.Design.dll
False
- ..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.WebDesign.dll
+ ..\..\dll\Microsoft.ReportViewer.WebDesign.dll
False
- ..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.WebForms.dll
+ ..\..\dll\Microsoft.ReportViewer.WebForms.dll
False
- ..\packages\Microsoft.ReportingServices.ReportViewerControl.WebForms.150.900.148\lib\net40\Microsoft.ReportViewer.WinForms.dll
+ ..\..\dll\Microsoft.ReportViewer.WinForms.dll
- ..\..\..\dll\PdfSharp.resources.dll
+ ..\..\dll\PdfSharp.resources.dll
diff --git a/UID/My Project/licenses.licx b/UID/My Project/licenses.licx
index e4c81bb..ca77830 100644
--- a/UID/My Project/licenses.licx
+++ b/UID/My Project/licenses.licx
@@ -1,3 +1,2 @@
-GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v9, Version=9.1.2302.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
-GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v9, Version=9.1.2302.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
-GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v12, Version=12.3.17127.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
+GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
+GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
diff --git a/UID/Reports/TransportAuftrag/rptTransportauftrag.vb b/UID/Reports/TransportAuftrag/rptTransportauftrag.vb
index 6ae620a..6eb8e3f 100644
--- a/UID/Reports/TransportAuftrag/rptTransportauftrag.vb
+++ b/UID/Reports/TransportAuftrag/rptTransportauftrag.vb
@@ -33,8 +33,9 @@ Public Class rptTransportauftrag
txtDatum.Text = Date.Now.Day & "." & Date.Now.Month & "." & Date.Now.Year
txtSachbearbeiter.Text = "Sachbearbeiter: " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
-
+ Dim FilialNr = ""
If Standort = "4807" Or Standort = "VERAG AG" Then
+ FilialNr = "4807"
txtVerag.Text = "VERAG Spedition AG"
txtVeragAnschrift.Text = "AT 4975 - Suben 100" & vbCrLf &
"Tel. +43 77 11 / 27 77 - 31" & vbCrLf &
@@ -44,6 +45,7 @@ Public Class rptTransportauftrag
"FN: 216714y" & vbCrLf &
"UID : ATU 53187000"
ElseIf Standort = "4819" Or Standort = "VERAG GmbH" Then
+ FilialNr = "4819"
txtVerag.Text = "VERAG Spedition GmbH"
txtVeragAnschrift.Text = "Hartham 6" & vbCrLf &
"D 94152 Neuhaus am Inn" & vbCrLf &
@@ -56,7 +58,7 @@ Public Class rptTransportauftrag
"A-4975 Suben, Nr. 100"
End If
- txtFrachtposition.Text = FrachtPostHeader.Substring(1)
+ txtFrachtposition.Text = FilialNr & "/" & FrachtPostHeader.Substring(1)
If auftraglist(0).atr_TransportauftragArt = "NACH" Then
txtAnFirma.Text = auftraglist(0).atr_frachtfAb_firma
txtAnFirmaStrasse.Text = auftraglist(0).atr_frachtfAb_str & " " & auftraglist(0).atr_frachtfAb_strnr
diff --git a/UID/cDispoAuftraege.vb b/UID/cDispoAuftraege.vb
index 70fa0fb..29db697 100644
--- a/UID/cDispoAuftraege.vb
+++ b/UID/cDispoAuftraege.vb
@@ -504,13 +504,13 @@ Public Class cDispoAuftraege
cmd.Parameters.AddWithValue("@atr_id", atr_id)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
- For Each l In getParameterList()
- Dim propInfo As PropertyInfo = Me.GetType.GetProperty(l.Scalarvariable)
+ For Each i In getParameterList()
+ Dim propInfo As PropertyInfo = Me.GetType.GetProperty(i.Scalarvariable)
- If dr.Item(l.Text) Is DBNull.Value Then
+ If dr.Item(i.Text) Is DBNull.Value Then
propInfo.SetValue(Me, Nothing)
Else
- propInfo.SetValue(Me, dr.Item(l.Text))
+ propInfo.SetValue(Me, dr.Item(i.Text))
End If
Next
diff --git a/UID/frmAuftragNEU.vb b/UID/frmAuftragNEU.vb
index 1efacfe..a813f36 100644
--- a/UID/frmAuftragNEU.vb
+++ b/UID/frmAuftragNEU.vb
@@ -612,15 +612,15 @@ Public Class frmAuftragNEU
For Each r In Leistungen
Dim u As New usrcntlLeistungen(r.LeistungsNr, r.LeistungsBez, r.Steuerpflichtig, r.LeistungsIdDispo)
If AUFTRAG.BH_rechnungen IsNot Nothing AndAlso AUFTRAG.BH_rechnungen.Count > 0 Then
- For Each l In AUFTRAG.BH_rechnungen
- If (l.bhrg_leistungIdDispo IsNot Nothing And l.bhrg_leistungIdDispo = r.LeistungsIdDispo) Or (l.bhrg_leistungIdDispo Is Nothing And l.bhrg_code = r.LeistungsNr) Then
+ For Each re In AUFTRAG.BH_rechnungen
+ If (re.bhrg_leistungIdDispo IsNot Nothing And re.bhrg_leistungIdDispo = r.LeistungsIdDispo) Or (re.bhrg_leistungIdDispo Is Nothing And re.bhrg_code = r.LeistungsNr) Then
' MsgBox(l.bhrg_option)
- Select Case l.bhrg_option
- Case 1 : u.txtBetrag_Auftraggeber._value = getDBL(l.bhrg_pfl) + getDBL(l.bhrg_frei) : u.lblLeistung.Text = If(l.bhrg_vermerk, r.LeistungsBez)
- Case 2 : u.txtBetrag_Absender._value = getDBL(l.bhrg_pfl) + getDBL(l.bhrg_frei) : u.lblLeistung.Text = If(l.bhrg_vermerk, r.LeistungsBez)
- Case 3 : u.txtBetrag_Empfaenger._value = getDBL(l.bhrg_pfl) + getDBL(l.bhrg_frei) : u.lblLeistung.Text = If(l.bhrg_vermerk, r.LeistungsBez)
- Case 4 : u.txtBetrag_FraechterBis._value = getDBL(l.bhrg_pfl) + getDBL(l.bhrg_frei) : u.lblLeistung.Text = If(l.bhrg_vermerk, r.LeistungsBez)
- Case 5 : u.txtBetrag_FraechterAb._value = getDBL(l.bhrg_pfl) + getDBL(l.bhrg_frei) : u.lblLeistung.Text = If(l.bhrg_vermerk, r.LeistungsBez)
+ Select Case re.bhrg_option
+ Case 1 : u.txtBetrag_Auftraggeber._value = getDBL(re.bhrg_pfl) + getDBL(re.bhrg_frei) : u.lblLeistung.Text = If(re.bhrg_vermerk, r.LeistungsBez)
+ Case 2 : u.txtBetrag_Absender._value = getDBL(re.bhrg_pfl) + getDBL(re.bhrg_frei) : u.lblLeistung.Text = If(re.bhrg_vermerk, r.LeistungsBez)
+ Case 3 : u.txtBetrag_Empfaenger._value = getDBL(re.bhrg_pfl) + getDBL(re.bhrg_frei) : u.lblLeistung.Text = If(re.bhrg_vermerk, r.LeistungsBez)
+ Case 4 : u.txtBetrag_FraechterBis._value = getDBL(re.bhrg_pfl) + getDBL(re.bhrg_frei) : u.lblLeistung.Text = If(re.bhrg_vermerk, r.LeistungsBez)
+ Case 5 : u.txtBetrag_FraechterAb._value = getDBL(re.bhrg_pfl) + getDBL(re.bhrg_frei) : u.lblLeistung.Text = If(re.bhrg_vermerk, r.LeistungsBez)
End Select
End If
Next
@@ -1612,16 +1612,16 @@ Public Class frmAuftragNEU
initCMR2.CMR_Stempel_Frachtführer_2 = initCMR2.CMR_Frachtführer_3
- For Each l In AUFTRAG.LADUNGEN
+ For Each lad In AUFTRAG.LADUNGEN
Dim POS As New SDL.cCMRPos
- POS.Zeichen = l.lad_ZeNr
- POS.Anzahl = l.lad_Anzahl
- POS.Art = l.lad_Art
- POS.Bezeichnung = l.lad_Bezeichnung
- POS.StatistikNr = l.lad_StatNr
- POS.Bruttogewicht = l.lad_BruttoKg
- POS.Umfang = l.lad_Umfang
+ POS.Zeichen = lad.lad_ZeNr
+ POS.Anzahl = lad.lad_Anzahl
+ POS.Art = lad.lad_Art
+ POS.Bezeichnung = lad.lad_Bezeichnung
+ POS.StatistikNr = lad.lad_StatNr
+ POS.Bruttogewicht = lad.lad_BruttoKg
+ POS.Umfang = lad.lad_Umfang
initCMR2.CMRPos.Add(POS)
Next
@@ -1954,15 +1954,15 @@ Public Class frmAuftragNEU
If SPEDBUCH.Packstücke IsNot Nothing AndAlso SPEDBUCH.Packstücke.StartsWith(" / ") Then SPEDBUCH.Packstücke = Replace(SPEDBUCH.Packstücke, " / ", "", , 1)
Dim rohmasse As Double = 0.0
- For Each l In AUFTRAG.LADUNGEN
+ For Each lad In AUFTRAG.LADUNGEN
' SPEDBUCH.Packstücke &= vbNewLine & If(l.lad_Anzahl, "") & " " & If(l.lad_Art, "Pk") & " " & If(l.lad_Bezeichnung, "-")
- SPEDBUCH.Packstücke &= "; " & If(l.lad_Anzahl, "") & " " & If(l.lad_Art, "Pk") & " " & If(l.lad_Bezeichnung, "-")
- If l.lad_BruttoKg IsNot Nothing AndAlso l.lad_BruttoKg <> "" Then
- SPEDBUCH.Packstücke &= ", " & l.lad_BruttoKg
- If Not (l.lad_BruttoKg.Contains("kg") Or l.lad_BruttoKg.Contains("to") Or l.lad_BruttoKg.Contains("t")) Then SPEDBUCH.Packstücke &= " kg"
+ SPEDBUCH.Packstücke &= "; " & If(lad.lad_Anzahl, "") & " " & If(lad.lad_Art, "Pk") & " " & If(lad.lad_Bezeichnung, "-")
+ If lad.lad_BruttoKg IsNot Nothing AndAlso lad.lad_BruttoKg <> "" Then
+ SPEDBUCH.Packstücke &= ", " & lad.lad_BruttoKg
+ If Not (lad.lad_BruttoKg.Contains("kg") Or lad.lad_BruttoKg.Contains("to") Or lad.lad_BruttoKg.Contains("t")) Then SPEDBUCH.Packstücke &= " kg"
End If
- Dim kg = If(l.lad_BruttoKg, "").Trim
+ Dim kg = If(lad.lad_BruttoKg, "").Trim
kg = kg.ToLower.Replace("kg", "").Replace("to", "").Replace("t", "")
If IsNumeric(kg) Then rohmasse += CDbl(kg)
Next
diff --git a/UID/frmCMR.vb b/UID/frmCMR.vb
index 44bee24..8229e0c 100644
--- a/UID/frmCMR.vb
+++ b/UID/frmCMR.vb
@@ -254,7 +254,7 @@ Public Class frmCMR
If Not auftrag.atr_ladungen Is Nothing Then
- For Each l In auftrag.atr_ladungen
+ For Each lad In auftrag.atr_ladungen
dgvLadungen.Rows.Add(auftrag.atr_ladungen(0).lad_ZeNr, auftrag.atr_ladungen(0).lad_Anzahl, auftrag.atr_ladungen(0).lad_Art, auftrag.atr_ladungen(0).lad_Bezeichnung, auftrag.atr_ladungen(0).lad_StatNr, auftrag.atr_ladungen(0).lad_BruttoKg, auftrag.atr_ladungen(0).lad_Umfang)
Next
End If
diff --git a/UID/frmLogin.vb b/UID/frmLogin.vb
index b3d76a7..279f5c5 100644
--- a/UID/frmLogin.vb
+++ b/UID/frmLogin.vb
@@ -34,10 +34,10 @@
End Sub
Private Sub frmLogin_Load(sender As Object, e As EventArgs) Handles Me.Load
- If sAppPath Like "*\bin\Debug" Then
- txtUser.Text = "sebastian"
- txtPwd.Text = "verag#3"
- End If
+ 'If sAppPath Like "*\bin\Debug" Then
+ ' txtUser.Text = "sebastian"
+ ' txtPwd.Text = "verag#3"
+ 'End If
If TESTSYSTEM Then lblTestsystem.Visible = True
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = TESTSYSTEM
'Dim tmp As String
diff --git a/UID/frmMain/frmMainV2.Designer.vb b/UID/frmMain/frmMainV2.Designer.vb
index 73a0c34..bc7b29b 100644
--- a/UID/frmMain/frmMainV2.Designer.vb
+++ b/UID/frmMain/frmMainV2.Designer.vb
@@ -43,6 +43,7 @@ Partial Class frmMainV2
Me.PanMain = New System.Windows.Forms.Panel()
Me.UidDataSet1 = New DISPO.UIDDataSet()
Me.Timer_Refresh = New System.Windows.Forms.Timer(Me.components)
+ Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.ContextMenuStrip1.SuspendLayout()
Me.PanOben.SuspendLayout()
@@ -76,6 +77,7 @@ Partial Class frmMainV2
'
'PanOben
'
+ Me.PanOben.Controls.Add(Me.btnMitarbeiterKonto)
Me.PanOben.Controls.Add(Me.btnFrachtkosten)
Me.PanOben.Controls.Add(Me.btnAuftraege)
Me.PanOben.Controls.Add(Me.btnFirmen)
@@ -83,7 +85,7 @@ Partial Class frmMainV2
Me.PanOben.Dock = System.Windows.Forms.DockStyle.Top
Me.PanOben.Location = New System.Drawing.Point(0, 0)
Me.PanOben.Name = "PanOben"
- Me.PanOben.Size = New System.Drawing.Size(1587, 48)
+ Me.PanOben.Size = New System.Drawing.Size(1587, 82)
Me.PanOben.TabIndex = 15
'
'btnFrachtkosten
@@ -242,10 +244,10 @@ Partial Class frmMainV2
'PanMain
'
Me.PanMain.Dock = System.Windows.Forms.DockStyle.Fill
- Me.PanMain.Location = New System.Drawing.Point(0, 48)
+ Me.PanMain.Location = New System.Drawing.Point(0, 82)
Me.PanMain.Margin = New System.Windows.Forms.Padding(0)
Me.PanMain.Name = "PanMain"
- Me.PanMain.Size = New System.Drawing.Size(1587, 887)
+ Me.PanMain.Size = New System.Drawing.Size(1587, 853)
Me.PanMain.TabIndex = 17
'
'UidDataSet1
@@ -258,6 +260,24 @@ Partial Class frmMainV2
Me.Timer_Refresh.Enabled = True
Me.Timer_Refresh.Interval = 5000
'
+ 'btnMitarbeiterKonto
+ '
+ Me.btnMitarbeiterKonto.allowBorder = False
+ Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White
+ Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0
+ Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black
+ Me.btnMitarbeiterKonto.Image = CType(resources.GetObject("btnMitarbeiterKonto.Image"), System.Drawing.Image)
+ Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1457, 4)
+ Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto"
+ Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(118, 67)
+ Me.btnMitarbeiterKonto.TabIndex = 88
+ Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer"
+ Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False
+ '
'frmMainV2
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -301,4 +321,5 @@ Partial Class frmMainV2
Friend WithEvents Label20 As Label
Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
Friend WithEvents ChatANAUSToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents btnMitarbeiterKonto As VERAG_PROG_ALLGEMEIN.FlatButton
End Class
diff --git a/UID/frmMain/frmMainV2.resx b/UID/frmMain/frmMainV2.resx
index c56a8d2..e79afcf 100644
--- a/UID/frmMain/frmMainV2.resx
+++ b/UID/frmMain/frmMainV2.resx
@@ -121,10 +121,41 @@
265, 17
+
+
+ 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
- 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
+ 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
@@ -150,7 +181,7 @@
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
- EwAACxMBAJqcGAAAAv1JREFUSEutl8urTlEYhz867gZIbpHLyCUppRASSpFrDNxDuYVIokxMkIGRP4Ew
+ EgAACxIB0t1+/AAAAv1JREFUSEutl8urTlEYhz867gZIbpHLyCUppRASSpFrDNxDuYVIokxMkIGRP4Ew
MBBl4BpKhGKgDKQkUmYUivA8+9vvaZ119ufzHedXz9lrrb33+1uXd639nRpqg97QKyHq/6M0Xoqx9SwK
/aFfieU+oIbClBaYXDIIlHHS2B3i2wsb+pbXojdoFXyC313gI2wD5cCMnWJbu3Fquh6qArbKTFDGTqVn
8cfhh+lmyAO8gCtwtQk+8xzivdMQcvpXgktSKE2krZAaBs7Av2oZxHuHbEDj4DVE+1poH6lrEjdy9oAq
@@ -169,7 +200,7 @@
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
- EwAACxMBAJqcGAAAA19JREFUSEvFlm1IU1EYx8+GzvWlNFZ+2lB8QSQsKkVQ3IeJ4CwjKIggFCMQKhoR
+ EgAACxIB0t1+/AAAA19JREFUSEvFlm1IU1EYx8+GzvWlNFZ+2lB8QSQsKkVQ3IeJ4CwjKIggFCMQKhoR
EURE0Icghi/pzEq/RBEGpUuRBmpiNEYURMV6JQqMgl7MCiKo9f8/7syxq4V0sz/82H1e7vOcc+/OOVct
QDVgGhwQaxG1HcTASbEWUY2AjU+IZVQaOAMOi2WidgM2bhHLqOWA8S9imaiDgIU7xTLKCRh/KJaJOgZY
+JxYRhUBxp+IZaL8gIXPi2XUesD4c7FM1GnAwpfFMsoNGH8ploniTFk4KJZRGwDjb4CVDrN0BbBwSCyj
diff --git a/UID/frmMain/frmMainV2.vb b/UID/frmMain/frmMainV2.vb
index efd9287..409d99a 100644
--- a/UID/frmMain/frmMainV2.vb
+++ b/UID/frmMain/frmMainV2.vb
@@ -1,4 +1,7 @@
-Public Class frmMainV2
+Imports System.Drawing.Drawing2D
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmMainV2
Private Declare Function GetActiveWindow Lib "user32" Alias "GetActiveWindow" () As IntPtr
Public Shared cUserSettings As New cUsersettings
@@ -50,6 +53,10 @@
cUserSettings.load()
ShowChat()
btnAuftraege.PerformClick()
+
+ btnMitarbeiterKonto.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+ setProfileImage()
+
End Sub
Private Sub btnSchliessen_Click(sender As Object, e As EventArgs) Handles btnSchliessen.Click
@@ -156,5 +163,68 @@
ShowChat()
End Sub
+ Private Sub btnMitarbeiterKonto_Click(sender As Object, e As EventArgs) Handles btnMitarbeiterKonto.Click
+ Me.Cursor = Cursors.WaitCursor
+ Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)
+ f.Show()
+ Me.Cursor = Cursors.Default
+ End Sub
+
+ Public Sub setProfileImage()
+ Try
+ If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId IsNot Nothing Then
+
+ Dim originalImage = Image.FromFile(cDATENSERVER.GET_PDFPath_BY_DocID(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_foto_DocId)) 'My.Resources.Koerfez61
+
+ Dim picSize = 35
+
+ Dim space_X As Integer = 0
+ Dim space_Y As Integer = 0
+ Dim picWidth As Integer = 0
+ Dim picHheight As Integer = 0
+
+ Dim factor As Double = 1
+ If originalImage.Height < originalImage.Width Then
+ factor = picSize / originalImage.Height
+ picWidth = originalImage.Width * factor
+ picHheight = originalImage.Height * factor
+
+
+ Else
+ factor = picSize / originalImage.Width
+ picWidth = originalImage.Width * factor
+ picHheight = originalImage.Height * factor
+
+ End If
+
+
+ Dim croppedImage As New Bitmap(picWidth, picHheight)
+
+ Using g = Graphics.FromImage(croppedImage)
+ Dim path As New GraphicsPath
+
+
+ path.AddEllipse(0, 0, picSize, picSize)
+
+ Dim reg As New Region(path)
+
+
+ g.Clip = reg
+
+ g.DrawImage(originalImage, 0, 0, picWidth, picHheight)
+ End Using
+
+
+ btnMitarbeiterKonto.Image = croppedImage
+
+ Exit Sub
+ End If
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+
+ End Try
+ 'btnMitarbeiterKonto.Image = My.Resources.mitarbeiter_s
+
+ End Sub
End Class
\ No newline at end of file
diff --git a/UID/frmPrintView.Designer.vb b/UID/frmPrintView.Designer.vb
index 72b1e5b..4a692dd 100644
--- a/UID/frmPrintView.Designer.vb
+++ b/UID/frmPrintView.Designer.vb
@@ -33,7 +33,7 @@ Partial Class frmPrintView
Me.ReportViewer1.LocalReport.ReportEmbeddedResource = "UID.rptDetailsPrint.rdlc"
Me.ReportViewer1.Location = New System.Drawing.Point(0, 0)
Me.ReportViewer1.Name = "ReportViewer1"
- Me.ReportViewer1.ServerReport.BearerToken = Nothing
+ 'Me.ReportViewer1.ServerReport.BearerToken = Nothing
Me.ReportViewer1.Size = New System.Drawing.Size(856, 612)
Me.ReportViewer1.TabIndex = 0
'
diff --git a/UID/licenses.licx b/UID/licenses.licx
index 98d441c..8b13789 100644
--- a/UID/licenses.licx
+++ b/UID/licenses.licx
@@ -1,2 +1 @@
-GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win.v9, Version=9.1.2302.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
-GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports.v9, Version=9.1.2302.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
+