From 5da5d01450747064eb629d4f46905d2252b9dda4 Mon Sep 17 00:00:00 2001 From: Crudelis Date: Fri, 27 Oct 2023 14:01:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=80=ED=8B=B0=20=EB=AA=A8=EB=8B=88?= =?UTF-8?q?=ED=84=B0=20=EC=84=A4=EC=A0=95=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomForm/FindMonitor.cs | 14 +++++--------- .../CustomUserControl/SettingControl.cs | 5 ++--- .../CustomUserControl/UserList.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/FindMonitor.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/FindMonitor.cs index 35335ce..ccc7f50 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomForm/FindMonitor.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomForm/FindMonitor.cs @@ -1,21 +1,17 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Drawing; using System.Windows.Forms; namespace HSUCO_Cargo_Garage_Operation_Program.CustomForm { public partial class FindMonitor : Form { - public FindMonitor(string monitorNumber) + public FindMonitor(string monitorNumber, Point location) { InitializeComponent(); + this.StartPosition = FormStartPosition.Manual; label_No.Text = monitorNumber; + this.Location = location; + this.TopMost = true; } } } diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs index a0e2b54..22c9578 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/SettingControl.cs @@ -102,13 +102,12 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl timer.Interval = 5000; timer.Tick += Timer_Tick; - timer.Start(); for (int i = 0; i < findMonitors.Length; i++) { - findMonitors[i] = new FindMonitor((i + 1).ToString()); - findMonitors[i].Location = new System.Drawing.Point(scr[i].WorkingArea.Top, scr[i].WorkingArea.X); + findMonitors[i] = new FindMonitor((i + 1).ToString(), new System.Drawing.Point(scr[i].Bounds.Left + 30, scr[i].Bounds.Top + 30)); findMonitors[i].Show(); } + timer.Start(); } private void Timer_Tick(object sender, EventArgs e) diff --git a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs index dc2da30..710380e 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/CustomUserControl/UserList.cs @@ -426,7 +426,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl MetroMessageBox.Show(this, "이용중인 사용자가 아닙니다.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - + var result = MetroMessageBox.Show(this, "발급 하시겠습니까?", "증명서 발급", MessageBoxButtons.YesNo, MessageBoxIcon.Question); if (result == DialogResult.No) return; @@ -463,7 +463,7 @@ namespace HSUCO_Cargo_Garage_Operation_Program.CustomUserControl setCertificateInformation.StartDate = promotion.StartDate; setCertificateInformation.EndDate = promotion.EndDate; setCertificateInformation.Amount = certificateInformation.Amount; - + Database.SetCertificate(setCertificateInformation); var print = new PrintCertificate(new List() { certificateInformation }, Global.GlobalSettings.GarageName); diff --git a/HSUCO_Cargo_Garage_Operation_Program/Properties/AssemblyInfo.cs b/HSUCO_Cargo_Garage_Operation_Program/Properties/AssemblyInfo.cs index b2d8701..d4bbc3f 100644 --- a/HSUCO_Cargo_Garage_Operation_Program/Properties/AssemblyInfo.cs +++ b/HSUCO_Cargo_Garage_Operation_Program/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.*")] -[assembly: AssemblyFileVersion("1.5.*")] +[assembly: AssemblyVersion("1.6.*")] +[assembly: AssemblyFileVersion("1.6.*")]