diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index c05af93..f3bc040 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index 0094efb..221d5a5 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -67,7 +67,7 @@ this.마크작업ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.마크목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.소장자료검색ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.엑셀작성ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.마크정리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.iSBN조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.반입및반출ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.반입ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -226,49 +226,49 @@ // 물품등록ToolStripMenuItem // this.물품등록ToolStripMenuItem.Name = "물품등록ToolStripMenuItem"; - this.물품등록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.물품등록ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.물품등록ToolStripMenuItem.Text = "물품등록"; this.물품등록ToolStripMenuItem.Click += new System.EventHandler(this.물품등록ToolStripMenuItem_Click); // // 목록등록편의ToolStripMenuItem // this.목록등록편의ToolStripMenuItem.Name = "목록등록편의ToolStripMenuItem"; - this.목록등록편의ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.목록등록편의ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.목록등록편의ToolStripMenuItem.Text = "목록조회"; this.목록등록편의ToolStripMenuItem.Click += new System.EventHandler(this.목록등록편의ToolStripMenuItem_Click); // // 목록집계ToolStripMenuItem // this.목록집계ToolStripMenuItem.Name = "목록집계ToolStripMenuItem"; - this.목록집계ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.목록집계ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.목록집계ToolStripMenuItem.Text = "목록집계"; this.목록집계ToolStripMenuItem.Click += new System.EventHandler(this.목록집계ToolStripMenuItem_Click); // // 주문입력ToolStripMenuItem // this.주문입력ToolStripMenuItem.Name = "주문입력ToolStripMenuItem"; - this.주문입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.주문입력ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.주문입력ToolStripMenuItem.Text = "주문입력"; this.주문입력ToolStripMenuItem.Click += new System.EventHandler(this.주문입력ToolStripMenuItem_Click); // // 매입ToolStripMenuItem // this.매입ToolStripMenuItem.Name = "매입ToolStripMenuItem"; - this.매입ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.매입ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.매입ToolStripMenuItem.Text = "입고작업"; this.매입ToolStripMenuItem.Click += new System.EventHandler(this.매입ToolStripMenuItem_Click); // // 재고입력및조회ToolStripMenuItem // this.재고입력및조회ToolStripMenuItem.Name = "재고입력및조회ToolStripMenuItem"; - this.재고입력및조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.재고입력및조회ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.재고입력및조회ToolStripMenuItem.Text = "재고입력 및 조회"; this.재고입력및조회ToolStripMenuItem.Click += new System.EventHandler(this.재고입력및조회ToolStripMenuItem_Click); // // 반품처리ToolStripMenuItem // this.반품처리ToolStripMenuItem.Name = "반품처리ToolStripMenuItem"; - this.반품처리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.반품처리ToolStripMenuItem.Size = new System.Drawing.Size(166, 22); this.반품처리ToolStripMenuItem.Text = "반품처리"; this.반품처리ToolStripMenuItem.Click += new System.EventHandler(this.반품처리ToolStripMenuItem_Click); // @@ -287,14 +287,14 @@ // 송금내역조회ToolStripMenuItem // this.송금내역조회ToolStripMenuItem.Name = "송금내역조회ToolStripMenuItem"; - this.송금내역조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.송금내역조회ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.송금내역조회ToolStripMenuItem.Text = "송금 내역 조회"; this.송금내역조회ToolStripMenuItem.Click += new System.EventHandler(this.송금내역조회ToolStripMenuItem_Click); // // 송금등록ToolStripMenuItem // this.송금등록ToolStripMenuItem.Name = "송금등록ToolStripMenuItem"; - this.송금등록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.송금등록ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.송금등록ToolStripMenuItem.Text = "송금 등록"; this.송금등록ToolStripMenuItem.Click += new System.EventHandler(this.송금등록ToolStripMenuItem_Click); // @@ -305,7 +305,7 @@ this.매입장부ToolStripMenuItem1, this.매입미결제ToolStripMenuItem}); this.매입장부ToolStripMenuItem.Name = "매입장부ToolStripMenuItem"; - this.매입장부ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.매입장부ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.매입장부ToolStripMenuItem.Text = "매입"; // // 매입집계ToolStripMenuItem @@ -338,7 +338,7 @@ this.매출조회ToolStripMenuItem, this.매출집계ToolStripMenuItem1}); this.매출입력ToolStripMenuItem.Name = "매출입력ToolStripMenuItem"; - this.매출입력ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.매출입력ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.매출입력ToolStripMenuItem.Text = "매출"; // // 매출입력ToolStripMenuItem1 @@ -372,7 +372,7 @@ // 파트타임관리ToolStripMenuItem // this.파트타임관리ToolStripMenuItem.Name = "파트타임관리ToolStripMenuItem"; - this.파트타임관리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.파트타임관리ToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.파트타임관리ToolStripMenuItem.Text = "파트타임 관리"; this.파트타임관리ToolStripMenuItem.Click += new System.EventHandler(this.파트타임관리ToolStripMenuItem_Click); // @@ -434,7 +434,7 @@ this.마크작업ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.마크목록ToolStripMenuItem, this.소장자료검색ToolStripMenuItem, - this.엑셀작성ToolStripMenuItem, + this.마크정리ToolStripMenuItem, this.iSBN조회ToolStripMenuItem}); this.마크작업ToolStripMenuItem.Name = "마크작업ToolStripMenuItem"; this.마크작업ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); @@ -443,28 +443,28 @@ // 마크목록ToolStripMenuItem // this.마크목록ToolStripMenuItem.Name = "마크목록ToolStripMenuItem"; - this.마크목록ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.마크목록ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.마크목록ToolStripMenuItem.Text = "마크 목록"; this.마크목록ToolStripMenuItem.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click); // // 소장자료검색ToolStripMenuItem // this.소장자료검색ToolStripMenuItem.Name = "소장자료검색ToolStripMenuItem"; - this.소장자료검색ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.소장자료검색ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.소장자료검색ToolStripMenuItem.Text = "소장자료검색"; this.소장자료검색ToolStripMenuItem.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click); // - // 엑셀작성ToolStripMenuItem + // 마크정리ToolStripMenuItem // - this.엑셀작성ToolStripMenuItem.Name = "엑셀작성ToolStripMenuItem"; - this.엑셀작성ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); - this.엑셀작성ToolStripMenuItem.Text = "엑셀 작성"; - this.엑셀작성ToolStripMenuItem.Click += new System.EventHandler(this.엑셀작성ToolStripMenuItem_Click); + this.마크정리ToolStripMenuItem.Name = "마크정리ToolStripMenuItem"; + this.마크정리ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.마크정리ToolStripMenuItem.Text = "마크 정리"; + this.마크정리ToolStripMenuItem.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click); // // iSBN조회ToolStripMenuItem // this.iSBN조회ToolStripMenuItem.Name = "iSBN조회ToolStripMenuItem"; - this.iSBN조회ToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.iSBN조회ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.iSBN조회ToolStripMenuItem.Text = "ISBN 조회"; this.iSBN조회ToolStripMenuItem.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click); // @@ -1005,7 +1005,7 @@ private System.Windows.Forms.ToolStripMenuItem 마크작업ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 마크목록ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 소장자료검색ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 엑셀작성ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 마크정리ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 반입및반출ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 반입ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 반출ToolStripMenuItem; diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index 8527599..17f607c 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -528,7 +528,7 @@ namespace WindowsFormsApp1 Job_Order Job_Order; Mac_List Mac_List; Mac_Stat Mac_Stat; - Make_Excel Excel_make; + Marc_Plan Marc_Plan; Search_Infor Mac_search_Infor; Check_ISBN Mac_check_ISBN; Mac_Input Mac_Input; @@ -635,19 +635,19 @@ namespace WindowsFormsApp1 Mac_search_Infor.Show(); } } - private void 엑셀작성ToolStripMenuItem_Click(object sender, EventArgs e) + private void 마크정리ToolStripMenuItem_Click(object sender, EventArgs e) { - if (Excel_make != null) + if (Marc_Plan != null) { - Excel_make.Focus(); + Marc_Plan.Focus(); } else { - Excel_make = new Make_Excel(this); - Excel_make.MdiParent = this; - Excel_make.WindowState = FormWindowState.Maximized; - Excel_make.FormClosed += (o, ea) => Excel_make = null; - Excel_make.Show(); + Marc_Plan = new Marc_Plan(this); + Marc_Plan.MdiParent = this; + Marc_Plan.WindowState = FormWindowState.Maximized; + Marc_Plan.FormClosed += (o, ea) => Marc_Plan = null; + Marc_Plan.Show(); } } private void iSBN조회ToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 39c62d9..4e7cb2d 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -181,6 +181,18 @@ Mac_Stat_Stat.cs + + Form + + + Marc_mkList.cs + + + Form + + + Marc_Plan_Sub_SelectList.cs + Form @@ -562,11 +574,11 @@ Mac_List.cs - + Form - - Make_Excel.cs + + Marc_Plan.cs Form @@ -697,6 +709,12 @@ Mac_Stat_Stat.cs + + Marc_mkList.cs + + + Marc_Plan_Sub_SelectList.cs + Marc_Preview.cs @@ -889,8 +907,8 @@ Mac_List.cs - - Make_Excel.cs + + Marc_Plan.cs Nonverbal.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 25fdcea..7b047a4 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 b93c42f..5e4f891 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 495964e..a2d292b 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/DesignTimeResolveAssemblyReferencesInput.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1ed5731..080c262 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index 78e50fa..f204aa0 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -78d81dd0b148e78357440a5ede6a02876a89170f +dfd41c0905a34d0eb5bb582ce372d3b46680e340 diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index 82071f2..c2520c3 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -83,7 +83,6 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Mac_Stat.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Mac_Input.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Mac_List.resources -C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Make_Excel.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Nonverbal.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Search_Infor.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Set_Macro.resources @@ -121,3 +120,6 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크. C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Preview.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Check_ISBN_Split.resources C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Mac_Stat_Stat.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\WindowsFormsApp1.Mac.Marc_Plan.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_Plan_Sub_SelectList.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_mkList.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index cdf7079..6229407 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 25fdcea..7b047a4 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 b93c42f..5e4f891 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/WindowsFormsApp1.Mac.Make_Excel.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList.resources similarity index 100% rename from unimarc/unimarc/obj/Debug/WindowsFormsApp1.Mac.Make_Excel.resources rename to unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_Plan_Sub_SelectList.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_mkList.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_mkList.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_mkList.resources differ diff --git a/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Mac.Marc_Plan.resources b/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Mac.Marc_Plan.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/WindowsFormsApp1.Mac.Marc_Plan.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 495964e..a2d292b 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/마크/Equip_manage.Designer.cs b/unimarc/unimarc/마크/Equip_manage.Designer.cs index 00c6222..ec908a1 100644 --- a/unimarc/unimarc/마크/Equip_manage.Designer.cs +++ b/unimarc/unimarc/마크/Equip_manage.Designer.cs @@ -28,33 +28,19 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); this.SuspendLayout(); // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(371, 219); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(107, 12); - this.label1.TabIndex = 5; - this.label1.Text = "마크관리_장비관리"; - // // Equip_manage // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.label1); this.Name = "Equip_manage"; - this.Text = "Equip_manage"; + this.Text = "장비관리"; this.ResumeLayout(false); - this.PerformLayout(); } #endregion - - private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 043ca60..f3f4930 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -70,7 +70,6 @@ namespace ExcelTest // 전기 5 string[] combo5 = { "해당무", "자서전", "개인전기서", "전기물의 합저서", "전기적 정보가 포함된 자료" }; comboBox5.Items.AddRange(combo5); - comboBox5.SelectedIndex = 0; // 언어 36 string[] combo6 = { "한국어", "영어", "일본어", "중국어", "독일어", @@ -83,12 +82,18 @@ namespace ExcelTest "헝가리어" }; comboBox6.Items.AddRange(combo6); + // 콤보박스 정렬및 필터 + string[] combo8 = { "등급", "복본" }; + comboBox8.Items.AddRange(combo8); + comboBox1.SelectedIndex = 0; comboBox2.SelectedIndex = 0; comboBox3.SelectedIndex = 0; - comboBox7.SelectedIndex = 0; comboBox4.SelectedIndex = 0; + comboBox5.SelectedIndex = 0; comboBox6.SelectedIndex = 0; + comboBox7.SelectedIndex = 0; + comboBox8.SelectedIndex = 0; } /// /// 가져온 목록을 책목록과 연동하여 Grid에 집어넣음. @@ -98,7 +103,7 @@ namespace ExcelTest public void input_list(string date, string value) { db.DBcon(); - string Area = "`idx`, `isbn`, `book_name`, `author`, `book_comp`, `pay`, `image_url`"; + string Area = "`idx`, `isbn`, `header`, `num`, `book_name`, `author`, `book_comp`, `pay`, `image_url`"; string[] sear_tbl = { "date", "list_name" }; string[] sear_col = { date, value }; @@ -106,21 +111,28 @@ namespace ExcelTest string db_res = db.DB_Send_CMD_Search(cmd); string[] db_data = db_res.Split('|'); - string[] grid = { "", "", "", "", "", "", "", "", "" }; + string[] grid = { + "", "", "", "", "", + "", "", "", "", "", + "", "V" }; for(int a = 0; a < db_data.Length; a++) { - if (a % 7 == 0) { grid[0] = db_data[a]; } - if (a % 7 == 1) { grid[1] = db_data[a]; } - if (a % 7 == 2) { grid[2] = db_data[a]; } - if (a % 7 == 3) { grid[3] = db_data[a]; } - if (a % 7 == 4) { grid[4] = db_data[a]; } - if (a % 7 == 5) { grid[5] = db_data[a]; } - if (a % 7 == 6) { grid[6] = db_data[a]; List_Book.Rows.Add(grid); } + if (a % 9 == 0) { grid[0] = db_data[a]; } // 0: idx + if (a % 9 == 1) { grid[1] = db_data[a]; } // 1: isbn + if (a % 9 == 2) { grid[2] = db_data[a]; } // 2: header + if (a % 9 == 3) { grid[2] += db_data[a]; } // 2: num + if (a % 9 == 4) { grid[3] = db_data[a]; } // 3: book_num + if (a % 9 == 5) { grid[4] = db_data[a]; } // 4: author + if (a % 9 == 6) { grid[5] = db_data[a]; } // 5: book_comp + if (a % 9 == 7) { grid[6] = db_data[a]; } // 6: pay + if (a % 9 == 8) { grid[7] = db_data[a]; // 7: image_url + List_Book.Rows.Add(grid); + } } chk_Marc(); } /// - /// 마크 체크하는 함수 + /// 마크 유무 확인하는 함수 /// void chk_Marc() { @@ -131,7 +143,10 @@ namespace ExcelTest string cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`idx`, `marc`, `grade`"); string db_res = db.DB_Send_CMD_Search(cmd); string[] db_data = db_res.Split('|'); - if (db_data.Length < 2) { List_Book.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; } + if (db_data.Length < 2) { + List_Book.Rows[a].DefaultCellStyle.BackColor = Color.LightGray; + List_Book.Rows[a].Cells["grade"].Value = "2"; + } else { switch (db_data[2]) { @@ -549,16 +564,33 @@ namespace ExcelTest string[] Insert_tbl = { "compidx", "ISBN", "서명", "저자", "출판사", "가격", "marc", "비고1", "비고2", "url", "grade", "marc_chk", "user", "division", "008tag", - "date", "user" }; + "date" }; string[] Insert_col = { ml.compidx, grid_data[0], grid_data[1], grid_data[2], grid_data[3], grid_data[4], made_Ori_marc(), etc1.Text, etc2.Text, grid_data[5], cb_grade.SelectedIndex.ToString(), "1", user_name, tag056, text008.Text, - date, user_name }; + date }; string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); db.DB_Send_CMD_reVoid(Incmd); MessageBox.Show("추가"); } + List_Book.Rows[row_idx].Cells["db_marc"].Value = made_Ori_marc(); + List_Book.Rows[row_idx].DefaultCellStyle.BackColor = Color.White; + switch (cb_grade.SelectedIndex) + { + case 0: // A + List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Blue; + break; + case 1: // B + List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Red; + break; + case 2: // C + List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Black; + break; + case 3: // D + List_Book.Rows[row_idx].DefaultCellStyle.ForeColor = Color.Gray; + break; + } MessageBox.Show("저장되었습니다!"); } #region Save_Click_Sub @@ -702,6 +734,11 @@ namespace ExcelTest { if (e.RowIndex == -1) { return; } int row_idx = e.RowIndex; + int col_idx = e.ColumnIndex; + + if (check_V(row_idx, col_idx)) + return; + Save_data(row_idx); richTextBox1.Text = ""; if (!click_Marc(row_idx)) { richTextBox1.Text = Make_Empty(); } @@ -717,6 +754,22 @@ namespace ExcelTest cb_grade.SelectedIndex = grade; } #region ContentClick_Sub + bool check_V(int row, int col) + { + string name = List_Book.Columns[col].Name; + if (name == "colCheck") + { + if (List_Book.Rows[row].Cells[col].Value.ToString() == "V") + List_Book.Rows[row].Cells[col].Value = ""; + + else if (List_Book.Rows[row].Cells[col].Value.ToString() == "") + List_Book.Rows[row].Cells[col].Value = "V"; + + return true; + } + else + return false; + } bool click_Marc(int row) { string Marc_data = List_Book.Rows[row].Cells["db_marc"].Value.ToString(); @@ -811,11 +864,11 @@ namespace ExcelTest text008.Text = Empty_008.Replace("▲", ""); data008 = text008.Text; string Empty_text = string.Format("008\t \t{0}\n" + - "020\t \t▼a{1}▼c{5}▲\n" + + "020\t \t▼a{1}▼c\\{5}▲\n" + "245\t \t▼a{2}▲\n" + "260\t \t▼b{4}▲\n" + "700\t \t▼a{3}▲\n" + - "950\t \t▼b{5}▲\n", + "950\t \t▼b\\{5}▲\n", Empty_008, data_book[0], data_book[1], data_book[2], data_book[3], data_book[4]); /* "008\t \t" + Empty_008 + "\n020\t \t▼a" + data_book[0] + "▲\n" + "245\t \t▼a" + data_book[1] + " ▲\n" + "260\t \t▼b" + data_book[3] + " ▲\n" + @@ -985,37 +1038,17 @@ namespace ExcelTest result += value.ToString(); return result; } - private void dataGridView2_DataError(object sender, DataGridViewDataErrorEventArgs e) - { - // ((System.Windows.Forms.DataGridView)sender).Rows.Add(); - } - private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) - { - Rectangle rect = new Rectangle(e.RowBounds.Location.X, - e.RowBounds.Location.Y, - ((DataGridView)sender).RowHeadersWidth - 4, - e.RowBounds.Height); - - TextRenderer.DrawText(e.Graphics, - (e.RowIndex + 1).ToString(), - ((DataGridView)sender).RowHeadersDefaultCellStyle.Font, - rect, - ((DataGridView)sender).RowHeadersDefaultCellStyle.ForeColor, - TextFormatFlags.VerticalCenter | TextFormatFlags.Right); - } - private void dataGridView8_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Delete) + if (e.KeyCode == Keys.Space) { - for (int a = 0; a < List_Book.Rows.Count - 1; a++) - { - if(List_Book.Rows[a].Selected == true) - { - List_Book.Rows.Remove(List_Book.Rows[a]); - break; - } - } + int row = List_Book.CurrentCell.RowIndex; + + if (List_Book.Rows[row].Cells["colCheck"].Value.ToString() == "V") + List_Book.Rows[row].Cells["colCheck"].Value = ""; + + else + List_Book.Rows[row].Cells["colCheck"].Value = "V"; } } private void pictureBox1_DoubleClick(object sender, EventArgs e) @@ -1025,5 +1058,118 @@ namespace ExcelTest zp.Show(); } + private void btn_Search_Click(object sender, EventArgs e) + { + if (List_Book.RowCount < 0) return; + + Search_ReSet(); + + bool isSort = rb_Sort.Checked; + int combo = comboBox8.SelectedIndex; // 0: 등급 / 1: 복본 + + if (isSort) { + if (combo == 0) { + List_Book.Sort(List_Book.Columns["grade"], System.ComponentModel.ListSortDirection.Ascending); + } + else { + List_Book.Sort(List_Book.Columns["ISBN13"], System.ComponentModel.ListSortDirection.Ascending); + } + } + else { + string text; + if (combo == 0) { + text = comboBox9.SelectedIndex.ToString(); + Search_Filter("grade", text); + } + else { // 수정필요 + + } + } + } + #region Search_Click_Sub + private void Search_ReSet() + { + DataGridViewBand reSet; + for (int a = 0; a < List_Book.RowCount; a++) { + reSet = List_Book.Rows[a]; + reSet.Visible = true; + } + } + + private void Search_Filter(string target, string text) + { + int count = List_Book.Rows.Count; + DataGridViewBand band; + for (int a = 0; a < count; a++) + { + if (List_Book.Rows[a].Cells[target].Value.ToString() != text) { + band = List_Book.Rows[a]; + band.Visible = false; + } + } + } + #endregion + + private void comboBox8_SelectedIndexChanged(object sender, EventArgs e) + { + comboBox9.Items.Clear(); + + ComboBox cb = sender as ComboBox; + if (cb.SelectedIndex == 0) { + comboBox9.Enabled = true; + string[] grade = { "A", "B", "C", "D" }; + comboBox9.Items.AddRange(grade); + comboBox9.SelectedIndex = 0; + } + else + comboBox9.Enabled = false; + } + + private void rb_Sort_CheckedChanged(object sender, EventArgs e) + { + RadioButton rb = sender as RadioButton; + string text = rb.Text; + if (text == "정렬") + comboBox9.Enabled = false; + + else + comboBox9.Enabled = true; + } + + private void btn_mk_marcList_Click(object sender, EventArgs e) + { + // 회색배경과 V를 체크한 후 + // 반출을 도와주는 창이 표출됨 + string msg = ""; + bool isSuccess = true; + + for (int a = 0; a < List_Book.Rows.Count; a++) + { + if (!Check_BackColor(a) || !Check_List_V(a)) { + isSuccess = false; + msg += List_Book.Rows[a].Cells["num"].Value.ToString() + " "; + } + } + if (!isSuccess) { + MessageBox.Show(string.Format("표시된 연번을 확인해주세요.\n{0}", msg)); + return; + } + } + #region 마크생성목록_Sub + bool Check_BackColor(int row) + { + if (List_Book.Rows[row].DefaultCellStyle.BackColor != Color.LightGray) + return true; + + return false; + } + bool Check_List_V(int row) + { + if (List_Book.Rows[row].Cells["colCheck"].Value.ToString() == "V") + return true; + + return false; + } + #endregion } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index dfc1496..dc29092 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,7 +28,8 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.etc1 = new System.Windows.Forms.RichTextBox(); this.etc2 = new System.Windows.Forms.RichTextBox(); @@ -56,16 +57,6 @@ this.comboBox7 = new System.Windows.Forms.ComboBox(); this.Btn_Memo = new System.Windows.Forms.Button(); this.List_Book = new System.Windows.Forms.DataGridView(); - this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.url = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.btn_Save = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.text008 = new System.Windows.Forms.TextBox(); @@ -76,17 +67,39 @@ this.btn_preview = new System.Windows.Forms.Button(); this.cb_grade = new System.Windows.Forms.ComboBox(); this.label6 = new System.Windows.Forms.Label(); + this.rb_Sort = new System.Windows.Forms.RadioButton(); + this.rb_Filter = new System.Windows.Forms.RadioButton(); + this.comboBox8 = new System.Windows.Forms.ComboBox(); + this.comboBox9 = new System.Windows.Forms.ComboBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btn_Search = new System.Windows.Forms.Button(); + this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pay = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.url = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCheck = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_mk_marcList = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // richTextBox1 // this.richTextBox1.AcceptsTab = true; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.richTextBox1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.richTextBox1.Location = new System.Drawing.Point(386, 89); + this.richTextBox1.Font = new System.Drawing.Font("굴림체", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.richTextBox1.Location = new System.Drawing.Point(502, 92); this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Size = new System.Drawing.Size(631, 649); this.richTextBox1.TabIndex = 32; @@ -97,7 +110,7 @@ // this.etc1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.etc1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc1.Location = new System.Drawing.Point(1023, 321); + this.etc1.Location = new System.Drawing.Point(1139, 324); this.etc1.Name = "etc1"; this.etc1.Size = new System.Drawing.Size(291, 204); this.etc1.TabIndex = 32; @@ -108,7 +121,7 @@ // this.etc2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.etc2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc2.Location = new System.Drawing.Point(1023, 531); + this.etc2.Location = new System.Drawing.Point(1139, 534); this.etc2.Name = "etc2"; this.etc2.Size = new System.Drawing.Size(291, 201); this.etc2.TabIndex = 32; @@ -118,7 +131,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(390, 12); + this.label1.Location = new System.Drawing.Point(506, 15); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 14; @@ -127,7 +140,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(559, 12); + this.label2.Location = new System.Drawing.Point(675, 15); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 206; @@ -137,7 +150,7 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(600, 8); + this.comboBox1.Location = new System.Drawing.Point(716, 11); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(79, 20); this.comboBox1.TabIndex = 207; @@ -147,7 +160,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(692, 12); + this.label3.Location = new System.Drawing.Point(808, 15); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 206; @@ -157,7 +170,7 @@ // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(743, 8); + this.comboBox2.Location = new System.Drawing.Point(859, 11); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(79, 20); this.comboBox2.TabIndex = 207; @@ -167,7 +180,7 @@ // label98 // this.label98.AutoSize = true; - this.label98.Location = new System.Drawing.Point(845, 12); + this.label98.Location = new System.Drawing.Point(961, 15); this.label98.Name = "label98"; this.label98.Size = new System.Drawing.Size(53, 12); this.label98.TabIndex = 14; @@ -177,7 +190,7 @@ // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(899, 8); + this.comboBox3.Location = new System.Drawing.Point(1015, 11); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(118, 20); this.comboBox3.TabIndex = 207; @@ -187,7 +200,7 @@ // label99 // this.label99.AutoSize = true; - this.label99.Location = new System.Drawing.Point(1142, 12); + this.label99.Location = new System.Drawing.Point(1258, 15); this.label99.Name = "label99"; this.label99.Size = new System.Drawing.Size(29, 12); this.label99.TabIndex = 206; @@ -195,7 +208,7 @@ // // text008col // - this.text008col.Location = new System.Drawing.Point(1171, 8); + this.text008col.Location = new System.Drawing.Point(1287, 11); this.text008col.Name = "text008col"; this.text008col.Size = new System.Drawing.Size(41, 21); this.text008col.TabIndex = 204; @@ -204,7 +217,7 @@ // label100 // this.label100.AutoSize = true; - this.label100.Location = new System.Drawing.Point(644, 34); + this.label100.Location = new System.Drawing.Point(760, 37); this.label100.Name = "label100"; this.label100.Size = new System.Drawing.Size(53, 12); this.label100.TabIndex = 206; @@ -214,7 +227,7 @@ // this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(695, 30); + this.comboBox4.Location = new System.Drawing.Point(811, 33); this.comboBox4.Name = "comboBox4"; this.comboBox4.Size = new System.Drawing.Size(79, 20); this.comboBox4.TabIndex = 207; @@ -224,7 +237,7 @@ // label101 // this.label101.AutoSize = true; - this.label101.Location = new System.Drawing.Point(783, 34); + this.label101.Location = new System.Drawing.Point(899, 37); this.label101.Name = "label101"; this.label101.Size = new System.Drawing.Size(29, 12); this.label101.TabIndex = 206; @@ -234,7 +247,7 @@ // this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(813, 30); + this.comboBox5.Location = new System.Drawing.Point(929, 33); this.comboBox5.Name = "comboBox5"; this.comboBox5.Size = new System.Drawing.Size(101, 20); this.comboBox5.TabIndex = 207; @@ -244,7 +257,7 @@ // label102 // this.label102.AutoSize = true; - this.label102.Location = new System.Drawing.Point(929, 34); + this.label102.Location = new System.Drawing.Point(1045, 37); this.label102.Name = "label102"; this.label102.Size = new System.Drawing.Size(29, 12); this.label102.TabIndex = 206; @@ -254,7 +267,7 @@ // this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(959, 30); + this.comboBox6.Location = new System.Drawing.Point(1075, 33); this.comboBox6.Name = "comboBox6"; this.comboBox6.Size = new System.Drawing.Size(101, 20); this.comboBox6.TabIndex = 207; @@ -263,7 +276,7 @@ // // text008gov // - this.text008gov.Location = new System.Drawing.Point(1099, 30); + this.text008gov.Location = new System.Drawing.Point(1215, 33); this.text008gov.Name = "text008gov"; this.text008gov.Size = new System.Drawing.Size(41, 21); this.text008gov.TabIndex = 204; @@ -272,7 +285,7 @@ // label103 // this.label103.AutoSize = true; - this.label103.Location = new System.Drawing.Point(1070, 34); + this.label103.Location = new System.Drawing.Point(1186, 37); this.label103.Name = "label103"; this.label103.Size = new System.Drawing.Size(29, 12); this.label103.TabIndex = 206; @@ -282,7 +295,7 @@ // this.col008res.AutoSize = true; this.col008res.ForeColor = System.Drawing.Color.Blue; - this.col008res.Location = new System.Drawing.Point(1214, 12); + this.col008res.Location = new System.Drawing.Point(1330, 15); this.col008res.Name = "col008res"; this.col008res.Size = new System.Drawing.Size(13, 12); this.col008res.TabIndex = 206; @@ -293,7 +306,7 @@ // this.gov008res.AutoSize = true; this.gov008res.ForeColor = System.Drawing.Color.Blue; - this.gov008res.Location = new System.Drawing.Point(1142, 34); + this.gov008res.Location = new System.Drawing.Point(1258, 37); this.gov008res.Name = "gov008res"; this.gov008res.Size = new System.Drawing.Size(13, 12); this.gov008res.TabIndex = 206; @@ -303,7 +316,7 @@ // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(392, 32); + this.checkBox1.Location = new System.Drawing.Point(508, 35); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(112, 16); this.checkBox1.TabIndex = 213; @@ -314,7 +327,7 @@ // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(516, 32); + this.checkBox2.Location = new System.Drawing.Point(632, 35); this.checkBox2.Name = "checkBox2"; this.checkBox2.Size = new System.Drawing.Size(112, 16); this.checkBox2.TabIndex = 213; @@ -326,7 +339,7 @@ // this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox7.FormattingEnabled = true; - this.comboBox7.Location = new System.Drawing.Point(1018, 8); + this.comboBox7.Location = new System.Drawing.Point(1134, 11); this.comboBox7.Name = "comboBox7"; this.comboBox7.Size = new System.Drawing.Size(118, 20); this.comboBox7.TabIndex = 207; @@ -335,7 +348,7 @@ // // Btn_Memo // - this.Btn_Memo.Location = new System.Drawing.Point(1239, 89); + this.Btn_Memo.Location = new System.Drawing.Point(1355, 92); this.Btn_Memo.Name = "Btn_Memo"; this.Btn_Memo.Size = new System.Drawing.Size(75, 23); this.Btn_Memo.TabIndex = 215; @@ -348,17 +361,18 @@ this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = false; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, 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.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, + this.num, this.book_name, this.author, this.book_comp, @@ -366,9 +380,10 @@ this.url, this.marc_idx, this.db_marc, - this.grade}); + this.grade, + this.colCheck}); this.List_Book.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.List_Book.Location = new System.Drawing.Point(12, 12); + this.List_Book.Location = new System.Drawing.Point(12, 57); this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; @@ -376,11 +391,181 @@ this.List_Book.RowHeadersWidth = 10; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.List_Book.Size = new System.Drawing.Size(370, 726); + this.List_Book.Size = new System.Drawing.Size(476, 684); this.List_Book.TabIndex = 217; this.List_Book.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellContentClick); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView8_KeyDown); // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(1355, 120); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(75, 23); + this.btn_Save.TabIndex = 215; + this.btn_Save.Text = "저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.Btn_Save_Click); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(8, 9); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(49, 12); + this.label4.TabIndex = 206; + this.label4.Text = "008 Tag"; + // + // text008 + // + this.text008.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.text008.Location = new System.Drawing.Point(60, 4); + this.text008.MaxLength = 40; + this.text008.Name = "text008"; + this.text008.Size = new System.Drawing.Size(356, 21); + this.text008.TabIndex = 204; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.panel3.Controls.Add(this.text008); + this.panel3.Controls.Add(this.label4); + this.panel3.Location = new System.Drawing.Point(503, 57); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(430, 30); + this.panel3.TabIndex = 219; + // + // btn_close + // + this.btn_close.Location = new System.Drawing.Point(1355, 149); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(75, 23); + this.btn_close.TabIndex = 215; + this.btn_close.Text = "닫 기"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.Btn_Close_Click); + // + // input_date + // + this.input_date.CustomFormat = "yyyy-MM-dd"; + this.input_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.input_date.Location = new System.Drawing.Point(565, 11); + this.input_date.Name = "input_date"; + this.input_date.Size = new System.Drawing.Size(91, 21); + this.input_date.TabIndex = 220; + this.input_date.ValueChanged += new System.EventHandler(this.input_date_ValueChanged); + // + // pictureBox1 + // + this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; + this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox1.Location = new System.Drawing.Point(1139, 62); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(204, 256); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 221; + this.pictureBox1.TabStop = false; + this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick); + // + // btn_preview + // + this.btn_preview.Location = new System.Drawing.Point(1355, 63); + this.btn_preview.Name = "btn_preview"; + this.btn_preview.Size = new System.Drawing.Size(75, 23); + this.btn_preview.TabIndex = 215; + this.btn_preview.Text = "미리보기"; + this.btn_preview.UseVisualStyleBackColor = true; + this.btn_preview.Click += new System.EventHandler(this.Btn_preview_Click); + // + // cb_grade + // + 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"}); + this.cb_grade.Location = new System.Drawing.Point(1026, 62); + this.cb_grade.Name = "cb_grade"; + this.cb_grade.Size = new System.Drawing.Size(75, 20); + this.cb_grade.TabIndex = 222; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(963, 66); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(57, 12); + this.label6.TabIndex = 223; + this.label6.Text = "마크 등급"; + // + // rb_Sort + // + this.rb_Sort.AutoSize = true; + this.rb_Sort.Location = new System.Drawing.Point(10, 8); + this.rb_Sort.Name = "rb_Sort"; + this.rb_Sort.Size = new System.Drawing.Size(47, 16); + this.rb_Sort.TabIndex = 224; + this.rb_Sort.TabStop = true; + this.rb_Sort.Text = "정렬"; + this.rb_Sort.UseVisualStyleBackColor = true; + this.rb_Sort.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged); + // + // rb_Filter + // + this.rb_Filter.AutoSize = true; + this.rb_Filter.Location = new System.Drawing.Point(57, 8); + this.rb_Filter.Name = "rb_Filter"; + this.rb_Filter.Size = new System.Drawing.Size(47, 16); + this.rb_Filter.TabIndex = 224; + this.rb_Filter.TabStop = true; + this.rb_Filter.Text = "필터"; + this.rb_Filter.UseVisualStyleBackColor = true; + this.rb_Filter.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged); + // + // comboBox8 + // + this.comboBox8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox8.FormattingEnabled = true; + this.comboBox8.Location = new System.Drawing.Point(115, 6); + this.comboBox8.Name = "comboBox8"; + this.comboBox8.Size = new System.Drawing.Size(79, 20); + this.comboBox8.TabIndex = 225; + this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged); + // + // comboBox9 + // + this.comboBox9.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox9.FormattingEnabled = true; + this.comboBox9.Location = new System.Drawing.Point(200, 6); + this.comboBox9.Name = "comboBox9"; + this.comboBox9.Size = new System.Drawing.Size(79, 20); + this.comboBox9.TabIndex = 225; + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.panel2); + this.panel1.Controls.Add(this.btn_Search); + this.panel1.Controls.Add(this.rb_Sort); + this.panel1.Controls.Add(this.comboBox9); + this.panel1.Controls.Add(this.rb_Filter); + this.panel1.Controls.Add(this.comboBox8); + this.panel1.Location = new System.Drawing.Point(12, 11); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(476, 35); + this.panel1.TabIndex = 226; + // + // btn_Search + // + this.btn_Search.Location = new System.Drawing.Point(293, 5); + this.btn_Search.Name = "btn_Search"; + this.btn_Search.Size = new System.Drawing.Size(79, 23); + this.btn_Search.TabIndex = 227; + this.btn_Search.Text = "검 색"; + this.btn_Search.UseVisualStyleBackColor = true; + this.btn_Search.Click += new System.EventHandler(this.btn_Search_Click); + // // list_idx // this.list_idx.HeaderText = "list_idx"; @@ -395,6 +580,14 @@ this.ISBN13.HeaderText = "ISBN13"; this.ISBN13.Name = "ISBN13"; this.ISBN13.ReadOnly = true; + this.ISBN13.Visible = false; + // + // num + // + this.num.HeaderText = "연번"; + this.num.Name = "num"; + this.num.ReadOnly = true; + this.num.Width = 50; // // book_name // @@ -402,7 +595,7 @@ this.book_name.HeaderText = "도서명"; this.book_name.Name = "book_name"; this.book_name.ReadOnly = true; - this.book_name.Width = 99; + this.book_name.Width = 150; // // author // @@ -410,7 +603,7 @@ this.author.HeaderText = "저자"; this.author.Name = "author"; this.author.ReadOnly = true; - this.author.Width = 50; + this.author.Width = 80; // // book_comp // @@ -418,7 +611,7 @@ this.book_comp.HeaderText = "출판사"; this.book_comp.Name = "book_comp"; this.book_comp.ReadOnly = true; - this.book_comp.Width = 56; + this.book_comp.Width = 80; // // pay // @@ -456,115 +649,43 @@ this.grade.Name = "grade"; this.grade.ReadOnly = true; this.grade.Visible = false; + this.grade.Width = 50; // - // btn_Save + // colCheck // - this.btn_Save.Location = new System.Drawing.Point(1239, 117); - this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(75, 23); - this.btn_Save.TabIndex = 215; - this.btn_Save.Text = "저 장"; - this.btn_Save.UseVisualStyleBackColor = true; - this.btn_Save.Click += new System.EventHandler(this.Btn_Save_Click); + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle8; + this.colCheck.HeaderText = "V"; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.Width = 30; // - // label4 + // btn_mk_marcList // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(8, 9); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(49, 12); - this.label4.TabIndex = 206; - this.label4.Text = "008 Tag"; + this.btn_mk_marcList.Location = new System.Drawing.Point(6, 5); + this.btn_mk_marcList.Name = "btn_mk_marcList"; + this.btn_mk_marcList.Size = new System.Drawing.Size(85, 23); + this.btn_mk_marcList.TabIndex = 227; + this.btn_mk_marcList.Text = "마크목록생성"; + this.btn_mk_marcList.UseVisualStyleBackColor = true; + this.btn_mk_marcList.Click += new System.EventHandler(this.btn_mk_marcList_Click); // - // text008 + // panel2 // - this.text008.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.text008.Location = new System.Drawing.Point(60, 4); - this.text008.MaxLength = 40; - this.text008.Name = "text008"; - this.text008.Size = new System.Drawing.Size(356, 21); - this.text008.TabIndex = 204; - // - // panel3 - // - this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.panel3.Controls.Add(this.text008); - this.panel3.Controls.Add(this.label4); - this.panel3.Location = new System.Drawing.Point(387, 54); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(430, 30); - this.panel3.TabIndex = 219; - // - // btn_close - // - this.btn_close.Location = new System.Drawing.Point(1239, 146); - this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(75, 23); - this.btn_close.TabIndex = 215; - this.btn_close.Text = "닫 기"; - this.btn_close.UseVisualStyleBackColor = true; - this.btn_close.Click += new System.EventHandler(this.Btn_Close_Click); - // - // input_date - // - this.input_date.CustomFormat = "yyyy-MM-dd"; - this.input_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.input_date.Location = new System.Drawing.Point(449, 8); - this.input_date.Name = "input_date"; - this.input_date.Size = new System.Drawing.Size(91, 21); - this.input_date.TabIndex = 220; - this.input_date.ValueChanged += new System.EventHandler(this.input_date_ValueChanged); - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; - this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox1.Location = new System.Drawing.Point(1023, 59); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(204, 256); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 221; - this.pictureBox1.TabStop = false; - this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick); - // - // btn_preview - // - this.btn_preview.Location = new System.Drawing.Point(1239, 60); - this.btn_preview.Name = "btn_preview"; - this.btn_preview.Size = new System.Drawing.Size(75, 23); - this.btn_preview.TabIndex = 215; - this.btn_preview.Text = "미리보기"; - this.btn_preview.UseVisualStyleBackColor = true; - this.btn_preview.Click += new System.EventHandler(this.Btn_preview_Click); - // - // cb_grade - // - 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"}); - this.cb_grade.Location = new System.Drawing.Point(910, 59); - this.cb_grade.Name = "cb_grade"; - this.cb_grade.Size = new System.Drawing.Size(75, 20); - this.cb_grade.TabIndex = 222; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(847, 63); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(57, 12); - this.label6.TabIndex = 223; - this.label6.Text = "마크 등급"; + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.btn_mk_marcList); + this.panel2.Location = new System.Drawing.Point(377, -1); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(98, 35); + this.panel2.TabIndex = 228; // // Marc // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1322, 753); + this.ClientSize = new System.Drawing.Size(1457, 770); + this.Controls.Add(this.panel1); this.Controls.Add(this.label6); this.Controls.Add(this.cb_grade); this.Controls.Add(this.pictureBox1); @@ -601,12 +722,15 @@ this.Controls.Add(this.label98); this.Controls.Add(this.label1); this.Name = "Marc"; - this.Text = "마크편집"; + this.Text = "마크 작성"; this.Load += new System.EventHandler(this.Marc_Load); ((System.ComponentModel.ISupportInitialize)(this.List_Book)).EndInit(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -652,8 +776,18 @@ private System.Windows.Forms.Button btn_close; private System.Windows.Forms.DateTimePicker input_date; private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Button btn_preview; + private System.Windows.Forms.ComboBox cb_grade; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.RadioButton rb_Sort; + private System.Windows.Forms.RadioButton rb_Filter; + private System.Windows.Forms.ComboBox comboBox8; + private System.Windows.Forms.ComboBox comboBox9; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button btn_Search; private System.Windows.Forms.DataGridViewTextBoxColumn list_idx; private System.Windows.Forms.DataGridViewTextBoxColumn ISBN13; + private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; private System.Windows.Forms.DataGridViewTextBoxColumn author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; @@ -662,8 +796,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn marc_idx; private System.Windows.Forms.DataGridViewTextBoxColumn db_marc; private System.Windows.Forms.DataGridViewTextBoxColumn grade; - private System.Windows.Forms.Button btn_preview; - private System.Windows.Forms.ComboBox cb_grade; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.DataGridViewTextBoxColumn colCheck; + private System.Windows.Forms.Button btn_mk_marcList; + private System.Windows.Forms.Panel panel2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx index e1b5275..f6d3d4b 100644 --- a/unimarc/unimarc/마크/Marc.resx +++ b/unimarc/unimarc/마크/Marc.resx @@ -123,6 +123,9 @@ True + + True + True @@ -147,4 +150,7 @@ True + + True + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs new file mode 100644 index 0000000..9fc9795 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -0,0 +1,341 @@ +namespace WindowsFormsApp1.Mac +{ + partial class Marc_Plan + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + 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(); + this.panel1 = new System.Windows.Forms.Panel(); + this.button1 = new System.Windows.Forms.Button(); + this.tb_Select_List = new System.Windows.Forms.TextBox(); + this.btn_Select_List = new System.Windows.Forms.Button(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.reg_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.class_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.chk_overlap = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.F = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.gu = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.s_book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.s_book_num = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.search_tag = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.button1); + this.panel1.Controls.Add(this.tb_Select_List); + this.panel1.Controls.Add(this.btn_Select_List); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1285, 38); + this.panel1.TabIndex = 0; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(531, 6); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 2; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tb_Select_List + // + this.tb_Select_List.Location = new System.Drawing.Point(90, 8); + this.tb_Select_List.Name = "tb_Select_List"; + this.tb_Select_List.ReadOnly = true; + this.tb_Select_List.Size = new System.Drawing.Size(321, 21); + this.tb_Select_List.TabIndex = 1; + // + // btn_Select_List + // + this.btn_Select_List.Location = new System.Drawing.Point(9, 7); + this.btn_Select_List.Name = "btn_Select_List"; + this.btn_Select_List.Size = new System.Drawing.Size(75, 23); + this.btn_Select_List.TabIndex = 0; + this.btn_Select_List.Text = "목록선택"; + this.btn_Select_List.UseVisualStyleBackColor = true; + this.btn_Select_List.Click += new System.EventHandler(this.btn_Select_List_Click); + // + // dataGridView1 + // + 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; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.num, + this.reg_num, + this.class_code, + this.author_code, + this.chk_overlap, + this.count, + this.F, + this.gu, + this.ISBN, + this.book_name, + this.s_book_name, + this.s_book_num, + this.author, + this.book_comp, + this.price, + this.search_tag, + this.colCheck}); + this.dataGridView1.Location = new System.Drawing.Point(13, 57); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(1284, 611); + this.dataGridView1.TabIndex = 1; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.checkBox1.Location = new System.Drawing.Point(1275, 63); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(15, 14); + this.checkBox1.TabIndex = 2; + this.checkBox1.TabStop = false; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // num + // + this.num.FillWeight = 64.46414F; + this.num.HeaderText = "연번"; + this.num.Name = "num"; + this.num.ReadOnly = true; + this.num.Width = 50; + // + // reg_num + // + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.reg_num.DefaultCellStyle = dataGridViewCellStyle2; + this.reg_num.FillWeight = 130.9363F; + this.reg_num.HeaderText = "등록번호"; + this.reg_num.Name = "reg_num"; + this.reg_num.Width = 102; + // + // class_code + // + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.class_code.DefaultCellStyle = dataGridViewCellStyle3; + this.class_code.FillWeight = 76.41504F; + this.class_code.HeaderText = "분류"; + this.class_code.Name = "class_code"; + this.class_code.Width = 59; + // + // author_code + // + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.author_code.DefaultCellStyle = dataGridViewCellStyle4; + this.author_code.FillWeight = 77.02635F; + this.author_code.HeaderText = "저자기호"; + this.author_code.Name = "author_code"; + this.author_code.Width = 60; + // + // chk_overlap + // + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.chk_overlap.DefaultCellStyle = dataGridViewCellStyle5; + this.chk_overlap.FillWeight = 38.80909F; + this.chk_overlap.HeaderText = "V"; + this.chk_overlap.Name = "chk_overlap"; + this.chk_overlap.Width = 30; + // + // count + // + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.count.DefaultCellStyle = dataGridViewCellStyle6; + this.count.FillWeight = 40.14827F; + this.count.HeaderText = "C"; + this.count.Name = "count"; + this.count.Width = 31; + // + // F + // + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.F.DefaultCellStyle = dataGridViewCellStyle7; + this.F.FillWeight = 41.51828F; + this.F.HeaderText = "F"; + this.F.Name = "F"; + this.F.Width = 32; + // + // gu + // + this.gu.FillWeight = 71.64279F; + this.gu.HeaderText = "구분"; + this.gu.Name = "gu"; + this.gu.ReadOnly = true; + this.gu.Width = 56; + // + // ISBN + // + this.ISBN.HeaderText = "ISBN"; + this.ISBN.Name = "ISBN"; + this.ISBN.Visible = false; + // + // book_name + // + this.book_name.FillWeight = 291.9296F; + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.ReadOnly = true; + this.book_name.Width = 226; + // + // s_book_name + // + this.s_book_name.FillWeight = 129.9903F; + this.s_book_name.HeaderText = "총서명"; + this.s_book_name.Name = "s_book_name"; + this.s_book_name.ReadOnly = true; + this.s_book_name.Width = 101; + // + // s_book_num + // + this.s_book_num.FillWeight = 76.24091F; + this.s_book_num.HeaderText = "총서번호"; + this.s_book_num.Name = "s_book_num"; + this.s_book_num.ReadOnly = true; + this.s_book_num.Width = 59; + // + // author + // + this.author.FillWeight = 128.5217F; + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.ReadOnly = true; + // + // book_comp + // + this.book_comp.FillWeight = 125.7765F; + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.ReadOnly = true; + this.book_comp.Width = 97; + // + // price + // + this.price.FillWeight = 86.15041F; + this.price.HeaderText = "정가"; + this.price.Name = "price"; + this.price.ReadOnly = true; + this.price.Width = 67; + // + // search_tag + // + this.search_tag.FillWeight = 185.6383F; + this.search_tag.HeaderText = "검색태그"; + this.search_tag.Name = "search_tag"; + this.search_tag.ReadOnly = true; + this.search_tag.Width = 144; + // + // colCheck + // + this.colCheck.FalseValue = "F"; + this.colCheck.FillWeight = 34.79187F; + this.colCheck.HeaderText = "□"; + this.colCheck.IndeterminateValue = "F"; + this.colCheck.Name = "colCheck"; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCheck.TrueValue = "T"; + this.colCheck.Width = 27; + // + // Marc_Plan + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1309, 716); + this.Controls.Add(this.checkBox1); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.panel1); + this.Name = "Marc_Plan"; + this.Text = "마크 정리"; + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.TextBox tb_Select_List; + private System.Windows.Forms.Button btn_Select_List; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.DataGridViewTextBoxColumn num; + private System.Windows.Forms.DataGridViewTextBoxColumn reg_num; + private System.Windows.Forms.DataGridViewTextBoxColumn class_code; + private System.Windows.Forms.DataGridViewTextBoxColumn author_code; + private System.Windows.Forms.DataGridViewTextBoxColumn chk_overlap; + private System.Windows.Forms.DataGridViewTextBoxColumn count; + private System.Windows.Forms.DataGridViewTextBoxColumn F; + private System.Windows.Forms.DataGridViewTextBoxColumn gu; + private System.Windows.Forms.DataGridViewTextBoxColumn ISBN; + private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn s_book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn s_book_num; + private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn search_tag; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs new file mode 100644 index 0000000..f8eb1a9 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -0,0 +1,51 @@ +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.Windows.Forms; + +namespace WindowsFormsApp1.Mac +{ + public partial class Marc_Plan : Form + { + Main main; + public Marc_Plan(Main _main) + { + InitializeComponent(); + main = _main; + } + + private void btn_Select_List_Click(object sender, EventArgs e) + { + dataGridView1.Rows.Add(1); + } + + private void button1_Click(object sender, EventArgs e) + { + foreach(DataGridViewColumn c in dataGridView1.Columns) + { + if (c.CellType.ToString().Contains("CheckBox")) + { + button1.Text = c.Index.ToString(); + } + } + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + foreach (DataGridViewRow r in dataGridView1.Rows) { + r.Cells["colCheck"].Value = ((CheckBox)sender).Checked; + } + } + } +} diff --git a/unimarc/unimarc/마크/Marc_Plan.resx b/unimarc/unimarc/마크/Marc_Plan.resx new file mode 100644 index 0000000..bc7a8a1 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan.resx @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs new file mode 100644 index 0000000..5df858a --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs @@ -0,0 +1,243 @@ + +namespace UniMarc.마크 +{ + partial class Marc_Plan_Sub_SelectList + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.cb_gu = new System.Windows.Forms.ComboBox(); + this.tb_Search = new System.Windows.Forms.TextBox(); + this.btn_Search = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.btn_Complite = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button5 = new System.Windows.Forms.Button(); + this.button6 = new System.Windows.Forms.Button(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.list_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.date = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.ControlDark; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.tb_Search); + this.panel1.Controls.Add(this.cb_gu); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label1); + this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(363, 27); + this.panel1.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(6, 6); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 0; + this.label1.Text = "구분"; + // + // cb_gu + // + this.cb_gu.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_gu.FormattingEnabled = true; + this.cb_gu.Location = new System.Drawing.Point(37, 2); + this.cb_gu.Name = "cb_gu"; + this.cb_gu.Size = new System.Drawing.Size(60, 20); + this.cb_gu.TabIndex = 1; + // + // tb_Search + // + this.tb_Search.BackColor = System.Drawing.Color.Khaki; + this.tb_Search.Location = new System.Drawing.Point(136, 2); + this.tb_Search.Name = "tb_Search"; + this.tb_Search.Size = new System.Drawing.Size(223, 21); + this.tb_Search.TabIndex = 2; + // + // btn_Search + // + this.btn_Search.Location = new System.Drawing.Point(369, 3); + this.btn_Search.Name = "btn_Search"; + this.btn_Search.Size = new System.Drawing.Size(57, 27); + this.btn_Search.TabIndex = 1; + this.btn_Search.Text = "검 색"; + this.btn_Search.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(105, 6); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(29, 12); + this.label2.TabIndex = 0; + this.label2.Text = "검색"; + // + // btn_Complite + // + this.btn_Complite.Location = new System.Drawing.Point(429, 3); + this.btn_Complite.Name = "btn_Complite"; + this.btn_Complite.Size = new System.Drawing.Size(57, 27); + this.btn_Complite.TabIndex = 1; + this.btn_Complite.Text = "완 료"; + this.btn_Complite.UseVisualStyleBackColor = true; + // + // button3 + // + this.button3.Location = new System.Drawing.Point(486, 3); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(57, 27); + this.button3.TabIndex = 1; + this.button3.Text = "진 행"; + this.button3.UseVisualStyleBackColor = true; + // + // button4 + // + this.button4.Location = new System.Drawing.Point(546, 3); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(57, 27); + this.button4.TabIndex = 1; + this.button4.Text = "수 정"; + this.button4.UseVisualStyleBackColor = true; + // + // button5 + // + this.button5.Location = new System.Drawing.Point(603, 3); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(57, 27); + this.button5.TabIndex = 1; + this.button5.Text = "삭 제"; + this.button5.UseVisualStyleBackColor = true; + // + // button6 + // + this.button6.Location = new System.Drawing.Point(663, 3); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(57, 27); + this.button6.TabIndex = 1; + this.button6.Text = "닫 기"; + this.button6.UseVisualStyleBackColor = true; + // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.list_name, + this.date, + this.colCheck}); + this.dataGridView1.Location = new System.Drawing.Point(3, 37); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(717, 150); + this.dataGridView1.TabIndex = 2; + this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + // + // list_name + // + this.list_name.HeaderText = "목록명"; + this.list_name.Name = "list_name"; + this.list_name.Width = 500; + // + // date + // + this.date.HeaderText = "등록일시"; + this.date.Name = "date"; + this.date.Width = 120; + // + // colCheck + // + this.colCheck.FalseValue = "F"; + this.colCheck.HeaderText = "V"; + this.colCheck.IndeterminateValue = "F"; + this.colCheck.Name = "colCheck"; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCheck.TrueValue = "T"; + this.colCheck.Width = 35; + // + // Marc_Plan_Sub_SelectList + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(726, 450); + this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.button6); + this.Controls.Add(this.button5); + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.btn_Complite); + this.Controls.Add(this.btn_Search); + this.Controls.Add(this.panel1); + this.Name = "Marc_Plan_Sub_SelectList"; + this.Text = "마크정리_목록선택"; + this.Load += new System.EventHandler(this.Marc_Plan_Sub_SelectList_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.TextBox tb_Search; + private System.Windows.Forms.ComboBox cb_gu; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btn_Search; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button btn_Complite; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.Button button6; + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn list_name; + private System.Windows.Forms.DataGridViewTextBoxColumn date; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs new file mode 100644 index 0000000..6a3d71c --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.cs @@ -0,0 +1,33 @@ +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.Windows.Forms; + +namespace UniMarc.마크 +{ + public partial class Marc_Plan_Sub_SelectList : Form + { + public Marc_Plan_Sub_SelectList() + { + InitializeComponent(); + } + + private void Marc_Plan_Sub_SelectList_Load(object sender, EventArgs e) + { + string[] gu = { "진행", "완료" }; + cb_gu.Items.AddRange(gu); + cb_gu.SelectedIndex = 0; + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + WindowsFormsApp1.Skill_Grid sg = new WindowsFormsApp1.Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + } +} diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx new file mode 100644 index 0000000..956a230 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_memo.Designer.cs b/unimarc/unimarc/마크/Marc_memo.Designer.cs index f8282ce..2768878 100644 --- a/unimarc/unimarc/마크/Marc_memo.Designer.cs +++ b/unimarc/unimarc/마크/Marc_memo.Designer.cs @@ -31,7 +31,15 @@ namespace UniMarc.마크 { this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.panel2 = new System.Windows.Forms.Panel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.btn_Close = new System.Windows.Forms.Button(); + this.cb_List = new System.Windows.Forms.ComboBox(); + this.btn_ReturnMarc = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); this.panel2.SuspendLayout(); + this.panel1.SuspendLayout(); + this.panel3.SuspendLayout(); this.SuspendLayout(); // // richTextBox1 @@ -39,10 +47,10 @@ namespace UniMarc.마크 this.richTextBox1.BackColor = System.Drawing.SystemColors.Control; this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.richTextBox1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.richTextBox1.Font = new System.Drawing.Font("굴림체", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(800, 450); + this.richTextBox1.Size = new System.Drawing.Size(800, 413); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); @@ -50,13 +58,76 @@ namespace UniMarc.마크 // panel2 // this.panel2.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.panel2.Controls.Add(this.richTextBox1); + this.panel2.Controls.Add(this.panel3); + this.panel2.Controls.Add(this.panel1); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(800, 450); this.panel2.TabIndex = 2; // + // panel1 + // + this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.panel1.Controls.Add(this.button1); + this.panel1.Controls.Add(this.cb_List); + this.panel1.Controls.Add(this.btn_ReturnMarc); + this.panel1.Controls.Add(this.btn_Close); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(800, 37); + this.panel1.TabIndex = 2; + // + // panel3 + // + this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.panel3.Controls.Add(this.richTextBox1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 37); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(800, 413); + this.panel3.TabIndex = 2; + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(707, 8); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(82, 23); + this.btn_Close.TabIndex = 0; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // cb_List + // + this.cb_List.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_List.FormattingEnabled = true; + this.cb_List.Location = new System.Drawing.Point(476, 9); + this.cb_List.Name = "cb_List"; + this.cb_List.Size = new System.Drawing.Size(121, 20); + this.cb_List.TabIndex = 1; + // + // btn_ReturnMarc + // + this.btn_ReturnMarc.Location = new System.Drawing.Point(619, 8); + this.btn_ReturnMarc.Name = "btn_ReturnMarc"; + this.btn_ReturnMarc.Size = new System.Drawing.Size(82, 23); + this.btn_ReturnMarc.TabIndex = 0; + this.btn_ReturnMarc.Text = "마크 옮기기"; + this.btn_ReturnMarc.UseVisualStyleBackColor = true; + this.btn_ReturnMarc.Click += new System.EventHandler(this.btn_ReturnMarc_Click); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(395, 8); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 2; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // // Marc_memo // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -66,7 +137,10 @@ namespace UniMarc.마크 this.Controls.Add(this.panel2); this.Name = "Marc_memo"; this.Text = "메모장"; + this.Load += new System.EventHandler(this.Marc_memo_Load); this.panel2.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel3.ResumeLayout(false); this.ResumeLayout(false); } @@ -75,5 +149,11 @@ namespace UniMarc.마크 public System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button btn_Close; + private System.Windows.Forms.ComboBox cb_List; + private System.Windows.Forms.Button btn_ReturnMarc; + private System.Windows.Forms.Button button1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_memo.cs b/unimarc/unimarc/마크/Marc_memo.cs index 4a56fb0..6ac486f 100644 --- a/unimarc/unimarc/마크/Marc_memo.cs +++ b/unimarc/unimarc/마크/Marc_memo.cs @@ -18,6 +18,73 @@ namespace UniMarc.마크 InitializeComponent(); } + private void Marc_memo_Load(object sender, EventArgs e) + { + string[] com_List = + { + "하나막", "코리스" + }; + cb_List.Items.AddRange(com_List); + } + + private void btn_ReturnMarc_Click(object sender, EventArgs e) + { + string text = richTextBox1.Text; + int idx = cb_List.SelectedIndex; + if (idx < 0) + return; + try + { + switch (idx) + { + case 0: + Hana(text); + break; + case 1: + Kolis(text); + break; + default: + break; + } + } + catch { } + btn_ReturnMarc.Text = cb_List.SelectedItem.ToString(); + } + #region + void Hana(string text) + { + string[] arr = text.Split('\n'); + + for (int a = 0; a < arr.Length - 1; a++) + { + arr[a] = arr[a].Insert(5, "\t"); + arr[a] = arr[a].Insert(3, "\t"); + } + + richTextBox1.Text = string.Join("▲\n", arr); + } + void Kolis(string text) + { + string[] arr = text.Split('\n'); + + for (int a = 0; a < arr.Length - 1; a++) + { + string[] tag = arr[a].Split('\t'); + if (tag[1].Length == 0) + { + tag[1] = " "; + } + else if (tag[1].Length == 1) + { + tag[1] += " "; + } + arr[a] = string.Join("\t", tag); + } + + richTextBox1.Text = string.Join("\n", arr); + } + #endregion + private void richTextBox1_KeyDown(object sender, KeyEventArgs e) { if (e.Control) @@ -39,5 +106,15 @@ namespace UniMarc.마크 this.Close(); } } + + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void button1_Click(object sender, EventArgs e) + { + string text = richTextBox1.Text; + } } } diff --git a/unimarc/unimarc/마크/Make_Excel.Designer.cs b/unimarc/unimarc/마크/Marc_mkList.Designer.cs similarity index 63% rename from unimarc/unimarc/마크/Make_Excel.Designer.cs rename to unimarc/unimarc/마크/Marc_mkList.Designer.cs index 5bcd5c3..8f8d3a2 100644 --- a/unimarc/unimarc/마크/Make_Excel.Designer.cs +++ b/unimarc/unimarc/마크/Marc_mkList.Designer.cs @@ -1,6 +1,7 @@ -namespace WindowsFormsApp1.Mac + +namespace UniMarc.마크 { - partial class Make_Excel + partial class Marc_mkList { /// /// Required designer variable. @@ -28,33 +29,19 @@ /// private void InitializeComponent() { - this.label1 = new System.Windows.Forms.Label(); this.SuspendLayout(); // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(371, 219); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(111, 12); - this.label1.TabIndex = 5; - this.label1.Text = "마크관리_마크 작성"; - // - // Make_Mac + // Marc_mkList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.label1); - this.Name = "Make_Mac"; - this.Text = "Make_Mac"; + this.Name = "Marc_mkList"; + this.Text = "마크목록생성"; this.ResumeLayout(false); - this.PerformLayout(); } #endregion - - private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Make_Excel.cs b/unimarc/unimarc/마크/Marc_mkList.cs similarity index 64% rename from unimarc/unimarc/마크/Make_Excel.cs rename to unimarc/unimarc/마크/Marc_mkList.cs index 751f7ca..b5258a8 100644 --- a/unimarc/unimarc/마크/Make_Excel.cs +++ b/unimarc/unimarc/마크/Marc_mkList.cs @@ -8,15 +8,13 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace WindowsFormsApp1.Mac +namespace UniMarc.마크 { - public partial class Make_Excel : Form + public partial class Marc_mkList : Form { - Main main; - public Make_Excel(Main _main) + public Marc_mkList() { InitializeComponent(); - main = _main; } } } diff --git a/unimarc/unimarc/마크/Make_Excel.resx b/unimarc/unimarc/마크/Marc_mkList.resx similarity index 100% rename from unimarc/unimarc/마크/Make_Excel.resx rename to unimarc/unimarc/마크/Marc_mkList.resx diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index d9db81c..74d03af 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -31,7 +31,11 @@ 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 dataGridViewCellStyle6 = 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 dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.NameLabel = new System.Windows.Forms.Label(); this.tb_sangho = new System.Windows.Forms.TextBox(); this.tb_addr = new System.Windows.Forms.TextBox(); @@ -782,6 +786,7 @@ this.marcGrid.RowTemplate.Height = 23; this.marcGrid.Size = new System.Drawing.Size(601, 350); this.marcGrid.TabIndex = 48; + this.marcGrid.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Grid_ValueChanged); this.marcGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); this.marcGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); // @@ -811,14 +816,14 @@ // this.gearGrid.AllowUserToAddRows = false; this.gearGrid.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - 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.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.gearGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gearGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, @@ -830,6 +835,7 @@ this.gearGrid.RowTemplate.Height = 23; this.gearGrid.Size = new System.Drawing.Size(601, 247); this.gearGrid.TabIndex = 48; + this.gearGrid.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.Grid_ValueChanged); this.gearGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); this.gearGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); // @@ -865,6 +871,8 @@ // // Column1 // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column1.DefaultCellStyle = dataGridViewCellStyle4; this.Column1.HeaderText = "날짜"; this.Column1.Name = "Column1"; // @@ -876,11 +884,15 @@ // // Column3 // + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.Column3.DefaultCellStyle = dataGridViewCellStyle5; this.Column3.HeaderText = "작성자"; this.Column3.Name = "Column3"; // // dataGridViewTextBoxColumn1 // + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle7; this.dataGridViewTextBoxColumn1.HeaderText = "날짜"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; // @@ -892,6 +904,8 @@ // // dataGridViewTextBoxColumn3 // + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn3.HeaderText = "작성자"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; // diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index 8c3305b..b936885 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -396,6 +396,8 @@ namespace WindowsFormsApp1.Home { if (!chk) return; + marcGrid.Rows.Clear(); + gearGrid.Rows.Clear(); marcGrid.Columns[0].ReadOnly = true; gearGrid.Columns[0].ReadOnly = true; @@ -405,18 +407,12 @@ namespace WindowsFormsApp1.Home string cmd = db.DB_Select_Search(Area, "Client", "idx", idx); string res = db.DB_Send_CMD_Search(cmd); string[] ary_res = res.Split('|'); - for (int a = 0; a < ary_res.Length; a++) - { - string[] ary_data = ary_res[a].Split('⊙'); - if (a % 2 == 0) - { - marcGrid.Rows.Add(ary_data); - } - else - { - gearGrid.Rows.Add(ary_data); - } - } + + string[] ary_marc = ary_res[0].Split('⊙'); + string[] ary_gear = ary_res[1].Split('⊙'); + + Add_Grid(ary_marc, marcGrid); + Add_Grid(ary_gear, gearGrid); int marc_count = marcGrid.Rows.Count; int gear_count = gearGrid.Rows.Count; @@ -428,6 +424,19 @@ namespace WindowsFormsApp1.Home gearGrid.Rows.Add(100 - gear_count); } + private void Add_Grid(string[] ary_data, DataGridView gridView) + { + string[] grid = { "", "", "" }; + for(int a = 0; a < ary_data.Length; a++) + { + if (a % 3 == 0) { grid[0] = ary_data[a]; } + if (a % 3 == 1) { grid[1] = ary_data[a]; } + if (a % 3 == 2) { grid[2] = ary_data[a]; + gridView.Rows.Add(grid); + } + } + } + private void tb_marcSave_Click(object sender, EventArgs e) { string[] Edit_col = { "c_marc", "c_gear" }; @@ -444,16 +453,15 @@ namespace WindowsFormsApp1.Home string result = ""; for (int a = 0; a < datagrid.Rows.Count; a++) { + if (datagrid.Rows[a].Cells[1].Value == null) break; + + if (datagrid.Rows[a].Cells[1].Value.ToString() == "") break; + string date = datagrid.Rows[a].Cells[0].Value.ToString(); string content = datagrid.Rows[a].Cells[1].Value.ToString(); string charge = datagrid.Rows[a].Cells[2].Value.ToString(); - if (date == "" && content == "" && charge == "") { - break; - } - else { - result += string.Format("{0}⊙{1}⊙{2}⊙", date, content, charge); - } + result += string.Format("{0}⊙{1}⊙{2}⊙", date, content, charge); } return result; } @@ -483,5 +491,21 @@ namespace WindowsFormsApp1.Home Skill_Grid sg = new Skill_Grid(); sg.DataGrid_to_Delete(sender, e); } + + private void Grid_ValueChanged(object sender, DataGridViewCellEventArgs e) + { + DataGridView gridView = sender as DataGridView; + + if (gridView.CurrentCell == null) return; + + if (e.ColumnIndex == 1) + { + string date = DateTime.Now.ToString("yyyy-MM-dd"); + string charge = main.toolStripLabel1.Text; + + gridView.Rows[e.RowIndex].Cells[0].Value = date; + gridView.Rows[e.RowIndex].Cells[2].Value = charge; + } + } } }