From 6add9a00bc8a6004c25b3611e964454b504c31ba Mon Sep 17 00:00:00 2001 From: LGram16 Date: Sun, 22 Feb 2026 13:33:12 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A7=88=ED=81=AC=ED=8E=B8=EC=A7=91=EC=B0=BD?= =?UTF-8?q?=20=EB=B0=8F=20=EC=8B=A0=EA=B7=9C=EC=83=9D=EC=84=B1=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unimarc/unimarc/DB_Utils.cs | 29 ++- unimarc/unimarc/Helper_DB.cs | 27 ++ unimarc/unimarc/PUB.cs | 2 +- unimarc/unimarc/Skill.cs | 2 +- unimarc/unimarc/마크/AddMarc2.Designer.cs | 231 ++++++++++++------ unimarc/unimarc/마크/AddMarc2.cs | 102 +++++--- unimarc/unimarc/마크/Marc2.cs | 95 +++---- unimarc/unimarc/마크/Marc2.designer.cs | 78 ++++-- .../unimarc/마크/MarcCopySelect2.Designer.cs | 162 ++++++++++-- unimarc/unimarc/마크/MarcCopySelect2.cs | 140 ++--------- unimarc/unimarc/마크/MarcCopySelect2.resx | 47 ++++ .../마크/MarcEditorControl.Designer.cs | 224 ++++++++--------- unimarc/unimarc/마크/MarcEditorControl.cs | 119 ++++++--- unimarc/unimarc/마크/fMarc_Editor.Designer.cs | 24 +- unimarc/unimarc/마크/fMarc_Editor.cs | 18 +- 15 files changed, 819 insertions(+), 481 deletions(-) diff --git a/unimarc/unimarc/DB_Utils.cs b/unimarc/unimarc/DB_Utils.cs index 53b0ec1..d8f97d0 100644 --- a/unimarc/unimarc/DB_Utils.cs +++ b/unimarc/unimarc/DB_Utils.cs @@ -1,19 +1,34 @@ -namespace UniMarc +using AR; + +namespace UniMarc { public static class DB_Utils { public static bool ExistISBN(string value) { - Helper_DB db = new Helper_DB(); + if (value.isEmpty()) + { + UTIL.MsgE("중복검사할 ISBN값이 입력되지 않았습니다"); + return false; + } // ISBN 중복체크 string checkSql = string.Format("SELECT COUNT(*) FROM Marc WHERE isbn = '{0}' AND compidx = '{1}'", value, PUB.user.CompanyIdx); - string dupeCount = db.self_Made_Cmd(checkSql).Replace("|", ""); - if (dupeCount != "0" && !string.IsNullOrEmpty(dupeCount)) + var ret = Helper_DB.ExcuteScalar(checkSql); + if (ret.value == null) { - return true; + UTIL.MsgE($"Database error [ExistISBN]\n{ret.errorMessage}"); + return false; + } + if (int.TryParse(ret.value.ToString(), out int cnt) == false) + return false; + else + { + if (cnt > 0) + { + return true; + } + return false; } - return false; - } } } diff --git a/unimarc/unimarc/Helper_DB.cs b/unimarc/unimarc/Helper_DB.cs index 39d2ba8..1ae3961 100644 --- a/unimarc/unimarc/Helper_DB.cs +++ b/unimarc/unimarc/Helper_DB.cs @@ -102,6 +102,33 @@ namespace UniMarc } } + /// + /// 단일항목값을 반환 합니다 + /// + /// + /// + public static (object value, string errorMessage) ExcuteScalar(string query, MySqlConnection cn = null) + { + try + { + var bLocalCN = cn == null; + if (cn == null) cn = CreateConnection(eDbType.unimarc);//new MySqlConnection(cs); + var cmd = new MySqlCommand(query, cn); + cn.Open(); + var val = cmd.ExecuteScalar(); + cmd.Dispose(); + if (bLocalCN) cn.Dispose(); + return (val, string.Empty); + } + catch (Exception ex) + { + return (null, ex.Message); + } + } + + + + /// /// Insert 명령을 수행한 후 자동 생성된 index값을 반환합니다. /// 오류발생시에는 -1을 반환합니다 diff --git a/unimarc/unimarc/PUB.cs b/unimarc/unimarc/PUB.cs index 7d19e37..4d2f74c 100644 --- a/unimarc/unimarc/PUB.cs +++ b/unimarc/unimarc/PUB.cs @@ -55,7 +55,7 @@ namespace UniMarc string Empty_text = string.Format( "020\t \t▼a{1}▼c\\{5}▲\n" + "056\t \t▼a▼25▲\n" + - "100\t \t▼a▲\n" + + "100\t \t▼a{2}▲\n" + "245\t \t▼a{2}▼d{3}▲\n" + "260\t \t▼b{4}▲\n" + "300\t \t▼a▼c▲\n" + diff --git a/unimarc/unimarc/Skill.cs b/unimarc/unimarc/Skill.cs index 4ace2eb..0fde85b 100644 --- a/unimarc/unimarc/Skill.cs +++ b/unimarc/unimarc/Skill.cs @@ -1933,7 +1933,7 @@ namespace UniMarc /// public string[] Take_Tag(string marc, string[] search, bool pSearchTag = false) { - string[] ary = marc.Split(''); + string[] ary = marc.Split(''); //0x1E string[] tag = res_dir(ary[0].Substring(24)); (string[] jisi, string[] mrc) = jisi_Symbol(tag, ary); diff --git a/unimarc/unimarc/마크/AddMarc2.Designer.cs b/unimarc/unimarc/마크/AddMarc2.Designer.cs index 6d7d5ac..d414808 100644 --- a/unimarc/unimarc/마크/AddMarc2.Designer.cs +++ b/unimarc/unimarc/마크/AddMarc2.Designer.cs @@ -29,7 +29,6 @@ namespace UniMarc /// private void InitializeComponent() { - this.btn_close = new System.Windows.Forms.Button(); this.btn_Save = new System.Windows.Forms.Button(); this.Btn_SearchKolis = new System.Windows.Forms.Button(); this.cb_SearchCol = new System.Windows.Forms.ComboBox(); @@ -42,30 +41,29 @@ namespace UniMarc this.rtEtc1 = new System.Windows.Forms.RichTextBox(); this.rtEtc2 = new System.Windows.Forms.RichTextBox(); this.panel6 = new System.Windows.Forms.Panel(); - this.lbl_SaveData = new System.Windows.Forms.Label(); - this.cb_grade = new System.Windows.Forms.ComboBox(); + this.radD = new System.Windows.Forms.RadioButton(); + this.radC = new System.Windows.Forms.RadioButton(); + this.radB = new System.Windows.Forms.RadioButton(); + this.radA = new System.Windows.Forms.RadioButton(); this.label6 = new System.Windows.Forms.Label(); + this.lbl_SaveData = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.button2 = new System.Windows.Forms.Button(); this.panel2.SuspendLayout(); this.panel5.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel6.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // - // btn_close - // - this.btn_close.Location = new System.Drawing.Point(102, 156); - this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(77, 23); - this.btn_close.TabIndex = 381; - this.btn_close.Text = "닫 기"; - this.btn_close.UseVisualStyleBackColor = true; - this.btn_close.Click += new System.EventHandler(this.btn_close_Click); - // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(19, 185); + this.btn_Save.Location = new System.Drawing.Point(11, 90); this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(77, 23); + this.btn_Save.Size = new System.Drawing.Size(107, 33); this.btn_Save.TabIndex = 398; this.btn_Save.Text = "저장(F9)"; this.btn_Save.UseVisualStyleBackColor = true; @@ -73,9 +71,10 @@ namespace UniMarc // // Btn_SearchKolis // - this.Btn_SearchKolis.Location = new System.Drawing.Point(102, 185); + this.Btn_SearchKolis.Dock = System.Windows.Forms.DockStyle.Fill; + this.Btn_SearchKolis.Location = new System.Drawing.Point(131, 3); this.Btn_SearchKolis.Name = "Btn_SearchKolis"; - this.Btn_SearchKolis.Size = new System.Drawing.Size(77, 23); + this.Btn_SearchKolis.Size = new System.Drawing.Size(122, 39); this.Btn_SearchKolis.TabIndex = 397; this.Btn_SearchKolis.Text = "코리스 검색"; this.Btn_SearchKolis.UseVisualStyleBackColor = true; @@ -90,16 +89,17 @@ namespace UniMarc "서명", "저자", "출판사"}); - this.cb_SearchCol.Location = new System.Drawing.Point(19, 15); + this.cb_SearchCol.Location = new System.Drawing.Point(11, 20); this.cb_SearchCol.Name = "cb_SearchCol"; - this.cb_SearchCol.Size = new System.Drawing.Size(121, 20); + this.cb_SearchCol.Size = new System.Drawing.Size(238, 20); this.cb_SearchCol.TabIndex = 395; // // btn_Empty // - this.btn_Empty.Location = new System.Drawing.Point(19, 156); + this.btn_Empty.Dock = System.Windows.Forms.DockStyle.Fill; + this.btn_Empty.Location = new System.Drawing.Point(3, 3); this.btn_Empty.Name = "btn_Empty"; - this.btn_Empty.Size = new System.Drawing.Size(77, 23); + this.btn_Empty.Size = new System.Drawing.Size(122, 39); this.btn_Empty.TabIndex = 396; this.btn_Empty.Text = "비 우 기"; this.btn_Empty.UseVisualStyleBackColor = true; @@ -107,9 +107,9 @@ namespace UniMarc // // tb_Search // - this.tb_Search.Location = new System.Drawing.Point(11, 41); + this.tb_Search.Location = new System.Drawing.Point(11, 47); this.tb_Search.Name = "tb_Search"; - this.tb_Search.Size = new System.Drawing.Size(205, 21); + this.tb_Search.Size = new System.Drawing.Size(188, 21); this.tb_Search.TabIndex = 0; this.tb_Search.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_ISBN_KeyDown); // @@ -120,7 +120,7 @@ namespace UniMarc 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(1059, 751); + this.panel2.Size = new System.Drawing.Size(1324, 939); this.panel2.TabIndex = 394; // // marcEditorControl1 @@ -129,7 +129,7 @@ namespace UniMarc this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); this.marcEditorControl1.Name = "marcEditorControl1"; - this.marcEditorControl1.Size = new System.Drawing.Size(793, 751); + this.marcEditorControl1.Size = new System.Drawing.Size(1058, 939); this.marcEditorControl1.TabIndex = 394; // // panel5 @@ -137,9 +137,9 @@ namespace UniMarc this.panel5.Controls.Add(this.tableLayoutPanel1); this.panel5.Controls.Add(this.panel6); this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(793, 0); + this.panel5.Location = new System.Drawing.Point(1058, 0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(266, 751); + this.panel5.Size = new System.Drawing.Size(266, 939); this.panel5.TabIndex = 395; // // tableLayoutPanel1 @@ -149,12 +149,12 @@ namespace UniMarc this.tableLayoutPanel1.Controls.Add(this.rtEtc1, 0, 0); this.tableLayoutPanel1.Controls.Add(this.rtEtc2, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 308); + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 377); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(266, 443); + this.tableLayoutPanel1.Size = new System.Drawing.Size(266, 562); this.tableLayoutPanel1.TabIndex = 0; // // rtEtc1 @@ -164,7 +164,7 @@ namespace UniMarc this.rtEtc1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.rtEtc1.Location = new System.Drawing.Point(3, 3); this.rtEtc1.Name = "rtEtc1"; - this.rtEtc1.Size = new System.Drawing.Size(260, 215); + this.rtEtc1.Size = new System.Drawing.Size(260, 275); this.rtEtc1.TabIndex = 32; this.rtEtc1.Text = "Remark1"; // @@ -173,63 +173,147 @@ namespace UniMarc this.rtEtc2.BackColor = System.Drawing.SystemColors.ScrollBar; this.rtEtc2.Dock = System.Windows.Forms.DockStyle.Fill; this.rtEtc2.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.rtEtc2.Location = new System.Drawing.Point(3, 224); + this.rtEtc2.Location = new System.Drawing.Point(3, 284); this.rtEtc2.Name = "rtEtc2"; - this.rtEtc2.Size = new System.Drawing.Size(260, 216); + this.rtEtc2.Size = new System.Drawing.Size(260, 275); this.rtEtc2.TabIndex = 32; this.rtEtc2.Text = "Remark2"; // // panel6 // - this.panel6.Controls.Add(this.tb_Search); - this.panel6.Controls.Add(this.cb_SearchCol); - this.panel6.Controls.Add(this.btn_Save); - this.panel6.Controls.Add(this.Btn_SearchKolis); - this.panel6.Controls.Add(this.lbl_SaveData); - this.panel6.Controls.Add(this.cb_grade); + this.panel6.Controls.Add(this.groupBox1); + this.panel6.Controls.Add(this.tableLayoutPanel2); + this.panel6.Controls.Add(this.button1); + this.panel6.Controls.Add(this.radD); + this.panel6.Controls.Add(this.radC); + this.panel6.Controls.Add(this.radB); + this.panel6.Controls.Add(this.radA); this.panel6.Controls.Add(this.label6); - this.panel6.Controls.Add(this.btn_Empty); - this.panel6.Controls.Add(this.btn_close); + this.panel6.Controls.Add(this.btn_Save); + this.panel6.Controls.Add(this.lbl_SaveData); this.panel6.Dock = System.Windows.Forms.DockStyle.Top; this.panel6.Location = new System.Drawing.Point(0, 0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(266, 308); + this.panel6.Padding = new System.Windows.Forms.Padding(5); + this.panel6.Size = new System.Drawing.Size(266, 377); this.panel6.TabIndex = 1; // - // lbl_SaveData + // radD // - this.lbl_SaveData.AutoSize = true; - this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_SaveData.ForeColor = System.Drawing.Color.PaleTurquoise; - this.lbl_SaveData.Location = new System.Drawing.Point(32, 119); - this.lbl_SaveData.Name = "lbl_SaveData"; - this.lbl_SaveData.Size = new System.Drawing.Size(64, 19); - this.lbl_SaveData.TabIndex = 319; - this.lbl_SaveData.Text = "[] []"; + this.radD.AutoSize = true; + this.radD.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radD.Location = new System.Drawing.Point(210, 126); + this.radD.Name = "radD"; + this.radD.Size = new System.Drawing.Size(42, 27); + this.radD.TabIndex = 403; + this.radD.TabStop = true; + this.radD.Text = "D"; + this.radD.UseVisualStyleBackColor = true; // - // cb_grade + // radC // - this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_grade.FormattingEnabled = true; - this.cb_grade.Items.AddRange(new object[] { - "A (F9)", - "B (F10)", - "C (F11)", - "D (F12)"}); - this.cb_grade.Location = new System.Drawing.Point(19, 96); - this.cb_grade.Name = "cb_grade"; - this.cb_grade.Size = new System.Drawing.Size(75, 20); - this.cb_grade.TabIndex = 222; + this.radC.AutoSize = true; + this.radC.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radC.Location = new System.Drawing.Point(163, 126); + this.radC.Name = "radC"; + this.radC.Size = new System.Drawing.Size(41, 27); + this.radC.TabIndex = 402; + this.radC.TabStop = true; + this.radC.Text = "C"; + this.radC.UseVisualStyleBackColor = true; + // + // radB + // + this.radB.AutoSize = true; + this.radB.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radB.Location = new System.Drawing.Point(116, 126); + this.radB.Name = "radB"; + this.radB.Size = new System.Drawing.Size(41, 27); + this.radB.TabIndex = 401; + this.radB.TabStop = true; + this.radB.Text = "B"; + this.radB.UseVisualStyleBackColor = true; + // + // radA + // + this.radA.AutoSize = true; + this.radA.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.radA.Location = new System.Drawing.Point(69, 126); + this.radA.Name = "radA"; + this.radA.Size = new System.Drawing.Size(41, 27); + this.radA.TabIndex = 400; + this.radA.TabStop = true; + this.radA.Text = "A"; + this.radA.UseVisualStyleBackColor = true; // // label6 // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label6.Location = new System.Drawing.Point(16, 78); + this.label6.Location = new System.Drawing.Point(28, 136); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(62, 12); - this.label6.TabIndex = 223; - this.label6.Text = "마크 등급"; + this.label6.Size = new System.Drawing.Size(31, 12); + this.label6.TabIndex = 399; + this.label6.Text = "등급"; + // + // lbl_SaveData + // + this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.lbl_SaveData.ForeColor = System.Drawing.Color.Black; + this.lbl_SaveData.Location = new System.Drawing.Point(6, 157); + this.lbl_SaveData.Multiline = true; + this.lbl_SaveData.Name = "lbl_SaveData"; + this.lbl_SaveData.Size = new System.Drawing.Size(255, 164); + this.lbl_SaveData.TabIndex = 319; + this.lbl_SaveData.Text = "[] []"; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(154, 90); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(107, 33); + this.button1.TabIndex = 404; + this.button1.Text = "닫기"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Controls.Add(this.btn_Empty, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.Btn_SearchKolis, 1, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 327); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(256, 45); + this.tableLayoutPanel2.TabIndex = 407; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.button2); + this.groupBox1.Controls.Add(this.cb_SearchCol); + this.groupBox1.Controls.Add(this.tb_Search); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.groupBox1.Location = new System.Drawing.Point(5, 5); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(256, 80); + this.groupBox1.TabIndex = 408; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "마크 검색"; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(205, 46); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(45, 22); + this.button2.TabIndex = 405; + this.button2.Text = "검색"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // // AddMarc2 // @@ -247,12 +331,14 @@ namespace UniMarc this.tableLayoutPanel1.ResumeLayout(false); this.panel6.ResumeLayout(false); this.panel6.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.Button btn_close; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.TextBox tb_Search; private System.Windows.Forms.ComboBox cb_SearchCol; @@ -265,8 +351,15 @@ namespace UniMarc public System.Windows.Forms.RichTextBox rtEtc1; public System.Windows.Forms.RichTextBox rtEtc2; private System.Windows.Forms.Panel panel6; - private System.Windows.Forms.Label lbl_SaveData; - private System.Windows.Forms.ComboBox cb_grade; + private System.Windows.Forms.TextBox lbl_SaveData; + private System.Windows.Forms.RadioButton radD; + private System.Windows.Forms.RadioButton radC; + private System.Windows.Forms.RadioButton radB; + private System.Windows.Forms.RadioButton radA; private System.Windows.Forms.Label label6; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button button2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/AddMarc2.cs b/unimarc/unimarc/마크/AddMarc2.cs index 2c8058d..f6e641d 100644 --- a/unimarc/unimarc/마크/AddMarc2.cs +++ b/unimarc/unimarc/마크/AddMarc2.cs @@ -1,4 +1,5 @@ -using SHDocVw; +using AR; +using SHDocVw; using System; using System.Collections.Generic; using System.ComponentModel; @@ -23,17 +24,22 @@ namespace UniMarc public AddMarc2(Main _m) { InitializeComponent(); + db.DBcon(); + marcEditorControl1.db = this.db; m = _m; } private void AddMarc_Load(object sender, EventArgs e) { cb_SearchCol.SelectedIndex = 0; - db.DBcon(); + + TextReset(); - marcEditorControl1.db = this.db; + this.KeyPreview = true; + this.radD.Checked = true; //등급기본 + } protected override bool ProcessCmdKey(ref Message msg, Keys keyData) @@ -54,18 +60,28 @@ namespace UniMarc if (marcEditorControl1.CheckValidation() == false) return; string dbMarc = marcEditorControl1.MakeMarcString(); - - string tag056 = Tag056(dbMarc, _param); - string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - string orimarc = st.made_Ori_marc(dbMarc).Replace(@"\", "￦"); - if (!isMustTag(orimarc)) + string tag056 = marcEditorControl1.Tag056();// Tag056(dbMarc, _param); + if(tag056.isEmpty()) { + UTIL.MsgE("056 태그값을 확인할 수 없습니다\n개발자 문의 하세요"); return; } + string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + //string orimarc = st.made_Ori_marc(dbMarc).Replace(@"\", "￦"); + + //if (!isMustTag(orimarc)) + //{ + // return; + //} var MarcText = dbMarc; string midx = this.lbl_Midx; string[] BookData = GetBookData(MarcText); + if(string.Join("",BookData).isEmpty()) + { + UTIL.MsgE("도서정보를 추출할 수 없습니다\n개발자 문의 하세요"); + return; + } bool IsCoverDate = false; if (_param != null && _param.SaveDate != "") @@ -74,20 +90,23 @@ namespace UniMarc TimeSpan sp = CheckDate(_param.SaveDate, date); IsCoverDate = IsCoverData(sp.Days, _param.User); } - - string Table = "Marc"; + bool isUpdate; if (lbl_Midx != "") isUpdate = true; else isUpdate = false; - var grade = this.cb_grade.SelectedIndex;// int.Parse(param.Grade); + var v_grade = ""; + if (radA.Checked) v_grade = "0"; + else if (radB.Checked) v_grade = "1"; + else if (radC.Checked) v_grade = "2"; + else if (radD.Checked) v_grade = "3"; if (isUpdate) - UpdateMarc(Table, midx, orimarc, grade, tag056, date, IsCoverDate, _param); + UpdateMarc(midx, dbMarc, v_grade, tag056, date, IsCoverDate, _param); else - InsertMarc(Table, BookData, orimarc, grade, tag056, date, _param); + InsertMarc(BookData, dbMarc, v_grade, tag056, date, _param); MessageBox.Show("저장되었습니다.", "저장"); } @@ -98,20 +117,28 @@ namespace UniMarc } + private void tb_ISBN_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode != Keys.Enter) return; + searchMarc(); + + } + void searchMarc() + { TextReset(); string SearchText = tb_Search.Text; string SearchCol = cb_SearchCol.SelectedItem.ToString(); - var mcs = new MarcCopySelect2(this); - mcs.Init(SearchCol, SearchText); - mcs.Show(); + var mcs = new MarcCopySelect2(SearchCol, SearchText); + if (mcs.ShowDialog() == DialogResult.OK) + { + //값을적용해야한다 + //SelectMarc_Sub 함수 내용이 들어오면된다. + } } - /// /// ISBN 검색후 특정 마크 선택시 현재폼에 적용시키는 폼 /// @@ -135,7 +162,8 @@ namespace UniMarc NewMake = true, text008 = GridData[5] }; - this.marcEditorControl1.LoadBookData(Marc, ISBN); + var debmarc = PUB.MakeEmptyMarc(ISBN, "BookName", "Author", "Publisher", "Price"); + this.marcEditorControl1.LoadBookData(Marc,ISBN, debmarc); mOldMarc = GridData[6]; lbl_Midx = GridData[0]; } @@ -161,6 +189,8 @@ namespace UniMarc { if (isDelete) { + var isbn = $"※{DateTime.Now.ToString("yyMMddhhmmss")}"; + var emptryMarc = PUB.MakeEmptyMarc(isbn, "title", "author", "publisher", "price"); var emptymarc = TextResetSub(); _param = new MacEditorParameter { @@ -168,7 +198,7 @@ namespace UniMarc SaveDate = string.Empty, NewMake = true, }; - marcEditorControl1.LoadBookData(emptymarc, string.Empty); + marcEditorControl1.LoadBookData(string.Empty, isbn, defaultMarc: emptryMarc); } @@ -214,11 +244,11 @@ namespace UniMarc "700\t \t▼a▲\n" + "950\t \t▼b▲\n"); - + return Empty_text; } - + #region SaveSub /// @@ -231,10 +261,12 @@ namespace UniMarc /// 분류기호 /// 저장시각 yyyy-MM-dd HH:mm:ss /// 덮어씌울지 유무 - void UpdateMarc(string Table, string MarcIndex, string oriMarc, int grade, string tag056, string date, bool IsCovertDate, MacEditorParameter param) + void UpdateMarc(string MarcIndex, string oriMarc, string grade, string tag056, string date, bool IsCovertDate, MacEditorParameter param) { var etc1 = rtEtc1.Text.Trim(); var etc2 = rtEtc2.Text.Trim(); + + if (grade.isEmpty()) grade = "2"; string[] EditTable = { "compidx", "marc", "marc_chk","marc1", "marc_chk1", "비고1", @@ -247,6 +279,7 @@ namespace UniMarc etc2, tag056, param.text008, date, PUB.user.UserName, grade.ToString() }; + string[] SearchTable = { "idx", "compidx" }; string[] SearchColumn = { MarcIndex, PUB.user.CompanyIdx }; @@ -277,7 +310,7 @@ namespace UniMarc // EditTable[3] = "marc_chk2"; // break; //} - string UpCMD = db.More_Update(Table, EditTable, EditColumn, SearchTable, SearchColumn); + string UpCMD = db.More_Update("Marc", EditTable, EditColumn, SearchTable, SearchColumn); PUB.log.Add("ADDMarcUPDATE", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, UpCMD.Replace("\r", " ").Replace("\n", " "))); Helper_DB.ExcuteNonQuery(UpCMD); } @@ -291,8 +324,9 @@ namespace UniMarc /// 마크 등급 /// 분류기호 /// 저장시각 yyyy-MM-dd HH:mm:ss - void InsertMarc(string Table, string[] BookData, string oriMarc, int grade, string tag056, string date, MacEditorParameter param) + void InsertMarc(string[] BookData, string oriMarc, string grade, string tag056, string date, MacEditorParameter param) { + if (grade.isEmpty()) grade = "2"; var etc1 = rtEtc1.Text.Trim(); var etc2 = rtEtc2.Text.Trim(); string[] InsertTable = @@ -302,7 +336,7 @@ namespace UniMarc "user", "division", "008tag", "date", "compidx" }; - + string[] InsertColumn = { BookData[0], BookData[1], BookData[2], BookData[3], BookData[4], @@ -310,7 +344,7 @@ namespace UniMarc PUB.user.UserName, tag056, param.text008, date, PUB.user.CompanyIdx }; - string InCMD = db.DB_INSERT(Table, InsertTable, InsertColumn); + string InCMD = db.DB_INSERT("Marc", InsertTable, InsertColumn); PUB.log.Add("ADDMarcINSERT", string.Format("{0}({1}) : {2}", PUB.user.UserName, PUB.user.CompanyIdx, InCMD.Replace("\r", " ").Replace("\n", " "))); Helper_DB.ExcuteNonQuery(InCMD); } @@ -338,7 +372,7 @@ namespace UniMarc return Last - Save; } - + /// /// 필수태그 검사 @@ -445,9 +479,9 @@ namespace UniMarc return result; } - string Tag056(string marc,MacEditorParameter param) + string Tag056(string marc, MacEditorParameter param) { - // string marc = richTextBox1.Text; + // string marc = richTextBox1.Text; string[] temp = marc.Split('\n'); List target = temp.ToList(); bool isEight = false; @@ -482,7 +516,7 @@ namespace UniMarc return tag056; } - + /// /// 문자와 문자사이의 값 가져오기 @@ -580,6 +614,14 @@ namespace UniMarc af.Show(); } + private void button1_Click(object sender, EventArgs e) + { + this.Close(); + } + private void button2_Click(object sender, EventArgs e) + { + searchMarc(); + } } } diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index deb3dd6..5ecd040 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -413,11 +413,11 @@ namespace UniMarc gradeNo = 2; } - if (gradeNo == 0 ) + if (gradeNo == 0) radA.Checked = true; - else if(gradeNo == 1) + else if (gradeNo == 1) radB.Checked = true; - else if(gradeNo == 3) + else if (gradeNo == 3) radD.Checked = true; else radC.Checked = true; @@ -531,36 +531,34 @@ namespace UniMarc var dr = this.bs1.Current as MarcBookItem; - var copySelect = new MarcCopySelect2(this, dr); - copySelect.Init("isbn", dr.ISBN13); - copySelect.Show(); - } - - /// - /// 선택된 마크에 대한 정보를 그리드뷰에 저장. - /// - /// - /// [0] idx, [1] compidx, [2] user, [3] date, [4] grade, [5] tag008, [6] marc - public void SelectMarc_Sub(MarcBookItem row, string[] GridData) - { - row.MarcIdx = GridData[0]; - row.User = GridData[2]; - row.SaveDate = GridData[4]; - row.Grade = GridData[3]; - // text008.Text = GridData[5]; - row.DbMarc = GridData[6]; - mOldMarc = GridData[6]; - - // row.ForeColor = SetGradeColor(row.Grade); // Handled by MarcBookItem automatically - row.BackColor = Color.Yellow; - - var currentitem = this.bs1.Current as MarcBookItem; - if (currentitem != null && currentitem == row) + using (var copySelect = new MarcCopySelect2("isbn", dr.ISBN13)) { - List_Book_SelectionChanged(null, null); + if (copySelect.ShowDialog() == DialogResult.OK) + { + dr.MarcIdx = copySelect.GridData[0]; + dr.User = copySelect.GridData[2]; + dr.SaveDate = copySelect.GridData[4]; + dr.Grade = copySelect.GridData[3]; + // text008.Text = GridData[5]; + dr.DbMarc = copySelect.GridData[6]; + mOldMarc = copySelect.GridData[6]; + + // row.ForeColor = SetGradeColor(row.Grade); // Handled by MarcBookItem automatically + dr.BackColor = Color.Yellow; + + var currentitem = this.bs1.Current as MarcBookItem; + if (currentitem != null && currentitem == dr) + { + List_Book_SelectionChanged(null, null); + } + } } + + } + + #region Save_Click_Sub @@ -841,29 +839,7 @@ namespace UniMarc private void button1_Click(object sender, EventArgs e) { - // 현재 데이터를 한줄 복사하고 ISBN 값을 삭제한다 - // 생성된 자료는 좌측 목록에 추가되어야하고, 그 목록이 선택되도록 한다. - if (List_Book.SelectedRows.Count == 0) - return; - DataGridViewRow selectedRow = List_Book.SelectedRows[0]; - int nRow = List_Book.Rows.Add(); - DataGridViewRow newRow = List_Book.Rows[nRow]; - - for (int i = 0; i < selectedRow.Cells.Count; i++) - { - newRow.Cells[i].Value = selectedRow.Cells[i].Value; - } - - newRow.Cells["ISBN13"].Value = ""; - newRow.Cells["marc_idx"].Value = ""; - newRow.Cells["list_idx"].Value = ""; - //newRow.Cells["grade"].Value = "3"; // 등급 초기화 (D) - newRow.DefaultCellStyle.ForeColor = Color.Red; // 색상 초기화 (D급 색상) - - List_Book.ClearSelection(); - newRow.Selected = true; - List_Book.FirstDisplayedScrollingRowIndex = nRow; } private void btClose_Click(object sender, EventArgs e) @@ -945,7 +921,7 @@ namespace UniMarc { marcEditorControl1.Tag056(); // 008 태그가 richTextBox1에 포함되도록 갱신 var orimarc = st.made_Ori_marc(marcEditorControl1.richTextBox1).Replace(@"\", "￦"); - var fb = new Marc_CopyForm( orimarc); + var fb = new Marc_CopyForm(orimarc); fb.ShowDialog(); } @@ -979,7 +955,7 @@ namespace UniMarc string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string orimarc = marcEditorControl1.MakeMarcString();// st.made_Ori_marc(marcEditorControl1.richTextBox1).Replace(@"\", "￦"); - + this.Param.text008 = marcEditorControl1.text008.Text.Trim(); this.Param.tag056 = marcEditorControl1.Tag056(); @@ -993,10 +969,10 @@ namespace UniMarc string table_name = "Marc"; string newsavedMarc = orimarc; var v_grade = "";// cb_grade.SelectedIndex.ToString(); // 등급은 0~3의 숫자로 저장된다고 가정 - if(radA.Checked) v_grade = "0"; - else if(radB.Checked) v_grade = "1"; - else if(radC.Checked) v_grade = "2"; - else if(radD.Checked) v_grade = "3"; + if (radA.Checked) v_grade = "0"; + else if (radB.Checked) v_grade = "1"; + else if (radC.Checked) v_grade = "2"; + else if (radD.Checked) v_grade = "3"; var v_etc1 = this.etc1.Text.Trim(); var v_etc2 = this.etc2.Text.Trim(); @@ -1108,5 +1084,10 @@ namespace UniMarc { } + + private void button3_Click(object sender, EventArgs e) + { + this.Close(); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc2.designer.cs b/unimarc/unimarc/마크/Marc2.designer.cs index e22d81b..9a164d1 100644 --- a/unimarc/unimarc/마크/Marc2.designer.cs +++ b/unimarc/unimarc/마크/Marc2.designer.cs @@ -108,6 +108,8 @@ this.btn_FillBlank = new System.Windows.Forms.Button(); this.label6 = new System.Windows.Forms.Label(); this.marcEditorControl1 = new UniMarc.MarcEditorControl(); + this.button3 = new System.Windows.Forms.Button(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); label31 = new System.Windows.Forms.Label(); label30 = new System.Windows.Forms.Label(); label33 = new System.Windows.Forms.Label(); @@ -128,6 +130,7 @@ this.panel5.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel6.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); this.SuspendLayout(); // // label31 @@ -775,16 +778,14 @@ // // panel6 // + this.panel6.Controls.Add(this.tableLayoutPanel2); + this.panel6.Controls.Add(this.button3); this.panel6.Controls.Add(this.radD); this.panel6.Controls.Add(this.radC); this.panel6.Controls.Add(this.radB); this.panel6.Controls.Add(this.radA); this.panel6.Controls.Add(this.lbl_SaveData); - this.panel6.Controls.Add(this.button2); - this.panel6.Controls.Add(this.btNext); - this.panel6.Controls.Add(this.btPrev); this.panel6.Controls.Add(this.btn_Save); - this.panel6.Controls.Add(this.btn_FillBlank); this.panel6.Controls.Add(this.label6); this.panel6.Dock = System.Windows.Forms.DockStyle.Top; this.panel6.Location = new System.Drawing.Point(0, 0); @@ -797,7 +798,7 @@ // this.radD.AutoSize = true; this.radD.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.radD.Location = new System.Drawing.Point(194, 12); + this.radD.Location = new System.Drawing.Point(194, 41); this.radD.Name = "radD"; this.radD.Size = new System.Drawing.Size(42, 27); this.radD.TabIndex = 323; @@ -809,7 +810,7 @@ // this.radC.AutoSize = true; this.radC.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.radC.Location = new System.Drawing.Point(147, 12); + this.radC.Location = new System.Drawing.Point(147, 41); this.radC.Name = "radC"; this.radC.Size = new System.Drawing.Size(41, 27); this.radC.TabIndex = 322; @@ -821,7 +822,7 @@ // this.radB.AutoSize = true; this.radB.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.radB.Location = new System.Drawing.Point(100, 12); + this.radB.Location = new System.Drawing.Point(100, 41); this.radB.Name = "radB"; this.radB.Size = new System.Drawing.Size(41, 27); this.radB.TabIndex = 321; @@ -833,7 +834,7 @@ // this.radA.AutoSize = true; this.radA.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.radA.Location = new System.Drawing.Point(53, 12); + this.radA.Location = new System.Drawing.Point(53, 41); this.radA.Name = "radA"; this.radA.Size = new System.Drawing.Size(41, 27); this.radA.TabIndex = 320; @@ -845,19 +846,20 @@ // this.lbl_SaveData.BackColor = System.Drawing.Color.SkyBlue; this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_SaveData.ForeColor = System.Drawing.Color.PaleTurquoise; - this.lbl_SaveData.Location = new System.Drawing.Point(11, 49); + this.lbl_SaveData.ForeColor = System.Drawing.Color.Black; + this.lbl_SaveData.Location = new System.Drawing.Point(11, 73); this.lbl_SaveData.Multiline = true; this.lbl_SaveData.Name = "lbl_SaveData"; - this.lbl_SaveData.Size = new System.Drawing.Size(241, 123); + this.lbl_SaveData.Size = new System.Drawing.Size(241, 136); this.lbl_SaveData.TabIndex = 319; this.lbl_SaveData.Text = "[] []"; // // button2 // - this.button2.Location = new System.Drawing.Point(11, 230); + this.button2.Dock = System.Windows.Forms.DockStyle.Fill; + this.button2.Location = new System.Drawing.Point(3, 3); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(110, 33); + this.button2.Size = new System.Drawing.Size(127, 40); this.button2.TabIndex = 231; this.button2.Text = "유사본"; this.button2.UseVisualStyleBackColor = true; @@ -865,9 +867,10 @@ // // btNext // - this.btNext.Location = new System.Drawing.Point(147, 269); + this.btNext.Dock = System.Windows.Forms.DockStyle.Fill; + this.btNext.Location = new System.Drawing.Point(136, 49); this.btNext.Name = "btNext"; - this.btNext.Size = new System.Drawing.Size(107, 33); + this.btNext.Size = new System.Drawing.Size(127, 41); this.btNext.TabIndex = 230; this.btNext.Text = "다 음(F8)"; this.btNext.UseVisualStyleBackColor = true; @@ -875,9 +878,10 @@ // // btPrev // - this.btPrev.Location = new System.Drawing.Point(11, 269); + this.btPrev.Dock = System.Windows.Forms.DockStyle.Fill; + this.btPrev.Location = new System.Drawing.Point(3, 49); this.btPrev.Name = "btPrev"; - this.btPrev.Size = new System.Drawing.Size(110, 33); + this.btPrev.Size = new System.Drawing.Size(127, 41); this.btPrev.TabIndex = 229; this.btPrev.Text = "이 전(F7)"; this.btPrev.UseVisualStyleBackColor = true; @@ -885,7 +889,7 @@ // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(147, 230); + this.btn_Save.Location = new System.Drawing.Point(11, 6); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(107, 33); this.btn_Save.TabIndex = 215; @@ -895,9 +899,10 @@ // // btn_FillBlank // - this.btn_FillBlank.Location = new System.Drawing.Point(11, 178); + this.btn_FillBlank.Dock = System.Windows.Forms.DockStyle.Fill; + this.btn_FillBlank.Location = new System.Drawing.Point(136, 3); this.btn_FillBlank.Name = "btn_FillBlank"; - this.btn_FillBlank.Size = new System.Drawing.Size(243, 46); + this.btn_FillBlank.Size = new System.Drawing.Size(127, 40); this.btn_FillBlank.TabIndex = 228; this.btn_FillBlank.Text = "미소장 마크 코리스\r\n칸채우기"; this.btn_FillBlank.UseVisualStyleBackColor = true; @@ -907,7 +912,7 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label6.Location = new System.Drawing.Point(12, 22); + this.label6.Location = new System.Drawing.Point(12, 51); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(31, 12); this.label6.TabIndex = 223; @@ -923,6 +928,34 @@ this.marcEditorControl1.Size = new System.Drawing.Size(817, 658); this.marcEditorControl1.TabIndex = 0; // + // button3 + // + this.button3.Location = new System.Drawing.Point(147, 6); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(107, 33); + this.button3.TabIndex = 405; + this.button3.Text = "닫기"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Controls.Add(this.button2, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.btn_FillBlank, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.btPrev, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.btNext, 1, 1); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 215); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(266, 93); + this.tableLayoutPanel2.TabIndex = 406; + // // Marc2 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -951,6 +984,7 @@ this.tableLayoutPanel1.ResumeLayout(false); this.panel6.ResumeLayout(false); this.panel6.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); this.ResumeLayout(false); } @@ -1024,5 +1058,7 @@ private System.Windows.Forms.RadioButton radC; private System.Windows.Forms.RadioButton radB; private System.Windows.Forms.RadioButton radD; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcCopySelect2.Designer.cs b/unimarc/unimarc/마크/MarcCopySelect2.Designer.cs index 9eaea9a..fa2b6f9 100644 --- a/unimarc/unimarc/마크/MarcCopySelect2.Designer.cs +++ b/unimarc/unimarc/마크/MarcCopySelect2.Designer.cs @@ -29,7 +29,9 @@ namespace UniMarc /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MarcCopySelect2)); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.panel1 = new System.Windows.Forms.Panel(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); @@ -42,10 +44,24 @@ namespace UniMarc this.panel2 = new System.Windows.Forms.Panel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.panel3 = new System.Windows.Forms.Panel(); + this.bs1 = new System.Windows.Forms.BindingSource(this.components); + this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); + this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); + this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); + this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); + this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); + this.bindingNavigator1.SuspendLayout(); this.SuspendLayout(); // // dataGridView1 @@ -53,21 +69,21 @@ namespace UniMarc this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; - 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; + 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.AutoSize; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1109, 106); + this.dataGridView1.Size = new System.Drawing.Size(1109, 107); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -160,10 +176,11 @@ namespace UniMarc // panel2 // this.panel2.Controls.Add(this.dataGridView1); + this.panel2.Controls.Add(this.bindingNavigator1); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 33); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1109, 106); + this.panel2.Size = new System.Drawing.Size(1109, 134); this.panel2.TabIndex = 2; // // richTextBox1 @@ -174,7 +191,7 @@ namespace UniMarc this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F); this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1109, 540); + this.richTextBox1.Size = new System.Drawing.Size(1109, 512); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; // @@ -182,12 +199,109 @@ namespace UniMarc // this.panel3.Controls.Add(this.richTextBox1); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 139); + this.panel3.Location = new System.Drawing.Point(0, 167); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1109, 540); + this.panel3.Size = new System.Drawing.Size(1109, 512); this.panel3.TabIndex = 3; // - // MarcCopySelect + // bindingNavigator1 + // + this.bindingNavigator1.AddNewItem = null; + this.bindingNavigator1.BindingSource = this.bs1; + this.bindingNavigator1.CountItem = this.bindingNavigatorCountItem; + this.bindingNavigator1.DeleteItem = null; + this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bindingNavigator1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bindingNavigatorMoveFirstItem, + this.bindingNavigatorMovePreviousItem, + this.bindingNavigatorSeparator, + this.bindingNavigatorPositionItem, + this.bindingNavigatorCountItem, + this.bindingNavigatorSeparator1, + this.bindingNavigatorMoveNextItem, + this.bindingNavigatorMoveLastItem, + this.bindingNavigatorSeparator2}); + this.bindingNavigator1.Location = new System.Drawing.Point(0, 107); + this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; + this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem; + this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem; + this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem; + this.bindingNavigator1.Name = "bindingNavigator1"; + this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem; + this.bindingNavigator1.Size = new System.Drawing.Size(1109, 27); + this.bindingNavigator1.TabIndex = 4; + this.bindingNavigator1.Text = "bindingNavigator1"; + // + // bindingNavigatorMoveFirstItem + // + this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); + this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; + this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; + // + // bindingNavigatorMovePreviousItem + // + this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); + this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; + this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; + // + // bindingNavigatorSeparator + // + this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 27); + // + // bindingNavigatorPositionItem + // + this.bindingNavigatorPositionItem.AccessibleName = "위치"; + this.bindingNavigatorPositionItem.AutoSize = false; + this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; + this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); + this.bindingNavigatorPositionItem.Text = "0"; + this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; + // + // bindingNavigatorCountItem + // + this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 24); + this.bindingNavigatorCountItem.Text = "/{0}"; + this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; + // + // bindingNavigatorSeparator1 + // + this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 27); + // + // bindingNavigatorMoveNextItem + // + this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); + this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; + this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; + // + // bindingNavigatorMoveLastItem + // + this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); + this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; + this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(24, 24); + this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; + // + // bindingNavigatorSeparator2 + // + this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator"; + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 27); + // + // MarcCopySelect2 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -195,13 +309,18 @@ namespace UniMarc this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); - this.Name = "MarcCopySelect"; + this.Name = "MarcCopySelect2"; this.Text = "마크 선택"; ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit(); + this.bindingNavigator1.ResumeLayout(false); + this.bindingNavigator1.PerformLayout(); this.ResumeLayout(false); } @@ -220,5 +339,16 @@ namespace UniMarc private System.Windows.Forms.Button btn_Search; private System.Windows.Forms.TextBox tb_SearchBox; private System.Windows.Forms.ProgressBar progressBar1; + private System.Windows.Forms.BindingNavigator bindingNavigator1; + private System.Windows.Forms.BindingSource bs1; + private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; + private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; + private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; + private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcCopySelect2.cs b/unimarc/unimarc/마크/MarcCopySelect2.cs index 1e6b750..e30d2a8 100644 --- a/unimarc/unimarc/마크/MarcCopySelect2.cs +++ b/unimarc/unimarc/마크/MarcCopySelect2.cs @@ -14,27 +14,20 @@ namespace UniMarc public partial class MarcCopySelect2 : Form { Helper_DB db = new Helper_DB(); - Marc2 m2; - AddMarc2 am2; MarcBookItem item; - public MarcCopySelect2() + public MarcCopySelect2(string search_col, string search_Target) { InitializeComponent(); - } - public MarcCopySelect2(AddMarc2 cD) - { - InitializeComponent(); - am2 = cD; - db.DBcon(); - } - public MarcCopySelect2(Marc2 _m,MarcBookItem _item) - { - InitializeComponent(); - m2 = _m; - this.item = _item; db.DBcon(); + + cb_SearchFilter.Text = search_col; + if(cb_SearchFilter.SelectedIndex <0) + cb_SearchFilter.SelectedIndex = 0; + tb_SearchBox.Text = search_Target; + } + private void tb_SearchBox_KeyDown(object sender, KeyEventArgs e) { @@ -46,96 +39,14 @@ namespace UniMarc { if (cb_SearchFilter.SelectedIndex < 0) return; - dataGridView1.Rows.Clear(); - richTextBox1.Text = ""; - string search_Col = ""; - string search_Target = tb_SearchBox.Text; - switch (cb_SearchFilter.SelectedIndex) - { - case 0: - search_Col = "ISBN"; - break; - case 1: - search_Col = "서명"; - break; - case 2: - search_Col = "저자"; - break; - case 3: - search_Col = "출판사"; - break; - } - Init(search_Col, search_Target); - } + var search_Target = tb_SearchBox.Text.Trim(); + var search_col = cb_SearchFilter.Text.Trim(); - public void Init(string search_col, string search_Target, string CD_LP) - { - SettingGrid_CDLP(); - - btn_ShowDeleteMarc.Visible = false; - btn_Delete.Visible = false; - - if (search_Target == "") return; - - string Area = "`idx`, `Code`, `user`, `date`, `Marc`"; - string Table = "DVD_Marc"; - string Query = string.Format("SELECT {0} FROM {1} WHERE `{2}` = \"{3}\"", Area, Table, search_col, search_Target); - string Result = db.DB_Send_CMD_Search(Query); - string[] GridData = Result.Split('|'); - - InputGrid_CDLP(GridData); - } - - private void SettingGrid_CDLP() - { - DataGridView dgv = dataGridView1; - dgv.Columns.Add("idx", "idx"); - dgv.Columns.Add("code", "CODE"); - dgv.Columns.Add("user", "수정자"); - dgv.Columns.Add("date", "수정시각"); - dgv.Columns.Add("marc", "Marc"); - - dgv.Columns["idx"].Visible = false; - dgv.Columns["user"].Width = 120; - dgv.Columns["date"].Width = 120; - dgv.Columns["marc"].Width = 300; - } - - private void InputGrid_CDLP(string[] Value) - { - progressBar1.Value = 0; - progressBar1.Maximum = Value.Length / 5; - - string[] Grid = { "", "", "", "", "" }; - - for (int a = 0; a < Value.Length; a++) - { - if (a % 5 == 0) Grid[0] = Value[a]; // idx - if (a % 5 == 1) Grid[1] = Value[a]; // CODE - if (a % 5 == 2) Grid[2] = Value[a]; // user - if (a % 5 == 3) Grid[3] = Value[a]; // date - if (a % 5 == 4) - { - Grid[4] = Value[a]; // marc - dataGridView1.Rows.Add(Grid); - progressBar1.Value += 1; - } - } - - for (int a = 0; a < dataGridView1.Rows.Count; a++) - { - string savedate = dataGridView1.Rows[a].Cells["date"].Value.ToString(); - SaveDataCheck(savedate, a); - } - } - - public void Init(string search_col, string search_Target) - { SettingGrid_Book(); if (search_Target == "") return; - // 0 1 2 3 4 + // 0 1 2 3 4 string Area = "`idx`, `compidx`, `ISBN`, `서명`, `저자`, " + // 5 6 7 8 9 "`출판사`, `user`, `date`, `grade`, `008tag`, " + @@ -378,10 +289,10 @@ namespace UniMarc if (e.RowIndex < 0) return; SelectMarc(e.RowIndex); } - + public string[] GridData; void SelectMarc(int row) { - string[] GridData = { + GridData = new string[]{ dataGridView1.Rows[row].Cells["idx"].Value.ToString(), dataGridView1.Rows[row].Cells["compidx"].Value.ToString(), dataGridView1.Rows[row].Cells["user"].Value.ToString(), @@ -391,19 +302,22 @@ namespace UniMarc dataGridView1.Rows[row].Cells["marc"].Value.ToString() }; - if(m2 != null) - { - m2.SelectMarc_Sub(this.item, GridData); - } + var fullMarc = dataGridView1.Rows[row].Cells["marc"].Value.ToString(); + + this.DialogResult = DialogResult.OK; + //if (m2 != null) + //{ + // m2.SelectMarc_Sub(this.item, GridData); + //} - if (am2 != null) - { - string Marc = richTextBox1.Text; - string isbn = dataGridView1.Rows[row].Cells["isbn"].Value.ToString(); - am2.SelectMarc_Sub(Marc, isbn, GridData); - } - this.Close(); + //if (am2 != null) + //{ + // string Marc = richTextBox1.Text; + // string isbn = dataGridView1.Rows[row].Cells["isbn"].Value.ToString(); + // am2.SelectMarc_Sub(fullMarc, isbn, GridData); + //} + //this.Close(); } private void btn_Close_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/MarcCopySelect2.resx b/unimarc/unimarc/마크/MarcCopySelect2.resx index 1af7de1..80dc2f2 100644 --- a/unimarc/unimarc/마크/MarcCopySelect2.resx +++ b/unimarc/unimarc/마크/MarcCopySelect2.resx @@ -117,4 +117,51 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 195, 22 + + + 22, 22 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAExSURBVDhPY2AYNKBw1vP/TQue/8+c+Pg/uhwMhLc/wCnH + kDvz2f9VR97/x6UovvvB/+CGa1jlwCBjytP/C/d9wKoovufh/6X7///3r76AIQcHCT1P/k/b8h5DUUT7 + fbDmzFn//3uVnsBtQGTXo/+9qz+gKAptvQfW3Lru/3//zr//XfIP4DYgsPnh/7r57+CKglvu/l+09/// + jnX//2fM+fnfru7nf/uM7bgN8Ki6/z9/2hsURXbFt/+nz/n937/r23+dwnf/LRLW4zbAvvTu/+zJrzEU + 6aec/29S9OK/Stan/8aRy3AbYJF3539q/2usigySTvyXTfv6Xzd4HoYcHBhm3f4f1vISpyL91Mv/NXyn + YZUDA520G//9qh/iVaTiMQGnHINT7pX/IAV4FQ1KAADwdsCrWJS2HgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPY2AYMiC8/cF/dDGiQXz3g//BDdfIMyC+5+H/ + pfv///evvkC6ARHt98GaM2f9/+9VeoI0A0Jb74E1t677/9+/8+9/l/wDxBsQ3HL3/6K9//93rPv/P2PO + z/92dT//22dsJ94AELArvv0/fc7v//5d3/7rFL77b5GwnjQDQEA/5fx/k6IX/1WyPv03jlxGugEgYJB0 + 4r9s2tf/usHzyDMABPRTL//X8J1GvgEgoOIxgTIDBi8AANAUYJgsLP+3AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACkSURBVDhPY2AYdKBw1vP/6GIkgdyZz/4ndN8j35CMKU// + z9v/+39C1x3yDEnoefJ/9r5f/zu3/v3vVnqZdEMiux79n7Lt1/+SpX//J0z/+98m9yxphgQ2P/zfuvY9 + WLNxyZf/0tHX/htHLiPeEI+q+/9L5r6Da1Z06SFeMwjYl979H9jyjDzNIGCRd+e/TcEV8jSDgGHWbfI1 + g4BO2g3yNQ9NAACgfl+gY6ualwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAErSURBVDhPY2AYVKBw1vP/6GIwAJJrWvD8f+bExzjVMOTO + fPY/ofseVgUguVVH3v8Pb3+AVR4MMqY8/T9v/+//CV13MBSB5Bbu+/A/uOEahhwcJPQ8+T9736//nVv/ + /ncrvYyiECQ3bcv7//7VF3AbENn16P+Ubb/+lyz9+z9h+t//Nrln4YpBcr2rP/z3Kj2B24DA5of/W9e+ + B2s2LvnyXzr62n/jyGVgDSC5uvnv/rvkH8BtgEfV/f8lc9/BNSu69MAVg+Typ735b5+xHbcB9qV3/we2 + PMPQDJPLnvz6v0XCetwGWOTd+W9TcAVDM0wutf813EtYgWHWbayaQQAkF9by8r9u8Dys8mCgk3YDpyRI + zq/64X8N32k41eAFTrlX/qt4TABjdLmBBQC+0b+zZl1WGAAAAABJRU5ErkJggg== + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcEditorControl.Designer.cs b/unimarc/unimarc/마크/MarcEditorControl.Designer.cs index 91ff3e0..c6edabe 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.Designer.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.Designer.cs @@ -28,14 +28,14 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle65 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle66 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle67 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle68 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle69 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle70 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.label31 = new System.Windows.Forms.Label(); this.label30 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); @@ -349,7 +349,7 @@ this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.richTextBox1.Location = new System.Drawing.Point(3, 21); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(994, 780); + this.richTextBox1.Size = new System.Drawing.Size(994, 774); this.richTextBox1.TabIndex = 32; this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); @@ -357,18 +357,18 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(462, 13); + this.label1.Location = new System.Drawing.Point(454, 11); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(63, 14); + this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 14; this.label1.Text = "입력일자"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(641, 14); + this.label2.Location = new System.Drawing.Point(641, 11); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(49, 14); + this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 206; this.label2.Text = "이용자"; // @@ -376,9 +376,9 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(693, 11); + this.comboBox1.Location = new System.Drawing.Point(693, 7); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(93, 21); + this.comboBox1.Size = new System.Drawing.Size(93, 20); this.comboBox1.TabIndex = 207; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -386,9 +386,9 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(468, 38); + this.label3.Location = new System.Drawing.Point(454, 33); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(63, 14); + this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 206; this.label3.Text = "자료형식"; // @@ -396,9 +396,9 @@ // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(532, 35); + this.comboBox2.Location = new System.Drawing.Point(510, 29); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(87, 21); + this.comboBox2.Size = new System.Drawing.Size(116, 20); this.comboBox2.TabIndex = 207; this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -406,9 +406,9 @@ // label98 // this.label98.AutoSize = true; - this.label98.Location = new System.Drawing.Point(466, 62); + this.label98.Location = new System.Drawing.Point(454, 55); this.label98.Name = "label98"; - this.label98.Size = new System.Drawing.Size(63, 14); + this.label98.Size = new System.Drawing.Size(53, 12); this.label98.TabIndex = 14; this.label98.Text = "내용형식"; // @@ -416,9 +416,9 @@ // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(532, 59); + this.comboBox3.Location = new System.Drawing.Point(510, 51); this.comboBox3.Name = "comboBox3"; - this.comboBox3.Size = new System.Drawing.Size(118, 21); + this.comboBox3.Size = new System.Drawing.Size(139, 20); this.comboBox3.TabIndex = 207; this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -426,27 +426,27 @@ // label99 // this.label99.AutoSize = true; - this.label99.Location = new System.Drawing.Point(781, 62); + this.label99.Location = new System.Drawing.Point(781, 55); this.label99.Name = "label99"; - this.label99.Size = new System.Drawing.Size(35, 14); + this.label99.Size = new System.Drawing.Size(29, 12); this.label99.TabIndex = 206; this.label99.Text = "대학"; // // text008col // this.text008col.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.text008col.Location = new System.Drawing.Point(819, 58); + this.text008col.Location = new System.Drawing.Point(813, 51); this.text008col.Name = "text008col"; - this.text008col.Size = new System.Drawing.Size(26, 23); + this.text008col.Size = new System.Drawing.Size(26, 21); this.text008col.TabIndex = 204; this.text008col.KeyDown += new System.Windows.Forms.KeyEventHandler(this.text008col_KeyDown); // // label100 // this.label100.AutoSize = true; - this.label100.Location = new System.Drawing.Point(627, 39); + this.label100.Location = new System.Drawing.Point(627, 33); this.label100.Name = "label100"; - this.label100.Size = new System.Drawing.Size(63, 14); + this.label100.Size = new System.Drawing.Size(53, 12); this.label100.TabIndex = 206; this.label100.Text = "문학형식"; // @@ -454,9 +454,9 @@ // this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(693, 36); + this.comboBox4.Location = new System.Drawing.Point(693, 29); this.comboBox4.Name = "comboBox4"; - this.comboBox4.Size = new System.Drawing.Size(93, 21); + this.comboBox4.Size = new System.Drawing.Size(93, 20); this.comboBox4.TabIndex = 207; this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -464,9 +464,9 @@ // label101 // this.label101.AutoSize = true; - this.label101.Location = new System.Drawing.Point(494, 86); + this.label101.Location = new System.Drawing.Point(478, 77); this.label101.Name = "label101"; - this.label101.Size = new System.Drawing.Size(35, 14); + this.label101.Size = new System.Drawing.Size(29, 12); this.label101.TabIndex = 206; this.label101.Text = "전기"; // @@ -474,9 +474,9 @@ // this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(532, 83); + this.comboBox5.Location = new System.Drawing.Point(510, 73); this.comboBox5.Name = "comboBox5"; - this.comboBox5.Size = new System.Drawing.Size(97, 21); + this.comboBox5.Size = new System.Drawing.Size(118, 20); this.comboBox5.TabIndex = 207; this.comboBox5.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox5.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -484,9 +484,9 @@ // label102 // this.label102.AutoSize = true; - this.label102.Location = new System.Drawing.Point(636, 86); + this.label102.Location = new System.Drawing.Point(636, 77); this.label102.Name = "label102"; - this.label102.Size = new System.Drawing.Size(35, 14); + this.label102.Size = new System.Drawing.Size(29, 12); this.label102.TabIndex = 206; this.label102.Text = "언어"; // @@ -494,9 +494,9 @@ // this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(674, 83); + this.comboBox6.Location = new System.Drawing.Point(674, 73); this.comboBox6.Name = "comboBox6"; - this.comboBox6.Size = new System.Drawing.Size(97, 21); + this.comboBox6.Size = new System.Drawing.Size(97, 20); this.comboBox6.TabIndex = 207; this.comboBox6.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox6.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -504,18 +504,18 @@ // text008gov // this.text008gov.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.text008gov.Location = new System.Drawing.Point(819, 82); + this.text008gov.Location = new System.Drawing.Point(813, 73); this.text008gov.Name = "text008gov"; - this.text008gov.Size = new System.Drawing.Size(26, 23); + this.text008gov.Size = new System.Drawing.Size(26, 21); this.text008gov.TabIndex = 204; this.text008gov.KeyDown += new System.Windows.Forms.KeyEventHandler(this.text008col_KeyDown); // // label103 // this.label103.AutoSize = true; - this.label103.Location = new System.Drawing.Point(781, 86); + this.label103.Location = new System.Drawing.Point(781, 77); this.label103.Name = "label103"; - this.label103.Size = new System.Drawing.Size(35, 14); + this.label103.Size = new System.Drawing.Size(29, 12); this.label103.TabIndex = 206; this.label103.Text = "기관"; // @@ -524,9 +524,9 @@ this.col008res.AutoSize = true; this.col008res.BackColor = System.Drawing.SystemColors.ActiveBorder; this.col008res.ForeColor = System.Drawing.Color.Blue; - this.col008res.Location = new System.Drawing.Point(850, 62); + this.col008res.Location = new System.Drawing.Point(844, 55); this.col008res.Name = "col008res"; - this.col008res.Size = new System.Drawing.Size(17, 14); + this.col008res.Size = new System.Drawing.Size(13, 12); this.col008res.TabIndex = 206; this.col008res.Text = " "; this.col008res.TextChanged += new System.EventHandler(this.col008res_TextChanged); @@ -536,9 +536,9 @@ this.gov008res.AutoSize = true; this.gov008res.BackColor = System.Drawing.SystemColors.ActiveBorder; this.gov008res.ForeColor = System.Drawing.Color.Blue; - this.gov008res.Location = new System.Drawing.Point(850, 86); + this.gov008res.Location = new System.Drawing.Point(844, 77); this.gov008res.Name = "gov008res"; - this.gov008res.Size = new System.Drawing.Size(17, 14); + this.gov008res.Size = new System.Drawing.Size(13, 12); this.gov008res.TabIndex = 206; this.gov008res.Text = " "; this.gov008res.TextChanged += new System.EventHandler(this.col008res_TextChanged); @@ -546,9 +546,9 @@ // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(366, 11); + this.checkBox1.Location = new System.Drawing.Point(366, 9); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(96, 18); + this.checkBox1.Size = new System.Drawing.Size(84, 16); this.checkBox1.TabIndex = 213; this.checkBox1.Text = "회의간행물"; this.checkBox1.UseVisualStyleBackColor = true; @@ -557,9 +557,9 @@ // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(366, 36); + this.checkBox2.Location = new System.Drawing.Point(366, 31); this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(96, 18); + this.checkBox2.Size = new System.Drawing.Size(84, 16); this.checkBox2.TabIndex = 213; this.checkBox2.Text = "기념논문집"; this.checkBox2.UseVisualStyleBackColor = true; @@ -569,9 +569,9 @@ // this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox7.FormattingEnabled = true; - this.comboBox7.Location = new System.Drawing.Point(651, 59); + this.comboBox7.Location = new System.Drawing.Point(651, 51); this.comboBox7.Name = "comboBox7"; - this.comboBox7.Size = new System.Drawing.Size(118, 21); + this.comboBox7.Size = new System.Drawing.Size(120, 20); this.comboBox7.TabIndex = 207; this.comboBox7.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox7.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -580,7 +580,7 @@ // this.Btn_Memo.Location = new System.Drawing.Point(790, 6); this.Btn_Memo.Name = "Btn_Memo"; - this.Btn_Memo.Size = new System.Drawing.Size(97, 27); + this.Btn_Memo.Size = new System.Drawing.Size(97, 22); this.Btn_Memo.TabIndex = 215; this.Btn_Memo.Text = "메모장"; this.Btn_Memo.UseVisualStyleBackColor = true; @@ -589,10 +589,10 @@ // label4 // this.label4.Dock = System.Windows.Forms.DockStyle.Left; - this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label4.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(40, 50); + this.label4.Size = new System.Drawing.Size(43, 50); this.label4.TabIndex = 206; this.label4.Text = "008"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -602,10 +602,10 @@ this.text008.BackColor = System.Drawing.Color.White; this.text008.Dock = System.Windows.Forms.DockStyle.Fill; 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(40, 0); + this.text008.Location = new System.Drawing.Point(43, 0); this.text008.Margin = new System.Windows.Forms.Padding(3); this.text008.Name = "text008"; - this.text008.Size = new System.Drawing.Size(289, 50); + this.text008.Size = new System.Drawing.Size(286, 50); this.text008.TabIndex = 204; this.text008.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -624,7 +624,6 @@ // // btn_Reflesh008 // - this.btn_Reflesh008.BackColor = System.Drawing.SystemColors.WindowText; this.btn_Reflesh008.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btn_Reflesh008.Dock = System.Windows.Forms.DockStyle.Right; this.btn_Reflesh008.Location = new System.Drawing.Point(329, 0); @@ -632,6 +631,7 @@ this.btn_Reflesh008.Name = "btn_Reflesh008"; this.btn_Reflesh008.Size = new System.Drawing.Size(28, 50); this.btn_Reflesh008.TabIndex = 207; + this.btn_Reflesh008.Text = "갱신"; this.btn_Reflesh008.UseVisualStyleBackColor = false; this.btn_Reflesh008.Click += new System.EventHandler(this.btn_Reflesh008_Click); // @@ -642,16 +642,16 @@ this.input_date.Checked = false; this.input_date.CustomFormat = "yyyy-MM-dd"; this.input_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.input_date.Location = new System.Drawing.Point(532, 9); + this.input_date.Location = new System.Drawing.Point(510, 7); this.input_date.Name = "input_date"; this.input_date.ShowCheckBox = true; - this.input_date.Size = new System.Drawing.Size(82, 23); + this.input_date.Size = new System.Drawing.Size(116, 21); this.input_date.TabIndex = 220; this.input_date.ValueChanged += new System.EventHandler(this.input_date_ValueChanged); // // btn_preview // - this.btn_preview.Location = new System.Drawing.Point(790, 33); + this.btn_preview.Location = new System.Drawing.Point(790, 28); this.btn_preview.Name = "btn_preview"; this.btn_preview.Size = new System.Drawing.Size(97, 22); this.btn_preview.TabIndex = 215; @@ -666,11 +666,11 @@ this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tabControl1.Location = new System.Drawing.Point(0, 110); + this.tabControl1.Location = new System.Drawing.Point(0, 98); this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1028, 794); + this.tabControl1.Size = new System.Drawing.Size(1028, 806); this.tabControl1.TabIndex = 0; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // @@ -682,7 +682,7 @@ this.tabPage1.Location = new System.Drawing.Point(24, 4); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1000, 804); + this.tabPage1.Size = new System.Drawing.Size(1000, 798); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "마크 편집"; // @@ -705,7 +705,7 @@ this.tabPage2.Location = new System.Drawing.Point(24, 4); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1000, 786); + this.tabPage2.Size = new System.Drawing.Size(1000, 798); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "마크 칸채우기"; // @@ -758,7 +758,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(994, 780); + this.panel4.Size = new System.Drawing.Size(994, 792); this.panel4.TabIndex = 0; // // Btn_interlock @@ -800,8 +800,8 @@ this.GridView020.Name = "GridView020"; this.GridView020.RowHeadersVisible = false; this.GridView020.RowHeadersWidth = 30; - dataGridViewCellStyle71.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle71; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle1; this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 0; @@ -875,8 +875,8 @@ this.GridView505.Name = "GridView505"; this.GridView505.RowHeadersVisible = false; this.GridView505.RowHeadersWidth = 30; - dataGridViewCellStyle72.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle72; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle2; this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 2; @@ -1015,14 +1015,14 @@ this.GridView246.AllowDrop = true; this.GridView246.AllowUserToAddRows = false; this.GridView246.AllowUserToResizeRows = false; - dataGridViewCellStyle65.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle65.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle65.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle65.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle65.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle65.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle65.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle65; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("돋움", 9.75F, 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.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.GridView246.ColumnHeadersHeight = 29; this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Text246Jisi, @@ -1035,8 +1035,8 @@ this.GridView246.Name = "GridView246"; this.GridView246.RowHeadersVisible = false; this.GridView246.RowHeadersWidth = 30; - dataGridViewCellStyle66.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle66; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle4; this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(542, 138); this.GridView246.TabIndex = 31; @@ -1195,14 +1195,14 @@ this.GridView440.AllowDrop = true; this.GridView440.AllowUserToAddRows = false; this.GridView440.AllowUserToResizeRows = false; - dataGridViewCellStyle67.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle67.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle67.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle67.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle67.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle67.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle67.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle67; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text440a, @@ -1215,8 +1215,8 @@ this.GridView440.Name = "GridView440"; this.GridView440.RowHeadersVisible = false; this.GridView440.RowHeadersWidth = 30; - dataGridViewCellStyle68.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle68; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle6; this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 18; @@ -1324,14 +1324,14 @@ this.GridView490.AllowDrop = true; this.GridView490.AllowUserToAddRows = false; this.GridView490.AllowUserToResizeRows = false; - dataGridViewCellStyle69.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle69.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle69.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle69.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle69.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle69.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle69.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle69; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("돋움", 9.75F, 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.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text490a, @@ -1340,8 +1340,8 @@ this.GridView490.Name = "GridView490"; this.GridView490.RowHeadersVisible = false; this.GridView490.RowHeadersWidth = 30; - dataGridViewCellStyle70.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle70; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle8; this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(370, 71); this.GridView490.TabIndex = 19; @@ -2140,9 +2140,9 @@ // checkBox4 // this.checkBox4.AutoSize = true; - this.checkBox4.Location = new System.Drawing.Point(366, 60); + this.checkBox4.Location = new System.Drawing.Point(366, 53); this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(54, 18); + this.checkBox4.Size = new System.Drawing.Size(48, 16); this.checkBox4.TabIndex = 213; this.checkBox4.Text = "색인"; this.checkBox4.UseVisualStyleBackColor = true; @@ -2181,9 +2181,10 @@ this.panel6.Controls.Add(this.comboBox5); this.panel6.Controls.Add(this.label102); this.panel6.Dock = System.Windows.Forms.DockStyle.Top; + this.panel6.Font = new System.Drawing.Font("돋움", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.panel6.Location = new System.Drawing.Point(0, 0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1028, 110); + this.panel6.Size = new System.Drawing.Size(1028, 98); this.panel6.TabIndex = 321; // // panel7 @@ -2196,7 +2197,7 @@ this.panel7.Location = new System.Drawing.Point(0, 53); this.panel7.Margin = new System.Windows.Forms.Padding(0); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(358, 52); + this.panel7.Size = new System.Drawing.Size(358, 41); this.panel7.TabIndex = 221; // // lbl_ISBN @@ -2205,9 +2206,10 @@ this.lbl_ISBN.BorderStyle = System.Windows.Forms.BorderStyle.None; this.lbl_ISBN.Dock = System.Windows.Forms.DockStyle.Fill; this.lbl_ISBN.Font = new System.Drawing.Font("굴림", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lbl_ISBN.Location = new System.Drawing.Point(40, 0); + this.lbl_ISBN.Location = new System.Drawing.Point(43, 0); this.lbl_ISBN.Name = "lbl_ISBN"; - this.lbl_ISBN.Size = new System.Drawing.Size(288, 39); + this.lbl_ISBN.ReadOnly = true; + this.lbl_ISBN.Size = new System.Drawing.Size(285, 39); this.lbl_ISBN.TabIndex = 204; this.lbl_ISBN.Text = "0000000000000"; this.lbl_ISBN.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -2221,7 +2223,7 @@ this.btChangeISBN.Location = new System.Drawing.Point(328, 0); this.btChangeISBN.Margin = new System.Windows.Forms.Padding(0); this.btChangeISBN.Name = "btChangeISBN"; - this.btChangeISBN.Size = new System.Drawing.Size(28, 50); + this.btChangeISBN.Size = new System.Drawing.Size(28, 39); this.btChangeISBN.TabIndex = 207; this.btChangeISBN.Text = "변경"; this.btChangeISBN.UseVisualStyleBackColor = false; @@ -2230,10 +2232,10 @@ // label56 // this.label56.Dock = System.Windows.Forms.DockStyle.Left; - this.label56.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label56.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label56.Location = new System.Drawing.Point(0, 0); this.label56.Name = "label56"; - this.label56.Size = new System.Drawing.Size(40, 50); + this.label56.Size = new System.Drawing.Size(43, 39); this.label56.TabIndex = 206; this.label56.Text = "ISBN"; this.label56.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -2244,7 +2246,7 @@ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.pictureBox1.Location = new System.Drawing.Point(890, 7); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(131, 98); + this.pictureBox1.Size = new System.Drawing.Size(131, 84); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 221; this.pictureBox1.TabStop = false; diff --git a/unimarc/unimarc/마크/MarcEditorControl.cs b/unimarc/unimarc/마크/MarcEditorControl.cs index f2173f5..b8d7829 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.cs @@ -36,7 +36,7 @@ namespace UniMarc String_Text st = new String_Text(); string l_idx = string.Empty; string c_idx = string.Empty; - + public MarcEditorControl() { InitializeComponent(); @@ -122,23 +122,39 @@ namespace UniMarc /// /// /// - public void LoadBookData(string dbMarc,string isbn = "",string defaultMarc="") + public void LoadBookData(string dbMarc, string isbn = "", string defaultMarc = "") { mLoadCompleted = false; richTextBox1.Text = ""; + richTextBox1.Enabled = true; - LoadMarc(dbMarc); //여기에서도 008을 설정한다 + + if (dbMarc.isEmpty() == false) + { + dbMarc = dbMarc.Replace('▼', (char)0x1E); //1e -> ▼ (필드종단기호) + dbMarc = dbMarc.Replace('▲', (char)0x1F); //1f -> ▲ (식별자기호) + dbMarc = dbMarc.Replace('↔', (char)0x1D); //1d -> ↔ (레코드종단기호) + } string extractedIsbn = isbn; - if (extractedIsbn.isEmpty()) + if (dbMarc.isEmpty() == false) { - //마크데이터에서 ISBN(020a)을 찾아서 설정한다. - string[] isbnTags = st.Take_Tag(dbMarc, new string[] { "020a" }); - if (isbnTags.Length > 0 && !isbnTags[0].isEmpty()) + LoadMarc(dbMarc); //여기에서도 008을 설정한다 + if (extractedIsbn.isEmpty()) { - extractedIsbn = isbnTags[0].Trim(); + //마크데이터에서 ISBN(020a)을 찾아서 설정한다. + string[] isbnTags = st.Take_Tag(dbMarc, new string[] { "020a" }); + if (isbnTags.Length > 0 && !isbnTags[0].isEmpty()) + { + extractedIsbn = isbnTags[0].Trim(); + } } } + else + { + text008.Text = "180507s2016 ulka c 000 f kor "; + data008 = text008.Text; + } lbl_ISBN.Text = $"{extractedIsbn}"; if (!extractedIsbn.isEmpty()) @@ -159,8 +175,7 @@ namespace UniMarc } Create_008(); - st.Color_change("▼", richTextBox1); - st.Color_change("▲", richTextBox1); + UpdateTextColor(); mLoadCompleted = true; } @@ -215,13 +230,13 @@ namespace UniMarc //if (e.KeyCode == Keys.F9) - // SaveGrade(Keys.F9); + // SaveGrade(Keys.F9); //else if (e.KeyCode == Keys.F10) - // SaveGrade(Keys.F10); + // SaveGrade(Keys.F10); //else if (e.KeyCode == Keys.F11) - // SaveGrade(Keys.F11); + // SaveGrade(Keys.F11); //else if (e.KeyCode == Keys.F12) - // SaveGrade(Keys.F12); + // SaveGrade(Keys.F12); if (e.KeyCode == Keys.F3) { rt.SelectionColor = Color.Blue; @@ -269,7 +284,7 @@ namespace UniMarc /// public string MakeMarcString() { - return st.made_Ori_marc(richTextBox1).Replace(@"\", "￦"); + return st.made_Ori_marc(richTextBox1).Replace(@"\", "￦"); } private void etc_KeyDown(object sender, KeyEventArgs e) @@ -308,12 +323,16 @@ namespace UniMarc memo.Location = new Point(1018, 8); memo.Show(); } + + /// + /// richTextBox1 에 값을 단순 설정합니다 + /// 008등의 태그값은 적용되지 않습니다. + /// 완전한 데이터를 로드하기 위해서는 LoadBookData() 를 사용해야 함 + /// + /// public void SetMarcString(string text) { richTextBox1.Text = text; - // Sync with internal data structures (008, etc) - //string orimarc = st.made_Ori_marc(richTextBox1).Replace(@"\", "￦"); - //LoadMarc(orimarc); } private void Btn_preview_Click(object sender, EventArgs e) @@ -328,7 +347,7 @@ namespace UniMarc }; mp.Show(); } - + #region Save_Click_Sub @@ -390,7 +409,7 @@ namespace UniMarc if (!isPass(BaseText)) { - UTIL.MsgE( "입력된 마크의 상태를 확인해주세요."); + UTIL.MsgE("입력된 마크의 상태를 확인해주세요."); return false; } @@ -403,9 +422,15 @@ namespace UniMarc // 3. ISBN 포함 여부 확인 (경고성) var v_ISBN = this.lbl_ISBN.Text.Trim(); + if (v_ISBN.isEmpty()) + { + UTIL.MsgE("상단 ISBN값이 없습니다. 변경버튼으로 값을 입력하세요"); + lbl_ISBN.Focus(); + return false; + } if (BaseText.IndexOf(v_ISBN) < 0) { - var dlg = UTIL.MsgQ("저장된 ISBN이 마크데이터에 없습니다.\nISBN값이 변경되었습니다.\n그래도 저장 할까요?"); + var dlg = UTIL.MsgQ($"저장된 ISBN 값({lbl_ISBN.Text})이 마크데이터에 없습니다.\n\nISBN값이 변경되었습니다.\n취소 후 ISBN 변경기능을 통해서 값을 변경 후 다시 시도하세요. \n\n혹은 그래도 저장 할까요?"); if (dlg != DialogResult.Yes) return false; } @@ -452,7 +477,7 @@ namespace UniMarc if (!is1XX) { - MessageBox.Show("기본표목이 존재하지않습니다."); + MessageBox.Show("기본표목(100a | 110a | 111a)이 존재하지않습니다."); return false; } @@ -470,7 +495,7 @@ namespace UniMarc if (!is7XX) { - MessageBox.Show("부출표목이 존재하지않습니다."); + MessageBox.Show("부출표목(700a | 710a | 711a)이 존재하지않습니다."); return false; } @@ -583,8 +608,8 @@ namespace UniMarc richTextBox1.Text = result; return true; } - - + + /// /// 마크데이터가 있는지 확인하고 메모장으로 출력 /// @@ -731,8 +756,16 @@ namespace UniMarc private void btn_Reflesh008_Click(object sender, EventArgs e) { string data = text008.Text; + + if (this.tabControl1.SelectedIndex == 1) + { + AR.UTIL.MsgE("[칸채우기]가 아닌 [마크 편집] 탭에서 저장해주세요!"); + return ; + } + + //data =data.PadRight(40,' '); - string oriMarc = st.made_Ori_marc(richTextBox1).Replace("\\", "￦"); + string oriMarc = MakeMarcString();// st.made_Ori_marc(richTextBox1).Replace("\\", "￦"); //if (data == "" || data == null) { return; } @@ -756,9 +789,17 @@ namespace UniMarc // 발행년유형 (6), 발행년1 (07-10), 발행년2 (11-14) string DateSet = pubDateSet(ContentTag[0]); + if(string.IsNullOrEmpty(DateSet)) + { + return; + } // 발행국 (15-17) string Country = pubCountry(ContentTag[1]); + if(Country.isEmpty()) + { + return; + } // 삽화표시 (18-21) string Picture = tag008.Picture_008(ContentTag[2]); @@ -815,8 +856,8 @@ namespace UniMarc if (pubDate.Length < 3) { - MessageBox.Show("260c가 인식되지않습니다."); - return "false"; + MessageBox.Show($"260c 값이 없거나 올바르지 않습니다\n\n값:{pubDate}"); + return null; } else if (pubDate.Length < 5) Result = "s" + pubDate + " "; @@ -844,8 +885,8 @@ namespace UniMarc if (res == "") { - MessageBox.Show("260a가 인식되지않습니다."); - return "false"; + MessageBox.Show($"260c 값이 없거나 올바르지 않습니다\n\n값:{ContentTag}"); + return null; } else if (res.Length < 3) Result = res + " "; @@ -984,7 +1025,7 @@ namespace UniMarc //} #endregion - + @@ -1015,6 +1056,11 @@ namespace UniMarc } } + void UpdateTextColor() + { + st.Color_change("▼", richTextBox1); + st.Color_change("▲", richTextBox1); + } private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) @@ -1030,8 +1076,7 @@ namespace UniMarc { case 0: // 칸채우기 -> 메모장 InputMemo(SplitLine); - st.Color_change("▼", richTextBox1); - st.Color_change("▲", richTextBox1); + UpdateTextColor(); break; case 1: // 메모장 -> 칸채우기 // 칸을 채우기 전에 텍스트박스와 그리드뷰를 비움. @@ -2979,11 +3024,12 @@ namespace UniMarc } lbl_ISBN.Text = newisbn; + lbl_ISBN.Tag = newisbn; // 1. RichTextBox (마크 편집) 동기화 if (!string.IsNullOrEmpty(oldIsbn)) { - richTextBox1.Text = richTextBox1.Text.Replace(oldIsbn, newisbn); + richTextBox1.Text = richTextBox1.Text.Replace("▼a" + oldIsbn, "▼a" + newisbn); } // 2. GridView020 (칸채우기) 동기화 @@ -2998,6 +3044,9 @@ namespace UniMarc // 3. 이미지 업데이트 ShowImage(newisbn); + + // 4. 텍스트 색상 업데이트 + UpdateTextColor(); } private void pictureBox1_Click(object sender, EventArgs e) @@ -3009,7 +3058,7 @@ namespace UniMarc return; } - var zp = new Zoom_Picture(url,lbl_ISBN.Text.Trim()); + var zp = new Zoom_Picture(url, lbl_ISBN.Text.Trim()); zp.Show(); } } diff --git a/unimarc/unimarc/마크/fMarc_Editor.Designer.cs b/unimarc/unimarc/마크/fMarc_Editor.Designer.cs index 0945e9d..e8800df 100644 --- a/unimarc/unimarc/마크/fMarc_Editor.Designer.cs +++ b/unimarc/unimarc/마크/fMarc_Editor.Designer.cs @@ -34,6 +34,7 @@ namespace UniMarc this.etc1 = new System.Windows.Forms.RichTextBox(); this.etc2 = new System.Windows.Forms.RichTextBox(); this.panel6 = new System.Windows.Forms.Panel(); + this.btn_FillBlank = new System.Windows.Forms.Button(); this.radD = new System.Windows.Forms.RadioButton(); this.radC = new System.Windows.Forms.RadioButton(); this.radB = new System.Windows.Forms.RadioButton(); @@ -43,7 +44,6 @@ namespace UniMarc this.btNext = new System.Windows.Forms.Button(); this.btPrev = new System.Windows.Forms.Button(); this.btn_Save = new System.Windows.Forms.Button(); - this.btn_FillBlank = new System.Windows.Forms.Button(); this.panel5.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel6.SuspendLayout(); @@ -114,6 +114,16 @@ namespace UniMarc this.panel6.Size = new System.Drawing.Size(266, 308); this.panel6.TabIndex = 1; // + // btn_FillBlank + // + this.btn_FillBlank.Location = new System.Drawing.Point(11, 178); + this.btn_FillBlank.Name = "btn_FillBlank"; + this.btn_FillBlank.Size = new System.Drawing.Size(243, 46); + this.btn_FillBlank.TabIndex = 329; + this.btn_FillBlank.Text = "미소장 마크 코리스\r\n칸채우기"; + this.btn_FillBlank.UseVisualStyleBackColor = true; + this.btn_FillBlank.Click += new System.EventHandler(this.btn_FillBlank_Click); + // // radD // this.radD.AutoSize = true; @@ -175,7 +185,7 @@ namespace UniMarc // lbl_SaveData // this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_SaveData.ForeColor = System.Drawing.Color.PaleTurquoise; + this.lbl_SaveData.ForeColor = System.Drawing.Color.Black; this.lbl_SaveData.Location = new System.Drawing.Point(9, 45); this.lbl_SaveData.Multiline = true; this.lbl_SaveData.Name = "lbl_SaveData"; @@ -213,16 +223,6 @@ namespace UniMarc this.btn_Save.UseVisualStyleBackColor = true; this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); // - // btn_FillBlank - // - this.btn_FillBlank.Location = new System.Drawing.Point(11, 178); - this.btn_FillBlank.Name = "btn_FillBlank"; - this.btn_FillBlank.Size = new System.Drawing.Size(243, 46); - this.btn_FillBlank.TabIndex = 329; - this.btn_FillBlank.Text = "미소장 마크 코리스\r\n칸채우기"; - this.btn_FillBlank.UseVisualStyleBackColor = true; - this.btn_FillBlank.Click += new System.EventHandler(this.btn_FillBlank_Click); - // // fMarc_Editor // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/unimarc/마크/fMarc_Editor.cs b/unimarc/unimarc/마크/fMarc_Editor.cs index ed2b8fc..f9653cc 100644 --- a/unimarc/unimarc/마크/fMarc_Editor.cs +++ b/unimarc/unimarc/마크/fMarc_Editor.cs @@ -32,7 +32,7 @@ namespace UniMarc SaveTarget Target; - public fMarc_Editor(string isbn, string marcstring, SaveTarget _target,string etc1, string etc2,int grade) + public fMarc_Editor(string isbn, string marcstring, SaveTarget _target, string etc1, string etc2, int grade) { InitializeComponent(); db.DBcon(); @@ -41,9 +41,10 @@ namespace UniMarc //update grade radio button if (grade == 0) radA.Checked = true; - else if(grade == 1) radB.Checked = true; - else if(grade == 2) radC.Checked = true; - else if(grade == 3) radD.Checked = true; + else if (grade == 1) radB.Checked = true; + else if (grade == 2) radC.Checked = true; + else if (grade == 3) radD.Checked = true; + else radC.Checked = true; Target = _target; marcEditorControl1 = new MarcEditorControl(); @@ -169,7 +170,7 @@ namespace UniMarc string tag008Value = marcEditorControl1.text008.Text; - var v_grade = ""; + var v_grade = "2"; if (radA.Checked) v_grade = "0"; else if (radB.Checked) v_grade = "1"; else if (radC.Checked) v_grade = "2"; @@ -236,7 +237,7 @@ namespace UniMarc string cmd = db.More_Update(Table, Update_Col, Update_data, Search_Col, Search_data); var rlt = Helper_DB.ExcuteNonQuery(cmd); - if(rlt.applyCount == 1) + if (rlt.applyCount == 1) { // Notify Parent BookUpdated?.Invoke(this, new BookUpdatedEventArgs @@ -256,10 +257,11 @@ namespace UniMarc UTIL.MsgI($"저장되었습니다!\nDatabase = {this.Target}"); } - else if(rlt.applyCount == 0){ + else if (rlt.applyCount == 0) + { UTIL.MsgE($"저장된 자료가 없습니다\nIDX:{Search_data[0]}\n\n개발자 문의 하세요"); } - else if(rlt.applyCount > 1) + else if (rlt.applyCount > 1) { UTIL.MsgE($"복수({rlt.applyCount})의 자료가 업데이트 되었습니다\nIDX:{Search_data[0]}\n\n개발자 문의 하세요"); }