diff --git a/ArinLog/bin/Debug/ArinLog.Net4.dll b/ArinLog/bin/Debug/ArinLog.Net4.dll index de0571f..7761ed1 100644 Binary files a/ArinLog/bin/Debug/ArinLog.Net4.dll and b/ArinLog/bin/Debug/ArinLog.Net4.dll differ diff --git a/ArinLog/bin/Debug/ArinLog.Net4.pdb b/ArinLog/bin/Debug/ArinLog.Net4.pdb index d49045a..3bfdb94 100644 Binary files a/ArinLog/bin/Debug/ArinLog.Net4.pdb and b/ArinLog/bin/Debug/ArinLog.Net4.pdb differ diff --git a/ArinLog/bin/Debug/ArinLog.Net4.xml b/ArinLog/bin/Debug/ArinLog.Net4.xml index 49b3013..4ebe556 100644 --- a/ArinLog/bin/Debug/ArinLog.Net4.xml +++ b/ArinLog/bin/Debug/ArinLog.Net4.xml @@ -6,19 +6,21 @@ ArinLog.Net4 - - - Returns the cached ResourceManager instance used by this class. - - - - Overrides the current thread's CurrentUICulture property for all - resource lookups using this strongly typed resource class. - - - + + A strongly-typed resource class, for looking up localized strings, etc. + + + Returns the cached ResourceManager instance used by this class. + + + + + Overrides the current thread's CurrentUICulture property for all + resource lookups using this strongly typed resource class. + + - \ No newline at end of file + diff --git a/ArinLog/obj/Debug/ArinLog.Net4.pdb b/ArinLog/obj/Debug/ArinLog.Net4.pdb index d49045a..3bfdb94 100644 Binary files a/ArinLog/obj/Debug/ArinLog.Net4.pdb and b/ArinLog/obj/Debug/ArinLog.Net4.pdb differ diff --git a/ArinLog/obj/Debug/ArinLog.Net4.xml b/ArinLog/obj/Debug/ArinLog.Net4.xml index 49b3013..4ebe556 100644 --- a/ArinLog/obj/Debug/ArinLog.Net4.xml +++ b/ArinLog/obj/Debug/ArinLog.Net4.xml @@ -6,19 +6,21 @@ ArinLog.Net4 - - - Returns the cached ResourceManager instance used by this class. - - - - Overrides the current thread's CurrentUICulture property for all - resource lookups using this strongly typed resource class. - - - + + A strongly-typed resource class, for looking up localized strings, etc. + + + Returns the cached ResourceManager instance used by this class. + + + + + Overrides the current thread's CurrentUICulture property for all + resource lookups using this strongly typed resource class. + + - \ No newline at end of file + diff --git a/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt b/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt index b884de1..0800f75 100644 --- a/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt +++ b/ArinLog/obj/Debug/ArinLog.vbproj.FileListAbsolute.txt @@ -110,3 +110,13 @@ E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\ E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.dll E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.xml E:\Tinsky\Visual Basic For ENERGY\ECO2\ECO2_170122_0003(190703)_Git (2)\ArinLog\obj\Debug\ArinLog.Net4.pdb +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\bin\Debug\ArinLog.Net4.dll +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\bin\Debug\ArinLog.Net4.pdb +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\bin\Debug\ArinLog.Net4.xml +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.Resources.resources +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.vbproj.GenerateResource.cache +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.vbproj.CoreCompileInputs.cache +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.Net4.dll +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.Net4.xml +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.Net4.pdb +D:\Tinsky\Energy\ECO2\ECO2_170122_0003(190703)_Git (3)\ArinLog\obj\Debug\ArinLog.vbprojAssemblyReference.cache diff --git a/ArinLog/obj/Debug/ArinLog.vbproj.GenerateResource.Cache b/ArinLog/obj/Debug/ArinLog.vbproj.GenerateResource.Cache index 1db0dc1..bb9307d 100644 Binary files a/ArinLog/obj/Debug/ArinLog.vbproj.GenerateResource.Cache and b/ArinLog/obj/Debug/ArinLog.vbproj.GenerateResource.Cache differ diff --git a/ArinWarev1/Calculator/CShared.vb b/ArinWarev1/Calculator/CShared.vb index 764e756..16222df 100644 --- a/ArinWarev1/Calculator/CShared.vb +++ b/ArinWarev1/Calculator/CShared.vb @@ -9,7 +9,15 @@ Public Class CShared Else Try Dim drArea As DS.tbl_DescRow = CType(DSET1.tbl_Desc.Rows(0), DS.tbl_DescRow) - Return CType(DSET1.tbl_weather.Select("code ='" & drArea.buildarea & "'")(0), DS.tbl_weatherRow) + Dim AreaGrpCode As String = drArea.buildarea + + '/그룹코드에서 데이터를 찾아야한다. + Dim drWeatherGrp As DS.weather_groupRow = CType(DSET1.weather_group.Select("code='" + AreaGrpCode + "'")(0), DS.weather_groupRow) + Dim AreaName As String = drWeatherGrp.area + + 'Dim drtblWeather As DS.tbl_weatherRow = DSET1.tbl_weather.Select("name='" + AreaName + "'")(0) + + Return CType(DSET1.tbl_weather.Select("건물위치 ='" & AreaName & "'")(0), DS.tbl_weatherRow) Catch ex As Exception MsgBox("건물개요의 지역정보를 찾을수없습니다.", MsgBoxStyle.Critical, "오류") Return Nothing @@ -52,6 +60,9 @@ Public Class CShared ''' 클래스 생성자 ''' Public Sub New() + + If 기상데이터 Is Nothing Then Return + '//지정된 존에 해당하는 지역정보를 가지고옴(현재기상정보가 존에 할당되어있어서 그렇다) '//1번째 존에 지역이 설정된걸로 간주한다 diff --git a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb index f8dc91b..cb00609 100644 --- a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb +++ b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.Designer.vb @@ -23,105 +23,154 @@ Partial Class fSelectWeatherGroup _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim ListViewItem1 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("1561564") + Dim ListViewItem2 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("dfsdfsdf") Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(fSelectWeatherGroup)) Me.Label1 = New System.Windows.Forms.Label() - Me.cmbArea1 = New System.Windows.Forms.ComboBox() Me.btOK = New System.Windows.Forms.Button() - Me.cmbArea2 = New System.Windows.Forms.ComboBox() Me.bsArea2 = New System.Windows.Forms.BindingSource(Me.components) - Me.bsArea1 = New System.Windows.Forms.BindingSource(Me.components) Me.DS = New Eco2Ar.DS() + Me.bsArea1 = New System.Windows.Forms.BindingSource(Me.components) + Me.lv1 = New System.Windows.Forms.ListView() + Me.lv2 = New System.Windows.Forms.ListView() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) + Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) CType(Me.bsArea2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.bsArea1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DS, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.bsArea1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label1 ' - Me.Label1.AutoSize = True + Me.Label1.Dock = System.Windows.Forms.DockStyle.Top Me.Label1.Font = New System.Drawing.Font("맑은 고딕", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.Label1.Location = New System.Drawing.Point(14, 22) + Me.Label1.Location = New System.Drawing.Point(10, 10) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(188, 30) + Me.Label1.Size = New System.Drawing.Size(632, 41) Me.Label1.TabIndex = 0 Me.Label1.Text = "지역을 선택하세요" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) ' - 'cmbArea1 - ' - Me.cmbArea1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend - Me.cmbArea1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems - Me.cmbArea1.Font = New System.Drawing.Font("맑은 고딕", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.cmbArea1.FormattingEnabled = True - Me.cmbArea1.Location = New System.Drawing.Point(19, 73) - Me.cmbArea1.Name = "cmbArea1" - Me.cmbArea1.Size = New System.Drawing.Size(291, 40) - Me.cmbArea1.TabIndex = 1 - ' 'btOK ' + Me.btOK.Dock = System.Windows.Forms.DockStyle.Bottom Me.btOK.Font = New System.Drawing.Font("맑은 고딕", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.btOK.Location = New System.Drawing.Point(22, 468) + Me.btOK.Location = New System.Drawing.Point(10, 492) Me.btOK.Name = "btOK" - Me.btOK.Size = New System.Drawing.Size(588, 50) + Me.btOK.Size = New System.Drawing.Size(632, 50) Me.btOK.TabIndex = 2 Me.btOK.Text = "확 인" Me.btOK.UseVisualStyleBackColor = True ' - 'cmbArea2 - ' - Me.cmbArea2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend - Me.cmbArea2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems - Me.cmbArea2.Font = New System.Drawing.Font("맑은 고딕", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) - Me.cmbArea2.FormattingEnabled = True - Me.cmbArea2.Location = New System.Drawing.Point(316, 73) - Me.cmbArea2.Name = "cmbArea2" - Me.cmbArea2.Size = New System.Drawing.Size(291, 40) - Me.cmbArea2.TabIndex = 4 - ' 'bsArea2 ' Me.bsArea2.DataMember = "weather_group" Me.bsArea2.DataSource = Me.DS ' - 'bsArea1 - ' - Me.bsArea1.DataMember = "weather_group" - Me.bsArea1.DataSource = Me.DS - ' 'DS ' Me.DS.DataSetName = "DS" Me.DS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'bsArea1 + ' + Me.bsArea1.DataMember = "weather_group" + Me.bsArea1.DataSource = Me.DS + ' + 'lv1 + ' + Me.lv1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1}) + Me.lv1.Dock = System.Windows.Forms.DockStyle.Fill + Me.lv1.Font = New System.Drawing.Font("맑은 고딕", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.lv1.FullRowSelect = True + Me.lv1.GridLines = True + Me.lv1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None + Me.lv1.HideSelection = False + Me.lv1.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem1}) + Me.lv1.Location = New System.Drawing.Point(10, 51) + Me.lv1.Name = "lv1" + Me.lv1.Size = New System.Drawing.Size(311, 431) + Me.lv1.TabIndex = 5 + Me.lv1.UseCompatibleStateImageBehavior = False + Me.lv1.View = System.Windows.Forms.View.Details + ' + 'lv2 + ' + Me.lv2.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader2}) + Me.lv2.Dock = System.Windows.Forms.DockStyle.Right + Me.lv2.Font = New System.Drawing.Font("맑은 고딕", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) + Me.lv2.FullRowSelect = True + Me.lv2.GridLines = True + Me.lv2.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None + Me.lv2.HideSelection = False + Me.lv2.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem2}) + Me.lv2.Location = New System.Drawing.Point(331, 51) + Me.lv2.Name = "lv2" + Me.lv2.Size = New System.Drawing.Size(311, 431) + Me.lv2.TabIndex = 5 + Me.lv2.UseCompatibleStateImageBehavior = False + Me.lv2.View = System.Windows.Forms.View.Details + ' + 'Panel1 + ' + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Panel1.Location = New System.Drawing.Point(10, 482) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(632, 10) + Me.Panel1.TabIndex = 6 + ' + 'Panel2 + ' + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Right + Me.Panel2.Location = New System.Drawing.Point(321, 51) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(10, 431) + Me.Panel2.TabIndex = 7 + ' + 'ColumnHeader1 + ' + Me.ColumnHeader1.Width = 300 + ' + 'ColumnHeader2 + ' + Me.ColumnHeader2.Width = 300 + ' 'fSelectWeatherGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(622, 542) - Me.Controls.Add(Me.cmbArea2) + Me.ClientSize = New System.Drawing.Size(652, 552) + Me.Controls.Add(Me.lv1) + Me.Controls.Add(Me.Panel2) + Me.Controls.Add(Me.lv2) + Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.btOK) - Me.Controls.Add(Me.cmbArea1) Me.Controls.Add(Me.Label1) Me.Font = New System.Drawing.Font("맑은 고딕", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(129, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "fSelectWeatherGroup" + Me.Padding = New System.Windows.Forms.Padding(10) Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "적용 지역 선택" CType(Me.bsArea2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.bsArea1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DS, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.bsArea1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) - Me.PerformLayout() End Sub Friend WithEvents Label1 As Label - Friend WithEvents cmbArea1 As ComboBox Friend WithEvents btOK As Button - Friend WithEvents cmbArea2 As ComboBox Friend WithEvents bsArea2 As BindingSource Friend WithEvents bsArea1 As BindingSource Public WithEvents DS As DS + Friend WithEvents lv1 As ListView + Friend WithEvents lv2 As ListView + Friend WithEvents Panel1 As Panel + Friend WithEvents Panel2 As Panel + Friend WithEvents ColumnHeader1 As ColumnHeader + Friend WithEvents ColumnHeader2 As ColumnHeader End Class diff --git a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb index e6072a3..a1ce510 100644 --- a/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb +++ b/ArinWarev1/Forms_Basic/fSelectWeatherGroup.vb @@ -1,22 +1,112 @@ Public Class fSelectWeatherGroup - Private Sub fSelectArea_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Public SelectedCode As String = String.Empty + Dim preCode As String + Dim bInit As Boolean + Public Sub New(precode_ As String) + + ' 디자이너에서 이 호출이 필요합니다. + InitializeComponent() + Me.preCode = precode_ + ' InitializeComponent() 호출 뒤에 초기화 코드를 추가하세요. + + End Sub + Private Sub fSelectArea_Load(sender As Object, e As EventArgs) Handles MyBase.Load + bInit = False bsArea1.DataSource = DSET1 bsArea2.DataSource = DSET2 bsArea1.Filter = "code like '%0000'" bsArea2.Filter = "code = 'test'" - cmbArea1.DisplayMember = "name" - cmbArea1.ValueMember = "code" - cmbArea2.DisplayMember = "name" - cmbArea2.ValueMember = "code" - cmbArea1.DataSource = bsArea1 - cmbArea2.DataSource = bsArea2 + '//좌측목록에 데이터를 표시한다 + Dim list = From m In DSET1.weather_group + Where m.code.EndsWith("0000") + Select m + + + + lv1.Items.Clear() + For Each item As DS.weather_groupRow In list + Dim lvitem As ListViewItem = lv1.Items.Add(item.name) + lvitem.Tag = item.code + + '//입력된 코드가 있다면 선택해준다 + If preCode.Length = 6 Then + If item.code.Substring(0, 2) = preCode.Substring(0, 2) Then + lvitem.Selected = True + lvitem.Focused = True + End If + End If + + Next + + '//입력된 코드가 있다면 중분류를 선택해준다 + If preCode.Length = 6 Then + SelectGrp2Code(preCode) + End If + + + bInit = True + + '//선택되지 않았다면 1번아이템을 선택해준다 + If lv1.SelectedItems.Count < 1 AndAlso lv1.Items.Count > 0 Then + lv1.Items(0).Selected = True '//중분류는 이 걸로 자동 선택됨 + End If + + Me.Show() + Me.lv1.Select() End Sub + Private Sub lv1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lv1.SelectedIndexChanged + '//왼쪽에서 목록을 선태갛면 그걸로 시작하는 데이터를 표시해줘야하낟 + + If bInit = False OrElse lv1.SelectedItems.Count < 1 Then Return + + Dim GrpItem As ListViewItem = lv1.SelectedItems(0) + Dim GrpCode As String = GrpItem.Tag.ToString() + + SelectGrp2Code(GrpCode) + 'Dim list = From m In DSET1.weather_group + ' Where m.code.StartsWith(GrpCode.Substring(0, 2)) AndAlso m.code.EndsWith("0000") = False AndAlso m.code.EndsWith("00") + ' Select m + + 'lv2.Items.Clear() + 'For Each item As DS.weather_groupRow In list + ' Dim lvitem As ListViewItem = lv2.Items.Add(item.name) + ' lvitem.Tag = item.code + 'Next + + End Sub + + Sub SelectGrp2Code(GrpCode As String) + + '//해당 중분류 아이템을 가져온다 + Dim list = From m In DSET1.weather_group + Where m.code.StartsWith(GrpCode.Substring(0, 2)) AndAlso m.code.EndsWith("0000") = False AndAlso m.code.EndsWith("00") + Select m + + lv2.Items.Clear() + For Each item As DS.weather_groupRow In list + Dim lvitem As ListViewItem = lv2.Items.Add(item.name) + lvitem.Tag = item.code + If GrpCode = item.code Then + lvitem.Focused = True + lvitem.Selected = True + End If + Next + End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btOK.Click + If lv2.SelectedItems.Count < 1 Then + MessageBox.Show("2차 지역을 선택하세요", "확인") + Return + End If + ' + SelectedCode = lv2.SelectedItems(0).Tag.ToString() DialogResult = DialogResult.OK End Sub + + End Class \ No newline at end of file diff --git a/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb b/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb index 5de9ee4..33029ed 100644 --- a/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb +++ b/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb @@ -67,7 +67,7 @@ Partial Class Frm_Desc Me.Label28 = New System.Windows.Forms.Label() Me.TextBox76 = New Eco2Ar.MyTb() Me.Panel3 = New System.Windows.Forms.Panel() - Me.cmbArea1 = New System.Windows.Forms.ComboBox() + Me.btArea = New System.Windows.Forms.Button() Me.Label19 = New System.Windows.Forms.Label() Me.MyTb7 = New Eco2Ar.MyTb() Me.Label29 = New System.Windows.Forms.Label() @@ -81,7 +81,6 @@ Partial Class Frm_Desc Me.TextBox73 = New Eco2Ar.MyTb() Me.TextBox71 = New Eco2Ar.MyTb() Me.Label35 = New System.Windows.Forms.Label() - Me.cmbArea2 = New Eco2Ar.MyCmb() Me.Label40 = New System.Windows.Forms.Label() Me.Label41 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() @@ -418,7 +417,7 @@ Partial Class Frm_Desc 'LinkLabel2 ' Me.LinkLabel2.AutoSize = True - Me.LinkLabel2.Location = New System.Drawing.Point(203, 551) + Me.LinkLabel2.Location = New System.Drawing.Point(206, 551) Me.LinkLabel2.Name = "LinkLabel2" Me.LinkLabel2.Size = New System.Drawing.Size(197, 12) Me.LinkLabel2.TabIndex = 177 @@ -621,7 +620,7 @@ Partial Class Frm_Desc 'Panel3 ' Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(219, Byte), Integer), CType(CType(221, Byte), Integer), CType(CType(223, Byte), Integer)) - Me.Panel3.Controls.Add(Me.cmbArea1) + Me.Panel3.Controls.Add(Me.btArea) Me.Panel3.Controls.Add(Me.Label19) Me.Panel3.Controls.Add(Me.MyTb7) Me.Panel3.Controls.Add(Me.Label29) @@ -635,7 +634,6 @@ Partial Class Frm_Desc Me.Panel3.Controls.Add(Me.TextBox73) Me.Panel3.Controls.Add(Me.TextBox71) Me.Panel3.Controls.Add(Me.Label35) - Me.Panel3.Controls.Add(Me.cmbArea2) Me.Panel3.Controls.Add(Me.Label40) Me.Panel3.Controls.Add(Me.Label41) Me.Panel3.Location = New System.Drawing.Point(1, 9) @@ -643,19 +641,13 @@ Partial Class Frm_Desc Me.Panel3.Size = New System.Drawing.Size(507, 162) Me.Panel3.TabIndex = 5 ' - 'cmbArea1 + 'btArea ' - Me.cmbArea1.BackColor = System.Drawing.Color.White - Me.cmbArea1.DisplayMember = "name" - Me.cmbArea1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cmbArea1.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.cmbArea1.FormattingEnabled = True - Me.cmbArea1.Location = New System.Drawing.Point(345, 5) - Me.cmbArea1.Margin = New System.Windows.Forms.Padding(4, 2, 4, 2) - Me.cmbArea1.Name = "cmbArea1" - Me.cmbArea1.Size = New System.Drawing.Size(152, 20) - Me.cmbArea1.TabIndex = 78 - Me.cmbArea1.ValueMember = "code" + Me.btArea.Location = New System.Drawing.Point(332, 27) + Me.btArea.Name = "btArea" + Me.btArea.Size = New System.Drawing.Size(165, 22) + Me.btArea.TabIndex = 79 + Me.btArea.UseVisualStyleBackColor = True ' 'Label19 ' @@ -752,7 +744,7 @@ Partial Class Frm_Desc 'TextBox72 ' Me.TextBox72.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "buildname", True)) - Me.TextBox72.Location = New System.Drawing.Point(81, 29) + Me.TextBox72.Location = New System.Drawing.Point(81, 28) Me.TextBox72.Name = "TextBox72" Me.TextBox72.NectControl = Nothing Me.TextBox72.Size = New System.Drawing.Size(211, 21) @@ -772,7 +764,7 @@ Partial Class Frm_Desc 'TextBox71 ' Me.TextBox71.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.bs, "buildaddr", True)) - Me.TextBox71.Location = New System.Drawing.Point(81, 53) + Me.TextBox71.Location = New System.Drawing.Point(81, 52) Me.TextBox71.Name = "TextBox71" Me.TextBox71.NectControl = Nothing Me.TextBox71.Size = New System.Drawing.Size(416, 21) @@ -790,17 +782,6 @@ Partial Class Frm_Desc Me.Label35.Text = "연면적(㎡)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) Me.Label35.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - 'cmbArea2 - ' - Me.cmbArea2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cmbArea2.FormattingEnabled = True - Me.cmbArea2.Items.AddRange(New Object() {"서울", "인천", "경기", "강원", "대구", "대전", "충남", "충북", "광주", "전남", "전북", "부산", "울산", "경북", "경남", "제주"}) - Me.cmbArea2.Location = New System.Drawing.Point(345, 29) - Me.cmbArea2.Name = "cmbArea2" - Me.cmbArea2.NectControl = Nothing - Me.cmbArea2.Size = New System.Drawing.Size(152, 20) - Me.cmbArea2.TabIndex = 12 - ' 'Label40 ' Me.Label40.AutoSize = True @@ -813,10 +794,11 @@ Partial Class Frm_Desc ' 'Label41 ' + Me.Label41.AutoSize = True Me.Label41.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label41.Location = New System.Drawing.Point(305, 13) + Me.Label41.Location = New System.Drawing.Point(299, 32) Me.Label41.Name = "Label41" - Me.Label41.Size = New System.Drawing.Size(43, 33) + Me.Label41.Size = New System.Drawing.Size(31, 12) Me.Label41.TabIndex = 2 Me.Label41.Text = "지역" Me.Label41.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1508,7 +1490,6 @@ Partial Class Frm_Desc Friend WithEvents TextBox75 As Eco2Ar.MyTb Friend WithEvents TextBox73 As Eco2Ar.MyTb Friend WithEvents DateTimePicker1 As System.Windows.Forms.DateTimePicker - Friend WithEvents cmbArea2 As Eco2Ar.MyCmb Friend WithEvents TextBox72 As Eco2Ar.MyTb Friend WithEvents TextBox70 As Eco2Ar.MyTb Friend WithEvents TextBox69 As Eco2Ar.MyTb @@ -1604,7 +1585,7 @@ Partial Class Frm_Desc Friend WithEvents Label24 As System.Windows.Forms.Label Friend WithEvents cmb_인증기관 As Eco2Ar.MyCmb Friend WithEvents CheckBox1 As System.Windows.Forms.CheckBox - Friend WithEvents cmbArea1 As ComboBox Friend WithEvents bsArea2 As BindingSource Friend WithEvents bsArea1 As BindingSource + Friend WithEvents btArea As Button End Class diff --git a/ArinWarev1/Forms_Input/Frm_Desc.vb b/ArinWarev1/Forms_Input/Frm_Desc.vb index 4b87931..cc2d550 100644 --- a/ArinWarev1/Forms_Input/Frm_Desc.vb +++ b/ArinWarev1/Forms_Input/Frm_Desc.vb @@ -7,12 +7,6 @@ Dim drv As DataRowView = bs.Current If drv Is Nothing Then Return True - If Me.cmbArea2.SelectedValue Is Nothing OrElse Me.cmbArea1.SelectedValue Is Nothing Then - MsgBox("지역이 선택되지 않았습니다" + vbCrLf + "계산작업을 위해서는 지역이 선택되어야 합니다", MsgBoxStyle.Critical, "확인") - drv("buildarea") = "0" - Else - drv("buildarea") = Me.cmbArea2.SelectedValue.ToString - End If bs.EndEdit() @@ -98,24 +92,24 @@ End Select End Sub - Sub AttachAreaBind() - '//지역중분류값을 업데이트한다 - bsArea1.DataSource = DSET1 - bsArea1.DataMember = "weather_group" - bsArea2.DataSource = DSET1 - bsArea2.DataMember = "weather_group" + 'Sub AttachAreaBind() + ' '//지역중분류값을 업데이트한다 + ' bsArea1.DataSource = DSET1 + ' bsArea1.DataMember = "weather_group" + ' bsArea2.DataSource = DSET1 + ' bsArea2.DataMember = "weather_group" - cmbArea1.DataSource = bsArea1 - cmbArea2.DataSource = bsArea2 + ' cmbArea1.DataSource = bsArea1 + ' cmbArea2.DataSource = bsArea2 - cmbArea1.DisplayMember = "name" - cmbArea1.ValueMember = "code" - 'bsArea1.Filter = "code like '%0000'" + ' cmbArea1.DisplayMember = "name" + ' cmbArea1.ValueMember = "code" + ' 'bsArea1.Filter = "code like '%0000'" - cmbArea2.DisplayMember = "name" - cmbArea2.ValueMember = "code" - 'bsArea2.Filter = "code ='test'" - End Sub + ' cmbArea2.DisplayMember = "name" + ' cmbArea2.ValueMember = "code" + ' 'bsArea2.Filter = "code ='test'" + 'End Sub Private Sub MdiMain_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load @@ -131,18 +125,16 @@ bsArea2.DataSource = DSET1 bsArea2.DataMember = "weather_group" - cmbArea1.DataSource = bsArea1 - cmbArea2.DataSource = bsArea2 - - cmbArea1.DisplayMember = "name" - cmbArea1.ValueMember = "code" - bsArea1.Filter = "code like '%0000'" - - cmbArea2.DisplayMember = "name" - cmbArea2.ValueMember = "code" - bsArea2.Filter = "code ='test'" + 'cmbArea1.DataSource = bsArea1 + 'cmbArea2.DataSource = bsArea2 + 'cmbArea1.DisplayMember = "name" + 'cmbArea1.ValueMember = "code" + 'bsArea1.Filter = "code like '%0000'" + 'cmbArea2.DisplayMember = "name" + 'cmbArea2.ValueMember = "code" + 'bsArea2.Filter = "code ='test'" Me.LinkLabel1.Visible = False Me.LinkLabel2.Visible = False @@ -167,7 +159,8 @@ Me.bs.MoveFirst() End Try - + Dim drDesc As DS.tbl_DescRow = DSET1.tbl_Desc.Rows(0) + btArea.Text = GetAreaName(drDesc.buildarea) If Not (Prj.UserId.ToLower() = "guest" OrElse Prj.UserId.ToLower().StartsWith("user") OrElse Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1") Then '//2011.03.08 추가 Dim MyVersion As String '= Format(My.Application.Info.Version.Minor, "0000") & Format(My.Application.Info.Version.Build, "0000") @@ -183,9 +176,9 @@ Try VersionInfo = L.Get_LastVersion("C") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0은 없거나 관리안함의 뜻이므로 넘어간다. - Dim Lc As String = Me.cmbArea2.SelectedValue + ' Dim Lc As String = Me.cmbArea2.SelectedValue Read_CommonCode() - Me.cmbArea2.SelectedValue = Lc + 'Me.cmbArea2.SelectedValue = Lc Me.bs.EndEdit() End If Catch ex As Exception @@ -203,9 +196,9 @@ VersionInfo = L.Get_LastVersion("P") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0은 없거나 관리안함의 뜻이므로 넘어간다. - Dim Lp As String = Me.cmbArea2.SelectedValue + 'Dim Lp As String = Me.cmbArea2.SelectedValue Read_ProfileData() - Me.cmbArea2.SelectedValue = Lp + 'Me.cmbArea2.SelectedValue = Lp Me.bs.EndEdit() End If Catch ex As Exception @@ -223,9 +216,9 @@ 'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString VersionInfo = L.Get_LastVersion("W") '//버젼을 가져오는데 eco 버젼만 가져오게 바꺼야겟죵 ^^ 구분자를 넣도록 합시닷! If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0은 없거나 관리안함의 뜻이므로 넘어간다. - Dim Lw As String = Me.cmbArea2.SelectedValue + 'Dim Lw As String = Me.cmbArea2.SelectedValue Read_WeatherData() - Me.cmbArea2.SelectedValue = Lw + 'Me.cmbArea2.SelectedValue = Lw Me.bs.EndEdit() End If Catch ex As Exception @@ -240,7 +233,7 @@ End If End If - 지역코드설정() + '지역코드설정() AddHandler DSET1.tbl_Desc.ColumnChanging, AddressOf AddNewDataRow_Zone_Changed2 @@ -250,10 +243,10 @@ Private Sub Binding_Zone() Dim bs_cmb_공조방식 As New BindingSource(DSET1, "tbl_weather") bs_cmb_공조방식.Filter = "" - Me.cmbArea2.DataSource = bs_cmb_공조방식 - cmbArea2.DisplayMember = "건물위치" - cmbArea2.ValueMember = "code" - Me.cmbArea2.DataBindings.Add("selectedvalue", Me.bs, "buildarea") + 'Me.cmbArea2.DataSource = bs_cmb_공조방식 + 'cmbArea2.DisplayMember = "건물위치" + 'cmbArea2.ValueMember = "code" + 'Me.cmbArea2.DataBindings.Add("selectedvalue", Me.bs, "buildarea") Dim bs_cmb_인증기관 As New BindingSource(DSET1, "tbl_common") bs_cmb_인증기관.Filter = "gubun='1100'" @@ -313,21 +306,21 @@ Private Sub LinkLabel1_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked - Dim L As String = Me.cmbArea2.SelectedValue + ' Dim L As String = Me.cmbArea2.SelectedValue If MsgBox("공용코드값을 서버로부터 가져오시겠습니까?", MsgBoxStyle.Information Or MsgBoxStyle.OkCancel, "확인") = MsgBoxResult.Ok Then Read_CommonCode() ' Me.cmbArea2.SelectedValue = L Me.bs.EndEdit() End Sub Private Sub LinkLabel2_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLabel2.LinkClicked - Dim L As String = Me.cmbArea2.SelectedValue + 'Dim L As String = Me.cmbArea2.SelectedValue If MsgBox("기상데이터값을 서버로부터 가져오시겠습니까?", MsgBoxStyle.Information Or MsgBoxStyle.OkCancel, "확인") = MsgBoxResult.Ok Then Read_WeatherData() - AttachAreaBind() + ' AttachAreaBind() ' Me.cmbArea2.SelectedValue = L Me.bs.EndEdit() End Sub Private Sub LinkLabel3_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked '//2010.12.06 추가 - Dim L As String = Me.cmbArea2.SelectedValue + ' Dim L As String = Me.cmbArea2.SelectedValue If MsgBox("표준프로파일값을 서버로부터 가져오시겠습니까?", MsgBoxStyle.Information Or MsgBoxStyle.OkCancel, "확인") = MsgBoxResult.Ok Then Read_ProfileData() ' Me.cmbArea2.SelectedValue = L Me.bs.EndEdit() @@ -379,92 +372,143 @@ End Sub - Private Sub 지역코드설정() - Dim drv As DataRowView = Me.bs.Current - If drv Is Nothing Then Return + 'Private Sub 지역코드설정() + ' Dim drv As DataRowView = Me.bs.Current + ' If drv Is Nothing Then Return - '//지역코드에는 Weather_Group의 코드값이 들어있다. - Dim 지역코드 As String = drv("buildarea").ToString - If 지역코드 <> "" AndAlso 지역코드 <> "0" AndAlso 지역코드 <> "00" AndAlso 지역코드.Length = 6 Then + ' '//지역코드에는 Weather_Group의 코드값이 들어있다. + ' Dim 지역코드 As String = drv("buildarea").ToString + ' If 지역코드 <> "" AndAlso 지역코드 <> "0" AndAlso 지역코드 <> "00" AndAlso 지역코드.Length = 6 Then - 변경암함_세부지역 = True + ' 변경암함_세부지역 = True - '//Dep 1 - Dim codeHeader As String = 지역코드.Substring(0, 2) - bsArea2.Filter = String.Format("code like '{0}%' and code not like '%0000' and code like '%00'", codeHeader) - Me.cmbArea1.SelectedValue = codeHeader + "0000" '//선택해줌 + ' '//Dep 1 + ' Dim codeHeader As String = 지역코드.Substring(0, 2) + ' bsArea2.Filter = String.Format("code like '{0}%' and code not like '%0000' and code like '%00'", codeHeader) + ' Me.cmbArea1.SelectedValue = codeHeader + "0000" '//선택해줌 - codeHeader = 지역코드.Substring(0, 4) - 'bsArea3.Filter = String.Format("code like '{0}%' and code not like '%00'", codeHeader) - Me.cmbArea2.SelectedValue = codeHeader + "00" + ' codeHeader = 지역코드.Substring(0, 4) + ' 'bsArea3.Filter = String.Format("code like '{0}%' and code not like '%00'", codeHeader) + ' Me.cmbArea2.SelectedValue = codeHeader + "00" - 'Me.cmbArea3.SelectedValue = 지역코드 + ' 'Me.cmbArea3.SelectedValue = 지역코드 - '//찾은 중분류코드에맞는 중분류를 자동 선택해준다. - 변경암함_세부지역 = False - Else - bsArea1.Filter = "code like '%0000'" - bsArea2.Filter = "code='test'" - 'bsArea3.Filter = "code='test'" - End If - End Sub + ' '//찾은 중분류코드에맞는 중분류를 자동 선택해준다. + ' 변경암함_세부지역 = False + ' Else + ' bsArea1.Filter = "code like '%0000'" + ' bsArea2.Filter = "code='test'" + ' 'bsArea3.Filter = "code='test'" + ' End If + 'End Sub - Private Sub cmbArea1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbArea1.SelectedIndexChanged - If init = False Then Return '//초기화전이면 수행안함 - Dim drv As DataRowView = Me.bs.Current - If drv Is Nothing Then Return + 'Private Sub cmbArea1_SelectedIndexChanged(sender As Object, e As EventArgs) + ' If init = False Then Return '//초기화전이면 수행안함 + ' Dim drv As DataRowView = Me.bs.Current + ' If drv Is Nothing Then Return - '//지역그룹선택을 바꾼다면 해당 지역에 맞도록 우측을 갱신해줘야한다 - If 변경암함_세부지역 Then Return '//순환참조방지 - If Me.cmbArea1.SelectedIndex < 0 OrElse cmbArea1.Text = "없음" OrElse cmbArea1.SelectedValue.ToString() = "00" Then - Me.cmbArea2.SelectedIndex = -1 - Else - Dim codeHeader As String = cmbArea1.SelectedValue.ToString().Substring(0, 2) - bsArea2.Filter = String.Format("code like '{0}%' and code not like '%0000' and code like '%00'", codeHeader) + ' '//지역그룹선택을 바꾼다면 해당 지역에 맞도록 우측을 갱신해줘야한다 + ' If 변경암함_세부지역 Then Return '//순환참조방지 + ' If Me.cmbArea1.SelectedIndex < 0 OrElse cmbArea1.Text = "없음" OrElse cmbArea1.SelectedValue.ToString() = "00" Then + ' Me.cmbArea2.SelectedIndex = -1 + ' Else + ' Dim codeHeader As String = cmbArea1.SelectedValue.ToString().Substring(0, 2) + ' bsArea2.Filter = String.Format("code like '{0}%' and code not like '%0000' and code like '%00'", codeHeader) - cmbArea2.DataSource = bsArea2 - cmbArea2.DisplayMember = "name" - cmbArea2.ValueMember = "code" + ' cmbArea2.DataSource = bsArea2 + ' cmbArea2.DisplayMember = "name" + ' cmbArea2.ValueMember = "code" - If (cmbArea2.Items.Count > 0) Then - cmbArea2.SelectedIndex = 0 - Else - cmbArea2.SelectedIndex = -1 - End If + ' If (cmbArea2.Items.Count > 0) Then + ' cmbArea2.SelectedIndex = 0 + ' Else + ' cmbArea2.SelectedIndex = -1 + ' End If - If cmbArea1.SelectedIndex >= 0 Then - drv("buildarea") = cmbArea1.SelectedValue.ToString() - drv.EndEdit() - End If + ' If cmbArea1.SelectedIndex >= 0 Then + ' drv("buildarea") = cmbArea1.SelectedValue.ToString() + ' drv.EndEdit() + ' End If - End If - End Sub + ' End If + 'End Sub - Private Sub CmbArea2_SelectedIndexChanged_1(sender As System.Object, e As System.EventArgs) Handles cmbArea2.SelectedIndexChanged - If init = False Then Return '//초기화전이면 수행안함 - Dim drv As DataRowView = Me.bs.Current - If drv Is Nothing Then Return + 'Private Sub CmbArea2_SelectedIndexChanged_1(sender As System.Object, e As System.EventArgs) + ' If init = False Then Return '//초기화전이면 수행안함 + ' Dim drv As DataRowView = Me.bs.Current + ' If drv Is Nothing Then Return - '//지역그룹선택을 바꾼다면 해당 지역에 맞도록 우측을 갱신해줘야한다 - If 변경암함_세부지역 Then Return '//순환참조방지 - If Me.cmbArea2.SelectedIndex < 0 OrElse cmbArea2.Text = "없음" OrElse cmbArea2.SelectedValue.ToString() = "00" Then - 'Me.cmbArea3.SelectedIndex = -1 - Else - Dim codeHeader As String = cmbArea2.SelectedValue.ToString().Substring(0, 4) - 'bsArea3.Filter = String.Format("code like '{0}%' and code not like '%00'", codeHeader) - 'cmbArea3.SelectedIndex = -1 + ' '//지역그룹선택을 바꾼다면 해당 지역에 맞도록 우측을 갱신해줘야한다 + ' If 변경암함_세부지역 Then Return '//순환참조방지 + ' If Me.cmbArea2.SelectedIndex < 0 OrElse cmbArea2.Text = "없음" OrElse cmbArea2.SelectedValue.ToString() = "00" Then + ' 'Me.cmbArea3.SelectedIndex = -1 + ' Else + ' Dim codeHeader As String = cmbArea2.SelectedValue.ToString().Substring(0, 4) + ' 'bsArea3.Filter = String.Format("code like '{0}%' and code not like '%00'", codeHeader) + ' 'cmbArea3.SelectedIndex = -1 - If cmbArea2.SelectedIndex >= 0 Then - drv("buildarea") = cmbArea2.SelectedValue.ToString() - drv.EndEdit() - End If + ' If cmbArea2.SelectedIndex >= 0 Then + ' drv("buildarea") = cmbArea2.SelectedValue.ToString() + ' drv.EndEdit() + ' End If - End If - End Sub + ' End If + 'End Sub Private Sub Label41_Click(sender As Object, e As EventArgs) Handles Label41.Click - Dim f As New fSelectWeatherGroup() - f.ShowDialog() + + End Sub + + Private Sub tbArea_TextChanged(sender As Object, e As EventArgs) + + End Sub + + Private Sub tbArea_Click(sender As Object, e As EventArgs) + + End Sub + + Function GetAreaName(code As String) + If String.IsNullOrEmpty(code) OrElse code.Length <> 6 Then Return code + Dim Grp1 As String = code.Substring(0, 2) + + '//그룹 이름 찾기 + Dim GrpName As String = String.Empty + Dim CodeName As String = String.Empty + + Dim GrpCode As String = Grp1 + "0000" + Dim GrpList() As DS.weather_groupRow = DSET1.weather_group.Select("code='" + GrpCode + "'") + If GrpList Is Nothing OrElse GrpList.Length = 1 Then + GrpName = GrpList(0).name + End If + + GrpList = DSET1.weather_group.Select("code='" + code + "'") + If GrpList Is Nothing OrElse GrpList.Length = 1 Then + CodeName = GrpList(0).name + End If + + If CodeName = String.Empty Then + Return code + Else + Return GrpName + " > " + CodeName + End If + + End Function + + Private Sub btArea_Click(sender As Object, e As EventArgs) Handles btArea.Click + Dim PreCode As String = String.Empty + Dim dr As DS.tbl_DescRow = Nothing + If DSET1.tbl_Desc.Rows.Count = 1 Then + dr = DSET1.tbl_Desc.Rows(0) + PreCode = dr.buildarea + End If + Dim f As New fSelectWeatherGroup(PreCode) + If f.ShowDialog() = DialogResult.OK Then + If Not dr Is Nothing Then + btArea.Text = GetAreaName(f.SelectedCode) + dr.buildarea = f.SelectedCode + dr.EndEdit() + End If + End If End Sub End Class \ No newline at end of file diff --git a/ArinWarev1/Forms_Input/Frm_v20091231_Weather.Designer.vb b/ArinWarev1/Forms_Input/Frm_v20091231_Weather.Designer.vb index 0ef439e..d84a5d5 100644 --- a/ArinWarev1/Forms_Input/Frm_v20091231_Weather.Designer.vb +++ b/ArinWarev1/Forms_Input/Frm_v20091231_Weather.Designer.vb @@ -1496,7 +1496,7 @@ Partial Class Frm_V20091231_Weather Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 102.0!)) Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 102.0!)) Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 96.0!)) - Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 146.0!)) + Me.TableLayoutPanel7.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 147.0!)) Me.TableLayoutPanel7.Controls.Add(Me.tb_w12, 3, 5) Me.TableLayoutPanel7.Controls.Add(Label64, 2, 5) Me.TableLayoutPanel7.Controls.Add(Label77, 2, 4) @@ -1530,7 +1530,7 @@ Partial Class Frm_V20091231_Weather Me.TableLayoutPanel7.RowStyles.Add(New System.Windows.Forms.RowStyle()) Me.TableLayoutPanel7.RowStyles.Add(New System.Windows.Forms.RowStyle()) Me.TableLayoutPanel7.RowStyles.Add(New System.Windows.Forms.RowStyle()) - Me.TableLayoutPanel7.Size = New System.Drawing.Size(451, 169) + Me.TableLayoutPanel7.Size = New System.Drawing.Size(452, 169) Me.TableLayoutPanel7.TabIndex = 122 ' 'tb_w12 @@ -3479,7 +3479,7 @@ Partial Class Frm_V20091231_Weather Me.Button6.BackColor = System.Drawing.Color.WhiteSmoke Me.Button6.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button6.Location = New System.Drawing.Point(146, 340) + Me.Button6.Location = New System.Drawing.Point(146, 448) Me.Button6.Name = "Button6" Me.Button6.Size = New System.Drawing.Size(108, 45) Me.Button6.TabIndex = 23 @@ -3491,7 +3491,7 @@ Partial Class Frm_V20091231_Weather Me.Button4.BackColor = System.Drawing.Color.WhiteSmoke Me.Button4.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.Location = New System.Drawing.Point(813, 340) + Me.Button4.Location = New System.Drawing.Point(813, 448) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(108, 45) Me.Button4.TabIndex = 22 @@ -3503,7 +3503,7 @@ Partial Class Frm_V20091231_Weather Me.Button5.BackColor = System.Drawing.Color.WhiteSmoke Me.Button5.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.Location = New System.Drawing.Point(685, 340) + Me.Button5.Location = New System.Drawing.Point(685, 448) Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(122, 45) Me.Button5.TabIndex = 21 @@ -3515,7 +3515,7 @@ Partial Class Frm_V20091231_Weather Me.Button7.BackColor = System.Drawing.Color.WhiteSmoke Me.Button7.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button7.Location = New System.Drawing.Point(558, 340) + Me.Button7.Location = New System.Drawing.Point(550, 448) Me.Button7.Name = "Button7" Me.Button7.Size = New System.Drawing.Size(108, 45) Me.Button7.TabIndex = 20 @@ -3527,7 +3527,7 @@ Partial Class Frm_V20091231_Weather Me.Button8.BackColor = System.Drawing.Color.WhiteSmoke Me.Button8.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button8.Location = New System.Drawing.Point(288, 340) + Me.Button8.Location = New System.Drawing.Point(280, 448) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(122, 45) Me.Button8.TabIndex = 19 @@ -3556,7 +3556,7 @@ Partial Class Frm_V20091231_Weather Me.dvArea3.Name = "dvArea3" Me.dvArea3.RowHeadersVisible = False Me.dvArea3.RowTemplate.Height = 23 - Me.dvArea3.Size = New System.Drawing.Size(236, 281) + Me.dvArea3.Size = New System.Drawing.Size(236, 392) Me.dvArea3.TabIndex = 18 Me.dvArea3.Tag = "3" ' @@ -3606,13 +3606,13 @@ Partial Class Frm_V20091231_Weather Me.dvArea2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dvArea2.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.CodeDataGridViewTextBoxColumn1, Me.area2, Me.NameDataGridViewTextBoxColumn1, Me.AreaDataGridViewTextBoxColumn1, Me.dvc_area2, Me.area3}) Me.dvArea2.DataSource = Me.bsWGDep2 - Me.dvArea2.Location = New System.Drawing.Point(288, 35) + Me.dvArea2.Location = New System.Drawing.Point(280, 35) Me.dvArea2.Margin = New System.Windows.Forms.Padding(0) Me.dvArea2.MultiSelect = False Me.dvArea2.Name = "dvArea2" Me.dvArea2.RowHeadersVisible = False Me.dvArea2.RowTemplate.Height = 23 - Me.dvArea2.Size = New System.Drawing.Size(378, 290) + Me.dvArea2.Size = New System.Drawing.Size(378, 401) Me.dvArea2.TabIndex = 17 Me.dvArea2.Tag = "2" ' @@ -3690,7 +3690,7 @@ Partial Class Frm_V20091231_Weather Me.dvArea1.Name = "dvArea1" Me.dvArea1.RowHeadersVisible = False Me.dvArea1.RowTemplate.Height = 23 - Me.dvArea1.Size = New System.Drawing.Size(236, 290) + Me.dvArea1.Size = New System.Drawing.Size(236, 401) Me.dvArea1.TabIndex = 16 Me.dvArea1.Tag = "1" ' @@ -3736,7 +3736,7 @@ Partial Class Frm_V20091231_Weather 'Label14 ' Me.Label14.AutoSize = True - Me.Label14.Location = New System.Drawing.Point(286, 14) + Me.Label14.Location = New System.Drawing.Point(278, 14) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(62, 12) Me.Label14.TabIndex = 14 diff --git a/ArinWarev1/Forms_Input/Frm_v20091231_Weather.resx b/ArinWarev1/Forms_Input/Frm_v20091231_Weather.resx index 9e21749..70a5ad8 100644 --- a/ArinWarev1/Forms_Input/Frm_v20091231_Weather.resx +++ b/ArinWarev1/Forms_Input/Frm_v20091231_Weather.resx @@ -412,18 +412,48 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 1397, 17 + + + True + + + True + + + True + + + 17, 56 + + + 131, 56 + 91, 17 17, 17 + + 17, 17 + True 155, 17 + + True + + + 155, 17 + + + 655, 17 + 655, 17 @@ -502,6 +532,15 @@ 252, 17 + + True + + + 252, 17 + + + 811, 17 + 811, 17 @@ -580,6 +619,15 @@ 360, 17 + + True + + + 360, 17 + + + 967, 17 + 967, 17 @@ -658,6 +706,15 @@ 473, 17 + + True + + + 473, 17 + + + 1241, 17 + 1241, 17 @@ -730,30 +787,15 @@ P0ilegWKIwMchCbSyQAAAABJRU5ErkJggg== - - 1397, 17 - - - True - - - True - - - True - - - 17, 56 - - - 131, 56 - 1123, 17 True + + True + 83