diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo
index 89161d3..8bf9fd0 100644
Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ
diff --git a/unimarc/unimarc/Login.Designer.cs b/unimarc/unimarc/Login.Designer.cs
index 78b2244..68d4be4 100644
--- a/unimarc/unimarc/Login.Designer.cs
+++ b/unimarc/unimarc/Login.Designer.cs
@@ -34,7 +34,6 @@
this.button2 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
this.chk_Save = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
@@ -93,17 +92,6 @@
this.label2.TabIndex = 2;
this.label2.Text = "비밀번호";
//
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.BackColor = System.Drawing.SystemColors.Control;
- this.label3.Location = new System.Drawing.Point(77, 61);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(33, 12);
- this.label3.TabIndex = 5;
- this.label3.Text = " ";
- this.label3.Click += new System.EventHandler(this.label3_Click);
- //
// chk_Save
//
this.chk_Save.AutoSize = true;
@@ -121,7 +109,6 @@
this.ClientSize = new System.Drawing.Size(480, 219);
this.ControlBox = false;
this.Controls.Add(this.chk_Save);
- this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.button2);
@@ -145,7 +132,6 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
private System.Windows.Forms.CheckBox chk_Save;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/Login.cs b/unimarc/unimarc/Login.cs
index 639f06f..6b79c21 100644
--- a/unimarc/unimarc/Login.cs
+++ b/unimarc/unimarc/Login.cs
@@ -50,8 +50,7 @@ namespace WindowsFormsApp1
this.Close();
}
else {
- MessageBox.Show("ID : [" + result[1] + "] PW : [" + result[2] + "]");
- // MessageBox.Show("아이디 혹은 비밀번호가 정확하지않습니다.");
+ MessageBox.Show("아이디 혹은 비밀번호가 정확하지않습니다.");
}
}
else {
@@ -118,16 +117,5 @@ namespace WindowsFormsApp1
if (e.KeyCode == Keys.Enter) { button1_Click(null, null); }
if (e.KeyCode == Keys.Escape) { this.Close(); }
}
-
- ///
- /// //TODO: 삭제대상
- ///
- ///
- ///
- private void label3_Click(object sender, EventArgs e)
- {
- ID_text.Text = "sh";
- PW_text.Text = "123";
- }
}
}
diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs
index 0508d98..4aca8f0 100644
--- a/unimarc/unimarc/Main.Designer.cs
+++ b/unimarc/unimarc/Main.Designer.cs
@@ -404,28 +404,28 @@
// 단축키설정
//
this.단축키설정.Name = "단축키설정";
- this.단축키설정.Size = new System.Drawing.Size(138, 22);
+ this.단축키설정.Size = new System.Drawing.Size(180, 22);
this.단축키설정.Text = "단축키";
this.단축키설정.Click += new System.EventHandler(this.단축키설정ToolStripMenuItem_Click);
//
// 매크로문구
//
this.매크로문구.Name = "매크로문구";
- this.매크로문구.Size = new System.Drawing.Size(138, 22);
+ this.매크로문구.Size = new System.Drawing.Size(180, 22);
this.매크로문구.Text = "매크로 문구";
this.매크로문구.Click += new System.EventHandler(this.매크로문구설정ToolStripMenuItem_Click);
//
// 불용어
//
this.불용어.Name = "불용어";
- this.불용어.Size = new System.Drawing.Size(138, 22);
+ this.불용어.Size = new System.Drawing.Size(180, 22);
this.불용어.Text = "불용어";
this.불용어.Click += new System.EventHandler(this.불용어ToolStripMenuItem_Click);
//
// 작업지시서
//
this.작업지시서.Name = "작업지시서";
- this.작업지시서.Size = new System.Drawing.Size(138, 22);
+ this.작업지시서.Size = new System.Drawing.Size(180, 22);
this.작업지시서.Text = "작업지시서";
this.작업지시서.Click += new System.EventHandler(this.작업지시서ToolStripMenuItem_Click);
//
@@ -444,35 +444,35 @@
// 마크목록
//
this.마크목록.Name = "마크목록";
- this.마크목록.Size = new System.Drawing.Size(146, 22);
+ this.마크목록.Size = new System.Drawing.Size(180, 22);
this.마크목록.Text = "마크 목록";
this.마크목록.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click);
//
// 소장자료검색
//
this.소장자료검색.Name = "소장자료검색";
- this.소장자료검색.Size = new System.Drawing.Size(146, 22);
+ this.소장자료검색.Size = new System.Drawing.Size(180, 22);
this.소장자료검색.Text = "소장자료검색";
this.소장자료검색.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click);
//
// 마크정리
//
this.마크정리.Name = "마크정리";
- this.마크정리.Size = new System.Drawing.Size(146, 22);
+ this.마크정리.Size = new System.Drawing.Size(180, 22);
this.마크정리.Text = "마크 정리";
this.마크정리.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click);
//
// 복본조사1
//
this.복본조사1.Name = "복본조사1";
- this.복본조사1.Size = new System.Drawing.Size(146, 22);
+ this.복본조사1.Size = new System.Drawing.Size(180, 22);
this.복본조사1.Text = "복본조사";
this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click);
//
// iSBN조회
//
this.iSBN조회.Name = "iSBN조회";
- this.iSBN조회.Size = new System.Drawing.Size(146, 22);
+ this.iSBN조회.Size = new System.Drawing.Size(180, 22);
this.iSBN조회.Text = "ISBN 조회";
this.iSBN조회.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click);
//
@@ -488,14 +488,14 @@
// 마크반입
//
this.마크반입.Name = "마크반입";
- this.마크반입.Size = new System.Drawing.Size(98, 22);
+ this.마크반입.Size = new System.Drawing.Size(180, 22);
this.마크반입.Text = "반입";
this.마크반입.Click += new System.EventHandler(this.반입ToolStripMenuItem_Click);
//
// 마크반출
//
this.마크반출.Name = "마크반출";
- this.마크반출.Size = new System.Drawing.Size(98, 22);
+ this.마크반출.Size = new System.Drawing.Size(180, 22);
this.마크반출.Text = "반출";
this.마크반출.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click);
//
@@ -514,14 +514,15 @@
//
this.마크수집.Enabled = false;
this.마크수집.Name = "마크수집";
- this.마크수집.Size = new System.Drawing.Size(122, 22);
+ this.마크수집.Size = new System.Drawing.Size(180, 22);
this.마크수집.Text = "마크수집";
+ this.마크수집.Visible = false;
this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click);
//
// 전집관리
//
this.전집관리.Name = "전집관리";
- this.전집관리.Size = new System.Drawing.Size(122, 22);
+ this.전집관리.Size = new System.Drawing.Size(180, 22);
this.전집관리.Text = "전집관리";
this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click);
//
@@ -529,14 +530,15 @@
//
this.검수.Enabled = false;
this.검수.Name = "검수";
- this.검수.Size = new System.Drawing.Size(122, 22);
+ this.검수.Size = new System.Drawing.Size(180, 22);
this.검수.Text = "검수";
+ this.검수.Visible = false;
this.검수.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click);
//
// 저자기호
//
this.저자기호.Name = "저자기호";
- this.저자기호.Size = new System.Drawing.Size(122, 22);
+ this.저자기호.Size = new System.Drawing.Size(180, 22);
this.저자기호.Text = "저자기호";
this.저자기호.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click);
//
@@ -552,14 +554,14 @@
// DLS조회
//
this.DLS조회.Name = "DLS조회";
- this.DLS조회.Size = new System.Drawing.Size(154, 22);
+ this.DLS조회.Size = new System.Drawing.Size(180, 22);
this.DLS조회.Text = "DLS_조회/입력";
this.DLS조회.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click);
//
// dLS복본조사
//
this.dLS복본조사.Name = "dLS복본조사";
- this.dLS복본조사.Size = new System.Drawing.Size(154, 22);
+ this.dLS복본조사.Size = new System.Drawing.Size(180, 22);
this.dLS복본조사.Text = "DLS 복본조사";
this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click);
//
@@ -579,6 +581,7 @@
this.서류작성.Name = "서류작성";
this.서류작성.Size = new System.Drawing.Size(180, 22);
this.서류작성.Text = "서류작성";
+ this.서류작성.Visible = false;
this.서류작성.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click);
//
// 마크통계
@@ -594,6 +597,7 @@
this.장비관리.Name = "장비관리";
this.장비관리.Size = new System.Drawing.Size(180, 22);
this.장비관리.Text = "장비관리";
+ this.장비관리.Visible = false;
this.장비관리.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click);
//
// 작업일지ToolStripMenuItem
@@ -1020,17 +1024,7 @@
private System.Windows.Forms.ToolStripMenuItem 마크설정ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 일괄처리관리ToolStripMenuItem;
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Button ShortCut3;
- private System.Windows.Forms.Button ShortCut2;
- private System.Windows.Forms.Button ShortCut1;
private System.Windows.Forms.ToolStripMenuItem 송금내역조회;
- private System.Windows.Forms.Button ShortCut10;
- private System.Windows.Forms.Button ShortCut9;
- private System.Windows.Forms.Button ShortCut8;
- private System.Windows.Forms.Button ShortCut6;
- private System.Windows.Forms.Button ShortCut5;
- private System.Windows.Forms.Button ShortCut7;
- private System.Windows.Forms.Button ShortCut4;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripMenuItem 사업체정보;
private System.Windows.Forms.ToolStripMenuItem 작업지시서;
@@ -1053,8 +1047,6 @@
private System.Windows.Forms.ToolStripMenuItem 마크통계;
private System.Windows.Forms.ToolStripMenuItem 장비관리;
private System.Windows.Forms.ToolStripMenuItem iSBN조회;
- private System.Windows.Forms.Button ShortCut12;
- private System.Windows.Forms.Button ShortCut11;
private System.Windows.Forms.OpenFileDialog openFileDialog1;
private System.Windows.Forms.ToolStripMenuItem 매출입금;
private System.Windows.Forms.ToolStripMenuItem 반품처리;
@@ -1065,5 +1057,17 @@
private System.Windows.Forms.ToolStripMenuItem dLS복본조사;
private System.Windows.Forms.ToolStripLabel VersionText;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ public System.Windows.Forms.Button ShortCut3;
+ public System.Windows.Forms.Button ShortCut2;
+ public System.Windows.Forms.Button ShortCut1;
+ public System.Windows.Forms.Button ShortCut10;
+ public System.Windows.Forms.Button ShortCut9;
+ public System.Windows.Forms.Button ShortCut8;
+ public System.Windows.Forms.Button ShortCut6;
+ public System.Windows.Forms.Button ShortCut5;
+ public System.Windows.Forms.Button ShortCut7;
+ public System.Windows.Forms.Button ShortCut4;
+ public System.Windows.Forms.Button ShortCut12;
+ public System.Windows.Forms.Button ShortCut11;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs
index d1984da..a28754f 100644
--- a/unimarc/unimarc/Main.cs
+++ b/unimarc/unimarc/Main.cs
@@ -76,9 +76,9 @@ namespace WindowsFormsApp1
// if (com_idx != "1")
// {
+ 납품관리ToolStripMenuItem.Visible = false;
+ 회계ToolStripMenuItem.Visible = false;
// }
- 납품관리ToolStripMenuItem.Visible = false;
- 회계ToolStripMenuItem.Visible = false;
if (result[7] != "관리자") { 마스터ToolStripMenuItem.Visible = false; }
Settings.Default.compidx = com_idx;
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index edc64c2..63c0164 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index 2e7c5c5..97221b3 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index 483f0b5..4982dc1 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index de38c88..2ab73c0 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index edc64c2..63c0164 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index 2e7c5c5..97221b3 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index 483f0b5..4982dc1 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/마크/Check_Copy_Sub_Search.cs b/unimarc/unimarc/마크/Check_Copy_Sub_Search.cs
index f0db5aa..7d8774d 100644
--- a/unimarc/unimarc/마크/Check_Copy_Sub_Search.cs
+++ b/unimarc/unimarc/마크/Check_Copy_Sub_Search.cs
@@ -61,6 +61,8 @@ namespace UniMarc.마크
SetCode(row);
this.Close();
}
+ if (e.KeyCode == Keys.Escape)
+ this.Close();
}
void SetCode(int row)
diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs
index 89d2592..92d848d 100644
--- a/unimarc/unimarc/마크/Check_copy.cs
+++ b/unimarc/unimarc/마크/Check_copy.cs
@@ -41,7 +41,7 @@ namespace WindowsFormsApp1.Mac
if (e.KeyCode == Keys.Enter)
{
string Target = tb_SearchTarget.Text;
- if (Target == "") { MessageBox.Show("도서관명이 비어있습니다."); return; }
+ // if (Target == "") { MessageBox.Show("도서관명이 비어있습니다."); return; }
string area = "`Province`, `Area`, `LibName`, `Code`, `URL`";
string cmd = string.Format("SELECT {0} FROM `lib_CopyCheck` WHERE `LibName` LIKE '%{1}%';", area, Target);
diff --git a/unimarc/unimarc/마크/DLS_Lookup.Designer.cs b/unimarc/unimarc/마크/DLS_Lookup.Designer.cs
index cc84b73..22d7cc2 100644
--- a/unimarc/unimarc/마크/DLS_Lookup.Designer.cs
+++ b/unimarc/unimarc/마크/DLS_Lookup.Designer.cs
@@ -259,7 +259,7 @@
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersWidth = 31;
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(301, 287);
+ this.dataGridView1.Size = new System.Drawing.Size(360, 636);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
@@ -268,9 +268,10 @@
//
this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel3.Controls.Add(this.dataGridView1);
- this.panel3.Location = new System.Drawing.Point(34, 382);
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel3.Location = new System.Drawing.Point(0, 76);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(303, 289);
+ this.panel3.Size = new System.Drawing.Size(362, 638);
this.panel3.TabIndex = 4;
//
// panel1
diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs
index ac283bc..49dee27 100644
--- a/unimarc/unimarc/마크/Mac_List.Designer.cs
+++ b/unimarc/unimarc/마크/Mac_List.Designer.cs
@@ -334,7 +334,6 @@
private System.Windows.Forms.TextBox tb_Search;
private System.Windows.Forms.ComboBox cb_state;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Button btn_Lookup;
private System.Windows.Forms.Button btn_Excel;
private System.Windows.Forms.Button btn_Close;
private System.Windows.Forms.Button btn_Save;
@@ -357,5 +356,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn etc;
private System.Windows.Forms.DataGridViewTextBoxColumn charge;
private System.Windows.Forms.DataGridViewTextBoxColumn check;
+ public System.Windows.Forms.Button btn_Lookup;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs
index 9dafd73..fbdab43 100644
--- a/unimarc/unimarc/마크/Mac_List.cs
+++ b/unimarc/unimarc/마크/Mac_List.cs
@@ -49,7 +49,7 @@ namespace WindowsFormsApp1.Mac
}
}
- private void btn_Lookup_Click(object sender, EventArgs e)
+ public void btn_Lookup_Click(object sender, EventArgs e)
{
string table = "Obj_List";
/* idx / 목록일자 / 완료일자 / 목록명 / 작업명
@@ -113,7 +113,7 @@ namespace WindowsFormsApp1.Mac
private void btn_AddList_Click(object sender, EventArgs e)
{
- Mac_List_Add listAdd = new Mac_List_Add();
+ Mac_List_Add listAdd = new Mac_List_Add(this);
listAdd.Show();
}
diff --git a/unimarc/unimarc/마크/Mac_List_Add.cs b/unimarc/unimarc/마크/Mac_List_Add.cs
index 15a34f0..3420b94 100644
--- a/unimarc/unimarc/마크/Mac_List_Add.cs
+++ b/unimarc/unimarc/마크/Mac_List_Add.cs
@@ -8,6 +8,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using WindowsFormsApp1;
+using WindowsFormsApp1.Mac;
namespace UniMarc.마크
{
@@ -15,10 +16,12 @@ namespace UniMarc.마크
{
Helper_DB db = new Helper_DB();
Skill_Grid sg = new Skill_Grid();
+ Mac_List ml;
- public Mac_List_Add()
+ public Mac_List_Add(Mac_List _ml)
{
InitializeComponent();
+ ml = _ml;
}
private void Mac_List_Add_Load(object sender, EventArgs e)
@@ -116,6 +119,7 @@ namespace UniMarc.마크
db.DB_Send_CMD_reVoid(InBook_Cmd);
MessageBox.Show("저장되었습니다!");
+ ml.btn_Lookup_Click(null, null);
}
#region AddList_Sub
diff --git a/unimarc/unimarc/마크/Mac_List_Merge.cs b/unimarc/unimarc/마크/Mac_List_Merge.cs
index a0a728c..484dbf2 100644
--- a/unimarc/unimarc/마크/Mac_List_Merge.cs
+++ b/unimarc/unimarc/마크/Mac_List_Merge.cs
@@ -78,7 +78,6 @@ namespace WindowsFormsApp1.마크
return;
}
- // TODO: 생각나는 필터링있으면 if문 추가할 것.
// 이 밑으론 DB적용사항. 기존목록유지시 INSERT만 / 기존목록삭제시 INSERT이후 기존목록DELETE
data_Insert();
for (int a = 0; a < dataGridView1.Rows.Count; a++)
@@ -87,9 +86,13 @@ namespace WindowsFormsApp1.마크
}
if (rb_Delete.Checked) {
- // 삭제 함수
+ // 기존 목록 삭제 함수
data_delete();
}
+
+ MessageBox.Show("목록이 병합되었습니다.");
+ ml.btn_Lookup_Click(null, null);
+ this.Close();
}
void data_Insert()
@@ -182,7 +185,8 @@ namespace WindowsFormsApp1.마크
"list_name", "date"
};
string[] targetData = {
- dataGridView1.Rows[row].Cells["list_name"].Value.ToString(), dataGridView1.Rows[row].Cells["list_date"].Value.ToString()
+ dataGridView1.Rows[row].Cells["list_name"].Value.ToString(),
+ dataGridView1.Rows[row].Cells["list_date"].Value.ToString()
};
string cmd = db.DB_Delete_No_Limit(table, "compidx", ml.compidx, target_Col, targetData);
@@ -200,7 +204,6 @@ namespace WindowsFormsApp1.마크
if (tb_list_name.Text == db_data[a])
return false;
}
-
return true;
}
@@ -214,14 +217,12 @@ namespace WindowsFormsApp1.마크
int result = 0;
List total = new List();
- for (int a = 0; a < dataGridView1.Rows.Count - 1; a++)
- {
+ for (int a = 0; a < dataGridView1.Rows.Count; a++)
total.Add(Convert.ToInt32(dataGridView1.Rows[a].Cells[column].Value.ToString()));
- }
+
for (int a = 0; a < total.Count; a++)
- {
result += total[a];
- }
+
return result;
}
private void btn_Close_Click(object sender, EventArgs e)
diff --git a/unimarc/unimarc/마크/Mac_Stat.Designer.cs b/unimarc/unimarc/마크/Mac_Stat.Designer.cs
index 61426dd..b909a14 100644
--- a/unimarc/unimarc/마크/Mac_Stat.Designer.cs
+++ b/unimarc/unimarc/마크/Mac_Stat.Designer.cs
@@ -40,6 +40,7 @@
this.date = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel2 = new System.Windows.Forms.Panel();
this.btn_Close = new System.Windows.Forms.Button();
+ this.btn_Lookup = new System.Windows.Forms.Button();
this.btn_Stats = new System.Windows.Forms.Button();
this.End_Date = new System.Windows.Forms.DateTimePicker();
this.Start_Date = new System.Windows.Forms.DateTimePicker();
@@ -52,9 +53,10 @@
this.label2 = new System.Windows.Forms.Label();
this.cb_Search = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
- this.btn_Lookup = new System.Windows.Forms.Button();
+ this.panel1 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel2.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
// dataGridView1
@@ -79,10 +81,11 @@
this.tag008,
this.charge,
this.date});
- this.dataGridView1.Location = new System.Drawing.Point(13, 53);
+ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
- this.dataGridView1.Size = new System.Drawing.Size(1105, 430);
+ this.dataGridView1.Size = new System.Drawing.Size(1130, 461);
this.dataGridView1.TabIndex = 8;
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
//
@@ -148,9 +151,10 @@
this.panel2.Controls.Add(this.label2);
this.panel2.Controls.Add(this.cb_Search);
this.panel2.Controls.Add(this.label1);
- this.panel2.Location = new System.Drawing.Point(12, 12);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1106, 34);
+ this.panel2.Size = new System.Drawing.Size(1130, 34);
this.panel2.TabIndex = 7;
//
// btn_Close
@@ -163,6 +167,16 @@
this.btn_Close.UseVisualStyleBackColor = true;
this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
//
+ // btn_Lookup
+ //
+ this.btn_Lookup.Location = new System.Drawing.Point(859, 5);
+ this.btn_Lookup.Name = "btn_Lookup";
+ this.btn_Lookup.Size = new System.Drawing.Size(75, 23);
+ this.btn_Lookup.TabIndex = 222;
+ this.btn_Lookup.Text = "조 회";
+ this.btn_Lookup.UseVisualStyleBackColor = true;
+ this.btn_Lookup.Click += new System.EventHandler(this.btn_Lookup_Click);
+ //
// btn_Stats
//
this.btn_Stats.Location = new System.Drawing.Point(940, 5);
@@ -218,6 +232,7 @@
this.cb_Sort.Name = "cb_Sort";
this.cb_Sort.Size = new System.Drawing.Size(82, 20);
this.cb_Sort.TabIndex = 1;
+ this.cb_Sort.SelectedIndexChanged += new System.EventHandler(this.cb_Sort_SelectedIndexChanged);
//
// label4
//
@@ -274,22 +289,21 @@
this.label1.TabIndex = 0;
this.label1.Text = "검색";
//
- // btn_Lookup
+ // panel1
//
- this.btn_Lookup.Location = new System.Drawing.Point(859, 5);
- this.btn_Lookup.Name = "btn_Lookup";
- this.btn_Lookup.Size = new System.Drawing.Size(75, 23);
- this.btn_Lookup.TabIndex = 222;
- this.btn_Lookup.Text = "조 회";
- this.btn_Lookup.UseVisualStyleBackColor = true;
- this.btn_Lookup.Click += new System.EventHandler(this.btn_Lookup_Click);
+ this.panel1.Controls.Add(this.dataGridView1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(0, 34);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1130, 461);
+ this.panel1.TabIndex = 9;
//
// Mac_Stat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1130, 495);
- this.Controls.Add(this.dataGridView1);
+ this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.Name = "Mac_Stat";
this.Text = "마크 통계";
@@ -297,6 +311,7 @@
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
+ this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -327,5 +342,6 @@
private System.Windows.Forms.ComboBox cb_Search;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btn_Lookup;
+ private System.Windows.Forms.Panel panel1;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Mac_Stat.cs b/unimarc/unimarc/마크/Mac_Stat.cs
index e13d010..9c92198 100644
--- a/unimarc/unimarc/마크/Mac_Stat.cs
+++ b/unimarc/unimarc/마크/Mac_Stat.cs
@@ -31,9 +31,8 @@ namespace WindowsFormsApp1.Mac
cb_Search.Items.AddRange(com1);
cb_Search.SelectedIndex = 0;
- string[] com2 = { "도서명", "ISBN", "IDX", "출판사" };
+ string[] com2 = { "도서명", "ISBN", "출판사" };
cb_Sort.Items.AddRange(com2);
- cb_Sort.SelectedIndex = 0;
string cmd = string.Format("SELECT `name` FROM `User_Data` WHERE `affil` = (SELECT `comp_name` FROM `Comp` WHERE `idx` = {0})", compidx);
@@ -129,25 +128,7 @@ namespace WindowsFormsApp1.Mac
end_Date += " 23:59:59";
cmd += string.Format(" AND `date` <= '{0}'", end_Date);
}
-
- switch (cb_Sort.SelectedIndex)
- {
- case 0: // 도서명
- cmd += string.Format(" ORDER BY '서명'");
- break;
- case 1: // ISBN
- cmd += string.Format(" ORDER BY 'ISBN'");
- break;
- case 2: // IDX
- cmd += string.Format(" ORDER BY 'idx'");
- break;
- case 3: // 출판사
- cmd += string.Format(" ORDER BY '출판사'");
- break;
- default:
- break;
- }
- return cmd + ";";
+ return cmd + " LIMIT 10000;";
}
#endregion
@@ -168,5 +149,19 @@ namespace WindowsFormsApp1.Mac
Skill_Grid sg = new Skill_Grid();
sg.Print_Grid_Num(sender, e);
}
+
+ private void cb_Sort_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ //[0] "도서명" / [1] "ISBN" / [2] "출판사"
+ int SortIdx = cb_Sort.SelectedIndex;
+
+ switch (SortIdx)
+ {
+ case 0: dataGridView1.Sort(book_name, ListSortDirection.Ascending); break;
+ case 1: dataGridView1.Sort(ISBN, ListSortDirection.Ascending); break;
+ case 2: dataGridView1.Sort(book_comp, ListSortDirection.Ascending); break;
+ }
+
+ }
}
}
diff --git a/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs b/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs
index 3e9eebd..52e3e95 100644
--- a/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs
+++ b/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs
@@ -75,6 +75,8 @@ namespace UniMarc.마크
this.lbl_s_total = new System.Windows.Forms.Label();
this.lbl_a_total = new System.Windows.Forms.Label();
this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
+ this.label12 = new System.Windows.Forms.Label();
+ this.lbl_10 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
@@ -108,18 +110,19 @@ namespace UniMarc.마크
// tableLayoutPanel1
//
this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.InsetDouble;
- this.tableLayoutPanel1.ColumnCount = 11;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 9.090908F));
+ this.tableLayoutPanel1.ColumnCount = 12;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 8.333333F));
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.label2, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.label3, 2, 0);
@@ -130,8 +133,6 @@ namespace UniMarc.마크
this.tableLayoutPanel1.Controls.Add(this.label8, 7, 0);
this.tableLayoutPanel1.Controls.Add(this.label9, 8, 0);
this.tableLayoutPanel1.Controls.Add(this.label10, 9, 0);
- this.tableLayoutPanel1.Controls.Add(this.label11, 10, 0);
- this.tableLayoutPanel1.Controls.Add(this.lbl_total, 10, 1);
this.tableLayoutPanel1.Controls.Add(this.lbl_9, 9, 1);
this.tableLayoutPanel1.Controls.Add(this.lbl_8, 8, 1);
this.tableLayoutPanel1.Controls.Add(this.lbl_7, 7, 1);
@@ -142,6 +143,10 @@ namespace UniMarc.마크
this.tableLayoutPanel1.Controls.Add(this.lbl_2, 2, 1);
this.tableLayoutPanel1.Controls.Add(this.lbl_1, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.lbl_0, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label11, 11, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lbl_total, 11, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label12, 10, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lbl_10, 10, 1);
this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 35);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
@@ -159,7 +164,7 @@ namespace UniMarc.마크
this.label1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.label1.Location = new System.Drawing.Point(6, 3);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(70, 71);
+ this.label1.Size = new System.Drawing.Size(63, 71);
this.label1.TabIndex = 0;
this.label1.Text = "총류";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -171,9 +176,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label2.Location = new System.Drawing.Point(85, 3);
+ this.label2.Location = new System.Drawing.Point(78, 3);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(70, 71);
+ this.label2.Size = new System.Drawing.Size(63, 71);
this.label2.TabIndex = 0;
this.label2.Text = "철학";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -185,9 +190,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label3.Location = new System.Drawing.Point(164, 3);
+ this.label3.Location = new System.Drawing.Point(150, 3);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(70, 71);
+ this.label3.Size = new System.Drawing.Size(63, 71);
this.label3.TabIndex = 0;
this.label3.Text = "종교";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -199,9 +204,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label4.Location = new System.Drawing.Point(243, 3);
+ this.label4.Location = new System.Drawing.Point(222, 3);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(70, 71);
+ this.label4.Size = new System.Drawing.Size(63, 71);
this.label4.TabIndex = 0;
this.label4.Text = "사회과학";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -213,9 +218,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label5.Location = new System.Drawing.Point(322, 3);
+ this.label5.Location = new System.Drawing.Point(294, 3);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(70, 71);
+ this.label5.Size = new System.Drawing.Size(63, 71);
this.label5.TabIndex = 0;
this.label5.Text = "자연과학";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -227,9 +232,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label6.Location = new System.Drawing.Point(401, 3);
+ this.label6.Location = new System.Drawing.Point(366, 3);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(70, 71);
+ this.label6.Size = new System.Drawing.Size(63, 71);
this.label6.TabIndex = 0;
this.label6.Text = "기술과학";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -241,9 +246,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label7.AutoSize = true;
this.label7.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label7.Location = new System.Drawing.Point(480, 3);
+ this.label7.Location = new System.Drawing.Point(438, 3);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(70, 71);
+ this.label7.Size = new System.Drawing.Size(63, 71);
this.label7.TabIndex = 0;
this.label7.Text = "예술";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -255,9 +260,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label8.Location = new System.Drawing.Point(559, 3);
+ this.label8.Location = new System.Drawing.Point(510, 3);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(70, 71);
+ this.label8.Size = new System.Drawing.Size(63, 71);
this.label8.TabIndex = 0;
this.label8.Text = "언어";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -269,9 +274,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label9.AutoSize = true;
this.label9.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label9.Location = new System.Drawing.Point(638, 3);
+ this.label9.Location = new System.Drawing.Point(582, 3);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(70, 71);
+ this.label9.Size = new System.Drawing.Size(63, 71);
this.label9.TabIndex = 0;
this.label9.Text = "문학";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -283,9 +288,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label10.AutoSize = true;
this.label10.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label10.Location = new System.Drawing.Point(717, 3);
+ this.label10.Location = new System.Drawing.Point(654, 3);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(70, 71);
+ this.label10.Size = new System.Drawing.Size(63, 71);
this.label10.TabIndex = 0;
this.label10.Text = "역사";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -297,9 +302,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.label11.AutoSize = true;
this.label11.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
- this.label11.Location = new System.Drawing.Point(796, 3);
+ this.label11.Location = new System.Drawing.Point(798, 3);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(75, 71);
+ this.label11.Size = new System.Drawing.Size(73, 71);
this.label11.TabIndex = 0;
this.label11.Text = "합계";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -311,9 +316,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_total.AutoSize = true;
this.lbl_total.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_total.Location = new System.Drawing.Point(796, 77);
+ this.lbl_total.Location = new System.Drawing.Point(798, 77);
this.lbl_total.Name = "lbl_total";
- this.lbl_total.Size = new System.Drawing.Size(75, 72);
+ this.lbl_total.Size = new System.Drawing.Size(73, 72);
this.lbl_total.TabIndex = 0;
this.lbl_total.Text = "0";
this.lbl_total.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -325,9 +330,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_9.AutoSize = true;
this.lbl_9.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_9.Location = new System.Drawing.Point(717, 77);
+ this.lbl_9.Location = new System.Drawing.Point(654, 77);
this.lbl_9.Name = "lbl_9";
- this.lbl_9.Size = new System.Drawing.Size(70, 72);
+ this.lbl_9.Size = new System.Drawing.Size(63, 72);
this.lbl_9.TabIndex = 0;
this.lbl_9.Text = "0";
this.lbl_9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -339,9 +344,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_8.AutoSize = true;
this.lbl_8.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_8.Location = new System.Drawing.Point(638, 77);
+ this.lbl_8.Location = new System.Drawing.Point(582, 77);
this.lbl_8.Name = "lbl_8";
- this.lbl_8.Size = new System.Drawing.Size(70, 72);
+ this.lbl_8.Size = new System.Drawing.Size(63, 72);
this.lbl_8.TabIndex = 0;
this.lbl_8.Text = "0";
this.lbl_8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -353,9 +358,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_7.AutoSize = true;
this.lbl_7.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_7.Location = new System.Drawing.Point(559, 77);
+ this.lbl_7.Location = new System.Drawing.Point(510, 77);
this.lbl_7.Name = "lbl_7";
- this.lbl_7.Size = new System.Drawing.Size(70, 72);
+ this.lbl_7.Size = new System.Drawing.Size(63, 72);
this.lbl_7.TabIndex = 0;
this.lbl_7.Text = "0";
this.lbl_7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -367,9 +372,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_6.AutoSize = true;
this.lbl_6.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_6.Location = new System.Drawing.Point(480, 77);
+ this.lbl_6.Location = new System.Drawing.Point(438, 77);
this.lbl_6.Name = "lbl_6";
- this.lbl_6.Size = new System.Drawing.Size(70, 72);
+ this.lbl_6.Size = new System.Drawing.Size(63, 72);
this.lbl_6.TabIndex = 0;
this.lbl_6.Text = "0";
this.lbl_6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -381,9 +386,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_5.AutoSize = true;
this.lbl_5.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_5.Location = new System.Drawing.Point(401, 77);
+ this.lbl_5.Location = new System.Drawing.Point(366, 77);
this.lbl_5.Name = "lbl_5";
- this.lbl_5.Size = new System.Drawing.Size(70, 72);
+ this.lbl_5.Size = new System.Drawing.Size(63, 72);
this.lbl_5.TabIndex = 0;
this.lbl_5.Text = "0";
this.lbl_5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -395,9 +400,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_4.AutoSize = true;
this.lbl_4.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_4.Location = new System.Drawing.Point(322, 77);
+ this.lbl_4.Location = new System.Drawing.Point(294, 77);
this.lbl_4.Name = "lbl_4";
- this.lbl_4.Size = new System.Drawing.Size(70, 72);
+ this.lbl_4.Size = new System.Drawing.Size(63, 72);
this.lbl_4.TabIndex = 0;
this.lbl_4.Text = "0";
this.lbl_4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -409,9 +414,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_3.AutoSize = true;
this.lbl_3.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_3.Location = new System.Drawing.Point(243, 77);
+ this.lbl_3.Location = new System.Drawing.Point(222, 77);
this.lbl_3.Name = "lbl_3";
- this.lbl_3.Size = new System.Drawing.Size(70, 72);
+ this.lbl_3.Size = new System.Drawing.Size(63, 72);
this.lbl_3.TabIndex = 0;
this.lbl_3.Text = "0";
this.lbl_3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -423,9 +428,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_2.AutoSize = true;
this.lbl_2.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_2.Location = new System.Drawing.Point(164, 77);
+ this.lbl_2.Location = new System.Drawing.Point(150, 77);
this.lbl_2.Name = "lbl_2";
- this.lbl_2.Size = new System.Drawing.Size(70, 72);
+ this.lbl_2.Size = new System.Drawing.Size(63, 72);
this.lbl_2.TabIndex = 0;
this.lbl_2.Text = "0";
this.lbl_2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -437,9 +442,9 @@ namespace UniMarc.마크
| System.Windows.Forms.AnchorStyles.Right)));
this.lbl_1.AutoSize = true;
this.lbl_1.BackColor = System.Drawing.Color.PapayaWhip;
- this.lbl_1.Location = new System.Drawing.Point(85, 77);
+ this.lbl_1.Location = new System.Drawing.Point(78, 77);
this.lbl_1.Name = "lbl_1";
- this.lbl_1.Size = new System.Drawing.Size(70, 72);
+ this.lbl_1.Size = new System.Drawing.Size(63, 72);
this.lbl_1.TabIndex = 0;
this.lbl_1.Text = "0";
this.lbl_1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -453,7 +458,7 @@ namespace UniMarc.마크
this.lbl_0.BackColor = System.Drawing.Color.PapayaWhip;
this.lbl_0.Location = new System.Drawing.Point(6, 77);
this.lbl_0.Name = "lbl_0";
- this.lbl_0.Size = new System.Drawing.Size(70, 72);
+ this.lbl_0.Size = new System.Drawing.Size(63, 72);
this.lbl_0.TabIndex = 0;
this.lbl_0.Text = "0";
this.lbl_0.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -757,6 +762,34 @@ namespace UniMarc.마크
this.dateTimePicker1.Size = new System.Drawing.Size(200, 21);
this.dateTimePicker1.TabIndex = 0;
//
+ // label12
+ //
+ this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label12.AutoSize = true;
+ this.label12.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.label12.Location = new System.Drawing.Point(726, 3);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(63, 71);
+ this.label12.TabIndex = 0;
+ this.label12.Text = "미분류";
+ this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lbl_10
+ //
+ this.lbl_10.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lbl_10.AutoSize = true;
+ this.lbl_10.BackColor = System.Drawing.Color.PapayaWhip;
+ this.lbl_10.Location = new System.Drawing.Point(726, 77);
+ this.lbl_10.Name = "lbl_10";
+ this.lbl_10.Size = new System.Drawing.Size(63, 72);
+ this.lbl_10.TabIndex = 0;
+ this.lbl_10.Text = "0";
+ this.lbl_10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
// Mac_Stat_Stat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -825,5 +858,7 @@ namespace UniMarc.마크
private System.Windows.Forms.Label lbl_s_total;
private System.Windows.Forms.Label lbl_a_total;
private System.Windows.Forms.DateTimePicker dateTimePicker1;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.Label lbl_10;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Mac_Stat_Stat.cs b/unimarc/unimarc/마크/Mac_Stat_Stat.cs
index 47ac1f3..1137926 100644
--- a/unimarc/unimarc/마크/Mac_Stat_Stat.cs
+++ b/unimarc/unimarc/마크/Mac_Stat_Stat.cs
@@ -33,12 +33,15 @@ namespace UniMarc.마크
{
Label[] label = {
lbl_0, lbl_1, lbl_2, lbl_3, lbl_4,
- lbl_5, lbl_6, lbl_7, lbl_8, lbl_9
+ lbl_5, lbl_6, lbl_7, lbl_8, lbl_9, lbl_10
};
for (int a = 0; a < label.Length; a++)
{
+ string count = a.ToString();
+ if (count == "10")
+ count = "";
string m_cmd = string.Format("SELECT COUNT(*) from `Marc` WHERE LEFT(`division`,1) = '{0}' AND `compidx` = {1};",
- a, compidx);
+ count, compidx);
string cmd = db.self_Made_Cmd(m_cmd);
cmd = cmd.Replace("|", "");
label[a].Text = cmd;
diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs
index a436f75..4baaef6 100644
--- a/unimarc/unimarc/마크/Marc.cs
+++ b/unimarc/unimarc/마크/Marc.cs
@@ -500,19 +500,19 @@ namespace ExcelTest
switch (key)
{
case Keys.F9:
- cb_grade.SelectedItem = "A";
+ cb_grade.SelectedItem = "A (F9)";
Btn_Save_Click(null, null);
break;
case Keys.F10:
- cb_grade.SelectedItem = "B";
+ cb_grade.SelectedItem = "B (F10)";
Btn_Save_Click(null, null);
break;
case Keys.F11:
- cb_grade.SelectedItem = "C";
+ cb_grade.SelectedItem = "C (F11)";
Btn_Save_Click(null, null);
break;
case Keys.F12:
- cb_grade.SelectedItem = "D";
+ cb_grade.SelectedItem = "D (F12)";
Btn_Save_Click(null, null);
break;
}
@@ -743,22 +743,40 @@ namespace ExcelTest
return false;
}
- bool isAuthor = false;
+ bool is1XX = false;
string[] AuthorTag = { "100a", "110a", "111a" };
Tag = st.Take_Tag(orimarc, AuthorTag);
foreach (string author in Tag)
{
if (author != "")
- isAuthor = true;
+ is1XX = true;
}
- if (!isAuthor)
+ if (!is1XX)
{
MessageBox.Show("기본표목이 존재하지않습니다.");
return false;
}
+ bool is7XX = false;
+ AuthorTag[0] = "700a";
+ AuthorTag[1] = "710a";
+ AuthorTag[2] = "711a";
+ Tag = st.Take_Tag(orimarc, AuthorTag);
+
+ foreach (string author in Tag)
+ {
+ if (author != "")
+ is7XX = true;
+ }
+
+ if (!is7XX)
+ {
+ MessageBox.Show("부출표목이 존재하지않습니다.");
+ return false;
+ }
+
return true;
}
@@ -1545,12 +1563,9 @@ namespace ExcelTest
TextBox tb = sender as TextBox;
- if (e.KeyCode == Keys.Control)
+ if (e.KeyCode == Keys.F3)
{
- if (e.KeyCode == Keys.T)
- {
- tb.Text += "▽";
- }
+ tb.Text += "▽";
}
}
diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs
index ede56b9..4aa59d8 100644
--- a/unimarc/unimarc/마크/Marc.designer.cs
+++ b/unimarc/unimarc/마크/Marc.designer.cs
@@ -28,19 +28,19 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.etc1 = new System.Windows.Forms.RichTextBox();
this.etc2 = new System.Windows.Forms.RichTextBox();
@@ -556,14 +556,14 @@
this.List_Book.AllowUserToAddRows = false;
this.List_Book.AllowUserToDeleteRows = false;
this.List_Book.AllowUserToResizeColumns = false;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle37.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle37;
this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.list_idx,
this.ISBN13,
@@ -585,14 +585,14 @@
this.List_Book.MultiSelect = false;
this.List_Book.Name = "List_Book";
this.List_Book.ReadOnly = true;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.ControlDark;
+ dataGridViewCellStyle40.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle40;
this.List_Book.RowTemplate.Height = 23;
this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.List_Book.Size = new System.Drawing.Size(543, 822);
@@ -691,9 +691,9 @@
//
// grade
//
- dataGridViewCellStyle2.Format = "N0";
- dataGridViewCellStyle2.NullValue = null;
- this.grade.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle38.Format = "N0";
+ dataGridViewCellStyle38.NullValue = null;
+ this.grade.DefaultCellStyle = dataGridViewCellStyle38;
this.grade.HeaderText = "등급";
this.grade.Name = "grade";
this.grade.ReadOnly = true;
@@ -702,8 +702,8 @@
//
// colCheck
//
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.colCheck.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.colCheck.DefaultCellStyle = dataGridViewCellStyle39;
this.colCheck.HeaderText = "V";
this.colCheck.Name = "colCheck";
this.colCheck.ReadOnly = true;
@@ -829,10 +829,10 @@
this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_grade.FormattingEnabled = true;
this.cb_grade.Items.AddRange(new object[] {
- "A",
- "B",
- "C",
- "D"});
+ "A (F9)",
+ "B (F10)",
+ "C (F11)",
+ "D (F12)"});
this.cb_grade.Location = new System.Drawing.Point(1513, 93);
this.cb_grade.Name = "cb_grade";
this.cb_grade.Size = new System.Drawing.Size(75, 20);
@@ -1106,8 +1106,8 @@
this.GridView020.Name = "GridView020";
this.GridView020.RowHeadersVisible = false;
this.GridView020.RowHeadersWidth = 30;
- dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle41.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle41;
this.GridView020.RowTemplate.Height = 23;
this.GridView020.Size = new System.Drawing.Size(408, 80);
this.GridView020.TabIndex = 244;
@@ -1174,8 +1174,8 @@
this.GridView505.Name = "GridView505";
this.GridView505.RowHeadersVisible = false;
this.GridView505.RowHeadersWidth = 30;
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle42;
this.GridView505.RowTemplate.Height = 23;
this.GridView505.Size = new System.Drawing.Size(401, 71);
this.GridView505.TabIndex = 246;
@@ -1307,14 +1307,14 @@
this.GridView246.AllowDrop = true;
this.GridView246.AllowUserToAddRows = false;
this.GridView246.AllowUserToResizeRows = false;
- dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle43.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43;
this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Text246Jisi,
this.Text246i,
@@ -1326,8 +1326,8 @@
this.GridView246.Name = "GridView246";
this.GridView246.RowHeadersVisible = false;
this.GridView246.RowHeadersWidth = 30;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle44.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle44;
this.GridView246.RowTemplate.Height = 23;
this.GridView246.Size = new System.Drawing.Size(493, 138);
this.GridView246.TabIndex = 250;
@@ -1477,14 +1477,14 @@
this.GridView440.AllowDrop = true;
this.GridView440.AllowUserToAddRows = false;
this.GridView440.AllowUserToResizeRows = false;
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle45.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle45.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle45.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle45.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle45.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle45;
this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.text440a,
@@ -1497,8 +1497,8 @@
this.GridView440.Name = "GridView440";
this.GridView440.RowHeadersVisible = false;
this.GridView440.RowHeadersWidth = 30;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle46.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle46;
this.GridView440.RowTemplate.Height = 23;
this.GridView440.Size = new System.Drawing.Size(597, 71);
this.GridView440.TabIndex = 245;
@@ -1554,7 +1554,7 @@
//
// text700a
//
- this.text700a.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.text700a.BackColor = System.Drawing.SystemColors.Info;
this.text700a.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.text700a.Location = new System.Drawing.Point(44, 20);
this.text700a.Name = "text700a";
@@ -1597,14 +1597,14 @@
this.GridView490.AllowDrop = true;
this.GridView490.AllowUserToAddRows = false;
this.GridView490.AllowUserToResizeRows = false;
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle47.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle47.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle47.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle47.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle47.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle47;
this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.text490a,
@@ -1613,8 +1613,8 @@
this.GridView490.Name = "GridView490";
this.GridView490.RowHeadersVisible = false;
this.GridView490.RowHeadersWidth = 30;
- dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
- this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle48;
this.GridView490.RowTemplate.Height = 23;
this.GridView490.Size = new System.Drawing.Size(321, 71);
this.GridView490.TabIndex = 247;
@@ -2557,7 +2557,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Gray;
- this.ClientSize = new System.Drawing.Size(1759, 914);
+ this.ClientSize = new System.Drawing.Size(1808, 908);
this.Controls.Add(this.lbl_BookList);
this.Controls.Add(this.lbl_ISBN);
this.Controls.Add(this.lbl_SaveData);
diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx
index e44cd20..f8abcd5 100644
--- a/unimarc/unimarc/마크/Marc.resx
+++ b/unimarc/unimarc/마크/Marc.resx
@@ -279,4 +279,16 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
index b694743..1f22a72 100644
--- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
@@ -28,13 +28,13 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
this.panel1 = new System.Windows.Forms.Panel();
this.btn_Save = new System.Windows.Forms.Button();
this.panel4 = new System.Windows.Forms.Panel();
@@ -91,7 +91,6 @@
// panel1
//
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel1.Controls.Add(this.btn_Save);
this.panel1.Controls.Add(this.panel4);
this.panel1.Controls.Add(this.btn_Close);
this.panel1.Controls.Add(this.btn_Select_List);
@@ -102,7 +101,7 @@
//
// btn_Save
//
- this.btn_Save.Location = new System.Drawing.Point(402, 5);
+ this.btn_Save.Location = new System.Drawing.Point(3, 2);
this.btn_Save.Name = "btn_Save";
this.btn_Save.Size = new System.Drawing.Size(86, 23);
this.btn_Save.TabIndex = 10;
@@ -113,17 +112,18 @@
// panel4
//
this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel4.Controls.Add(this.btn_Save);
this.panel4.Controls.Add(this.btn_Excel);
this.panel4.Controls.Add(this.cb_EncodingType);
this.panel4.Controls.Add(this.btn_Output);
- this.panel4.Location = new System.Drawing.Point(585, 2);
+ this.panel4.Location = new System.Drawing.Point(402, 2);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(274, 29);
+ this.panel4.Size = new System.Drawing.Size(457, 29);
this.panel4.TabIndex = 9;
//
// btn_Excel
//
- this.btn_Excel.Location = new System.Drawing.Point(194, 2);
+ this.btn_Excel.Location = new System.Drawing.Point(338, 2);
this.btn_Excel.Name = "btn_Excel";
this.btn_Excel.Size = new System.Drawing.Size(75, 23);
this.btn_Excel.TabIndex = 8;
@@ -135,14 +135,14 @@
//
this.cb_EncodingType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_EncodingType.FormattingEnabled = true;
- this.cb_EncodingType.Location = new System.Drawing.Point(7, 3);
+ this.cb_EncodingType.Location = new System.Drawing.Point(130, 3);
this.cb_EncodingType.Name = "cb_EncodingType";
this.cb_EncodingType.Size = new System.Drawing.Size(81, 20);
this.cb_EncodingType.TabIndex = 9;
//
// btn_Output
//
- this.btn_Output.Location = new System.Drawing.Point(94, 2);
+ this.btn_Output.Location = new System.Drawing.Point(217, 2);
this.btn_Output.Name = "btn_Output";
this.btn_Output.Size = new System.Drawing.Size(75, 23);
this.btn_Output.TabIndex = 9;
@@ -303,14 +303,14 @@
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
@@ -366,8 +366,8 @@
//
// reg_num
//
- dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.reg_num.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.reg_num.DefaultCellStyle = dataGridViewCellStyle9;
this.reg_num.FillWeight = 130.9363F;
this.reg_num.HeaderText = "등록번호";
this.reg_num.Name = "reg_num";
@@ -375,8 +375,8 @@
//
// class_code
//
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.class_code.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.class_code.DefaultCellStyle = dataGridViewCellStyle10;
this.class_code.FillWeight = 76.41504F;
this.class_code.HeaderText = "분류";
this.class_code.Name = "class_code";
@@ -384,8 +384,8 @@
//
// author_code
//
- dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.author_code.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.author_code.DefaultCellStyle = dataGridViewCellStyle11;
this.author_code.FillWeight = 77.02635F;
this.author_code.HeaderText = "저자기호";
this.author_code.Name = "author_code";
@@ -393,8 +393,8 @@
//
// volume
//
- dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.volume.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.volume.DefaultCellStyle = dataGridViewCellStyle12;
this.volume.FillWeight = 38.80909F;
this.volume.HeaderText = "V";
this.volume.Name = "volume";
@@ -403,8 +403,8 @@
//
// copy
//
- dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.copy.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.copy.DefaultCellStyle = dataGridViewCellStyle13;
this.copy.FillWeight = 40.14827F;
this.copy.HeaderText = "C";
this.copy.Name = "copy";
@@ -413,8 +413,8 @@
//
// prefix
//
- dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.prefix.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.prefix.DefaultCellStyle = dataGridViewCellStyle14;
this.prefix.FillWeight = 41.51828F;
this.prefix.HeaderText = "F";
this.prefix.Name = "prefix";
diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs
index 37ca33a..90aadad 100644
--- a/unimarc/unimarc/마크/Marc_Plan.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.cs
@@ -16,6 +16,8 @@ namespace WindowsFormsApp1.Mac
{
Main main;
Helper_DB db = new Helper_DB();
+ string date = "";
+
public Marc_Plan(Main _main)
{
InitializeComponent();
@@ -61,6 +63,7 @@ namespace WindowsFormsApp1.Mac
public void mk_Grid(string ListName, string date)
{
btn_Select_List.Text = ListName;
+ this.date = date;
dataGridView1.Rows.Clear();
string Table = "Specs_Marc";
@@ -274,7 +277,7 @@ namespace WindowsFormsApp1.Mac
}
MessageBox.Show("저장되었습니다.");
-
+ mk_Grid(btn_Select_List.Text, this.date);
}
private void btn_Close_Click(object sender, EventArgs e)
@@ -337,6 +340,17 @@ namespace WindowsFormsApp1.Mac
String_Text st = new String_Text();
string Marc_data = string.Empty;
+ string FileEncodingType = "";
+
+ switch (cb_EncodingType.SelectedIndex)
+ {
+ case 0: FileEncodingType = "ANSI"; break;
+ case 1: FileEncodingType = "UTF-8"; break;
+ case 2: FileEncodingType = "UniCode"; break;
+ default: break;
+ }
+
+
for (int a = 0; a < dataGridView1.Rows.Count; a++)
{
if (dataGridView1.Rows[a].Cells["marc"].Value.ToString() == "" &&
@@ -349,7 +363,7 @@ namespace WindowsFormsApp1.Mac
string marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString();
marc = st.ConvertMarcType(marc);
marc = st.ApplyMark(marc);
- marc = st.made_Ori_marc(marc);
+ marc = st.made_Ori_marc(marc, FileEncodingType);
Marc_data += marc.Replace("￦", "\\");
}
@@ -362,15 +376,15 @@ namespace WindowsFormsApp1.Mac
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
- if (cb_EncodingType.SelectedIndex == 0) {
+ if (FileEncodingType == "ANSI") {
FileName = saveFileDialog.FileName;
File.WriteAllText(FileName, Marc_data, Encoding.Default);
}
- else if (cb_EncodingType.SelectedIndex == 1) {
+ else if (FileEncodingType == "UTF-8") {
FileName = saveFileDialog.FileName;
File.WriteAllText(FileName, Marc_data, Encoding.UTF8);
}
- else if (cb_EncodingType.SelectedIndex == 2) {
+ else if (FileEncodingType == "UniCode") {
FileName = saveFileDialog.FileName;
File.WriteAllText(FileName, Marc_data, Encoding.Unicode);
}
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
index 5e17cfd..a2a5838 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs
@@ -162,10 +162,10 @@ namespace UniMarc.마크
ListUser.Add(dataGridView1.Rows[row].Cells["user"].Value.ToString());
}
- Marc_Plan_Sub_SelectList_Morge morge = new Marc_Plan_Sub_SelectList_Morge();
+ Marc_Plan_Sub_SelectList_Morge morge = new Marc_Plan_Sub_SelectList_Morge(this);
morge.Init(ListIndex, ListName, ListDate, ListUser);
morge.TopMost = true;
- morge.Show();
+ morge.Show(this);
}
private void btn_Delete_Click(object sender, EventArgs e) // 삭제 (V 확인필요)
@@ -195,6 +195,9 @@ namespace UniMarc.마크
// 목록 내 마크 제거
cmd = db.DB_Delete_No_Limit("Specs_Marc", "compidx", compidx, search_col, search_data);
db.DB_Send_CMD_reVoid(cmd);
+
+ MessageBox.Show("삭제되었습니다.");
+ btn_Search_Click(null, null);
}
#region ButtonSub
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs
index e691ff9..2e0d2c2 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Edit.cs
@@ -95,6 +95,7 @@ namespace UniMarc.마크
string cmd = db.More_Update("Specs_List", update_col, update_data, search_col, search_data);
db.DB_Send_CMD_reVoid(cmd);
MessageBox.Show("저장완료되었습니다.");
+ sub.btn_Search_Click(null, null);
this.Close();
}
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs
index b97b6bf..33de3e3 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList_Morge.cs
@@ -14,9 +14,11 @@ namespace UniMarc.마크
public partial class Marc_Plan_Sub_SelectList_Morge : Form
{
Helper_DB db = new Helper_DB();
- public Marc_Plan_Sub_SelectList_Morge()
+ Marc_Plan_Sub_SelectList sub;
+ public Marc_Plan_Sub_SelectList_Morge(Marc_Plan_Sub_SelectList _sub)
{
InitializeComponent();
+ sub = _sub;
}
public void Init(List ListIdx, List ListName, ListListDate, List ListUser)
@@ -88,6 +90,9 @@ namespace UniMarc.마크
db.DB_Send_CMD_reVoid(D_cmd);
}
}
+
+ MessageBox.Show("병합되었습니다.");
+ sub.btn_Search_Click(null, null);
}
private void btn_Close_Click(object sender, EventArgs e)
diff --git a/unimarc/unimarc/편의기능/Quick_menu.cs b/unimarc/unimarc/편의기능/Quick_menu.cs
index a728998..cf34a0e 100644
--- a/unimarc/unimarc/편의기능/Quick_menu.cs
+++ b/unimarc/unimarc/편의기능/Quick_menu.cs
@@ -32,7 +32,8 @@ namespace WindowsFormsApp1.Convenience
{
#region 메뉴 콤보박스 밑작업
string[] MenuList = {
- "적용안함", "홈", "납품관리", "회계", "마크"
+ //"적용안함", "홈", "납품관리", "회계", "마크"
+ "적용안함", "홈", "마크"
};
ComboBox[] Menu = {
@@ -41,12 +42,105 @@ namespace WindowsFormsApp1.Convenience
cb_menu11, cb_menu12
};
+ ComboBox[] ShortCombo = {
+ cb_setShort1,
+ cb_setShort2,
+ cb_setShort3,
+ cb_setShort4,
+ cb_setShort5,
+ cb_setShort6,
+ cb_setShort7,
+ cb_setShort8,
+ cb_setShort9,
+ cb_setShort10,
+ cb_setShort11,
+ cb_setShort12
+ };
+
for (int a = 0; a < Menu.Length; a++)
{
Menu[a].Items.AddRange(MenuList);
}
+
+
+ /// 저장된 퀵메뉴 입력 ///
+
+ string[] Home = {
+ "사용자 관리", "납품 / 거래처 관리", "주문처 관리", "도서정보 관리"
+ };
+ string[] Div = {
+ "물품등록", "목록조회", "목록집계", "주문입력", "입고작업",
+ "재고입력 및 조회", "반품처리"
+ };
+ string[] Acc = {
+ "송금내역조회", "송금등록", "매입 집계", "매입 장부", "매출 입력", "매출 입금",
+ "매출 조회", "매출 집계", "파트타임 관리"
+ };
+ string[] Marc = {
+ "마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
+ "반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리",
+ "검수", "저자기호", "DLS 조회 입력", "서류작성",
+ "마크통계", "장비관리"
+ };
+
+ string[] QuickButton = {
+ main.ShortCut1.Text, main.ShortCut2.Text, main.ShortCut3.Text, main.ShortCut4.Text, main.ShortCut5.Text,
+ main.ShortCut6.Text, main.ShortCut7.Text, main.ShortCut8.Text, main.ShortCut9.Text, main.ShortCut10.Text,
+ main.ShortCut11.Text, main.ShortCut12.Text
+ };
+
+ int count = 0;
+ foreach (string text in QuickButton)
+ {
+ // if (text.IndexOf("미지정") < 0) {
+ // continue;
+ // }
+
+ if (isContain(text, Home)) {
+ Menu[count].SelectedIndex = 1;
+ ShortCombo[count].SelectedItem = text;
+ }
+
+ // else if (isContain(text, Div)) {
+ // Menu[count].SelectedItem = 2;
+ // ShortCombo[count].SelectedItem = text;
+ // continue;
+ // }
+ //
+ // else if (isContain(text, Acc)) {
+ // Menu[count].SelectedItem = 3;
+ // ShortCombo[count].SelectedItem = text;
+ // continue;
+ // }
+ //
+ // else if (isContain(text, Marc)) {
+ // Menu[count].SelectedItem = 4;
+ // ShortCombo[count].SelectedItem = text;
+ // continue;
+ // }
+ else if (isContain(text, Marc)) {
+ Menu[count].SelectedIndex = 2;
+ ShortCombo[count].SelectedItem = text;
+ }
+ else {
+ Menu[count].SelectedIndex = 0;
+ }
+ count++;
+ }
+
#endregion
}
+
+ bool isContain(string text, string[] MenuData)
+ {
+ foreach (string menu in MenuData)
+ {
+ if (menu.Contains(text))
+ return true;
+ }
+ return false;
+ }
+
private void btn_save_Click(object sender, EventArgs e)
{
string Table = "User_ShortCut";
@@ -131,20 +225,25 @@ namespace WindowsFormsApp1.Convenience
"송금내역조회", "송금등록", "매입 집계", "매입 장부", "매출 입력", "매출 입금",
"매출 조회", "매출 집계", "파트타임 관리"
};
-
string[] Marc = {
+ "마크 목록", "소장자료검색", "마크 정리", "복본 조사", "ISBN 조회",
+ "반입", "반출",
+ "전집관리", "저자기호", "DLS 복본 조사", "DLS 조회 입력",
+ "마크통계"
+ };
+ /* string[] Marc = {
"마크 목록", "소장자료검색", "마크 정리", "ISBN 조회", "반입",
"반출", "복본 조사", "DLS 복본 조사", "마크 수집", "전집관리",
"검수", "저자기호", "DLS 조회 입력", "서류작성",
"마크통계", "장비관리"
- };
+ };*/
int count = 0;
foreach (string name in comboName)
{
if (name == combo.Name)
break;
-
+ count++;
}
if (DetailMenu[count].Items.Count > 0)
@@ -160,13 +259,13 @@ namespace WindowsFormsApp1.Convenience
case 1: // 홈
DetailMenu[count].Items.AddRange(Home);
break;
- case 2: // 납품관리
- //DetailMenu[count].Items.AddRange(Div);
- break;
- case 3: // 회계
- //DetailMenu[count].Items.AddRange(Acc);
- break;
- case 4: // 마크
+ //case 2: 납품관리
+ // DetailMenu[count].Items.AddRange(Div);
+ // break;
+ //case 3: 회계
+ // DetailMenu[count].Items.AddRange(Acc);
+ // break;
+ case 2: // 4: 마크
DetailMenu[count].Items.AddRange(Marc);
break;
default: