Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL
This commit is contained in:
@@ -146,6 +146,7 @@ Public Class cMessenger
|
||||
Me.chat_erstelltMaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
|
||||
Me.chat_erstelltAm = Now
|
||||
Me.chat_art = "LKW_CHAT"
|
||||
If chat_SendungsId > 0 Then Me.chat_art = "SND_CHAT"
|
||||
LOAD_ByLKW(chat_AvisoId, chat_SendungsId, chat_art, topMax, dateTmp)
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -28,15 +28,15 @@ Partial Class frmMitarbeitersuche
|
||||
Me.Button4 = New System.Windows.Forms.Button()
|
||||
Me.btnClose = New System.Windows.Forms.Button()
|
||||
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
|
||||
Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
|
||||
Me.pnlMain = New System.Windows.Forms.Panel()
|
||||
Me.pnl = New System.Windows.Forms.Panel()
|
||||
Me.pnlZeiten = New System.Windows.Forms.Panel()
|
||||
Me.Button1 = New System.Windows.Forms.Button()
|
||||
Me.cbxHomeoffice = New System.Windows.Forms.CheckBox()
|
||||
Me.btnZEGehen = New System.Windows.Forms.Button()
|
||||
Me.btnZEKommen = New System.Windows.Forms.Button()
|
||||
Me.lblTimasSaldo = New System.Windows.Forms.Label()
|
||||
Me.lblMAId = New System.Windows.Forms.Label()
|
||||
Me.PictureBox9 = New System.Windows.Forms.PictureBox()
|
||||
Me.Label5 = New System.Windows.Forms.Label()
|
||||
Me.btnSettings = New System.Windows.Forms.Button()
|
||||
Me.lblTimasZeiten = New System.Windows.Forms.Label()
|
||||
@@ -63,6 +63,11 @@ Partial Class frmMitarbeitersuche
|
||||
Me.pnlGeburtstag = New System.Windows.Forms.Panel()
|
||||
Me.lblGeburtstag = New System.Windows.Forms.Label()
|
||||
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
|
||||
Me.Label9 = New System.Windows.Forms.Label()
|
||||
Me.Label12 = New System.Windows.Forms.Label()
|
||||
Me.Panel2 = New System.Windows.Forms.Panel()
|
||||
Me.Label13 = New System.Windows.Forms.Label()
|
||||
Me.lblStatusZE = New System.Windows.Forms.Label()
|
||||
Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
|
||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||
Me.lblPosition = New System.Windows.Forms.Label()
|
||||
@@ -73,13 +78,12 @@ Partial Class frmMitarbeitersuche
|
||||
Me.lblFirma = New System.Windows.Forms.Label()
|
||||
Me.Label4 = New System.Windows.Forms.Label()
|
||||
Me.Label3 = New System.Windows.Forms.Label()
|
||||
Me.cbxHomeoffice = New System.Windows.Forms.CheckBox()
|
||||
Me.sbMitarbeiter = New VERAG_PROG_ALLGEMEIN.MySearchBox()
|
||||
Me.pnlSrch.SuspendLayout()
|
||||
CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.pnlMain.SuspendLayout()
|
||||
Me.pnl.SuspendLayout()
|
||||
Me.pnlZeiten.SuspendLayout()
|
||||
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.pnlWohnadresse.SuspendLayout()
|
||||
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.pnlMotto.SuspendLayout()
|
||||
@@ -87,6 +91,7 @@ Partial Class frmMitarbeitersuche
|
||||
CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.pnlGeburtstag.SuspendLayout()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.Panel2.SuspendLayout()
|
||||
Me.MyPanel1.SuspendLayout()
|
||||
Me.SuspendLayout()
|
||||
'
|
||||
@@ -145,32 +150,6 @@ Partial Class frmMitarbeitersuche
|
||||
Me.PictureBox2.TabIndex = 18
|
||||
Me.PictureBox2.TabStop = False
|
||||
'
|
||||
'sbMitarbeiter
|
||||
'
|
||||
Me.sbMitarbeiter._allowFreitext = False
|
||||
Me.sbMitarbeiter._AllowSetValue = False
|
||||
Me.sbMitarbeiter._allowSpaceAsSplitter = True
|
||||
Me.sbMitarbeiter._autoSizeGross = False
|
||||
Me.sbMitarbeiter._hideIfListEmpty = True
|
||||
Me.sbMitarbeiter._value = Nothing
|
||||
Me.sbMitarbeiter.conn_art = "FMZOLL"
|
||||
Me.sbMitarbeiter.dgvpos = "LEFT"
|
||||
Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
|
||||
Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
|
||||
Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
|
||||
Me.sbMitarbeiter.key_visible = False
|
||||
Me.sbMitarbeiter.KEYPARAM = Nothing
|
||||
Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
|
||||
Me.sbMitarbeiter.Name = "sbMitarbeiter"
|
||||
Me.sbMitarbeiter.searchActive = True
|
||||
Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
|
||||
Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
|
||||
Me.sbMitarbeiter.SQL_SELECT = Nothing
|
||||
Me.sbMitarbeiter.SQL_WHERE = Nothing
|
||||
Me.sbMitarbeiter.SQL_WhereParamList = Nothing
|
||||
Me.sbMitarbeiter.TabIndex = 0
|
||||
Me.sbMitarbeiter.usrcntl = Nothing
|
||||
'
|
||||
'pnlMain
|
||||
'
|
||||
Me.pnlMain.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
|
||||
@@ -179,16 +158,16 @@ Partial Class frmMitarbeitersuche
|
||||
Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.pnlMain.Location = New System.Drawing.Point(0, 48)
|
||||
Me.pnlMain.Name = "pnlMain"
|
||||
Me.pnlMain.Size = New System.Drawing.Size(776, 456)
|
||||
Me.pnlMain.Size = New System.Drawing.Size(776, 482)
|
||||
Me.pnlMain.TabIndex = 1
|
||||
'
|
||||
'pnl
|
||||
'
|
||||
Me.pnl.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
|
||||
Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
|
||||
Me.pnl.Controls.Add(Me.Panel2)
|
||||
Me.pnl.Controls.Add(Me.pnlZeiten)
|
||||
Me.pnl.Controls.Add(Me.lblMAId)
|
||||
Me.pnl.Controls.Add(Me.PictureBox9)
|
||||
Me.pnl.Controls.Add(Me.Label5)
|
||||
Me.pnl.Controls.Add(Me.btnSettings)
|
||||
Me.pnl.Controls.Add(Me.lblTimasZeiten)
|
||||
@@ -213,54 +192,88 @@ Partial Class frmMitarbeitersuche
|
||||
Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
|
||||
Me.pnl.Location = New System.Drawing.Point(0, 0)
|
||||
Me.pnl.Name = "pnl"
|
||||
Me.pnl.Size = New System.Drawing.Size(774, 454)
|
||||
Me.pnl.Size = New System.Drawing.Size(774, 480)
|
||||
Me.pnl.TabIndex = 24
|
||||
'
|
||||
'pnlZeiten
|
||||
'
|
||||
Me.pnlZeiten.Controls.Add(Me.cbxHomeoffice)
|
||||
Me.pnlZeiten.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
|
||||
Me.pnlZeiten.BackColor = System.Drawing.Color.Cornsilk
|
||||
Me.pnlZeiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
|
||||
Me.pnlZeiten.Controls.Add(Me.Label12)
|
||||
Me.pnlZeiten.Controls.Add(Me.Label9)
|
||||
Me.pnlZeiten.Controls.Add(Me.Button1)
|
||||
Me.pnlZeiten.Controls.Add(Me.btnZEGehen)
|
||||
Me.pnlZeiten.Controls.Add(Me.btnZEKommen)
|
||||
Me.pnlZeiten.Controls.Add(Me.lblTimasSaldo)
|
||||
Me.pnlZeiten.Location = New System.Drawing.Point(58, 393)
|
||||
Me.pnlZeiten.Controls.Add(Me.cbxHomeoffice)
|
||||
Me.pnlZeiten.Location = New System.Drawing.Point(0, 402)
|
||||
Me.pnlZeiten.Name = "pnlZeiten"
|
||||
Me.pnlZeiten.Size = New System.Drawing.Size(569, 48)
|
||||
Me.pnlZeiten.Size = New System.Drawing.Size(591, 66)
|
||||
Me.pnlZeiten.TabIndex = 22
|
||||
'
|
||||
'Button1
|
||||
'
|
||||
Me.Button1.BackColor = System.Drawing.Color.White
|
||||
Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
|
||||
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.Button1.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.zeiterfassung_s
|
||||
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.TopLeft
|
||||
Me.Button1.Location = New System.Drawing.Point(9, 17)
|
||||
Me.Button1.Name = "Button1"
|
||||
Me.Button1.Size = New System.Drawing.Size(123, 45)
|
||||
Me.Button1.TabIndex = 126
|
||||
Me.Button1.Text = "Zeiterfassung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Online"
|
||||
Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.Button1.UseVisualStyleBackColor = False
|
||||
'
|
||||
'cbxHomeoffice
|
||||
'
|
||||
Me.cbxHomeoffice.AutoSize = True
|
||||
Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
|
||||
Me.cbxHomeoffice.Location = New System.Drawing.Point(351, 1)
|
||||
Me.cbxHomeoffice.Name = "cbxHomeoffice"
|
||||
Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
|
||||
Me.cbxHomeoffice.TabIndex = 125
|
||||
Me.cbxHomeoffice.Text = "Homeoffice"
|
||||
Me.cbxHomeoffice.UseVisualStyleBackColor = True
|
||||
'
|
||||
'btnZEGehen
|
||||
'
|
||||
Me.btnZEGehen.BackColor = System.Drawing.Color.White
|
||||
Me.btnZEGehen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
|
||||
Me.btnZEGehen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnZEGehen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_gehen
|
||||
Me.btnZEGehen.ImageAlign = System.Drawing.ContentAlignment.TopRight
|
||||
Me.btnZEGehen.Location = New System.Drawing.Point(460, 0)
|
||||
Me.btnZEGehen.Location = New System.Drawing.Point(463, 16)
|
||||
Me.btnZEGehen.Name = "btnZEGehen"
|
||||
Me.btnZEGehen.Size = New System.Drawing.Size(95, 45)
|
||||
Me.btnZEGehen.Size = New System.Drawing.Size(107, 45)
|
||||
Me.btnZEGehen.TabIndex = 124
|
||||
Me.btnZEGehen.Text = "GEHEN"
|
||||
Me.btnZEGehen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnZEGehen.UseVisualStyleBackColor = True
|
||||
Me.btnZEGehen.UseVisualStyleBackColor = False
|
||||
'
|
||||
'btnZEKommen
|
||||
'
|
||||
Me.btnZEKommen.BackColor = System.Drawing.Color.White
|
||||
Me.btnZEKommen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
|
||||
Me.btnZEKommen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnZEKommen.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.ze_kommen
|
||||
Me.btnZEKommen.ImageAlign = System.Drawing.ContentAlignment.TopLeft
|
||||
Me.btnZEKommen.Location = New System.Drawing.Point(348, 0)
|
||||
Me.btnZEKommen.Location = New System.Drawing.Point(351, 16)
|
||||
Me.btnZEKommen.Name = "btnZEKommen"
|
||||
Me.btnZEKommen.Size = New System.Drawing.Size(106, 45)
|
||||
Me.btnZEKommen.TabIndex = 123
|
||||
Me.btnZEKommen.Text = "KOMMEN"
|
||||
Me.btnZEKommen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
Me.btnZEKommen.UseVisualStyleBackColor = True
|
||||
Me.btnZEKommen.UseVisualStyleBackColor = False
|
||||
'
|
||||
'lblTimasSaldo
|
||||
'
|
||||
Me.lblTimasSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
|
||||
Me.lblTimasSaldo.Location = New System.Drawing.Point(7, 9)
|
||||
Me.lblTimasSaldo.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
|
||||
Me.lblTimasSaldo.Location = New System.Drawing.Point(148, 21)
|
||||
Me.lblTimasSaldo.Name = "lblTimasSaldo"
|
||||
Me.lblTimasSaldo.Size = New System.Drawing.Size(223, 24)
|
||||
Me.lblTimasSaldo.Size = New System.Drawing.Size(198, 24)
|
||||
Me.lblTimasSaldo.TabIndex = 30
|
||||
'
|
||||
'lblMAId
|
||||
@@ -275,16 +288,6 @@ Partial Class frmMitarbeitersuche
|
||||
Me.lblMAId.Text = "12345"
|
||||
Me.lblMAId.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
'
|
||||
'PictureBox9
|
||||
'
|
||||
Me.PictureBox9.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_green
|
||||
Me.PictureBox9.Location = New System.Drawing.Point(18, 396)
|
||||
Me.PictureBox9.Name = "PictureBox9"
|
||||
Me.PictureBox9.Size = New System.Drawing.Size(34, 34)
|
||||
Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
|
||||
Me.PictureBox9.TabIndex = 120
|
||||
Me.PictureBox9.TabStop = False
|
||||
'
|
||||
'Label5
|
||||
'
|
||||
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
@@ -301,9 +304,9 @@ Partial Class frmMitarbeitersuche
|
||||
Me.btnSettings.FlatStyle = System.Windows.Forms.FlatStyle.Flat
|
||||
Me.btnSettings.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.wheel_s
|
||||
Me.btnSettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
Me.btnSettings.Location = New System.Drawing.Point(641, 394)
|
||||
Me.btnSettings.Location = New System.Drawing.Point(646, 95)
|
||||
Me.btnSettings.Name = "btnSettings"
|
||||
Me.btnSettings.Size = New System.Drawing.Size(125, 45)
|
||||
Me.btnSettings.Size = New System.Drawing.Size(125, 61)
|
||||
Me.btnSettings.TabIndex = 29
|
||||
Me.btnSettings.Text = "Einstellungen"
|
||||
Me.btnSettings.TextAlign = System.Drawing.ContentAlignment.MiddleRight
|
||||
@@ -368,7 +371,7 @@ Partial Class frmMitarbeitersuche
|
||||
'
|
||||
Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
|
||||
Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom
|
||||
Me.Panel3.Location = New System.Drawing.Point(0, 441)
|
||||
Me.Panel3.Location = New System.Drawing.Point(0, 467)
|
||||
Me.Panel3.Name = "Panel3"
|
||||
Me.Panel3.Size = New System.Drawing.Size(774, 13)
|
||||
Me.Panel3.TabIndex = 26
|
||||
@@ -547,6 +550,66 @@ Partial Class frmMitarbeitersuche
|
||||
Me.PictureBox1.TabIndex = 13
|
||||
Me.PictureBox1.TabStop = False
|
||||
'
|
||||
'Label9
|
||||
'
|
||||
Me.Label9.AutoSize = True
|
||||
Me.Label9.BackColor = System.Drawing.Color.Transparent
|
||||
Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
|
||||
Me.Label9.Location = New System.Drawing.Point(10, 2)
|
||||
Me.Label9.Name = "Label9"
|
||||
Me.Label9.Size = New System.Drawing.Size(71, 13)
|
||||
Me.Label9.TabIndex = 30
|
||||
Me.Label9.Text = "Zeiterfassung"
|
||||
Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
'
|
||||
'Label12
|
||||
'
|
||||
Me.Label12.AutoSize = True
|
||||
Me.Label12.BackColor = System.Drawing.Color.Transparent
|
||||
Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
|
||||
Me.Label12.Location = New System.Drawing.Point(145, 2)
|
||||
Me.Label12.Name = "Label12"
|
||||
Me.Label12.Size = New System.Drawing.Size(117, 13)
|
||||
Me.Label12.TabIndex = 127
|
||||
Me.Label12.Text = "Saldo (letzte Buchung):"
|
||||
Me.Label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
'
|
||||
'Panel2
|
||||
'
|
||||
Me.Panel2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
|
||||
Me.Panel2.BackColor = System.Drawing.Color.Cornsilk
|
||||
Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
|
||||
Me.Panel2.Controls.Add(Me.lblStatusZE)
|
||||
Me.Panel2.Controls.Add(Me.Label13)
|
||||
Me.Panel2.Location = New System.Drawing.Point(590, 402)
|
||||
Me.Panel2.Name = "Panel2"
|
||||
Me.Panel2.Size = New System.Drawing.Size(185, 66)
|
||||
Me.Panel2.TabIndex = 128
|
||||
'
|
||||
'Label13
|
||||
'
|
||||
Me.Label13.AutoSize = True
|
||||
Me.Label13.BackColor = System.Drawing.Color.Transparent
|
||||
Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
|
||||
Me.Label13.Location = New System.Drawing.Point(7, 2)
|
||||
Me.Label13.Name = "Label13"
|
||||
Me.Label13.Size = New System.Drawing.Size(113, 13)
|
||||
Me.Label13.TabIndex = 128
|
||||
Me.Label13.Text = "Status (Zeiterfassung):"
|
||||
Me.Label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
'
|
||||
'lblStatusZE
|
||||
'
|
||||
Me.lblStatusZE.BackColor = System.Drawing.Color.Firebrick
|
||||
Me.lblStatusZE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
|
||||
Me.lblStatusZE.ForeColor = System.Drawing.Color.White
|
||||
Me.lblStatusZE.Location = New System.Drawing.Point(7, 17)
|
||||
Me.lblStatusZE.Name = "lblStatusZE"
|
||||
Me.lblStatusZE.Size = New System.Drawing.Size(174, 25)
|
||||
Me.lblStatusZE.TabIndex = 12
|
||||
Me.lblStatusZE.Text = "OFFLINE"
|
||||
Me.lblStatusZE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
|
||||
'
|
||||
'MyPanel1
|
||||
'
|
||||
Me.MyPanel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(250, Byte), Integer), CType(CType(254, Byte), Integer), CType(CType(255, Byte), Integer))
|
||||
@@ -660,16 +723,31 @@ Partial Class frmMitarbeitersuche
|
||||
Me.Label3.Text = "Niederlassung:"
|
||||
Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
|
||||
'
|
||||
'cbxHomeoffice
|
||||
'sbMitarbeiter
|
||||
'
|
||||
Me.cbxHomeoffice.AutoSize = True
|
||||
Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
|
||||
Me.cbxHomeoffice.Location = New System.Drawing.Point(262, 7)
|
||||
Me.cbxHomeoffice.Name = "cbxHomeoffice"
|
||||
Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
|
||||
Me.cbxHomeoffice.TabIndex = 125
|
||||
Me.cbxHomeoffice.Text = "Homeoffice"
|
||||
Me.cbxHomeoffice.UseVisualStyleBackColor = True
|
||||
Me.sbMitarbeiter._allowFreitext = False
|
||||
Me.sbMitarbeiter._AllowSetValue = False
|
||||
Me.sbMitarbeiter._allowSpaceAsSplitter = True
|
||||
Me.sbMitarbeiter._autoSizeGross = False
|
||||
Me.sbMitarbeiter._hideIfListEmpty = True
|
||||
Me.sbMitarbeiter._value = Nothing
|
||||
Me.sbMitarbeiter.conn_art = "FMZOLL"
|
||||
Me.sbMitarbeiter.dgvpos = "LEFT"
|
||||
Me.sbMitarbeiter.DISPLAY_PARAM = Nothing
|
||||
Me.sbMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!)
|
||||
Me.sbMitarbeiter.INVISIBLE_COLUMNS = Nothing
|
||||
Me.sbMitarbeiter.key_visible = False
|
||||
Me.sbMitarbeiter.KEYPARAM = Nothing
|
||||
Me.sbMitarbeiter.Location = New System.Drawing.Point(45, 11)
|
||||
Me.sbMitarbeiter.Name = "sbMitarbeiter"
|
||||
Me.sbMitarbeiter.searchActive = True
|
||||
Me.sbMitarbeiter.Size = New System.Drawing.Size(582, 29)
|
||||
Me.sbMitarbeiter.SQL_ORDER_BY = Nothing
|
||||
Me.sbMitarbeiter.SQL_SELECT = Nothing
|
||||
Me.sbMitarbeiter.SQL_WHERE = Nothing
|
||||
Me.sbMitarbeiter.SQL_WhereParamList = Nothing
|
||||
Me.sbMitarbeiter.TabIndex = 0
|
||||
Me.sbMitarbeiter.usrcntl = Nothing
|
||||
'
|
||||
'frmMitarbeitersuche
|
||||
'
|
||||
@@ -677,7 +755,7 @@ Partial Class frmMitarbeitersuche
|
||||
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
|
||||
Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
|
||||
Me.BackColor = System.Drawing.Color.WhiteSmoke
|
||||
Me.ClientSize = New System.Drawing.Size(776, 504)
|
||||
Me.ClientSize = New System.Drawing.Size(776, 530)
|
||||
Me.Controls.Add(Me.pnlMain)
|
||||
Me.Controls.Add(Me.pnlSrch)
|
||||
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
|
||||
@@ -693,7 +771,6 @@ Partial Class frmMitarbeitersuche
|
||||
Me.pnl.PerformLayout()
|
||||
Me.pnlZeiten.ResumeLayout(False)
|
||||
Me.pnlZeiten.PerformLayout()
|
||||
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.pnlWohnadresse.ResumeLayout(False)
|
||||
CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.pnlMotto.ResumeLayout(False)
|
||||
@@ -702,6 +779,8 @@ Partial Class frmMitarbeitersuche
|
||||
Me.pnlGeburtstag.ResumeLayout(False)
|
||||
Me.pnlGeburtstag.PerformLayout()
|
||||
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
|
||||
Me.Panel2.ResumeLayout(False)
|
||||
Me.Panel2.PerformLayout()
|
||||
Me.MyPanel1.ResumeLayout(False)
|
||||
Me.ResumeLayout(False)
|
||||
|
||||
@@ -750,11 +829,16 @@ Partial Class frmMitarbeitersuche
|
||||
Friend WithEvents btnSettings As Windows.Forms.Button
|
||||
Friend WithEvents lblTimasZeiten As Windows.Forms.Label
|
||||
Friend WithEvents lblTimasSaldo As Windows.Forms.Label
|
||||
Friend WithEvents PictureBox9 As Windows.Forms.PictureBox
|
||||
Friend WithEvents lblMAId As Windows.Forms.Label
|
||||
Friend WithEvents Label5 As Windows.Forms.Label
|
||||
Friend WithEvents pnlZeiten As Windows.Forms.Panel
|
||||
Friend WithEvents btnZEGehen As Windows.Forms.Button
|
||||
Friend WithEvents btnZEKommen As Windows.Forms.Button
|
||||
Friend WithEvents cbxHomeoffice As Windows.Forms.CheckBox
|
||||
Friend WithEvents Button1 As Windows.Forms.Button
|
||||
Friend WithEvents Label12 As Windows.Forms.Label
|
||||
Friend WithEvents Label9 As Windows.Forms.Label
|
||||
Friend WithEvents Panel2 As Windows.Forms.Panel
|
||||
Friend WithEvents lblStatusZE As Windows.Forms.Label
|
||||
Friend WithEvents Label13 As Windows.Forms.Label
|
||||
End Class
|
||||
|
||||
@@ -49,6 +49,7 @@ Public Class frmMitarbeitersuche
|
||||
Else
|
||||
Me.Close()
|
||||
End If
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.LOAD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_id)
|
||||
initMA()
|
||||
End If
|
||||
|
||||
@@ -231,10 +232,6 @@ Public Class frmMitarbeitersuche
|
||||
initMA()
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click
|
||||
Dim webAddress As String = "https://zeit.verag.ag/webterminal/"
|
||||
Process.Start(webAddress)
|
||||
End Sub
|
||||
|
||||
|
||||
Sub setBGPic(art, MA)
|
||||
@@ -321,6 +318,7 @@ Public Class frmMitarbeitersuche
|
||||
|
||||
Private Sub initTimasSaldo()
|
||||
|
||||
lblStatusZE.Visible = False
|
||||
|
||||
btn.Visible = True
|
||||
'Eintrag für Zeitübersicht
|
||||
@@ -331,13 +329,19 @@ Public Class frmMitarbeitersuche
|
||||
Dim dtZeiten As New DataTable
|
||||
If timas IsNot Nothing Then
|
||||
timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text)
|
||||
lblStatusZE.Visible = True
|
||||
If timas.getTimeEntries(MA.mit_timasId, dtZeiten, requestDone) Then
|
||||
PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_green
|
||||
'PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_green
|
||||
lblStatusZE.BackColor = Color.Green
|
||||
lblStatusZE.Text = "ONLINE"
|
||||
|
||||
btnZEGehen.Enabled = True
|
||||
btnZEKommen.Enabled = False
|
||||
Else
|
||||
PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red
|
||||
' PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red
|
||||
lblStatusZE.Text = "OFFLINE"
|
||||
lblStatusZE.BackColor = Color.Firebrick
|
||||
|
||||
btnZEGehen.Enabled = False
|
||||
btnZEKommen.Enabled = True
|
||||
End If
|
||||
@@ -353,4 +357,9 @@ Public Class frmMitarbeitersuche
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click
|
||||
Dim webAddress As String = "https://zeit.verag.ag/webterminal/"
|
||||
Process.Start(webAddress)
|
||||
End Sub
|
||||
End Class
|
||||
@@ -610,6 +610,16 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property zeiterfassung_s() As System.Drawing.Bitmap
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("zeiterfassung_s", resourceCulture)
|
||||
Return CType(obj,System.Drawing.Bitmap)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
@@ -629,5 +639,15 @@ Namespace My.Resources
|
||||
Return CType(obj,System.Drawing.Bitmap)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property zwiterfassung() As System.Drawing.Bitmap
|
||||
Get
|
||||
Dim obj As Object = ResourceManager.GetObject("zwiterfassung", resourceCulture)
|
||||
Return CType(obj,System.Drawing.Bitmap)
|
||||
End Get
|
||||
End Property
|
||||
End Module
|
||||
End Namespace
|
||||
|
||||
@@ -127,6 +127,9 @@
|
||||
<data name="personGray_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ze_gehen" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="seal" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\seal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -139,14 +142,11 @@
|
||||
<data name="pfeil_links" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pfeil_links.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Verag_Spedition_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="seal2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\seal2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Verag-AG-Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="docAllgemein" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\docAllgemein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -166,11 +166,8 @@
|
||||
<data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TiMaS-Paket-Time" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TiMaS-Paket-Time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pfeil_unten" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="people" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Unisped_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
@@ -181,6 +178,9 @@
|
||||
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="zwiterfassung" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\zwiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ok" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -1354,12 +1354,15 @@
|
||||
<data name="IMEX-LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Verag_Customs_Service_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="house1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pdf_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Verag_Customs_Service_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="picboxNext_Enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\picboxNext_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -1375,6 +1378,54 @@
|
||||
<data name="weiblich" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\weiblich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Verag-AG-Logopng" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pfeil_rechts" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="FrontOfficeSUB_Horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pfeil_unten" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="scanner1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\scanner1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="personGray_w" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="android-note1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Verag_Spedition_GMBH_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ze_kommen" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ze_kommen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="TiMaS-Paket-Time" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\TiMaS-Paket-Time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="fremdSped" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="easteregg" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\easteregg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="uhr_notime" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\uhr_notime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ZwAbEinfuegen" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAA5YAAAPUCAYAAADWm6YZAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
|
||||
@@ -1979,51 +2030,6 @@
|
||||
Fy9uXn75Zbv0yOsRACAqTOz/AQDTq+UV1OGCAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="FrontOfficeSUB_Horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="person" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="personGray_w" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="android-note1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pfeil_rechts" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Atilla" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="house1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="fremdSped" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="easteregg" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\easteregg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="uhr_notime" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\uhr_notime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="scanner1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\scanner1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\..\..\..\AVISO\Aviso\Diverses\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -2036,16 +2042,16 @@
|
||||
<data name="house" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="stift" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="today" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="people" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="Atilla" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ze_gehen" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="ze_kommen" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\ze_kommen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
<data name="zeiterfassung_s" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
BIN
VERAG_PROG_ALLGEMEIN/Resources/zeiterfassung_s.png
Normal file
BIN
VERAG_PROG_ALLGEMEIN/Resources/zeiterfassung_s.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
VERAG_PROG_ALLGEMEIN/Resources/zwiterfassung.png
Normal file
BIN
VERAG_PROG_ALLGEMEIN/Resources/zwiterfassung.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 87 KiB |
@@ -100,7 +100,7 @@ Public Class cTimasAPI
|
||||
If saldo IsNot Nothing Then
|
||||
Dim saldoAsDouble = CDbl(saldo)
|
||||
saldoAsDouble = Math.Round(saldoAsDouble / 3600, 2)
|
||||
info = "Saldo Vortag: " & saldoAsDouble & "h"
|
||||
info = "Vortag: " & saldoAsDouble & " h"
|
||||
End If
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
Public Class cNCTS_Helper
|
||||
Imports System.Windows.Forms
|
||||
Imports System.Xml.Linq
|
||||
|
||||
Public Class cNCTS_Helper
|
||||
|
||||
|
||||
Shared Function getXLS_FremdBRG(_COMPANY As String, _BRG_TEXT As String, _BRG_VALUE As String, datVon As Date, datBis As Date, _EZOLL As Boolean) As String 'MyComboBox1._value ,cboBRG.TEXT,_BRG_VALUE,datVon.Value ,datBis.Value.ToShortDateString ,cbxEZollDaten.Checked
|
||||
@@ -18,24 +21,50 @@
|
||||
|
||||
|
||||
'DAKOSY:
|
||||
Dim sqlatr = " SELECT (SELECT TOP 1 CONVERT(varchar, [dySt_ergZeitpunkt] ,104 ) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 ) as Datum, ncts_Befoerderungsmittel_KennzeichenAbgang as Kennzeichen, isnull(ncts_MRN,'') as MRN, ncts_SumA_Befoerderer_Land as Land, nctsSA_AbgabenBetrag as GarantieBetrag, ncts_SumA_Befoerderer_Name as Firma " &
|
||||
" " & If(_BRG_TEXT.Contains("TOBB") Or _BRG_TEXT.Contains("OREGON"), ", isnull(ncts_BestimmungsstelleDienststellennummer,'') as Bestimmungsstelle ", "") & " " &
|
||||
" ,ncts_ObjectName as Bezugsnummer " &
|
||||
" , nctsSA_GRN as GRN " &
|
||||
" FROM [tblDakosy_NCTSOut] INNER JOIN [tblDakosy_NCTSOut_Sicherheitsangaben] on ncts_Id=[nctsSA_NctsId] "
|
||||
|
||||
sqlatr &= " WHERE nctsSA_GRN IN (" & _BRG_VALUE & ") and ncts_Status between 50 and 60 " ' CONVERT(date, ncts_Trans_DatumZeit ,104 ) BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'"
|
||||
'DAKOSY NCTS 004:
|
||||
Dim sqlatr = " SELECT (SELECT TOP 1 CONVERT(varchar, [dySt_ergZeitpunkt] ,104 ) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 ) as Datum, ncts_ActiveBorderTransportMeans_1_IdentificationNumber as Kennzeichen, isnull(ncts_MRN,'') as MRN,nctsGRT_AmountToBeCovered as GarantieBetrag /* ' ' as Land, , '' as Firma */" &
|
||||
" " & If(_BRG_TEXT.Contains("TOBB") Or _BRG_TEXT.Contains("OREGON"), ", isnull(ncts_CustomsOfficeOfDestinationDeclared,'') as Bestimmungsstelle ", "") & " " &
|
||||
" ,ncts_ObjectName as Bezugsnummer " &
|
||||
"FROM [tblDakosy_NCTSOut004] INNER JOIN tblDakosy_NCTSOut004_Guarantee on ncts_Id=[nctsGRT_NctsId] "
|
||||
|
||||
sqlatr &= " WHERE [nctsGRT_GRN] IN (" & _BRG_VALUE & ") and ncts_Status between 50 and 60 " ' CONVERT(date, ncts_Trans_DatumZeit ,104 ) BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'"
|
||||
sqlatr &= where
|
||||
sqlatr &= " AND (SELECT COUNT(*) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 AND CONVERT(date, [dySt_ergZeitpunkt] ,104 ) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "')>0 "
|
||||
sqlatr &= " AND ncts_Eroeffnung BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "' "
|
||||
sqlatr &= " ORDER BY Datum "
|
||||
|
||||
Dim dt As DataTable = SQL.loadDgvBySql(sqlatr, "FMZOLL", 120)
|
||||
|
||||
Dim C As New DataColumn
|
||||
C.ColumnName = "Firma"
|
||||
C.MaxLength = "30"
|
||||
dt.Columns.Add(C)
|
||||
|
||||
C = New DataColumn
|
||||
C.ColumnName = "Land"
|
||||
C.MaxLength = "3"
|
||||
dt.Columns.Add(C)
|
||||
|
||||
'Dim sqlatr = " SELECT (SELECT TOP 1 CONVERT(varchar, [dySt_ergZeitpunkt] ,104 ) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 ) as Datum, ncts_Befoerderungsmittel_KennzeichenAbgang as Kennzeichen, isnull(ncts_MRN,'') as MRN, ncts_SumA_Befoerderer_Land as Land, nctsSA_AbgabenBetrag as GarantieBetrag, ncts_SumA_Befoerderer_Name as Firma " &
|
||||
' " " & If(_BRG_TEXT.Contains("TOBB") Or _BRG_TEXT.Contains("OREGON"), ", isnull(ncts_BestimmungsstelleDienststellennummer,'') as Bestimmungsstelle ", "") & " " &
|
||||
' " ,ncts_ObjectName as Bezugsnummer " &
|
||||
' " , nctsSA_GRN as GRN " &
|
||||
' " FROM [tblDakosy_NCTSOut] INNER JOIN [tblDakosy_NCTSOut_Sicherheitsangaben] on ncts_Id=[nctsSA_NctsId] "
|
||||
|
||||
'sqlatr &= " WHERE nctsSA_GRN IN (" & _BRG_VALUE & ") and ncts_Status between 50 and 60 " ' CONVERT(date, ncts_Trans_DatumZeit ,104 ) BETWEEN '" & datVon.Value.ToShortDateString & "' AND '" & datBis.Value.ToShortDateString & "'"
|
||||
'sqlatr &= where
|
||||
'sqlatr &= " AND (SELECT COUNT(*) FROM [tblDakosy_Statusmeldungen] WHERE [dySt_dyId]=ncts_dyaAnmID AND [dySt_status] = 50 AND CONVERT(date, [dySt_ergZeitpunkt] ,104 ) BETWEEN '" & datVon.ToShortDateString & "' AND '" & datBis.ToShortDateString & "')>0 "
|
||||
'sqlatr &= " ORDER BY Datum "
|
||||
|
||||
|
||||
|
||||
' MsgBox(sqlatr)
|
||||
'Bei IMEX kein E-ZOLL
|
||||
If _COMPANY = "VERAG/ATILLA" Then
|
||||
If _EZOLL Then
|
||||
|
||||
'EZOLL:
|
||||
sqlatr = " Select TOP 100 AnmeldungsDatum As Datum , (Select [CrossIdnt] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID ) As Kennzeichen, isnull(CRN,'') as MRN, (select [CrossIdntNat] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID ) as Land, cast(GarantieWert as Decimal(17,2)) as GarantieBetrag,(SELECT [Na] FROM [ezoll].[dbo].[zsAnmCarrTra] where [zsAnmCarrTra].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID) as Firma "
|
||||
sqlatr = " Select TOP 100 AnmeldungsDatum As Datum , (Select [CrossIdnt] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID ) As Kennzeichen, isnull(CRN,'') as MRN, cast(GarantieWert as Decimal(17,2)) as GarantieBetrag, (select [CrossIdntNat] FROM [zsAnmTransp] where [zsAnmTransp].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID ) as Land,(SELECT [Na] FROM [ezoll].[dbo].[zsAnmCarrTra] where [zsAnmCarrTra].AnmID=vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme_Eroeffnungneu.AnmID) as Firma "
|
||||
sqlatr &= " " & If(_BRG_TEXT.Contains("TOBB") Or _BRG_TEXT.Contains("OREGON"), ", isnull(Bestimmungszollstelle,'') as Bestimmungsstelle ", "") & " "
|
||||
sqlatr &= " ,LRN as Bezugsnummer "
|
||||
sqlatr &= " , GRN "
|
||||
@@ -66,7 +95,7 @@
|
||||
getEmptyFraechter(dt)
|
||||
dt.Columns.Remove("Bezugsnummer")
|
||||
Dim optfileName = "NCTS_TOBB_" & datVon.ToShortDateString & "-" & datBis.ToShortDateString
|
||||
Return cProgramFunctions.genExcelFromDT_NEW(dt, {"E1:E" & (dt.Rows.Count + 1)}, , "Bürgschaftsbuchungen " & _BRG_TEXT, "Datum: " & Now.ToShortDateString, False, optfileName)
|
||||
Return cProgramFunctions.genExcelFromDT_NEW(dt, {"E1:E" & (dt.Rows.Count + 1)}, , "Bürgschaftsbuchungen " & _BRG_TEXT, "Datum: " & Now.ToShortDateString, False, optfileName,, )
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -80,7 +109,7 @@
|
||||
If dt IsNot Nothing Then
|
||||
For Each r In dt.Rows
|
||||
Try
|
||||
If r("Firma") Is DBNull.Value OrElse r("Firma") = "" Then
|
||||
If r("Firma") Is DBNull.Value OrElse r("Firma").trim = "" Then
|
||||
Dim Bezugsnummer = If(r("Bezugsnummer"), "")
|
||||
Dim FirmaTmp = ""
|
||||
Dim FirmaNat = ""
|
||||
@@ -93,6 +122,12 @@
|
||||
End If
|
||||
Else
|
||||
FirmaTmp = SQL.DLookup("isnull([Frachtführer],'')", "Speditionsbuch", " ([AtlasBezNrEZA]='" & Bezugsnummer & "' OR [AtlasBezNrNCTS]='" & Bezugsnummer & "')", "FMZOLL")
|
||||
|
||||
If FirmaTmp = "" And Bezugsnummer.ToString.Length >= 13 Then
|
||||
FirmaTmp = SQL.DLookup("isnull([Frächter],'')", "Aviso inner join tblSendungen on AvisoID=tblSnd_AvisoID", " cast(FilialenNr as varchar(4))+'/'+cast(AbfertigungsNr as varchar(10))='" & Bezugsnummer.ToString.Substring(0, 13) & "' ", "AVISO") ' and Datum >=DATEADD(month,-2, getdate())
|
||||
' MsgBox("cast(FilialenNr as varchar(4))+'/'+cast(AbfertigungsNr as varchar(10))='" & Bezugsnummer.ToString.Substring(0, 13) & "'")
|
||||
End If
|
||||
'SELECT FROM [AVISO].[dbo].[Aviso] inner join tblSendungen on AvisoID=tblSnd_AvisoID where cast(FilialenNr as varchar(4))+'/'+cast(AbfertigungsNr as varchar(10))like '4801/23000002%'
|
||||
End If
|
||||
|
||||
If FirmaTmp.ToString.Contains(";") Then FirmaTmp = FirmaTmp.ToString.Split(";")(0)
|
||||
|
||||
@@ -1321,6 +1321,12 @@
|
||||
<ItemGroup>
|
||||
<None Include="Resources\ze_kommen.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\zwiterfassung.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\zeiterfassung_s.png" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||
<ProjectExtensions />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
|
||||
Reference in New Issue
Block a user