From 5085236dcebf28a175ee8fdb59f37d1504858d65 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Fri, 25 Nov 2016 16:41:24 +0100 Subject: [PATCH] JJ 25.11 --- .../DD-Record-Organiser.vbproj | 9 ++ .../frmConstructor_Main.Designer.vb | 13 +- .../frmConstructor_Main.resx | 66 ++++++--- .../frmConstructor_Main.vb | 5 + .../frmGeodataNavigation.Designer.vb | 92 +++++++++++++ .../frmGeodataNavigation.resx | 126 ++++++++++++++++++ .../frmGeodataNavigation.vb | 106 +++++++++++++++ 7 files changed, 396 insertions(+), 21 deletions(-) create mode 100644 app/DD-Record-Organiser/frmGeodataNavigation.Designer.vb create mode 100644 app/DD-Record-Organiser/frmGeodataNavigation.resx create mode 100644 app/DD-Record-Organiser/frmGeodataNavigation.vb diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 44fe966..984bb15 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -304,6 +304,12 @@ Form + + frmGeodataNavigation.vb + + + Form + frmGoogle.vb @@ -735,6 +741,9 @@ frmFileInWork.vb + + frmGeodataNavigation.vb + frmGoogle.vb diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index c5b00c8..ead9fed 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -78,6 +78,7 @@ Partial Class frmConstructor_Main Me.AnwendungscacheResettsmi = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator19 = New System.Windows.Forms.ToolStripSeparator() Me.tsbtnRefresh_Entity = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.TCDetails = New DevExpress.XtraTab.XtraTabControl() Me.TabDetails = New DevExpress.XtraTab.XtraTabPage() Me.SplitContainerDetails = New DevExpress.XtraEditors.SplitContainerControl() @@ -135,8 +136,8 @@ Partial Class frmConstructor_Main Me.tsbtnDoc_Refresh = New System.Windows.Forms.ToolStripButton() Me.TabFollowUp = New DevExpress.XtraTab.XtraTabPage() Me.ListViewFollowUps = New System.Windows.Forms.ListView() - Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) - Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader) + Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.grpbxFU_Profile = New System.Windows.Forms.GroupBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.btnRemoveUser_FollowUp = New System.Windows.Forms.Button() @@ -513,7 +514,7 @@ Partial Class frmConstructor_Main ' 'ToolStripRecords ' - Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbldisplayRecords, Me.ToolStripDropDownButton3, Me.ToolStripSeparator19, Me.tsbtnRefresh_Entity}) + Me.ToolStripRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbldisplayRecords, Me.ToolStripDropDownButton3, Me.ToolStripSeparator19, Me.tsbtnRefresh_Entity, Me.ToolStripButton2}) resources.ApplyResources(Me.ToolStripRecords, "ToolStripRecords") Me.ToolStripRecords.Name = "ToolStripRecords" ' @@ -597,6 +598,11 @@ Partial Class frmConstructor_Main resources.ApplyResources(Me.tsbtnRefresh_Entity, "tsbtnRefresh_Entity") Me.tsbtnRefresh_Entity.Name = "tsbtnRefresh_Entity" ' + 'ToolStripButton2 + ' + resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2") + Me.ToolStripButton2.Name = "ToolStripButton2" + ' 'TCDetails ' Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color) @@ -1733,4 +1739,5 @@ End Sub Friend WithEvents colADDED_WHO As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colRECORD_ID As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 8616920..c925fe0 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -343,7 +343,7 @@ 0, 25 - 1067, 212 + 1074, 212 0 @@ -453,11 +453,35 @@ Neu laden + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + Magenta + + + 78, 22 + + + Geodaten + 0, 0 - 1067, 25 + 1074, 25 0 @@ -538,7 +562,7 @@ 0, 0 - 786, 336 + 786, 343 0 @@ -574,10 +598,10 @@ Ansicht gesperrt - 0, 286 + 0, 293 - 554, 24 + 561, 24 0 @@ -604,7 +628,7 @@ 0, 26 - 554, 310 + 561, 317 1 @@ -628,7 +652,7 @@ 0, 0 - 554, 26 + 561, 26 0 @@ -649,7 +673,7 @@ Panel2 - 1356, 340 + 1356, 347 1 @@ -810,7 +834,7 @@ 1 - 1356, 365 + 1356, 372 Detailansicht @@ -828,7 +852,7 @@ 0 - 1362, 396 + 1362, 403 1 @@ -975,7 +999,7 @@ Aqua - 1356, 340 + 1356, 347 7 @@ -1093,7 +1117,7 @@ 1 - 1356, 365 + 1356, 372 Dateien @@ -1524,7 +1548,7 @@ 2 - 1356, 365 + 1356, 372 Wiedervorlage @@ -1551,7 +1575,7 @@ Cyan - 1356, 340 + 1356, 347 0 @@ -1575,7 +1599,7 @@ 0, 25 - 1356, 340 + 1356, 347 2 @@ -1779,7 +1803,7 @@ - 1356, 365 + 1356, 372 Positionen @@ -1890,7 +1914,7 @@ 5 - 1356, 340 + 1356, 347 90 @@ -1962,7 +1986,7 @@ 1 - 1356, 365 + 1356, 372 Vorgängervarianten @@ -2955,6 +2979,12 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripButton2 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tslblDocIDTab1 diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 8735279..acc67d1 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -6287,4 +6287,9 @@ Public Class frmConstructor_Main End Try JUMP_RECORD_ID = 0 End Sub + + Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) Handles ToolStripButton2.Click + Dim frm As New frmGeodataNavigation(GridControlMain, CURRENT_FORM_ID) + frm.Show() + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmGeodataNavigation.Designer.vb b/app/DD-Record-Organiser/frmGeodataNavigation.Designer.vb new file mode 100644 index 0000000..afa084e --- /dev/null +++ b/app/DD-Record-Organiser/frmGeodataNavigation.Designer.vb @@ -0,0 +1,92 @@ + _ +Partial Class frmGeodataNavigation + 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() + Dim ImageTilesLayer1 As DevExpress.XtraMap.ImageTilesLayer = New DevExpress.XtraMap.ImageTilesLayer() + Dim VectorItemsLayer1 As DevExpress.XtraMap.VectorItemsLayer = New DevExpress.XtraMap.VectorItemsLayer() + Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.MapControl1 = New DevExpress.XtraMap.MapControl() + Me.tsLabelRecordCount = New System.Windows.Forms.ToolStripStatusLabel() + Me.StatusStrip1.SuspendLayout() + CType(Me.MapControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ToolStrip1 + ' + Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) + Me.ToolStrip1.Name = "ToolStrip1" + Me.ToolStrip1.Size = New System.Drawing.Size(796, 25) + Me.ToolStrip1.TabIndex = 0 + Me.ToolStrip1.Text = "ToolStrip1" + ' + 'StatusStrip1 + ' + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsLabelRecordCount}) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 477) + Me.StatusStrip1.Name = "StatusStrip1" + Me.StatusStrip1.Size = New System.Drawing.Size(796, 22) + Me.StatusStrip1.TabIndex = 1 + Me.StatusStrip1.Text = "StatusStrip1" + ' + 'MapControl1 + ' + Me.MapControl1.Dock = System.Windows.Forms.DockStyle.Fill + ImageTilesLayer1.Name = "ImageLayer" + VectorItemsLayer1.Name = "VectorLayer" + Me.MapControl1.Layers.Add(ImageTilesLayer1) + Me.MapControl1.Layers.Add(VectorItemsLayer1) + Me.MapControl1.Location = New System.Drawing.Point(0, 25) + Me.MapControl1.Name = "MapControl1" + Me.MapControl1.NavigationPanelOptions.Visible = False + Me.MapControl1.Size = New System.Drawing.Size(796, 452) + Me.MapControl1.TabIndex = 2 + ' + 'tsLabelRecordCount + ' + Me.tsLabelRecordCount.Name = "tsLabelRecordCount" + Me.tsLabelRecordCount.Size = New System.Drawing.Size(119, 17) + Me.tsLabelRecordCount.Text = "0 Elemente gefunden" + ' + 'frmGeodataNavigation + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(796, 499) + Me.Controls.Add(Me.MapControl1) + Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.ToolStrip1) + Me.Name = "frmGeodataNavigation" + Me.Text = "frmGeodataNavigation" + Me.StatusStrip1.ResumeLayout(False) + Me.StatusStrip1.PerformLayout() + CType(Me.MapControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip + Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip + Friend WithEvents MapControl1 As DevExpress.XtraMap.MapControl + Friend WithEvents tsLabelRecordCount As System.Windows.Forms.ToolStripStatusLabel +End Class diff --git a/app/DD-Record-Organiser/frmGeodataNavigation.resx b/app/DD-Record-Organiser/frmGeodataNavigation.resx new file mode 100644 index 0000000..2b7c922 --- /dev/null +++ b/app/DD-Record-Organiser/frmGeodataNavigation.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + + 124, 17 + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmGeodataNavigation.vb b/app/DD-Record-Organiser/frmGeodataNavigation.vb new file mode 100644 index 0000000..5fa40ae --- /dev/null +++ b/app/DD-Record-Organiser/frmGeodataNavigation.vb @@ -0,0 +1,106 @@ +Imports DevExpress.XtraMap +Imports DevExpress.XtraGrid + +Public Class frmGeodataNavigation + + Private BING_KEY As String = "hQUTlqLLK70bETnonpfi~0jx1pIAq1yQ7gXqbIyzKrg~Au-Tewbty8afAxdbNilSv4JlU7qwU-fQKu0ouH9e1uJmpIyVdA3jugVEWMdy1Rbt" + Private EntityId As Integer = Nothing + Private EntitySql As String = Nothing + Private Grid As GridControl = Nothing + + Private ReadOnly Property ImageLayer() As ImageTilesLayer + Get + Return CType(MapControl1.Layers("ImageLayer"), ImageTilesLayer) + End Get + End Property + + Private ReadOnly Property VectorLayer() As VectorItemsLayer + Get + Return CType(MapControl1.Layers("VectorLayer"), VectorItemsLayer) + End Get + End Property + + Public Sub New(ByRef gridControl As GridControl, ByVal EntityId As Integer) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.Grid = gridControl + Me.EntityId = EntityId + Me.EntitySql = String.Format("SELECT T.*, T1.LATITUDE, T1.LONGITUDE from VWTEMP_PMO_FORM{0} T,TBPMO_RECORD_GEODATA T1 WHERE T.[Record-ID] = T1.RECORD_ID", Me.EntityId) + End Sub + + Private Sub frmGeodataNavigation_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ' Liste für PushPins anlegen + Dim items As New List(Of MapPushpin) + + ' Kartendaten laden + Dim dataProvider As New BingMapDataProvider() + dataProvider.BingKey = BING_KEY + ImageLayer.DataProvider = dataProvider + + ' Datensätze mit Lat,Lon Werten laden + Dim dt As DataTable = ClassDatabase.Return_Datatable(Me.EntitySql) + + ' PushPins + For Each row As DataRow In dt.Rows + Dim lat As Double = row.Item("LATITUDE") + Dim lon As Double = row.Item("LONGITUDE") + Dim pushpin As New MapPushpin() + pushpin.Location = New GeoPoint(lat, lon) + pushpin.Text = row.Item("Record-ID").ToString() + pushpin.Information = row.Item("Record-ID") + + items.Add(pushpin) + Next + + Dim storage As New MapItemStorage() + Dim itemArray() As MapPushpin = items.ToArray() + + storage.Items.AddRange(itemArray) + VectorLayer.Data = storage + + tsLabelRecordCount.Text = String.Format("{0} Elemente gefunden", items.Count) + + MapControl1.ZoomToFitLayerItems() + End Sub + + Private Sub SetGridFilter(records As List(Of Integer)) + Dim filter As New List(Of String) + + For Each id As Integer In records + filter.Add(String.Format("[Record-Id] = {0}", id)) + Next + + Dim gridView As Views.Grid.GridView = Me.Grid.FocusedView + gridView.ActiveFilterString = String.Join(" OR ", filter.ToArray()) + End Sub + + 'Private Sub MapControl1_MapItemClick(sender As Object, e As MapItemClickEventArgs) Handles MapControl1.MapItemClick + + 'End Sub + + 'Private Sub MapControl1_MapItemDoubleClick(sender As Object, e As MapItemClickEventArgs) Handles MapControl1.MapItemDoubleClick + ' Dim item As MapPushpin = e.Item + ' Dim recordId As Integer = item.Information + + ' SetGridFilter(New List(Of Integer) From {recordId}) + 'End Sub + + Private Sub MapControl1_SelectionChanged(sender As Object, e As MapSelectionChangedEventArgs) Handles MapControl1.SelectionChanged + Dim items As List(Of Object) = e.Selection + Dim records As New List(Of Integer) + + For Each item As Object In items + Try + Dim pin As MapPushpin = CType(item, MapPushpin) + Dim recordId As Integer = pin.Information + records.Add(recordId) + Catch ex As Exception + MsgBox("Cannot convert selection to MapPushPin") + End Try + Next + + SetGridFilter(records) + End Sub +End Class \ No newline at end of file