diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index e56dc2e..10df365 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -28,6 +28,7 @@ Public Class ClassInit If dbResult = False Then Throw New Exception("Find more information in the logfile.") End If + Return True Catch ex As Exception MsgBox("Unexpected Error in Init Database:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 1e32710..7db8c1f 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1082,6 +1082,7 @@ + diff --git a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb index 97a1f42..c623d50 100644 --- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb @@ -1,6 +1,6 @@ Module ModuleRuntimeVariables Public MAIN_FORM As frmMain = Nothing - + Public ERROR_INIT = "NONE" Public CtrlBuilder As ClassControlBuilder Public CtrlCommandUI As ClassControlCommandsUI diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index b6ae4c4..9cda609 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -510,6 +510,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Copy_6524() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Copy_6524", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 3f4da95..39122d9 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -136,8 +136,8 @@ ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,9 +187,6 @@ ..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,6 +235,9 @@ ..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -250,6 +250,9 @@ ..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,6 +295,9 @@ ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -397,8 +403,8 @@ ..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -412,6 +418,9 @@ ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,8 +445,8 @@ ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\table_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -472,9 +481,6 @@ ..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -493,9 +499,6 @@ ..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -544,8 +547,8 @@ ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -562,7 +565,7 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Copy_6524.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/Copy_6524.png b/app/DD-Record-Organiser/Resources/Copy_6524.png new file mode 100644 index 0000000..5e506e8 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/Copy_6524.png differ diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb index 57219a1..976e75b 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -111,6 +111,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ZeigeRecordLogsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OfficeVorlagenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RecordKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton() Me.tsButtonShowWorkflowTasks = New System.Windows.Forms.ToolStripButton() Me.Panel2 = New System.Windows.Forms.Panel() @@ -927,7 +928,7 @@ Partial Class frmForm_Constructor_Main_2 'ToolStripDropDownButton1 ' Me.ToolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripDropDownButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WindreamsucheNeuLadenToolStripMenuItem, Me.WorkflowTasksNeuErstellenToolStripMenuItem, Me.ZeigeRecordLogsToolStripMenuItem, Me.OfficeVorlagenToolStripMenuItem, Me.VerknüpfungenAnzeigenToolStripMenuItem}) + Me.ToolStripDropDownButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WindreamsucheNeuLadenToolStripMenuItem, Me.WorkflowTasksNeuErstellenToolStripMenuItem, Me.ZeigeRecordLogsToolStripMenuItem, Me.OfficeVorlagenToolStripMenuItem, Me.VerknüpfungenAnzeigenToolStripMenuItem, Me.RecordKopierenToolStripMenuItem}) Me.ToolStripDropDownButton1.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041 Me.ToolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripDropDownButton1.Name = "ToolStripDropDownButton1" @@ -969,6 +970,13 @@ Partial Class frmForm_Constructor_Main_2 Me.VerknüpfungenAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(231, 22) Me.VerknüpfungenAnzeigenToolStripMenuItem.Text = "Verknüpfungen anzeigen" ' + 'RecordKopierenToolStripMenuItem + ' + Me.RecordKopierenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524 + Me.RecordKopierenToolStripMenuItem.Name = "RecordKopierenToolStripMenuItem" + Me.RecordKopierenToolStripMenuItem.Size = New System.Drawing.Size(231, 22) + Me.RecordKopierenToolStripMenuItem.Text = "Record kopieren" + ' 'tsButtonShowTaskOverview ' Me.tsButtonShowTaskOverview.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right @@ -1276,4 +1284,5 @@ Partial Class frmForm_Constructor_Main_2 Friend WithEvents GridControlParent As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewParent As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents btnRelinkParentID As System.Windows.Forms.Button + Friend WithEvents RecordKopierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index de972f4..811d1a8 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -3475,4 +3475,15 @@ Public Class frmForm_Constructor_Main_2 'Show_Verknuepfungen() End If End Sub + + Private Sub RecordKopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RecordKopierenToolStripMenuItem.Click + Dim result As MsgBoxResult + result = MessageBox.Show("Möchten Sie den Datensatz wirklich kopieren?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result <> MsgBoxResult.Yes Then + Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", CURRENT_RECORD_ID, Environment.UserName) + If ClassDatabase.Execute_non_Query(SQL, True) = True Then + LoadGrid_Selection() + End If + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index f04da16..a9f5277 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -38,17 +38,22 @@ Public Class frmMain Dim splash As New frmSplash() splash.ShowDialog() - If USER_IS_ADMIN = True Then - pageAdmin.Visible = True + If ERROR_INIT = "NONE" Then + If USER_IS_ADMIN = True Then + pageAdmin.Visible = True + End If + + LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() + + 'LoadMenuItems() + LoadMenuItems2() + LoadQuickStartItems() + ElseIf ERROR_INIT = "DATABASE" Then + Load_ConfigBasic() End If - - LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString() - - 'LoadMenuItems() - LoadMenuItems2() - LoadQuickStartItems() VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString + End Sub Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing @@ -450,12 +455,14 @@ Public Class frmMain End Sub Private Sub itemSettings_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemSettings.ItemClick + Load_ConfigBasic() + End Sub + Sub Load_ConfigBasic() frmConfig_Basic.ShowDialog() If CONNECTION_CHANGED = True Then Load_Connection_Dep_Data() End If End Sub - Private Sub BarButtonItem3_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem3.ItemClick Cursor = Cursors.WaitCursor OpenFormOverview() @@ -493,7 +500,7 @@ Public Class frmMain End Sub Private Sub BarButtonItem10_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem10.ItemClick - frmConfig_Basic.ShowDialog() + Load_ConfigBasic() End Sub Private Sub BarButtonItem12_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem12.ItemClick diff --git a/app/DD-Record-Organiser/frmSplash.vb b/app/DD-Record-Organiser/frmSplash.vb index 34bd73f..7cc6985 100644 --- a/app/DD-Record-Organiser/frmSplash.vb +++ b/app/DD-Record-Organiser/frmSplash.vb @@ -65,24 +65,28 @@ Public NotInheritable Class frmSplash System.Threading.Thread.Sleep(500) bw.ReportProgress(CalcProgress(2), "Initialisiere Datenbank") - Init.InitDatabase() + If Init.InitDatabase() = True Then + System.Threading.Thread.Sleep(500) - System.Threading.Thread.Sleep(500) + bw.ReportProgress(CalcProgress(3), "Initialisiere Windream-Einstellungen") + Init.InitWindream() - bw.ReportProgress(CalcProgress(3), "Initialisiere Windream-Einstellungen") - Init.InitWindream() + System.Threading.Thread.Sleep(500) - System.Threading.Thread.Sleep(500) + bw.ReportProgress(CalcProgress(4), "Initialisiere Benutzer") + Init.InitUserLogin() - bw.ReportProgress(CalcProgress(4), "Initialisiere Benutzer") - Init.InitUserLogin() + System.Threading.Thread.Sleep(500) - System.Threading.Thread.Sleep(500) + bw.ReportProgress(CalcProgress(5), "Initialisiere Oberfläche") + Init.InitInterface(mainForm) - bw.ReportProgress(CalcProgress(5), "Initialisiere Oberfläche") - Init.InitInterface(mainForm) + System.Threading.Thread.Sleep(500) + Else + ERROR_INIT = "DATABASE" + End If - System.Threading.Thread.Sleep(500) + End Sub Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs)