From cebb7cd0f2db0c64a8f43b59a74f154a7dee24a0 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Wed, 5 Oct 2016 16:56:00 +0200 Subject: [PATCH] jj 05.10 frmDiagrams --- .../DD-Record-Organiser.vbproj | 14 ++ .../My Project/Resources.Designer.vb | 10 + .../My Project/Resources.resx | 111 +++++------ .../My Project/licenses.licx | 7 +- .../asset_pie-series-chart_on_24X24.png | Bin 0 -> 313 bytes .../frmConstructor_Main.Designer.vb | 10 +- .../frmConstructor_Main.resx | 16 +- .../frmConstructor_Main.vb | 6 + .../frmDiagrams.Designer.vb | 172 ++++++++++++++++++ app/DD-Record-Organiser/frmDiagrams.resx | 120 ++++++++++++ app/DD-Record-Organiser/frmDiagrams.vb | 95 ++++++++++ 11 files changed, 501 insertions(+), 60 deletions(-) create mode 100644 app/DD-Record-Organiser/Resources/asset_pie-series-chart_on_24X24.png create mode 100644 app/DD-Record-Organiser/frmDiagrams.Designer.vb create mode 100644 app/DD-Record-Organiser/frmDiagrams.resx create mode 100644 app/DD-Record-Organiser/frmDiagrams.vb diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 7ae6601..efa0fb4 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -88,6 +88,7 @@ False + False @@ -117,6 +118,9 @@ False + + + False @@ -283,6 +287,12 @@ Form + + frmDiagrams.vb + + + Form + frmFileInWork.vb @@ -678,6 +688,9 @@ frmConstructorDesigner.vb + + frmDiagrams.vb + frmFileInWork.vb @@ -1373,6 +1386,7 @@ + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index 77b25a9..0fcfd98 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -370,6 +370,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property asset_pie_series_chart_on_24X24() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("asset_pie-series-chart_on_24X24", 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 e9696d6..d22d6cd 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -130,8 +130,11 @@ ..\Resources\UserInterfaceEditor_5845_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Carousel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_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 ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -175,9 +178,6 @@ ..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,9 +199,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\mail.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,6 +211,9 @@ ..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\checkbox_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -253,12 +253,15 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\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 @@ -274,26 +277,20 @@ ..\Resources\application_view_detail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.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 - - ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\calendar_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Carousel_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\f5.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -307,9 +304,6 @@ ..\Resources\flag_green.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 - ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -322,8 +316,8 @@ ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,6 +325,12 @@ ..\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 + ..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -388,9 +388,15 @@ ..\Resources\lock_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -403,8 +409,8 @@ ..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bug_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -424,6 +430,9 @@ ..\Resources\AddMark_10580.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\RemoveLink_9938.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\cmb.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -442,20 +451,17 @@ ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Task_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\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 + + ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Men6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -463,8 +469,8 @@ ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save_16xLG.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 @@ -490,15 +496,15 @@ ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\benutzer3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\WebUserControl(ascx)_11270_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -544,17 +550,14 @@ ..\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 ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -565,8 +568,8 @@ ..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\doc_excel_csv.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 ..\Resources\Men4.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -577,11 +580,11 @@ ..\Resources\keinbild.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\changechartlegendalignment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Login_6031_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -589,8 +592,8 @@ ..\Resources\f1.ico;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 + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -634,8 +637,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 @@ -658,7 +661,7 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\RemoveLink_9938.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asset_pie-series-chart_on_24X24.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/My Project/licenses.licx b/app/DD-Record-Organiser/My Project/licenses.licx index 07aa56e..861564b 100644 --- a/app/DD-Record-Organiser/My Project/licenses.licx +++ b/app/DD-Record-Organiser/My Project/licenses.licx @@ -1,5 +1,6 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organiser/Resources/asset_pie-series-chart_on_24X24.png b/app/DD-Record-Organiser/Resources/asset_pie-series-chart_on_24X24.png new file mode 100644 index 0000000000000000000000000000000000000000..37fa94775202b683ce85a17e692f6c6bf42d641b GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9F5he4R}c>anMpx|py z7srr_xVux=3N<;1wAPwg&DDuCN;~sQV3Ml$w4TtlS)tsebMwjM(957El(`&3z)*8F!&h(;l zeXWTeXAPQlqAxzZF0sn_>Z=u@k{3ivp8AAjL|yn|q!6C;GUiXst`oA(F&T5&j(pNA zmXw#`j9T8ftQtr%-sF2JccIUmK`CavxmuS}=7Qc6zOnMT-#*&7t^RdV>cWE1++f~} z3*YQAa?NWOh@CyK`p{mBt#NwR&sNO*vuoa)gFly>-&D_c`Eu&=;T(x?KyNd6y85}S Ib4q9e0Arnk^8f$< literal 0 HcmV?d00001 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 4ac3aab..6c4d6ee 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -35,6 +35,7 @@ Partial Class frmConstructor_Main Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EntitätssucheStartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.GridControlMain = New DevExpress.XtraGrid.GridControl() Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -242,7 +243,7 @@ Partial Class frmConstructor_Main ' 'CMSEntity ' - Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem, Me.FormDesignerToolStripMenuItem, Me.EntitätssucheStartenToolStripMenuItem}) + Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem, Me.FormDesignerToolStripMenuItem, Me.EntitätssucheStartenToolStripMenuItem, Me.AuswertungAnzeigenToolStripMenuItem}) Me.CMSEntity.Name = "ContextMenuStrip2" resources.ApplyResources(Me.CMSEntity, "CMSEntity") ' @@ -268,6 +269,12 @@ Partial Class frmConstructor_Main Me.EntitätssucheStartenToolStripMenuItem.Name = "EntitätssucheStartenToolStripMenuItem" resources.ApplyResources(Me.EntitätssucheStartenToolStripMenuItem, "EntitätssucheStartenToolStripMenuItem") ' + 'AuswertungAnzeigenToolStripMenuItem + ' + Me.AuswertungAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.asset_pie_series_chart_on_24X24 + Me.AuswertungAnzeigenToolStripMenuItem.Name = "AuswertungAnzeigenToolStripMenuItem" + resources.ApplyResources(Me.AuswertungAnzeigenToolStripMenuItem, "AuswertungAnzeigenToolStripMenuItem") + ' 'GridControlMain ' Me.GridControlMain.AllowDrop = True @@ -1343,4 +1350,5 @@ Partial Class frmConstructor_Main Friend WithEvents labelLoadEntity As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents ToolStripMI_DeleteFile As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tsstlblDocID As System.Windows.Forms.ToolStripStatusLabel + Friend WithEvents AuswertungAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 5452b1c..5c66344 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -158,8 +158,14 @@ Entitätssuche starten + + 194, 22 + + + Auswertung anzeigen + - 195, 92 + 195, 114 CMSEntity @@ -1781,7 +1787,7 @@ True - 88 + 174 6, 13 @@ -2268,6 +2274,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + AuswertungAnzeigenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + FunktionenDataGridToolStripMenuItem diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 6d88082..9a1ac01 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -6244,4 +6244,10 @@ Public Class frmConstructor_Main Private Sub TreeViewMain_DragOver(sender As Object, e As DragEventArgs) Handles TreeViewMain.DragOver e.Effect = DragDropEffects.Copy End Sub + + Private Sub AuswertungAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AuswertungAnzeigenToolStripMenuItem.Click + Dim frm As New frmDiagrams() + frm.MdiParent = MAIN_FORM + frm.Show() + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmDiagrams.Designer.vb b/app/DD-Record-Organiser/frmDiagrams.Designer.vb new file mode 100644 index 0000000..05b8f6e --- /dev/null +++ b/app/DD-Record-Organiser/frmDiagrams.Designer.vb @@ -0,0 +1,172 @@ + _ +Partial Class frmDiagrams + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.SplitContainerMain = New System.Windows.Forms.SplitContainer() + Me.SplitContainerTop = New System.Windows.Forms.SplitContainer() + Me.ChartTopLeft = New DevExpress.XtraCharts.ChartControl() + Me.ChartTopRight = New DevExpress.XtraCharts.ChartControl() + Me.SplitContainerBottom = New System.Windows.Forms.SplitContainer() + Me.ChartBottomLeft = New DevExpress.XtraCharts.ChartControl() + Me.ChartBottomRight = New DevExpress.XtraCharts.ChartControl() + CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerMain.Panel1.SuspendLayout() + Me.SplitContainerMain.Panel2.SuspendLayout() + Me.SplitContainerMain.SuspendLayout() + CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTop.Panel1.SuspendLayout() + Me.SplitContainerTop.Panel2.SuspendLayout() + Me.SplitContainerTop.SuspendLayout() + CType(Me.ChartTopLeft, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChartTopRight, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerBottom.Panel1.SuspendLayout() + Me.SplitContainerBottom.Panel2.SuspendLayout() + Me.SplitContainerBottom.SuspendLayout() + CType(Me.ChartBottomLeft, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ChartBottomRight, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'SplitContainerMain + ' + Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerMain.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerMain.Name = "SplitContainerMain" + Me.SplitContainerMain.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainerMain.Panel1 + ' + Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerTop) + ' + 'SplitContainerMain.Panel2 + ' + Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitContainerBottom) + Me.SplitContainerMain.Size = New System.Drawing.Size(1160, 671) + Me.SplitContainerMain.SplitterDistance = 386 + Me.SplitContainerMain.TabIndex = 0 + ' + 'SplitContainerTop + ' + Me.SplitContainerTop.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerTop.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerTop.Name = "SplitContainerTop" + ' + 'SplitContainerTop.Panel1 + ' + Me.SplitContainerTop.Panel1.Controls.Add(Me.ChartTopLeft) + ' + 'SplitContainerTop.Panel2 + ' + Me.SplitContainerTop.Panel2.Controls.Add(Me.ChartTopRight) + Me.SplitContainerTop.Size = New System.Drawing.Size(1160, 386) + Me.SplitContainerTop.SplitterDistance = 386 + Me.SplitContainerTop.TabIndex = 0 + ' + 'ChartTopLeft + ' + Me.ChartTopLeft.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartTopLeft.Location = New System.Drawing.Point(0, 0) + Me.ChartTopLeft.Name = "ChartTopLeft" + Me.ChartTopLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartTopLeft.Size = New System.Drawing.Size(386, 386) + Me.ChartTopLeft.TabIndex = 0 + ' + 'ChartTopRight + ' + Me.ChartTopRight.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartTopRight.Location = New System.Drawing.Point(0, 0) + Me.ChartTopRight.Name = "ChartTopRight" + Me.ChartTopRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartTopRight.Size = New System.Drawing.Size(770, 386) + Me.ChartTopRight.TabIndex = 1 + ' + 'SplitContainerBottom + ' + Me.SplitContainerBottom.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerBottom.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerBottom.Name = "SplitContainerBottom" + ' + 'SplitContainerBottom.Panel1 + ' + Me.SplitContainerBottom.Panel1.Controls.Add(Me.ChartBottomLeft) + ' + 'SplitContainerBottom.Panel2 + ' + Me.SplitContainerBottom.Panel2.Controls.Add(Me.ChartBottomRight) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1160, 281) + Me.SplitContainerBottom.SplitterDistance = 386 + Me.SplitContainerBottom.TabIndex = 0 + ' + 'ChartBottomLeft + ' + Me.ChartBottomLeft.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartBottomLeft.Location = New System.Drawing.Point(0, 0) + Me.ChartBottomLeft.Name = "ChartBottomLeft" + Me.ChartBottomLeft.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartBottomLeft.Size = New System.Drawing.Size(386, 281) + Me.ChartBottomLeft.TabIndex = 0 + ' + 'ChartBottomRight + ' + Me.ChartBottomRight.Dock = System.Windows.Forms.DockStyle.Fill + Me.ChartBottomRight.Location = New System.Drawing.Point(0, 0) + Me.ChartBottomRight.Name = "ChartBottomRight" + Me.ChartBottomRight.SeriesSerializable = New DevExpress.XtraCharts.Series(-1) {} + Me.ChartBottomRight.Size = New System.Drawing.Size(770, 281) + Me.ChartBottomRight.TabIndex = 0 + ' + 'frmDiagrams + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1160, 671) + Me.Controls.Add(Me.SplitContainerMain) + Me.Name = "frmDiagrams" + Me.Text = "frmDiagrams" + Me.SplitContainerMain.Panel1.ResumeLayout(False) + Me.SplitContainerMain.Panel2.ResumeLayout(False) + CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerMain.ResumeLayout(False) + Me.SplitContainerTop.Panel1.ResumeLayout(False) + Me.SplitContainerTop.Panel2.ResumeLayout(False) + CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTop.ResumeLayout(False) + CType(Me.ChartTopLeft, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChartTopRight, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerBottom.Panel1.ResumeLayout(False) + Me.SplitContainerBottom.Panel2.ResumeLayout(False) + CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerBottom.ResumeLayout(False) + CType(Me.ChartBottomLeft, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ChartBottomRight, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + Friend WithEvents SplitContainerMain As System.Windows.Forms.SplitContainer + Friend WithEvents SplitContainerTop As System.Windows.Forms.SplitContainer + Friend WithEvents SplitContainerBottom As System.Windows.Forms.SplitContainer + Friend WithEvents ChartTopLeft As DevExpress.XtraCharts.ChartControl + Friend WithEvents ChartTopRight As DevExpress.XtraCharts.ChartControl + Friend WithEvents ChartBottomLeft As DevExpress.XtraCharts.ChartControl + Friend WithEvents ChartBottomRight As DevExpress.XtraCharts.ChartControl +End Class diff --git a/app/DD-Record-Organiser/frmDiagrams.resx b/app/DD-Record-Organiser/frmDiagrams.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/app/DD-Record-Organiser/frmDiagrams.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmDiagrams.vb b/app/DD-Record-Organiser/frmDiagrams.vb new file mode 100644 index 0000000..205c324 --- /dev/null +++ b/app/DD-Record-Organiser/frmDiagrams.vb @@ -0,0 +1,95 @@ +Imports DevExpress.XtraCharts + +Public Class frmDiagrams + + Private Sub frmDiagrams_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + Dim CHART_ENTITY_SQL As String = "SELECT * FROM TBPMO_CHART_ENTITY WHERE ENTITY_ID = " & CURRENT_FORM_ID + Dim CHART_ENTITY_DT As DataTable = ClassDatabase.Return_Datatable(CHART_ENTITY_SQL) + + ' Check if Bottom Chart containers are needed + Select Case CHART_ENTITY_DT.Rows.Count + Case 0 + MsgBox("No Diagrams found") + Case 1 + ' Show only ChartTopLeft + SplitContainerTop.Panel2Collapsed = True + ' Collapse SplitContainerBottom + SplitContainerMain.Panel2Collapsed = True + Case 2 + ' Collapse SplitContainerBottom + SplitContainerMain.Panel2Collapsed = True + Case 3 + ' Collapse ChartBottomRight + SplitContainerBottom.Panel2Collapsed = True + ' Show SplitContainerBottom + SplitContainerMain.Panel2Collapsed = False + Case 4 + ' Show SplitContainerBottom + SplitContainerMain.Panel2Collapsed = False + End Select + + 'Adjust With and Height of containers + Dim containerW = Me.Width / 2 + SplitContainerTop.SplitterDistance = containerW + SplitContainerBottom.SplitterDistance = containerW + + Dim containerH = Me.Height / 2 + SplitContainerMain.SplitterDistance = containerH + + ' Create Charts + For Each row As DataRow In CHART_ENTITY_DT.Rows + Dim series As Series + Dim chart As ChartControl + + Dim i As Integer = CHART_ENTITY_DT.Rows.IndexOf(row) + + Dim type = row.Item("TYPE_CHART") + Dim title = row.Item("TITLE") + Dim guid = row.Item("GUID") + Dim value = row.Item("VALUE") + Dim argument = row.Item("ARGUMENT") + Dim sql = row.Item("SQL_COMMAND") + + Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(sql) + + ' Create series based on type + Select Case type + Case "BAR" + series = New Series(title, ViewType.Bar) + Case "LINE" + series = New Series(title, ViewType.Line) + Case "AREA" + series = New Series(title, ViewType.Area) + Case Else + Throw New Exception("Unknown Chart type for id " & title) + End Select + + ' Select Current Chart + Select Case i + Case 0 + chart = ChartTopLeft + Case 1 + chart = ChartTopRight + Case 2 + chart = ChartBottomLeft + Case Else + chart = ChartBottomRight + End Select + + ' Set DataSource + chart.DataSource = DATA_DT + + ' Set shown Columns for Chart + series.ArgumentDataMember = argument + series.ValueDataMembers.AddRange(New String() {value}) + + ' Show Data + chart.Series.Add(series) + Next + + Catch ex As Exception + MsgBox("Error While loading Diagram Data: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub +End Class \ No newline at end of file