diff --git a/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb b/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb index 33029ed..5e023be 100644 --- a/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb +++ b/ArinWarev1/Forms_Input/Frm_Desc.Designer.vb @@ -397,7 +397,7 @@ Partial Class Frm_Desc 'LinkLabel3 ' Me.LinkLabel3.AutoSize = True - Me.LinkLabel3.Location = New System.Drawing.Point(413, 551) + Me.LinkLabel3.Location = New System.Drawing.Point(209, 551) Me.LinkLabel3.Name = "LinkLabel3" Me.LinkLabel3.Size = New System.Drawing.Size(210, 12) Me.LinkLabel3.TabIndex = 177 @@ -417,13 +417,15 @@ Partial Class Frm_Desc 'LinkLabel2 ' Me.LinkLabel2.AutoSize = True - Me.LinkLabel2.Location = New System.Drawing.Point(206, 551) + Me.LinkLabel2.LinkColor = System.Drawing.Color.Red + Me.LinkLabel2.Location = New System.Drawing.Point(429, 551) Me.LinkLabel2.Name = "LinkLabel2" Me.LinkLabel2.Size = New System.Drawing.Size(197, 12) Me.LinkLabel2.TabIndex = 177 Me.LinkLabel2.TabStop = True Me.LinkLabel2.Text = "기상데이터 서버로부터 가져오기" Me.ToolTip1.SetToolTip(Me.LinkLabel2, "기상관련데이터를 서버로부터 가져옵니다") + Me.LinkLabel2.Visible = False ' 'Label18 ' diff --git a/ArinWarev1/Forms_Input/Frm_Desc.resx b/ArinWarev1/Forms_Input/Frm_Desc.resx index f5b7fdb..dae8133 100644 --- a/ArinWarev1/Forms_Input/Frm_Desc.resx +++ b/ArinWarev1/Forms_Input/Frm_Desc.resx @@ -123,6 +123,9 @@ 81, 17 + + 81, 17 + diff --git a/ArinWarev1/Forms_Input/Frm_Desc.vb b/ArinWarev1/Forms_Input/Frm_Desc.vb index cc2d550..389a811 100644 --- a/ArinWarev1/Forms_Input/Frm_Desc.vb +++ b/ArinWarev1/Forms_Input/Frm_Desc.vb @@ -125,16 +125,7 @@ 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'" + 'Read_WeatherFile() Me.LinkLabel1.Visible = False Me.LinkLabel2.Visible = False @@ -205,41 +196,47 @@ MsgBox("표준프로파일 에러" & ex.Message.ToString) End Try - '/기상데이터버젼확인 - Try - MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString - If MyVersion = "" Then MyVersion = "20100101" - Catch ex As Exception - MyVersion = "20100101" - End Try - Try - '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 - Read_WeatherData() - 'Me.cmbArea2.SelectedValue = Lw - Me.bs.EndEdit() - End If - Catch ex As Exception + '/기상데이터버젼확인 + '/기상데이터는 로컬파일을 사용하도록 한다 200816 + 'Try + ' MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString + ' If MyVersion = "" Then MyVersion = "20100101" + 'Catch ex As Exception + ' MyVersion = "20100101" + 'End Try + 'Try + ' '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 + ' Read_WeatherData() + ' 'Me.cmbArea2.SelectedValue = Lw + ' Me.bs.EndEdit() + ' End If + 'Catch ex As Exception + + 'End Try + + - End Try Else If Not Prj.UserId.ToLower() = "guest" Then '//서버업데이트기능 숨김 Me.LinkLabel1.Visible = True - Me.LinkLabel2.Visible = True + 'Me.LinkLabel2.Visible = True Me.LinkLabel3.Visible = True End If End If '지역코드설정() + AddHandler DSET1.tbl_Desc.ColumnChanging, AddressOf AddNewDataRow_Zone_Changed2 - AddDebug("▲ Form Load") + AddDebug("▲ Form Load") End Sub + Private Sub Binding_Zone() Dim bs_cmb_공조방식 As New BindingSource(DSET1, "tbl_weather") bs_cmb_공조방식.Filter = "" diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index cdf6301..2971c0e 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -893,42 +893,44 @@ Public Class MdiMain MsgBox("ǥ " & ex.Message.ToString) End Try End If - + + Read_WeatherFile() + '/͹Ȯ - Try - MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString - If MyVersion = "" Then MyVersion = "20100101" - Catch ex As Exception - MyVersion = "20100101" - End Try + 'Try + ' MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString + ' If MyVersion = "" Then MyVersion = "20100101" + 'Catch ex As Exception + ' MyVersion = "20100101" + 'End Try - pLog.Add(String.Format("͹ = {0}", MyVersion)) - If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020 - Try - 'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString - VersionInfo = L.Get_LastVersion("W2") '// µ eco ٲ߰ ^^ ڸ ֵ սô! - If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0 ų ̹Ƿ Ѿ. - If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then '//2011.03.08 ߰ - Dim Msg As New System.Text.StringBuilder - Msg.AppendLine("ο ȮεǾϴ" & vbCrLf) - Msg.AppendLine(":" & MyVersion & " űԹ:" & VersionInfo.Ver) - Msg.AppendLine("----------------------------------") - Msg.AppendLine(VersionInfo.Desc) - Msg.AppendLine("----------------------------------") - If VersionInfo.Link.Trim = "" Then VersionInfo.Link = "http://Ȩּ" - ' Msg.AppendLine("űԹ Ȯϱ ðڽϱ?") - If MsgBox(Msg.ToString, MsgBoxStyle.Information, "Ȯ") = MsgBoxResult.Ok Then - 'Shell("explorer " & VersionInfo.Link, AppWinStyle.NormalFocus) - ' End - End If - End If - End If - Catch ex As Exception + 'pLog.Add(String.Format("͹ = {0}", MyVersion)) + 'If Prj.UserId.ToLower() <> "guest" AndAlso Not Prj.UserId.ToLower().StartsWith("user") Then '//191020 + ' Try + ' 'MyVersion = DSET1.tbl_Desc.Rows(0)("versionw").ToString + ' VersionInfo = L.Get_LastVersion("W2") '// µ eco ٲ߰ ^^ ڸ ֵ սô! + ' If VersionInfo.Ver <> "0" AndAlso (CInt(VersionInfo.Ver) > CInt(MyVersion)) Then '//0 ų ̹Ƿ Ѿ. + ' If Prj.UserAuthType = "ADMIN" OrElse Prj.UserAuthType = "BOTH" OrElse Prj.UserAuthType = "BOTH2" OrElse Prj.UserAuthType = "BOTH1" Then '//2011.03.08 ߰ + ' Dim Msg As New System.Text.StringBuilder + ' Msg.AppendLine("ο ȮεǾϴ" & vbCrLf) + ' Msg.AppendLine(":" & MyVersion & " űԹ:" & VersionInfo.Ver) + ' Msg.AppendLine("----------------------------------") + ' Msg.AppendLine(VersionInfo.Desc) + ' Msg.AppendLine("----------------------------------") + ' If VersionInfo.Link.Trim = "" Then VersionInfo.Link = "http://Ȩּ" + ' ' Msg.AppendLine("űԹ Ȯϱ ðڽϱ?") + ' If MsgBox(Msg.ToString, MsgBoxStyle.Information, "Ȯ") = MsgBoxResult.Ok Then + ' 'Shell("explorer " & VersionInfo.Link, AppWinStyle.NormalFocus) + ' ' End + ' End If + ' End If + ' End If + ' Catch ex As Exception - End Try - End If + ' End Try + 'End If PrjChanged = False @@ -976,6 +978,66 @@ Public Class MdiMain Private GroupList_Yk As ArrayList Private GroupList_Bunbae As ArrayList + + Sub Read_WeatherFile() + '// ܺϿ Ѵ + DSET1.weather_cha.Clear() + DSET1.weather_ilsa.Clear() + DSET1.weather_supdo.Clear() + DSET1.weather_temp.Clear() + DSET1.weather_group.Clear() + DSET1.tbl_weather.Clear() + + Dim DataPath As String = AppDomain.CurrentDomain.BaseDirectory + "Data" + Dim fi1 As String = System.IO.Path.Combine(DataPath, DSET1.weather_cha.TableName + ".xml") + Dim fi2 As String = System.IO.Path.Combine(DataPath, DSET1.weather_ilsa.TableName + ".xml") + Dim fi3 As String = System.IO.Path.Combine(DataPath, DSET1.weather_supdo.TableName + ".xml") + Dim fi4 As String = System.IO.Path.Combine(DataPath, DSET1.weather_temp.TableName + ".xml") + Dim fi5 As String = System.IO.Path.Combine(DataPath, DSET1.tbl_weather.TableName + ".xml") + Dim fi6 As String = System.IO.Path.Combine(DataPath, DSET1.weather_group.TableName + ".xml") + + + + If System.IO.File.Exists(fi1) Then + DSET1.weather_cha.ReadXml(fi1) + Else + MsgBox("#1 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi2) Then + DSET1.weather_ilsa.ReadXml(fi2) + Else + MsgBox("#2 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi3) Then + DSET1.weather_supdo.ReadXml(fi3) + Else + MsgBox("#3 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi4) Then + DSET1.weather_temp.ReadXml(fi4) + Else + MsgBox("#4 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi5) Then + DSET1.tbl_weather.ReadXml(fi5) + Else + MsgBox("#5 ϴ\r\nα׷ ٽ ġϼ") + End If + If System.IO.File.Exists(fi6) Then + DSET1.weather_group.ReadXml(fi6) + Else + MsgBox("#6 ϴ\r\nα׷ ٽ ġϼ") + End If + + DSET1.weather_cha.AcceptChanges() + DSET1.weather_ilsa.AcceptChanges() + DSET1.weather_supdo.AcceptChanges() + DSET1.weather_temp.AcceptChanges() + DSET1.tbl_weather.AcceptChanges() + + DSET1.weather_group.AcceptChanges() + End Sub + '''޴ 籸ϴ¼ҽ Public Sub RefreshMenuList(autoselecttagname) Me.TreeView1.Nodes.Clear() '//Ʈʱȭ