diff --git a/Cls_LCable/PrintForm.vb b/Cls_LCable/PrintForm.vb index e5bd791..d2f9989 100644 --- a/Cls_LCable/PrintForm.vb +++ b/Cls_LCable/PrintForm.vb @@ -39,11 +39,11 @@ Public Class PrintForm Public Sub New() InitializeComponent() End Sub - Public Sub New(ByRef Src As DataTable, ByVal vAdmin As Boolean, ByVal vDefStyleIndex As Short, Optional ByVal IRow As DataRowView = Nothing, Optional DisWaterMK As Boolean = False) + Public Sub New(ByRef Src As DataTable, vdev As Boolean, ByVal vDefStyleIndex As Short, Optional ByVal IRow As DataRowView = Nothing, Optional DisWaterMK As Boolean = False) InitializeComponent() SrcTable = Src '// ̺ ӽ̺ صΰ Ѵ. Srcrow = IRow '//̰ Ŭ ̴. - Me.Admin = vAdmin + Me.Admin = vdev Me.DefStyleIndex = vDefStyleIndex DisableWaterMark = DisWaterMK '//190208 End Sub diff --git a/Cls_Tongshin/PrintForm.vb b/Cls_Tongshin/PrintForm.vb index 30d0a4e..dd89554 100644 --- a/Cls_Tongshin/PrintForm.vb +++ b/Cls_Tongshin/PrintForm.vb @@ -49,11 +49,11 @@ Public Class PrintForm Public Sub New() InitializeComponent() End Sub - Public Sub New(ByRef Src As DataTable, ByVal vAdmin As Boolean, ByVal vDefStyleIndex As Short, Optional ByVal IRow As DataRowView = Nothing, Optional DisWaterMK As Boolean = False) + Public Sub New(ByRef Src As DataTable, vdev As Boolean, ByVal vDefStyleIndex As Short, Optional ByVal IRow As DataRowView = Nothing, Optional DisWaterMK As Boolean = False) InitializeComponent() SrcTable = Src '// ̺ ӽ̺ صΰ Ѵ. Srcrow = IRow '//̰ Ŭ ̴. - Me.Admin = vAdmin + Me.Admin = vdev Me.DefStyleIndex = vDefStyleIndex DisableWaterMark = DisWaterMK '//190208 End Sub diff --git a/Epole/History.txt b/Epole/History.txt index a1d9356..b75ce81 100644 --- a/Epole/History.txt +++ b/Epole/History.txt @@ -1 +1,2 @@ -180117 chi *cls_tonshin 에서 간선과 전주번호 길이 최대값을 10에서 20으로 수정 \ No newline at end of file +190223 chi 스타일목록에서 마우스 우클릭으로 숨김/표시 처리가 가능함(단 관리자 로그인 시) +180117 chi *cls_tonshin 에서 간선과 전주번호 길이 최대값을 10에서 20으로 수정 \ No newline at end of file diff --git a/Epole/KT번호찰.vbproj.user b/Epole/KT번호찰.vbproj.user index 8ea7821..055b497 100644 --- a/Epole/KT번호찰.vbproj.user +++ b/Epole/KT번호찰.vbproj.user @@ -1,7 +1,7 @@  - true + false false ARIN250 diff --git a/Epole/MakeList.vb b/Epole/MakeList.vb index 4206841..0c0eb40 100644 --- a/Epole/MakeList.vb +++ b/Epole/MakeList.vb @@ -37,6 +37,22 @@ Public Class MakeList If msg = "ARIN2506" Then UserInfo.Type = E_AuthType.Demo MessageBox.Show(" α ", "Ȯ", MessageBoxButtons.OK, MessageBoxIcon.Information) + + Select Case UserInfo.Type + Case E_AuthType.Dev + Me.lb_auth.Text = "[]" + Me.lb_auth.ForeColor = Color.Green + Case E_AuthType.adm + Me.lb_auth.Text = "[]" + Me.lb_auth.ForeColor = Color.Blue + Case E_AuthType.Demo + Me.lb_auth.Text = "[ӽû]" + Me.lb_auth.ForeColor = Color.Blue + Case E_AuthType.Normal + Me.lb_auth.Text = "[]" + Me.lb_auth.ForeColor = Color.Black + End Select + End If ElseIf e.Control AndAlso e.Shift AndAlso e.KeyCode = Keys.F12 Then @@ -46,6 +62,22 @@ Public Class MakeList If msg = "ر" + Now.ToString("yyyyMMdd") Then UserInfo.Type = E_AuthType.adm MessageBox.Show(" α ", "Ȯ", MessageBoxButtons.OK, MessageBoxIcon.Information) + + Select Case UserInfo.Type + Case E_AuthType.Dev + Me.lb_auth.Text = "[]" + Me.lb_auth.ForeColor = Color.Green + Case E_AuthType.adm + Me.lb_auth.Text = "[]" + Me.lb_auth.ForeColor = Color.Blue + Case E_AuthType.Demo + Me.lb_auth.Text = "[ӽû]" + Me.lb_auth.ForeColor = Color.Blue + Case E_AuthType.Normal + Me.lb_auth.Text = "[]" + Me.lb_auth.ForeColor = Color.Black + End Select + End If End If diff --git a/Epole/입력폼/AddEpole_LCable.vb b/Epole/입력폼/AddEpole_LCable.vb index e4be8d2..e0d9fe3 100644 --- a/Epole/입력폼/AddEpole_LCable.vb +++ b/Epole/입력폼/AddEpole_LCable.vb @@ -444,6 +444,8 @@ Public Class AddEpole_LCable If UserInfo.Type = E_AuthType.Demo Then MsgBox(" ӽûԴϴ" & vbCrLf & " ޼ ӽûڸ µ˴ϴ", MsgBoxStyle.Information, "Ȯ") End If + ' Public Sub New(ByRef Src As DataTable, vdev As Boolean, ByVal vDefStyleIndex As Short, Optional ByVal IRow As DataRowView = Nothing, Optional DisWaterMK As Boolean = False, Optional vAdmin As Boolean = False) + Dim Aa As New Cls_LCable.PrintForm(Me.DT, IIf(UserInfo.Type = E_AuthType.Dev, True, False), Me.view1.⺻Ÿε, CType(Me.bs.Current, DataRowView), IIf(UserInfo.Type = E_AuthType.adm, True, False)) Aa.Fixed = New String() {TB1.Text, TB2.Text, TB3.Text, TB4.Text, TB5.Text, TB6.Text, TB7.Text} Aa.Show() diff --git a/SubProject/QRCodeLib/ThoughtWorks.QRCode.dll b/SubProject/QRCodeLib/ThoughtWorks.QRCode.dll index 428b3bc..8db0120 100644 Binary files a/SubProject/QRCodeLib/ThoughtWorks.QRCode.dll and b/SubProject/QRCodeLib/ThoughtWorks.QRCode.dll differ diff --git a/SubProject/QRCodeLib/ThoughtWorks.QRCode.pdb b/SubProject/QRCodeLib/ThoughtWorks.QRCode.pdb index 763d0d3..c5daf8e 100644 Binary files a/SubProject/QRCodeLib/ThoughtWorks.QRCode.pdb and b/SubProject/QRCodeLib/ThoughtWorks.QRCode.pdb differ