AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS_19012016

Browse Source
This commit is contained in:
SchreiberM
2016-01-20 11:33:37 +01:00
parent 0c256313e2
commit 48fe3a4845
10 changed files with 88 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/DD-Record-Organiser/ClassInit.vb
View File

@@ -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

1
app/DD-Record-Organiser/DD-Record-Organiser.vbproj
View File

@@ -1082,6 +1082,7 @@
<None Include="Resources\checkbox_16xLG.png" />
<None Include="Resources\bell_delete.png" />
<None Include="Resources\bell_go.png" />
<None Include="Resources\Copy_6524.png" />
<Content Include="Resources\cube.ico" />
<Content Include="Resources\138_PushPin_32x42_72.png" />
<None Include="Resources\PropertyGridEditorPart_6041.png" />

2
app/DD-Record-Organiser/ModuleRuntimeVariables.vb
View File

@@ -1,6 +1,6 @@
Module ModuleRuntimeVariables
Public MAIN_FORM As frmMain = Nothing
Public ERROR_INIT = "NONE"
Public CtrlBuilder As ClassControlBuilder
Public CtrlCommandUI As ClassControlCommandsUI

10
app/DD-Record-Organiser/My Project/Resources.Designer.vb generated
View File

@@ -510,6 +510,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
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
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

41
app/DD-Record-Organiser/My Project/Resources.resx
View File

@@ -136,8 +136,8 @@
<data name="DD_Icons-ADDI" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="brainpool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Home_5699_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="action_add_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -187,9 +187,6 @@
<data name="userAccounts" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="key_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="user_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -238,6 +235,9 @@
<data name="page_excel" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="database_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dtp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -250,6 +250,9 @@
<data name="application_view_detail" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="brick_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -292,6 +295,9 @@
<data name="page_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AddTable_5632" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -397,8 +403,8 @@
<data name="database_key" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AddTable_5632" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="key_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="windream-Logo-transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\windream-Logo-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -412,6 +418,9 @@
<data name="database_go1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="brainpool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="refresh_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -436,8 +445,8 @@
<data name="user_suit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Home_5699_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Table_748" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="table_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\table_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -472,9 +481,6 @@
<data name="folder_Open_32xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Men5" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="page_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -493,9 +499,6 @@
<data name="page_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Table_748" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -544,8 +547,8 @@
<data name="138_PushPin_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="database_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Men5" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Men5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="database_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -562,7 +565,7 @@
<data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="magifier_zoom_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Copy_6524" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Copy_6524.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
app/DD-Record-Organiser/Resources/Copy_6524.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

11
app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb generated
View File

@@ -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

11
app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb
View File

@@ -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

27
app/DD-Record-Organiser/frmMain.vb
View File

@@ -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

26
app/DD-Record-Organiser/frmSplash.vb
View File

@@ -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)