diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index bdf21be9..883ab076 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -195,6 +195,8 @@ Partial Class usrCntlSpeditionsBuchSuche Me.Label45 = New System.Windows.Forms.Label() Me.cboFilialeHandling = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.SplitContainer = New System.Windows.Forms.SplitContainer() + Me.Label48 = New System.Windows.Forms.Label() + Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cntxtCntxtSpeditionsbuch.SuspendLayout() Me.pnlRechts.SuspendLayout() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() @@ -298,6 +300,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtAuftraggeber._displayWoelflKd = False Me.kdtxtAuftraggeber._hideIfListEmpty = True Me.kdtxtAuftraggeber._loadKdData = False + Me.kdtxtAuftraggeber._searchName1 = True Me.kdtxtAuftraggeber._UseFIRMA = "" Me.kdtxtAuftraggeber._ValueKdAndName = True Me.kdtxtAuftraggeber.dgvpos = "LEFT" @@ -380,12 +383,12 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtBelegNr._WaehrungZeichen = True Me.txtBelegNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtBelegNr.ForeColor = System.Drawing.Color.Black - Me.txtBelegNr.Location = New System.Drawing.Point(511, 70) + Me.txtBelegNr.Location = New System.Drawing.Point(493, 70) Me.txtBelegNr.MaxLineLength = -1 Me.txtBelegNr.MaxLines_Warning = "" Me.txtBelegNr.MaxLines_Warning_Label = Nothing Me.txtBelegNr.Name = "txtBelegNr" - Me.txtBelegNr.Size = New System.Drawing.Size(217, 20) + Me.txtBelegNr.Size = New System.Drawing.Size(239, 20) Me.txtBelegNr.TabIndex = 8 ' 'cboVersLand @@ -437,18 +440,18 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtPackstücke._WaehrungZeichen = True Me.txtPackstücke.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtPackstücke.ForeColor = System.Drawing.Color.Black - Me.txtPackstücke.Location = New System.Drawing.Point(511, 108) + Me.txtPackstücke.Location = New System.Drawing.Point(493, 108) Me.txtPackstücke.MaxLineLength = -1 Me.txtPackstücke.MaxLines_Warning = "" Me.txtPackstücke.MaxLines_Warning_Label = Nothing Me.txtPackstücke.Name = "txtPackstücke" - Me.txtPackstücke.Size = New System.Drawing.Size(110, 20) + Me.txtPackstücke.Size = New System.Drawing.Size(64, 20) Me.txtPackstücke.TabIndex = 41 ' 'Label36 ' Me.Label36.AutoSize = True - Me.Label36.Location = New System.Drawing.Point(508, 93) + Me.Label36.Location = New System.Drawing.Point(490, 93) Me.Label36.Name = "Label36" Me.Label36.Size = New System.Drawing.Size(67, 13) Me.Label36.TabIndex = 40 @@ -497,6 +500,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtAvisierer._displayWoelflKd = False Me.kdtxtAvisierer._hideIfListEmpty = True Me.kdtxtAvisierer._loadKdData = False + Me.kdtxtAvisierer._searchName1 = True Me.kdtxtAvisierer._UseFIRMA = "" Me.kdtxtAvisierer._ValueKdAndName = True Me.kdtxtAvisierer.dgvpos = "LEFT" @@ -1463,7 +1467,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label20 ' Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(508, 54) + Me.Label20.Location = New System.Drawing.Point(490, 54) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(144, 13) Me.Label20.TabIndex = 3 @@ -1585,6 +1589,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtFrachtfuehrer._displayWoelflKd = False Me.kdtxtFrachtfuehrer._hideIfListEmpty = True Me.kdtxtFrachtfuehrer._loadKdData = False + Me.kdtxtFrachtfuehrer._searchName1 = True Me.kdtxtFrachtfuehrer._UseFIRMA = "" Me.kdtxtFrachtfuehrer._ValueKdAndName = True Me.kdtxtFrachtfuehrer.dgvpos = "LEFT" @@ -1884,6 +1889,8 @@ Partial Class usrCntlSpeditionsBuchSuche ' 'SplitContainer1.Panel2 ' + Me.SplitContainer1.Panel2.Controls.Add(Me.txtVermerk) + Me.SplitContainer1.Panel2.Controls.Add(Me.Label48) Me.SplitContainer1.Panel2.Controls.Add(Me.txtZollstelle) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxEIDR) Me.SplitContainer1.Panel2.Controls.Add(Me.cbxCMR) @@ -2240,7 +2247,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxCMR.BackColor = System.Drawing.Color.White Me.cbxCMR.Checked = True Me.cbxCMR.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxCMR.Location = New System.Drawing.Point(511, 198) + Me.cbxCMR.Location = New System.Drawing.Point(493, 198) Me.cbxCMR.Name = "cbxCMR" Me.cbxCMR.Size = New System.Drawing.Size(50, 17) Me.cbxCMR.TabIndex = 49 @@ -2273,12 +2280,12 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtKdAuftragsNr._WaehrungZeichen = True Me.txtKdAuftragsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtKdAuftragsNr.ForeColor = System.Drawing.Color.Black - Me.txtKdAuftragsNr.Location = New System.Drawing.Point(511, 26) + Me.txtKdAuftragsNr.Location = New System.Drawing.Point(493, 26) Me.txtKdAuftragsNr.MaxLineLength = -1 Me.txtKdAuftragsNr.MaxLines_Warning = "" Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNr.Name = "txtKdAuftragsNr" - Me.txtKdAuftragsNr.Size = New System.Drawing.Size(217, 20) + Me.txtKdAuftragsNr.Size = New System.Drawing.Size(239, 20) Me.txtKdAuftragsNr.TabIndex = 46 ' 'lstGrenze @@ -2294,7 +2301,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label40 ' Me.Label40.AutoSize = True - Me.Label40.Location = New System.Drawing.Point(508, 10) + Me.Label40.Location = New System.Drawing.Point(490, 10) Me.Label40.Name = "Label40" Me.Label40.Size = New System.Drawing.Size(102, 13) Me.Label40.TabIndex = 45 @@ -2362,6 +2369,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtEmpfaenger._displayWoelflKd = False Me.kdtxtEmpfaenger._hideIfListEmpty = True Me.kdtxtEmpfaenger._loadKdData = False + Me.kdtxtEmpfaenger._searchName1 = True Me.kdtxtEmpfaenger._UseFIRMA = "" Me.kdtxtEmpfaenger._ValueKdAndName = True Me.kdtxtEmpfaenger.dgvpos = "LEFT" @@ -2384,7 +2392,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxFakturiert.BackColor = System.Drawing.Color.White Me.cbxFakturiert.Checked = True Me.cbxFakturiert.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxFakturiert.Location = New System.Drawing.Point(557, 180) + Me.cbxFakturiert.Location = New System.Drawing.Point(539, 180) Me.cbxFakturiert.Name = "cbxFakturiert" Me.cbxFakturiert.Size = New System.Drawing.Size(70, 17) Me.cbxFakturiert.TabIndex = 32 @@ -2438,6 +2446,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtEndempfaenger._displayWoelflKd = False Me.kdtxtEndempfaenger._hideIfListEmpty = True Me.kdtxtEndempfaenger._loadKdData = False + Me.kdtxtEndempfaenger._searchName1 = True Me.kdtxtEndempfaenger._UseFIRMA = "" Me.kdtxtEndempfaenger._ValueKdAndName = True Me.kdtxtEndempfaenger.dgvpos = "LEFT" @@ -2460,7 +2469,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.cbxBar.BackColor = System.Drawing.Color.White Me.cbxBar.Checked = True Me.cbxBar.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxBar.Location = New System.Drawing.Point(511, 180) + Me.cbxBar.Location = New System.Drawing.Point(493, 180) Me.cbxBar.Name = "cbxBar" Me.cbxBar.Size = New System.Drawing.Size(42, 17) Me.cbxBar.TabIndex = 31 @@ -2505,6 +2514,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.kdtxtAbsender._displayWoelflKd = False Me.kdtxtAbsender._hideIfListEmpty = True Me.kdtxtAbsender._loadKdData = False + Me.kdtxtAbsender._searchName1 = True Me.kdtxtAbsender._UseFIRMA = "" Me.kdtxtAbsender._ValueKdAndName = True Me.kdtxtAbsender.dgvpos = "LEFT" @@ -2598,7 +2608,7 @@ Partial Class usrCntlSpeditionsBuchSuche Me.txtErfassungsnNr._WaehrungZeichen = True Me.txtErfassungsnNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtErfassungsnNr.ForeColor = System.Drawing.Color.Black - Me.txtErfassungsnNr.Location = New System.Drawing.Point(511, 154) + Me.txtErfassungsnNr.Location = New System.Drawing.Point(493, 154) Me.txtErfassungsnNr.MaxLineLength = -1 Me.txtErfassungsnNr.MaxLines_Warning = "" Me.txtErfassungsnNr.MaxLines_Warning_Label = Nothing @@ -2618,7 +2628,7 @@ Partial Class usrCntlSpeditionsBuchSuche 'Label16 ' Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(508, 138) + Me.Label16.Location = New System.Drawing.Point(490, 138) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(99, 13) Me.Label16.TabIndex = 12 @@ -2716,6 +2726,39 @@ Partial Class usrCntlSpeditionsBuchSuche Me.SplitContainer.SplitterWidth = 2 Me.SplitContainer.TabIndex = 3 ' + 'Label48 + ' + Me.Label48.AutoSize = True + Me.Label48.Location = New System.Drawing.Point(563, 93) + Me.Label48.Name = "Label48" + Me.Label48.Size = New System.Drawing.Size(49, 13) + Me.Label48.TabIndex = 56 + Me.Label48.Text = "Vermerk:" + ' + 'txtVermerk + ' + Me.txtVermerk._DateTimeOnly = False + Me.txtVermerk._numbersOnly = False + Me.txtVermerk._numbersOnlyKommastellen = "" + Me.txtVermerk._numbersOnlyTrennzeichen = True + Me.txtVermerk._Prozent = False + Me.txtVermerk._ShortDateNew = False + Me.txtVermerk._ShortDateOnly = False + Me.txtVermerk._TimeOnly = False + Me.txtVermerk._TimeOnly_Seconds = False + Me.txtVermerk._value = Nothing + Me.txtVermerk._Waehrung = False + Me.txtVermerk._WaehrungZeichen = True + Me.txtVermerk.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtVermerk.ForeColor = System.Drawing.Color.Black + Me.txtVermerk.Location = New System.Drawing.Point(563, 109) + Me.txtVermerk.MaxLineLength = -1 + Me.txtVermerk.MaxLines_Warning = "" + Me.txtVermerk.MaxLines_Warning_Label = Nothing + Me.txtVermerk.Name = "txtVermerk" + Me.txtVermerk.Size = New System.Drawing.Size(64, 20) + Me.txtVermerk.TabIndex = 57 + ' 'usrCntlSpeditionsBuchSuche ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None @@ -2925,4 +2968,6 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents Button23 As Button Friend WithEvents txtZollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox Friend WithEvents FlenderBocholtZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label48 As Label End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 9d946753..cf00e948 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -286,6 +286,9 @@ Public Class usrCntlSpeditionsBuchSuche If cboSachbearbeiter._value <> "" Then sqlstr &= " AND Speditionsbuch.[Personalnummer] = @Personalnummer " If cboSB_Qs._value <> "" Then sqlstr &= " AND Speditionsbuch.[PersonalnummerQS] = @PersonalnummerQS " If cboSB_TR._value <> "" Then sqlstr &= " AND Speditionsbuch.[PersonalnummerAbklTR] = @PersonalnummerAbklTR " + + If txtVermerk.Text <> "" Then sqlstr &= " AND Speditionsbuch.[Vermerk] LIKE @Vermerk " + Return sqlstr End Function @@ -332,6 +335,7 @@ Public Class usrCntlSpeditionsBuchSuche list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Personalnummer", cboSachbearbeiter._value)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerQS", cboSB_Qs._value)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("PersonalnummerAbklTR", cboSB_TR._value)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Vermerk", txtVermerk.Text.Replace("*", "%").ToUpper)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb index 48409fde..da323d74 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/SQL.vb @@ -71,19 +71,17 @@ Public Class SQL If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then Try - Return My.MySettings.Default.AsfinagConnectionString + Return My.MySettings.Default.AsfinagConnectionStringDEV Catch ex As Exception - 'Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" Return "Data Source=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" End Try Else Try - Return My.MySettings.Default.AsfinagConnectionString 'nach Prod-Start austauschen! + Return My.MySettings.Default.AsfinagConnectionStringPROD Catch ex As Exception - ' Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" - Return "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=test;Password=BmWr501956;" + Return "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;" End Try End If @@ -118,7 +116,7 @@ Public Class SQL Public Shared Function GetAsfinagConnectionString(TESTSYSTEM) As String If TESTSYSTEM Then - Return My.MySettings.Default.AsfinagConnectionString() + Return My.MySettings.Default.AsfinagConnectionStringDEV() Else Try Return My.MySettings.Default.FMZOLL_PRODConnectionString diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb index 5806b1ae..c7ffafee 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb @@ -34,6 +34,8 @@ Partial Class frmMitarbeitersuche Me.lblStatusZE = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() Me.pnlZeiten = New System.Windows.Forms.Panel() + Me.btnAkten = New System.Windows.Forms.Button() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.Button2 = New System.Windows.Forms.Button() Me.Label12 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() @@ -86,6 +88,7 @@ Partial Class frmMitarbeitersuche Me.pnl.SuspendLayout() Me.Panel2.SuspendLayout() Me.pnlZeiten.SuspendLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlWohnadresse.SuspendLayout() CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlMotto.SuspendLayout() @@ -203,9 +206,9 @@ Partial Class frmMitarbeitersuche 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.Location = New System.Drawing.Point(624, 402) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(185, 66) + Me.Panel2.Size = New System.Drawing.Size(151, 66) Me.Panel2.TabIndex = 128 ' 'lblStatusZE @@ -215,7 +218,7 @@ Partial Class frmMitarbeitersuche 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.Size = New System.Drawing.Size(140, 25) Me.lblStatusZE.TabIndex = 12 Me.lblStatusZE.Text = "OFFLINE" Me.lblStatusZE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -237,6 +240,8 @@ Partial Class frmMitarbeitersuche 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.btnAkten) + Me.pnlZeiten.Controls.Add(Me.PictureBox5) Me.pnlZeiten.Controls.Add(Me.Button2) Me.pnlZeiten.Controls.Add(Me.Label12) Me.pnlZeiten.Controls.Add(Me.Label9) @@ -247,9 +252,35 @@ Partial Class frmMitarbeitersuche 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(591, 66) + Me.pnlZeiten.Size = New System.Drawing.Size(624, 66) Me.pnlZeiten.TabIndex = 22 ' + 'btnAkten + ' + Me.btnAkten.BackColor = System.Drawing.Color.White + Me.btnAkten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAkten.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAkten.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.file_small + Me.btnAkten.ImageAlign = System.Drawing.ContentAlignment.TopLeft + Me.btnAkten.Location = New System.Drawing.Point(535, 15) + Me.btnAkten.Name = "btnAkten" + Me.btnAkten.Size = New System.Drawing.Size(85, 46) + Me.btnAkten.TabIndex = 130 + Me.btnAkten.Text = " AKTEN" + Me.btnAkten.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAkten.UseVisualStyleBackColor = False + Me.btnAkten.Visible = False + ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImage = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.blue_question_mark_hi + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(86, 1) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(18, 19) + Me.PictureBox5.TabIndex = 129 + Me.PictureBox5.TabStop = False + ' 'Button2 ' Me.Button2.BackColor = System.Drawing.Color.White @@ -257,9 +288,9 @@ Partial Class frmMitarbeitersuche Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.Image = Global.VERAG_PROG_ALLGEMEIN.My.Resources.Resources.parcel_small1 Me.Button2.ImageAlign = System.Drawing.ContentAlignment.TopLeft - Me.Button2.Location = New System.Drawing.Point(495, 15) + Me.Button2.Location = New System.Drawing.Point(457, 15) Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(90, 46) + Me.Button2.Size = New System.Drawing.Size(77, 46) Me.Button2.TabIndex = 128 Me.Button2.Text = "POST" Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -283,7 +314,7 @@ Partial Class frmMitarbeitersuche 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.Location = New System.Drawing.Point(9, 2) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(71, 13) Me.Label9.TabIndex = 30 @@ -297,9 +328,9 @@ Partial Class frmMitarbeitersuche 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.Location = New System.Drawing.Point(12, 21) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(123, 45) + Me.Button1.Size = New System.Drawing.Size(120, 41) 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 @@ -312,9 +343,9 @@ Partial Class frmMitarbeitersuche 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(382, 16) + Me.btnZEGehen.Location = New System.Drawing.Point(364, 16) Me.btnZEGehen.Name = "btnZEGehen" - Me.btnZEGehen.Size = New System.Drawing.Size(107, 45) + Me.btnZEGehen.Size = New System.Drawing.Size(90, 45) Me.btnZEGehen.TabIndex = 124 Me.btnZEGehen.Text = "GEHEN" Me.btnZEGehen.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -327,7 +358,7 @@ Partial Class frmMitarbeitersuche 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(270, 16) + Me.btnZEKommen.Location = New System.Drawing.Point(252, 16) Me.btnZEKommen.Name = "btnZEKommen" Me.btnZEKommen.Size = New System.Drawing.Size(106, 45) Me.btnZEKommen.TabIndex = 123 @@ -347,7 +378,7 @@ Partial Class frmMitarbeitersuche ' Me.cbxHomeoffice.AutoSize = True Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black - Me.cbxHomeoffice.Location = New System.Drawing.Point(270, 1) + Me.cbxHomeoffice.Location = New System.Drawing.Point(255, 1) Me.cbxHomeoffice.Name = "cbxHomeoffice" Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17) Me.cbxHomeoffice.TabIndex = 125 @@ -791,6 +822,7 @@ Partial Class frmMitarbeitersuche Me.Panel2.PerformLayout() Me.pnlZeiten.ResumeLayout(False) Me.pnlZeiten.PerformLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlWohnadresse.ResumeLayout(False) CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlMotto.ResumeLayout(False) @@ -860,4 +892,6 @@ Partial Class frmMitarbeitersuche Friend WithEvents lblStatusZE As Windows.Forms.Label Friend WithEvents Label13 As Windows.Forms.Label Friend WithEvents Button2 As Windows.Forms.Button + Friend WithEvents PictureBox5 As Windows.Forms.PictureBox + Friend WithEvents btnAkten As Windows.Forms.Button End Class diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index ae55e3a2..dd0a9386 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel +Imports System.Diagnostics.Eventing.Reader Imports System.Drawing Imports System.Net Imports System.Threading @@ -183,11 +184,9 @@ Public Class frmMitarbeitersuche End If End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then Button2.Visible = True - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_POSTGANG", "SDL") Then - Button2.Visible = True - End If - + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZE_AKTENGANG", "SDL") Then btnAkten.Visible = True End If End Sub @@ -298,12 +297,14 @@ Public Class frmMitarbeitersuche End If End Sub - Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click + Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnZEKommen.Click, btnZEGehen.Click, Button2.Click, btnAkten.Click Dim art As String If sender Is btnZEKommen Then art = "in" ElseIf sender Is btnZEGehen Then art = "out" + ElseIf sender Is btnAkten Then + art = "akten" Else art = "post" End If @@ -333,8 +334,31 @@ Public Class frmMitarbeitersuche initTimasData() End If + ElseIf art = "akten" Then + Dim aktengang As DateTime = Now().AddMinutes(-10) + Dim askPost As MsgBoxResult = MsgBox("Aktengang für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " eintragen?" & vbNewLine & aktengang.ToString(), vbYesNo) + If askPost = vbYes Then + Dim info + Dim timestp = aktengang - Else + Dim timeEntryExisting As Boolean = False + 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) + timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "out", 10) 'Ende 10 Aktengang + timestp = timestp.AddMinutes(1) + timas.setTimeEntry(cAllgemein.MITARBEITER, timestp, info, "in", 0) ' Start + End If + + MsgBox(info) + Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB + requestDone = False + initTimasData() + End If + + + Else 'normales kommen/gehen Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo) @@ -369,8 +393,9 @@ Public Class frmMitarbeitersuche Dim isServiceRunning As Boolean = True timas.getTimeSaldo(MA.mit_timasId, lblTimasSaldo.Text, isServiceRunning) If Not isServiceRunning Then - MsgBox("Abfragefehler!") - Exit Sub + 'Abfrage konnte nicht durchgeführt werden. + MsgBox("Abfragefehler am Timas-Server!") + 'Exit Sub End If lblStatusZE.Visible = True Dim checkEntry As Boolean = timas.getTimeEntries(MA.mit_timasId, dtZeiten,, requestDone) @@ -383,6 +408,7 @@ Public Class frmMitarbeitersuche btnZEGehen.Enabled = True btnZEKommen.Enabled = False + btnAkten.Enabled = False Else ' PictureBox9.Image = VERAG_PROG_ALLGEMEIN.My.Resources.Resources.uhr_red lblStatusZE.Text = "OFFLINE" @@ -390,13 +416,16 @@ Public Class frmMitarbeitersuche btnZEGehen.Enabled = False btnZEKommen.Enabled = True + btnAkten.Enabled = True End If Else 'Request wurde nicht verarbeitet -> Verbindungsfehler - lblStatusZE.Text = "Verbindungsfehler" + lblStatusZE.Text = "Serverfehler" lblStatusZE.BackColor = Color.Gray btnZEGehen.Enabled = False btnZEKommen.Enabled = False + Button2.Enabled = False + btnAkten.Enabled = False End If @@ -418,4 +447,9 @@ Public Class frmMitarbeitersuche Process.Start(webAddress) End Sub + Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click + Dim webAddress As String = "https://wiki.verag.ag/de/software/zeiterfassung/zeiterfassung" + Process.Start(webAddress) + End Sub + End Class \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb index dd881a88..ede5ecef 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Resources.Designer.vb @@ -100,6 +100,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property blue_question_mark_hi() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("blue-question-mark-hi", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -150,6 +160,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property file_small() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("file_small", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx b/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx index fe7f842f..87545d7c 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx +++ b/VERAG_PROG_ALLGEMEIN/My Project/Resources.resx @@ -127,25 +127,12 @@ ..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ze_gehen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\seal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -158,8 +145,8 @@ ..\Resources\pfeil_links.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\seal2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -179,8 +166,8 @@ ..\Resources\seal3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -188,9 +175,6 @@ ..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - @@ -799,6 +783,9 @@ ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zwiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -808,11 +795,8 @@ ..\Resources\picboxRotateRight_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -861,7 +845,7 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7s/QmYZNld + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAA9UFJREFUeF7s/QmYZNld nomHultbSy01EpbagISaEmJraGQQi5DYbBpJ7HiMwTPGbmMe/DfGM5jHeDyMZzDW2EaAV+FhbIyFWYVY 1GAQFkJIIEtdudSelVWZWZVZuVXua+VSXV0d/++7HbcUGX0yKzMj4t5zbrzv87xPRp6M5d577jn392VE 3Fur1+uIiIiIiIiIxzbYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiIiIiIiHhYg42IiIiIiIiIhzXYiIiI @@ -1974,8 +1958,14 @@ FgIAAAAAAAC0SrAQAAAAAAAAoFWChQAAAAAAAACt0ej5/x9oWtk/vf5fAAAAAElFTkSuQmCC - - ..\Resources\aviso.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\house1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pdf_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-Customs-Service-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1989,23 +1979,29 @@ ..\Resources\picboxZoomIn_Enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\house.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\sicherheit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\err.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\weiblich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\männlich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Logo_blue_globe_Horizontal.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\parcel_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2013,8 +2009,8 @@ ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zeiterfassung_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2022,17 +2018,17 @@ ..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Atilla.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ze_kommen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zwiterfassung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\TiMaS-Paket-Time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fremdSped.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\easteregg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2052,25 +2048,22 @@ ..\Resources\cake.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\männlich.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\blue-question-mark-hi.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Verag-Spedition-GMBH-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sicherheit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\today.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\people.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\parcel_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\err.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\file_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb index 719c44c7..4d9a315e 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Public NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -373,9 +373,9 @@ Namespace My Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _ Global.System.Configuration.DefaultSettingValueAttribute("Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false"& _ ";User ID=AppUser;Password=yp/THDd?xM+pZ$;")> _ - Public ReadOnly Property AsfinagConnectionString() As String + Public ReadOnly Property AsfinagConnectionStringDEV() As String Get - Return CType(Me("AsfinagConnectionString"),String) + Return CType(Me("AsfinagConnectionStringDEV"),String) End Get End Property @@ -391,6 +391,18 @@ Namespace My Me("EZOLL_UNISPEDConnectionString") = value End Set End Property + + _ + Public ReadOnly Property AsfinagConnectionStringPROD() As String + Get + Return CType(Me("AsfinagConnectionStringPROD"),String) + End Get + End Property End Class End Namespace diff --git a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings index 4edf70cb..d93b9a8b 100644 --- a/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings +++ b/VERAG_PROG_ALLGEMEIN/My Project/Settings.settings @@ -166,7 +166,7 @@ </SerializableConnectionString> Data Source=DEVELOPER\DEVSQL;Initial Catalog=Parkzeit;Integrated Security=false;User ID=sa;Password=BmWr501956; - + <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <ConnectionString>Data Source=192.168.0.90\DEVSQL;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</ConnectionString> @@ -176,5 +176,12 @@ Data Source=srv04.unisu.at;Initial Catalog=ezoll;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200</ConnectionString> +</SerializableConnectionString> + Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ASFINAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;Pooling=true;Min Pool Size=5;Max Pool Size=200 + \ No newline at end of file diff --git a/VERAG_PROG_ALLGEMEIN/Resources/blue-question-mark-hi.png b/VERAG_PROG_ALLGEMEIN/Resources/blue-question-mark-hi.png new file mode 100644 index 00000000..5db32a7a Binary files /dev/null and b/VERAG_PROG_ALLGEMEIN/Resources/blue-question-mark-hi.png differ diff --git a/VERAG_PROG_ALLGEMEIN/Resources/file_small.png b/VERAG_PROG_ALLGEMEIN/Resources/file_small.png new file mode 100644 index 00000000..cee9d644 Binary files /dev/null and b/VERAG_PROG_ALLGEMEIN/Resources/file_small.png differ diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb index cb315d36..39927113 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb @@ -49,7 +49,7 @@ Public Class cTimasAPI End Function - Public Sub getTimeSaldo(maid As Integer, ByRef info As String, Optional isEndpointRunning As Boolean = True) + Public Sub getTimeSaldo(maid As Integer, ByRef info As String, ByRef Optional isEndpointRunning As Boolean = True) Try Dim returnText As String = "" Dim failureText As String = "" @@ -119,7 +119,7 @@ Public Class cTimasAPI End Sub - Public Function getTimeEntries(ByVal maid As Integer, ByRef dtZeiten As DataTable, Optional ByRef entryExistingToday As Boolean = True, Optional ByRef requestDone As Boolean = False, Optional isEndpointRunning As Boolean = True) As Boolean + Public Function getTimeEntries(ByVal maid As Integer, ByRef dtZeiten As DataTable, Optional ByRef entryExistingToday As Boolean = True, Optional ByRef requestDone As Boolean = False, Optional ByRef isEndpointRunning As Boolean = True) As Boolean Try Dim isPresent = False @@ -156,7 +156,7 @@ Public Class cTimasAPI If (rest.ResponseStatusCode <> 200) Then Debug.WriteLine(rest.ResponseHeader) - 'rest.ResponseStatusCode & " " & rest.ResponseStatusText + Debug.WriteLine(rest.ResponseStatusCode & " " & rest.ResponseStatusText) Return isPresent End If diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 1aa91e11..bb6470ca 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -1354,6 +1354,21 @@ + + + + + + + + + + + + + + +