diff --git a/unimarc/unimarc/UC_SelectGrade.Designer.cs b/unimarc/unimarc/UC_SelectGrade.Designer.cs
new file mode 100644
index 0000000..b5cda7a
--- /dev/null
+++ b/unimarc/unimarc/UC_SelectGrade.Designer.cs
@@ -0,0 +1,136 @@
+namespace UniMarc
+{
+ partial class UC_SelectGrade
+ {
+ ///
+ /// 필수 디자이너 변수입니다.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// 사용 중인 모든 리소스를 정리합니다.
+ ///
+ /// 관리되는 리소스를 삭제해야 하면 true이고, 그렇지 않으면 false입니다.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region 구성 요소 디자이너에서 생성한 코드
+
+ ///
+ /// 디자이너 지원에 필요한 메서드입니다.
+ /// 이 메서드의 내용을 코드 편집기로 수정하지 마세요.
+ ///
+ private void InitializeComponent()
+ {
+ 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.radE = new System.Windows.Forms.RadioButton();
+ this.SuspendLayout();
+ //
+ // radD
+ //
+ this.radD.AutoSize = true;
+ this.radD.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.radD.Location = new System.Drawing.Point(147, 4);
+ this.radD.Name = "radD";
+ this.radD.Size = new System.Drawing.Size(34, 20);
+ this.radD.TabIndex = 328;
+ this.radD.TabStop = true;
+ this.radD.Text = "D";
+ this.radD.UseVisualStyleBackColor = true;
+ //
+ // radC
+ //
+ this.radC.AutoSize = true;
+ this.radC.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.radC.Location = new System.Drawing.Point(112, 4);
+ this.radC.Name = "radC";
+ this.radC.Size = new System.Drawing.Size(33, 20);
+ this.radC.TabIndex = 327;
+ 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", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.radB.Location = new System.Drawing.Point(77, 4);
+ this.radB.Name = "radB";
+ this.radB.Size = new System.Drawing.Size(33, 20);
+ this.radB.TabIndex = 326;
+ 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", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.radA.Location = new System.Drawing.Point(40, 4);
+ this.radA.Name = "radA";
+ this.radA.Size = new System.Drawing.Size(35, 20);
+ this.radA.TabIndex = 325;
+ 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(7, 8);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(31, 12);
+ this.label6.TabIndex = 324;
+ this.label6.Text = "등급";
+ //
+ // radE
+ //
+ this.radE.AutoSize = true;
+ this.radE.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.radE.Location = new System.Drawing.Point(183, 4);
+ this.radE.Name = "radE";
+ this.radE.Size = new System.Drawing.Size(32, 20);
+ this.radE.TabIndex = 329;
+ this.radE.TabStop = true;
+ this.radE.Text = "E";
+ this.radE.UseVisualStyleBackColor = true;
+ //
+ // UC_SelectGrade
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
+ this.Controls.Add(this.radE);
+ this.Controls.Add(this.radD);
+ this.Controls.Add(this.radC);
+ this.Controls.Add(this.radB);
+ this.Controls.Add(this.radA);
+ this.Controls.Add(this.label6);
+ this.Name = "UC_SelectGrade";
+ this.Size = new System.Drawing.Size(221, 29);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ 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.RadioButton radE;
+ }
+}
diff --git a/unimarc/unimarc/UC_SelectGrade.cs b/unimarc/unimarc/UC_SelectGrade.cs
new file mode 100644
index 0000000..dfdd076
--- /dev/null
+++ b/unimarc/unimarc/UC_SelectGrade.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace UniMarc
+{
+ public partial class UC_SelectGrade : UserControl
+ {
+ public UC_SelectGrade()
+ {
+ InitializeComponent();
+ }
+
+ public string GradeName
+ {
+ get
+ {
+ if(Grade == 0) return "A";
+ else if (Grade == 1) return "B";
+ else if (Grade == 2) return "C";
+ else if (Grade == 3) return "D";
+ else if (Grade == 4) return "E";
+ else return "";
+ }
+ set
+ {
+ if (value == "A") Grade = 0;
+ else if (value == "B") Grade = 1;
+ else if (value == "C") Grade = 2;
+ else if (value == "D") Grade = 3;
+ else if (value == "E") Grade = 4;
+ else Grade = -1;
+ }
+ }
+ public int Grade
+ {
+ get
+ {
+ if (radA.Checked) return 0;
+ else if (radB.Checked) return 1;
+ else if (radC.Checked) return 2;
+ else if (radD.Checked) return 3;
+ else if (radE.Checked) return 4;
+ else return -1;
+ }
+ set
+ {
+ if (value == -1)
+ {
+ radA.Checked = false;
+ radB.Checked = false;
+ radC.Checked = false;
+ radD.Checked = false;
+ radE.Checked = false;
+ }
+ else if (value == 0) radA.Checked = true;
+ else if (value == 1) radB.Checked = true;
+ else if (value == 2) radC.Checked = true;
+ else if (value == 3) radD.Checked = true;
+ else if (value == 4) radE.Checked = true;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/unimarc/unimarc/UC_SelectGrade.resx b/unimarc/unimarc/UC_SelectGrade.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/unimarc/unimarc/UC_SelectGrade.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj
index b626042..54cd7a2 100644
--- a/unimarc/unimarc/UniMarc.csproj
+++ b/unimarc/unimarc/UniMarc.csproj
@@ -270,6 +270,12 @@
+
+ UserControl
+
+
+ UC_SelectGrade.cs
+
Form
@@ -1105,6 +1111,9 @@
fSelectDT.cs
+
+ UC_SelectGrade.cs
+
fDevDB.cs
diff --git a/unimarc/unimarc/납품관리/Commodity_Search.Designer.cs b/unimarc/unimarc/납품관리/Commodity_Search.Designer.cs
index 2f42e3d..c5a41ef 100644
--- a/unimarc/unimarc/납품관리/Commodity_Search.Designer.cs
+++ b/unimarc/unimarc/납품관리/Commodity_Search.Designer.cs
@@ -71,7 +71,7 @@
this.dataGridView1.RowHeadersWidth = 20;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.dataGridView1.Size = new System.Drawing.Size(563, 242);
+ this.dataGridView1.Size = new System.Drawing.Size(984, 661);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
@@ -126,9 +126,10 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(563, 242);
+ this.ClientSize = new System.Drawing.Size(984, 661);
this.Controls.Add(this.dataGridView1);
this.Name = "Commodity_Search";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Commodity_Sub";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Commodity_Search_FormClosed);
this.Load += new System.EventHandler(this.Commodity_Sub_Load);
diff --git a/unimarc/unimarc/납품관리/Commodity_Search.cs b/unimarc/unimarc/납품관리/Commodity_Search.cs
index a8c8e5a..d9f1805 100644
--- a/unimarc/unimarc/납품관리/Commodity_Search.cs
+++ b/unimarc/unimarc/납품관리/Commodity_Search.cs
@@ -1,4 +1,5 @@
-using System;
+using AR;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -107,7 +108,13 @@ namespace UniMarc
}
private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
{
- string value = dataGridView1.Rows[e.RowIndex].Cells[0].Value.ToString();
+ if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
+ string value = dataGridView1.Rows[e.RowIndex].Cells[0].Value?.ToString() ?? string.Empty;
+ if(value.isEmpty())
+ {
+ UTIL.MsgE("값이 없습니다.\n잠시 후 다시 시도하세요");
+ return;
+ }
Set_data(value, e.RowIndex);
@@ -176,7 +183,7 @@ namespace UniMarc
if (com != null) { com.tb_clt1.Text = value; }
if (pur != null) { pur.tb_clt.Text = value; }
if (la != null) { la.tb_clt.Text = value; la.btn_lookup_Click(null, null); }
- if (si != null) { si.tb_clt.Text = value; si.lbl_tel.Text = dataGridView1.Rows[idx].Cells[2].Value.ToString(); }
+ if (si != null) { si.tb_clt.Text = value; si.lbl_tel.Text = dataGridView1.Rows[idx].Cells[2].Value?.ToString() ?? string.Empty; }
if (sb != null) { sb.tb_clt.Text = value; sb.btn_Lookup_Click(null, null); }
if (sip != null) { sip.tb_clt.Text = value; }
if (ll != null) { ll.tb_clt.Text = value; }
@@ -184,17 +191,17 @@ namespace UniMarc
dc.tb_SearchClient.Text = value;
dc.lbl_Client.Text = value;
dc.lbl_ID.Text = dataGridView1.Rows[idx].Cells["DLS_ID"].Value.ToString();
- dc.lbl_PW.Text = dataGridView1.Rows[idx].Cells["DLS_PW"].Value.ToString();
- dc.lbl_Area.Text = dataGridView1.Rows[idx].Cells["DLS_Area"].Value.ToString();
+ dc.lbl_PW.Text = dataGridView1.Rows[idx].Cells["DLS_PW"].Value?.ToString() ?? string.Empty;
+ dc.lbl_Area.Text = dataGridView1.Rows[idx].Cells["DLS_Area"].Value?.ToString() ?? string.Empty;
dc.btn_Connect.PerformClick();
//dc.SetArea(dataGridView1.Rows[idx].Cells["DLS_Area"].Value.ToString(), true);
}
if (sl != null) {
sl.tb_SearchClient.Text = value;
sl.lbl_Client.Text = value;
- sl.lbl_ID.Text = dataGridView1.Rows[idx].Cells["DLS_ID"].Value.ToString();
- sl.lbl_PW.Text = dataGridView1.Rows[idx].Cells["DLS_PW"].Value.ToString();
- sl.lbl_Area.Text = dataGridView1.Rows[idx].Cells["DLS_Area"].Value.ToString();
+ sl.lbl_ID.Text = dataGridView1.Rows[idx].Cells["DLS_ID"].Value?.ToString() ?? string.Empty;
+ sl.lbl_PW.Text = dataGridView1.Rows[idx].Cells["DLS_PW"].Value?.ToString() ?? string.Empty;
+ sl.lbl_Area.Text = dataGridView1.Rows[idx].Cells["DLS_Area"].Value?.ToString() ?? string.Empty;
sl.SetArea(dataGridView1.Rows[idx].Cells["DLS_Area"].Value.ToString(), true);
}
}
diff --git a/unimarc/unimarc/마크/AddMarc2.Designer.cs b/unimarc/unimarc/마크/AddMarc2.Designer.cs
index 33593b7..10172fd 100644
--- a/unimarc/unimarc/마크/AddMarc2.Designer.cs
+++ b/unimarc/unimarc/마크/AddMarc2.Designer.cs
@@ -48,13 +48,9 @@ namespace UniMarc
this.label1 = new System.Windows.Forms.Label();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.button1 = 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();
- this.radA = new System.Windows.Forms.RadioButton();
- this.label6 = new System.Windows.Forms.Label();
this.lbl_SaveData = new System.Windows.Forms.TextBox();
this.marcEditorControl1 = new UniMarc.MarcEditorControl();
+ this.uC_SelectGrade1 = new UniMarc.UC_SelectGrade();
this.panel2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel5.SuspendLayout();
@@ -202,15 +198,11 @@ namespace UniMarc
//
// panel6
//
+ this.panel6.Controls.Add(this.uC_SelectGrade1);
this.panel6.Controls.Add(this.btSave);
this.panel6.Controls.Add(this.panel1);
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.btSaveNew);
this.panel6.Controls.Add(this.lbl_SaveData);
this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
@@ -287,64 +279,6 @@ namespace UniMarc
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
- // radD
- //
- 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(211, 121);
- 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;
- //
- // radC
- //
- 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(164, 121);
- 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(117, 121);
- 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(70, 121);
- 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(29, 131);
- this.label6.Name = "label6";
- 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)));
@@ -365,6 +299,15 @@ namespace UniMarc
this.marcEditorControl1.Size = new System.Drawing.Size(1029, 939);
this.marcEditorControl1.TabIndex = 394;
//
+ // uC_SelectGrade1
+ //
+ this.uC_SelectGrade1.Grade = -1;
+ this.uC_SelectGrade1.GradeName = "";
+ this.uC_SelectGrade1.Location = new System.Drawing.Point(11, 121);
+ this.uC_SelectGrade1.Name = "uC_SelectGrade1";
+ this.uC_SelectGrade1.Size = new System.Drawing.Size(245, 29);
+ this.uC_SelectGrade1.TabIndex = 412;
+ //
// AddMarc2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -405,11 +348,6 @@ namespace UniMarc
public System.Windows.Forms.RichTextBox rtEtc2;
private System.Windows.Forms.Panel panel6;
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;
@@ -418,5 +356,6 @@ namespace UniMarc
private System.Windows.Forms.Label lbl_Midx;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btSave;
+ private UC_SelectGrade uC_SelectGrade1;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/AddMarc2.cs b/unimarc/unimarc/마크/AddMarc2.cs
index 92b0a84..46ec26b 100644
--- a/unimarc/unimarc/마크/AddMarc2.cs
+++ b/unimarc/unimarc/마크/AddMarc2.cs
@@ -37,7 +37,7 @@ namespace UniMarc
this.KeyPreview = true;
- this.radD.Checked = true; //등급기본
+ uC_SelectGrade1.GradeName = "D";
}
@@ -101,12 +101,16 @@ namespace UniMarc
//가져온 등급으로 변경해준다.
- if (selected.Grade == "0") radA.Checked = true;
- else if (selected.Grade == "1") radB.Checked = true;
- else if (selected.Grade == "2") radC.Checked = true;
- else if (selected.Grade == "3") radD.Checked = true;
+ //if (selected.Grade == "0") radA.Checked = true;
+ //else if (selected.Grade == "1") radB.Checked = true;
+ //else if (selected.Grade == "2") radC.Checked = true;
+ //else if (selected.Grade == "3") radD.Checked = true;
+ if (int.TryParse(selected.Grade, out int vgrade))
+ uC_SelectGrade1.Grade = vgrade;
+ else
+ uC_SelectGrade1.Grade = -1;
- rtEtc1.Text = selected.remark1;
+ rtEtc1.Text = selected.remark1;
rtEtc2.Text = selected.remark2;
}
}
@@ -396,11 +400,12 @@ namespace UniMarc
string midx = this.lbl_Midx.Tag?.ToString() ?? string.Empty;
if (isUpdate == false) midx = string.Empty;
- 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";
+ var v_grade = uC_SelectGrade1.Grade == -1 ? string.Empty : uC_SelectGrade1.Grade.ToString();
+
+ //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";
//midx 값이 emptry 라면 insert , 아니라면 update
UpdateMarc(midx, fullMarc, v_grade);
diff --git a/unimarc/unimarc/마크/DLS_Copy.Designer.cs b/unimarc/unimarc/마크/DLS_Copy.Designer.cs
index 8e3c423..6e4529a 100644
--- a/unimarc/unimarc/마크/DLS_Copy.Designer.cs
+++ b/unimarc/unimarc/마크/DLS_Copy.Designer.cs
@@ -52,6 +52,7 @@
this.btn_Search = new System.Windows.Forms.Button();
this.rBtn_BookName = new System.Windows.Forms.RadioButton();
this.panel2 = new System.Windows.Forms.Panel();
+ this.btn_Close = new System.Windows.Forms.Button();
this.btn_SiteDenote = new System.Windows.Forms.Button();
this.btn_Connect = new System.Windows.Forms.Button();
this.lbl_PW = new System.Windows.Forms.Label();
@@ -61,7 +62,6 @@
this.tb_SearchClient = new System.Windows.Forms.TextBox();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.lblStatus = new System.Windows.Forms.ToolStripLabel();
- this.btn_Close = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
@@ -92,7 +92,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(640, 699);
+ this.panel1.Size = new System.Drawing.Size(649, 699);
this.panel1.TabIndex = 1;
//
// panel8
@@ -101,7 +101,7 @@
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(0, 103);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(638, 594);
+ this.panel8.Size = new System.Drawing.Size(647, 594);
this.panel8.TabIndex = 5;
//
// dv1
@@ -119,7 +119,7 @@
this.dv1.Name = "dv1";
this.dv1.RowHeadersWidth = 31;
this.dv1.RowTemplate.Height = 23;
- this.dv1.Size = new System.Drawing.Size(638, 594);
+ this.dv1.Size = new System.Drawing.Size(647, 594);
this.dv1.TabIndex = 0;
this.dv1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
this.dv1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
@@ -164,7 +164,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
this.panel5.Location = new System.Drawing.Point(0, 68);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(638, 35);
+ this.panel5.Size = new System.Drawing.Size(647, 35);
this.panel5.TabIndex = 4;
//
// btn_ResultEmpty
@@ -209,8 +209,7 @@
//
// btn_ApplyFilter
//
- this.btn_ApplyFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btn_ApplyFilter.Location = new System.Drawing.Point(258, 4);
+ this.btn_ApplyFilter.Location = new System.Drawing.Point(259, 4);
this.btn_ApplyFilter.Name = "btn_ApplyFilter";
this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24);
this.btn_ApplyFilter.TabIndex = 5;
@@ -232,7 +231,7 @@
this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
this.panel3.Location = new System.Drawing.Point(0, 33);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(638, 35);
+ this.panel3.Size = new System.Drawing.Size(647, 35);
this.panel3.TabIndex = 4;
//
// label3
@@ -254,11 +253,10 @@
//
// chkShowBrowser
//
- this.chkShowBrowser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkShowBrowser.AutoSize = true;
this.chkShowBrowser.Checked = true;
this.chkShowBrowser.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkShowBrowser.Location = new System.Drawing.Point(354, 9);
+ this.chkShowBrowser.Location = new System.Drawing.Point(355, 9);
this.chkShowBrowser.Name = "chkShowBrowser";
this.chkShowBrowser.Size = new System.Drawing.Size(96, 16);
this.chkShowBrowser.TabIndex = 209;
@@ -331,13 +329,22 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(638, 33);
+ this.panel2.Size = new System.Drawing.Size(647, 33);
this.panel2.TabIndex = 3;
//
+ // btn_Close
+ //
+ this.btn_Close.Location = new System.Drawing.Point(559, 4);
+ this.btn_Close.Name = "btn_Close";
+ this.btn_Close.Size = new System.Drawing.Size(75, 24);
+ this.btn_Close.TabIndex = 7;
+ this.btn_Close.Text = "닫 기";
+ this.btn_Close.UseVisualStyleBackColor = true;
+ this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
+ //
// btn_SiteDenote
//
- this.btn_SiteDenote.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btn_SiteDenote.Location = new System.Drawing.Point(479, 5);
+ this.btn_SiteDenote.Location = new System.Drawing.Point(480, 5);
this.btn_SiteDenote.Name = "btn_SiteDenote";
this.btn_SiteDenote.Size = new System.Drawing.Size(77, 23);
this.btn_SiteDenote.TabIndex = 6;
@@ -347,8 +354,7 @@
//
// btn_Connect
//
- this.btn_Connect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btn_Connect.Location = new System.Drawing.Point(406, 5);
+ this.btn_Connect.Location = new System.Drawing.Point(407, 5);
this.btn_Connect.Name = "btn_Connect";
this.btn_Connect.Size = new System.Drawing.Size(70, 23);
this.btn_Connect.TabIndex = 5;
@@ -394,12 +400,10 @@
//
// tb_SearchClient
//
- this.tb_SearchClient.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.tb_SearchClient.ImeMode = System.Windows.Forms.ImeMode.Hangul;
- this.tb_SearchClient.Location = new System.Drawing.Point(76, 6);
+ this.tb_SearchClient.Location = new System.Drawing.Point(90, 6);
this.tb_SearchClient.Name = "tb_SearchClient";
- this.tb_SearchClient.Size = new System.Drawing.Size(326, 21);
+ this.tb_SearchClient.Size = new System.Drawing.Size(312, 21);
this.tb_SearchClient.TabIndex = 1;
this.tb_SearchClient.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchClient_KeyDown);
//
@@ -410,7 +414,7 @@
this.lblStatus});
this.statusStrip1.Location = new System.Drawing.Point(0, 699);
this.statusStrip1.Name = "statusStrip1";
- this.statusStrip1.Size = new System.Drawing.Size(640, 22);
+ this.statusStrip1.Size = new System.Drawing.Size(649, 22);
this.statusStrip1.TabIndex = 3;
this.statusStrip1.Text = "statusStrip1";
//
@@ -421,21 +425,11 @@
this.lblStatus.Text = "WD";
this.lblStatus.Click += new System.EventHandler(this.lblStatus_Click);
//
- // btn_Close
- //
- this.btn_Close.Location = new System.Drawing.Point(559, 4);
- this.btn_Close.Name = "btn_Close";
- this.btn_Close.Size = new System.Drawing.Size(75, 24);
- this.btn_Close.TabIndex = 7;
- this.btn_Close.Text = "닫 기";
- this.btn_Close.UseVisualStyleBackColor = true;
- this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
- //
// DLS_Copy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(640, 721);
+ this.ClientSize = new System.Drawing.Size(649, 721);
this.Controls.Add(this.panel1);
this.Controls.Add(this.statusStrip1);
this.Name = "DLS_Copy";
diff --git a/unimarc/unimarc/마크/DLS_Copy.cs b/unimarc/unimarc/마크/DLS_Copy.cs
index 47b8f2b..71a7221 100644
--- a/unimarc/unimarc/마크/DLS_Copy.cs
+++ b/unimarc/unimarc/마크/DLS_Copy.cs
@@ -157,6 +157,7 @@ namespace UniMarc
private void ClientSearch()
{
Commodity_Search cs = new Commodity_Search(this);
+ cs.StartPosition = FormStartPosition.CenterScreen;
cs.Clinet_name = tb_SearchClient.Text;
cs.Show();
}
diff --git a/unimarc/unimarc/마크/DLS_Copy.resx b/unimarc/unimarc/마크/DLS_Copy.resx
index 2e0b4d2..7a575ec 100644
--- a/unimarc/unimarc/마크/DLS_Copy.resx
+++ b/unimarc/unimarc/마크/DLS_Copy.resx
@@ -129,18 +129,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
17, 17
diff --git a/unimarc/unimarc/마크/DLS_Lookup.cs b/unimarc/unimarc/마크/DLS_Lookup.cs
index ecd62a0..cd12659 100644
--- a/unimarc/unimarc/마크/DLS_Lookup.cs
+++ b/unimarc/unimarc/마크/DLS_Lookup.cs
@@ -153,7 +153,21 @@ namespace UniMarc
}
if (move)
- webBrowser1.Navigate(webBrowser1.Document.GetElementById(Code[idx]).GetAttribute("value"));
+ {
+ var areacode = Code[idx];
+ if(webBrowser1.Document == null)
+ {
+ UTIL.MsgE("웹브라우저가 준비되지 않아 URL을 이동할 수 없습니다");
+ }
+ else
+ {
+ var elm = webBrowser1.Document.GetElementById(areacode);
+ var val = elm.GetAttribute("value");
+ webBrowser1.Navigate(val);
+ }
+
+ }
+
return Code[idx];
}
diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs
index e9f5844..e54e93e 100644
--- a/unimarc/unimarc/마크/Marc2.cs
+++ b/unimarc/unimarc/마크/Marc2.cs
@@ -3,6 +3,7 @@ using arCtl.TinyListview;
using System;
using System.Collections.Generic;
using System.ComponentModel;
+using System.Data;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.IO;
@@ -14,7 +15,6 @@ using System.Web.UI;
using System.Web.UI.WebControls.WebParts;
using System.Windows.Forms;
using UniMarc.ListOfValue;
-using static UniMarc.MarcEditorControl;
namespace UniMarc
{
@@ -90,10 +90,10 @@ namespace UniMarc
input_list(pItem);
}
- (string remark1, string remark2) ReadRemark(int row)
+ (string remark1, string remark2) ReadRemark(string marcidx)
{
string[] sear_tbl = { "idx" };
- string[] sear_col = { List_Book.Rows[row].Cells["marc_idx"].Value.ToString() };
+ string[] sear_col = { marcidx };// List_Book.Rows[row].Cells["marc_idx"].Value.ToString() };
string cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`비고1`, `비고2`");
string res = db.DB_Send_CMD_Search(cmd);
@@ -140,7 +140,8 @@ namespace UniMarc
}
- string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`";
+ string Area = "`idx`, `isbn_marc`, `header`, `num`, `book_name`, `author`, `book_comp`, `count`, `pay`, `image_url`, `m_idx`" +
+ ",search_book_name,search_author,search_book_comp,search_description,search_url";
string[] sear_tbl = { "l_idx", "compidx" };
string[] sear_col = { item.idx, PUB.user.CompanyIdx };
@@ -154,8 +155,8 @@ namespace UniMarc
"FROM {1} " +
"WHERE `{2}` = \"{4}\" AND `{3}` = \"{5}\"" +
"ORDER BY `idx` ASC;", Area, "Obj_List_Book", sear_tbl[0], sear_tbl[1], sear_col[0], sear_col[1]);
- string db_res = db.DB_Send_CMD_Search(cmd);
- string[] db_data = db_res.Split('|');
+ var db_res = Helper_DB.ExecuteDataTable(cmd);// db.DB_Send_CMD_Search(cmd);
+ //string[] db_data = db_res.Split('|');
string[] grid = {
"", "", "", "", "",
"", "", "", "", "",
@@ -164,19 +165,26 @@ namespace UniMarc
mLoadCompleted = false;
dataList = new SortableBindingList();
- for (int a = 0; a < db_data.Length - 1; a += 11)
+ foreach (DataRow dr in db_res.Rows)// (int a = 0; a < db_data.Length - 1; a += 11)
{
MarcBookItem bitem = new MarcBookItem();
- bitem.ListIdx = db_data[a]; // 0: idx
- bitem.ISBN13 = db_data[a + 1]; // 1: isbn
- bitem.Num = db_data[a + 2] + db_data[a + 3]; // 2: header + num
- bitem.BookName = db_data[a + 4]; // 3: book_num
- bitem.Author = db_data[a + 5]; // 4: author
- bitem.BookComp = db_data[a + 6]; // 5: book_comp
- bitem.Count = db_data[a + 7]; // 6: count
- bitem.Pay = db_data[a + 8]; // 7: pay
- bitem.Url = db_data[a + 9]; // 8: image_url
- bitem.MarcIdx = db_data[a + 10]; // 9: m_idx
+ bitem.ListIdx = dr["idx"]?.ToString() ?? string.Empty; // db_data[a]; // 0: idx
+ bitem.ISBN13 = dr["isbn_marc"]?.ToString() ?? string.Empty; // db_data[a + 1]; // 1: isbn
+ bitem.Num = (dr["header"]?.ToString() ?? string.Empty) +( dr["num"]?.ToString() ?? string.Empty);
+ //; //db_data[a + 2] + db_data[a + 3]; // 2: header + num
+ bitem.BookName = dr["book_name"]?.ToString() ?? string.Empty; // db_data[a + 4]; // 3: book_num
+ bitem.Author = dr["author"]?.ToString() ?? string.Empty; // db_data[a + 5]; // 4: author
+ bitem.BookComp = dr["book_comp"]?.ToString() ?? string.Empty; //db_data[a + 6]; // 5: book_comp
+ bitem.Count = dr["count"]?.ToString() ?? string.Empty; // db_data[a + 7]; // 6: count
+ bitem.Pay = dr["pay"]?.ToString() ?? string.Empty; //db_data[a + 8]; // 7: pay
+ bitem.Url = dr["image_url"]?.ToString() ?? string.Empty; //db_data[a + 9]; // 8: image_url
+ bitem.MarcIdx = dr["m_idx"]?.ToString() ?? string.Empty; //db_data[a + 10]; // 9: m_idx
+
+ bitem.search_book_name = dr["search_book_name"]?.ToString() ?? string.Empty; //db_data[a + 11]; // 9: m_idx
+ bitem.search_author = dr["search_author"]?.ToString() ?? string.Empty; //db_data[a + 12]; // 9: m_idx
+ bitem.search_book_comp = dr["search_book_comp"]?.ToString() ?? string.Empty; //db_data[a + 13]; // 9: m_idx
+ bitem.search_description = dr["search_description"]?.ToString() ?? string.Empty; // db_data[a + 14]; // 9: m_idx
+ bitem.search_url = dr["search_url"]?.ToString() ?? string.Empty; //db_data[a + 15]; // 9: m_idx
dataList.Add(bitem);
}
@@ -324,6 +332,7 @@ namespace UniMarc
private void List_Book_SelectionChanged(object sender, EventArgs e)
{
if (!mLoadCompleted) return;
+
if (List_Book.CurrentCell == null) return;
int row_idx = List_Book.CurrentCell.RowIndex;
int col_idx = List_Book.CurrentCell.ColumnIndex;
@@ -335,95 +344,10 @@ namespace UniMarc
}
if (row_idx == -1 || col_idx == -1) { return; }
- SaveRowIdx = row_idx;
-
- mOldMarc = List_Book.Rows[row_idx].Cells["db_marc"].Value?.ToString() ?? string.Empty;
- string isbn = List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString();
- if (isbn != "")
- {
- string CountQuery = string.Format("SELECT Count(isbn) FROM Marc WHERE isbn = {0} GROUP BY isbn;", isbn);
- string CountResult = db.self_Made_Cmd(CountQuery).Replace("|", "");
-
- if (CountResult == "")
- btn_CopySelect.Text = "0";
-
- if (CountResult == "0")
- {
- btn_CopySelect.Enabled = false;
- btn_CopySelect.BackColor = Color.Silver;
- }
- else
- {
- btn_CopySelect.Enabled = true;
- btn_CopySelect.BackColor = Color.Khaki;
- }
-
- btn_CopySelect.Text = CountResult;
- }
if (check_V(row_idx, col_idx))
return;
- string isbn13 = List_Book.Rows[row_idx].Cells["ISBN13"].Value?.ToString() ?? "";
- string bookName = List_Book.Rows[row_idx].Cells["book_name"].Value?.ToString() ?? "";
- string author = List_Book.Rows[row_idx].Cells["author"].Value?.ToString() ?? "";
- string publisher = List_Book.Rows[row_idx].Cells["book_comp"].Value?.ToString() ?? "";
- string price = List_Book.Rows[row_idx].Cells["pay"].Value?.ToString() ?? "";
- string url = List_Book.Rows[row_idx].Cells["url"].Value?.ToString() ?? ""; // or image_url?
- string marcIdx = List_Book.Rows[row_idx].Cells["marc_idx"].Value?.ToString() ?? "";
- string dbMarc = List_Book.Rows[row_idx].Cells["db_marc"].Value?.ToString() ?? "";
- string grade = List_Book.Rows[row_idx].Cells["grade"].Value?.ToString() ?? "";
- string user = List_Book.Rows[row_idx].Cells["user"].Value?.ToString() ?? "";
- string saveDate = List_Book.Rows[row_idx].Cells["SaveDate"].Value?.ToString() ?? "";
- string listIdx = List_Book.Rows[row_idx].Cells["list_idx"].Value?.ToString() ?? ""; // verify this column name in input_list
- this.lbListIdx.Text = $"Row:{SaveRowIdx},List:{listIdx}";
- var remark = ReadRemark(row_idx);
- this.Param = new MacEditorParameter
- {
- ISBN13 = isbn13,
- URL = url,
- ListIdx = listIdx,
- MarcIdx = marcIdx,
- SaveDate = saveDate,
- User = user,
- BookName = bookName,
- Author = author,
- Publisher = publisher,
- Price = price,
- OriginalMarc = dbMarc,
- };
- var defMarc = PUB.MakeEmptyMarc(isbn13, bookName, author, publisher, price);
- marcEditorControl1.LoadBookData(dbMarc, isbn13, defMarc);
-
- //등급선택 (dbMarc 데이터를 확인하여. 등급을 결정한다)
- int gradeNo;
- bool check_Marc = dbMarc.Length >= 3;
- if (!check_Marc)
- {
- //richTextBox1.Text = Make_Empty();
- gradeNo = 3; //마크가 없는것은 D등급으로 한다
- }
- else
- {
- etc1.Text = remark.remark1;
- etc2.Text = remark.remark2;
-
- //자료의 등급 다시 선택
- if (int.TryParse(grade, out gradeNo) == false)
- gradeNo = 2;
- }
-
- if (gradeNo == 0)
- radA.Checked = true;
- else if (gradeNo == 1)
- radB.Checked = true;
- else if (gradeNo == 3)
- radD.Checked = true;
- else
- radC.Checked = true;
-
- lbl_SaveData.Text = $"[{user}] [{saveDate}]";
-
}
@@ -550,7 +474,9 @@ namespace UniMarc
var currentitem = this.bs1.Current as MarcBookItem;
if (currentitem != null && currentitem == dr)
{
- List_Book_SelectionChanged(null, null);
+ //List_Book_SelectionChanged(null, null);
+ bs1_CurrentChanged(null, null);
+ //bs1.ResetBindings(false);
}
}
}
@@ -821,18 +747,22 @@ namespace UniMarc
switch (key)
{
case Keys.F9:
- radA.Checked = true;// cb_grade.SelectedIndex = 0;// = "A (F9)";
+ uC_SelectGrade1.GradeName = "A";
+ //radA.Checked = true;// cb_grade.SelectedIndex = 0;// = "A (F9)";
break;
case Keys.F10:
- radB.Checked = true;// cb_grade.SelectedIndex = 1;// = "B (F10)";
+ uC_SelectGrade1.GradeName = "B";
+ //radB.Checked = true;// cb_grade.SelectedIndex = 1;// = "B (F10)";
//Btn_Save_Click(null, null);
break;
case Keys.F11:
- radC.Checked = true;// cb_grade.SelectedIndex = 2;// = "C (F11)";
+ uC_SelectGrade1.GradeName = "C";
+ //radC.Checked = true;// cb_grade.SelectedIndex = 2;// = "C (F11)";
//Btn_Save_Click(null, null);
break;
case Keys.F12:
- radD.Checked = true;// cb_grade.SelectedIndex = 3;//.SelectedItem = "D (F12)";
+ uC_SelectGrade1.GradeName = "D";
+ //radD.Checked = true;// cb_grade.SelectedIndex = 3;//.SelectedItem = "D (F12)";
//Btn_Save_Click(null, null);
break;
}
@@ -965,11 +895,13 @@ 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";
+
+ // cb_grade.SelectedIndex.ToString(); // 등급은 0~3의 숫자로 저장된다고 가정
+ var v_grade = uC_SelectGrade1.Grade == -1 ? "" : uC_SelectGrade1.Grade.ToString();
+ //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();
@@ -1007,6 +939,7 @@ namespace UniMarc
// 2. 객체 데이터 업데이트 및 시각적 상태 계산
item.Status = MarcRecordStatus.MyCompany;
item.BackColor = GetSaveDateColor(date);
+ item.Grade = v_grade; //등급업데이트추가
// 3. 목록 인덱스 연동 업데이트 (Obj_List_Book)
string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND `compidx` ={2};", item.MarcIdx, item.ListIdx, mCompidx);
@@ -1096,5 +1029,123 @@ namespace UniMarc
rt.AppendText("[" + DateTime.Now.ToString("yy-MM-dd") + "]");
}
}
+
+ private void bs1_CurrentChanged(object sender, EventArgs e)
+ {
+ if (!mLoadCompleted) return;
+ var dr = bs1.Current as MarcBookItem;
+ if (dr == null) return;
+
+ //if (List_Book.CurrentCell == null) return;
+ //int row_idx = List_Book.CurrentCell.RowIndex;
+ //int col_idx = List_Book.CurrentCell.ColumnIndex;
+
+ //if (List_Book.SelectedCells.Count > 0)
+ //{
+ // row_idx = List_Book.SelectedCells[0].RowIndex;
+ // col_idx = List_Book.SelectedCells[0].ColumnIndex;
+ //}
+
+ //if (row_idx == -1 || col_idx == -1) { return; }
+ //SaveRowIdx = row_idx;
+
+ mOldMarc = dr.DbMarc;// List_Book.Rows[row_idx].Cells["db_marc"].Value?.ToString() ?? string.Empty;
+ string isbn = dr.ISBN13;// List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString();
+ if (isbn != "")
+ {
+ string CountQuery = string.Format("SELECT Count(isbn) FROM Marc WHERE isbn = {0} GROUP BY isbn;", isbn);
+ string CountResult = db.self_Made_Cmd(CountQuery).Replace("|", "");
+
+ if (CountResult == "")
+ btn_CopySelect.Text = "0";
+
+ if (CountResult == "0")
+ {
+ btn_CopySelect.Enabled = false;
+ btn_CopySelect.BackColor = Color.Silver;
+ }
+ else
+ {
+ btn_CopySelect.Enabled = true;
+ btn_CopySelect.BackColor = Color.Khaki;
+ }
+
+ btn_CopySelect.Text = CountResult;
+ }
+
+
+
+ string isbn13 = dr.ISBN13;// List_Book.Rows[row_idx].Cells["ISBN13"].Value?.ToString() ?? "";
+ string bookName = dr.BookName;// List_Book.Rows[row_idx].Cells["book_name"].Value?.ToString() ?? "";
+ string author = dr.Author;// List_Book.Rows[row_idx].Cells["author"].Value?.ToString() ?? "";
+ string publisher = dr.BookComp;// List_Book.Rows[row_idx].Cells["book_comp"].Value?.ToString() ?? "";
+ string price = dr.Pay;// List_Book.Rows[row_idx].Cells["pay"].Value?.ToString() ?? "";
+ string url = dr.Url;// List_Book.Rows[row_idx].Cells["url"].Value?.ToString() ?? ""; // or image_url?
+ string marcIdx = dr.MarcIdx;// List_Book.Rows[row_idx].Cells["marc_idx"].Value?.ToString() ?? "";
+ string dbMarc = dr.DbMarc;// List_Book.Rows[row_idx].Cells["db_marc"].Value?.ToString() ?? "";
+ string grade = dr.Grade;// List_Book.Rows[row_idx].Cells["grade"].Value?.ToString() ?? "";
+ string user = dr.User;// List_Book.Rows[row_idx].Cells["user"].Value?.ToString() ?? "";
+ string saveDate = dr.SaveDate;// List_Book.Rows[row_idx].Cells["SaveDate"].Value?.ToString() ?? "";
+ string listIdx = dr.ListIdx;// List_Book.Rows[row_idx].Cells["list_idx"].Value?.ToString() ?? ""; // verify this column name in input_list
+ this.lbListIdx.Text = $"Row:{SaveRowIdx},List:{listIdx}";
+ var remark = ReadRemark(dr.MarcIdx);
+ this.Param = new MacEditorParameter
+ {
+ ISBN13 = isbn13,
+ URL = url,
+ ListIdx = listIdx,
+ MarcIdx = marcIdx,
+ SaveDate = saveDate,
+ User = user,
+ BookName = bookName,
+ Author = author,
+ Publisher = publisher,
+ Price = price,
+ OriginalMarc = dbMarc,
+ };
+ var defMarc = PUB.MakeEmptyMarc(isbn13, bookName, author, publisher, price);
+ marcEditorControl1.LoadBookData(dbMarc, isbn13, defMarc);
+
+ //등급선택 (dbMarc 데이터를 확인하여. 등급을 결정한다)
+ int gradeNo;
+ bool check_Marc = dbMarc.Length >= 3;
+ if (!check_Marc)
+ {
+ //richTextBox1.Text = Make_Empty();
+ gradeNo = 3; //마크가 없는것은 D등급으로 한다
+ }
+ else
+ {
+ etc1.Text = remark.remark1;
+ etc2.Text = remark.remark2;
+
+ //자료의 등급 다시 선택
+ if (int.TryParse(grade, out gradeNo) == false)
+ gradeNo = 2;
+ }
+
+ uC_SelectGrade1.Grade = gradeNo;
+
+ lbl_SaveData.Text = $"[{user}] [{saveDate}]\n{dr.search_book_name}\n{dr.search_author}\n{dr.search_book_comp}\n{dr.search_description}";
+ if (dr.search_url.isEmpty())
+ {
+ linkLabel1.Enabled = false;
+ linkLabel1.Text = "ISBN 검색 URL이 존재하지않습니다.";
+ linkLabel1.Tag = null;
+ }
+ else
+ {
+ linkLabel1.Text = dr.search_url;
+ linkLabel1.Tag = dr.search_url;
+ linkLabel1.Enabled = true;
+ }
+ }
+
+ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ if (linkLabel1.Tag == null) return;
+ var ulr = linkLabel1.Tag.ToString();
+ System.Diagnostics.Process.Start(ulr);
+ }
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc2.designer.cs b/unimarc/unimarc/마크/Marc2.designer.cs
index 58e2bb7..3297dcb 100644
--- a/unimarc/unimarc/마크/Marc2.designer.cs
+++ b/unimarc/unimarc/마크/Marc2.designer.cs
@@ -39,10 +39,10 @@
System.Windows.Forms.Label label25;
System.Windows.Forms.Label label26;
System.Windows.Forms.Label label27;
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc2));
this.List_Book = new System.Windows.Forms.DataGridView();
this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -79,15 +79,10 @@
this.lbl_BookDate = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button();
this.bn1 = new System.Windows.Forms.BindingNavigator(this.components);
- this.bs1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
- 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.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
- this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.lbListIdx = new System.Windows.Forms.ToolStripLabel();
@@ -102,14 +97,16 @@
this.btPrev = new System.Windows.Forms.Button();
this.btNext = new System.Windows.Forms.Button();
this.button3 = 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();
- this.radA = new System.Windows.Forms.RadioButton();
this.lbl_SaveData = new System.Windows.Forms.TextBox();
this.btn_Save = new System.Windows.Forms.Button();
- this.label6 = new System.Windows.Forms.Label();
this.marcEditorControl1 = new UniMarc.MarcEditorControl();
+ this.bs1 = new System.Windows.Forms.BindingSource(this.components);
+ this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
+ this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
+ this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
+ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
+ this.uC_SelectGrade1 = new UniMarc.UC_SelectGrade();
+ this.linkLabel1 = new System.Windows.Forms.LinkLabel();
label31 = new System.Windows.Forms.Label();
label30 = new System.Windows.Forms.Label();
label33 = new System.Windows.Forms.Label();
@@ -126,11 +123,11 @@
this.panel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bn1)).BeginInit();
this.bn1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit();
this.panel5.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel6.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.bs1)).BeginInit();
this.SuspendLayout();
//
// label31
@@ -210,14 +207,14 @@
this.List_Book.AllowUserToDeleteRows = false;
this.List_Book.BackgroundColor = System.Drawing.Color.SkyBlue;
this.List_Book.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle29.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
this.List_Book.ColumnHeadersHeight = 29;
this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.list_idx,
@@ -241,14 +238,14 @@
this.List_Book.MultiSelect = false;
this.List_Book.Name = "List_Book";
this.List_Book.ReadOnly = true;
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.ControlDark;
+ dataGridViewCellStyle32.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle32;
this.List_Book.RowHeadersWidth = 51;
this.List_Book.RowTemplate.Height = 23;
this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
@@ -374,8 +371,8 @@
// colCheck
//
this.colCheck.DataPropertyName = "ColCheck";
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- this.colCheck.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ this.colCheck.DefaultCellStyle = dataGridViewCellStyle30;
this.colCheck.HeaderText = "V";
this.colCheck.MinimumWidth = 6;
this.colCheck.Name = "colCheck";
@@ -406,9 +403,9 @@
// grade
//
this.grade.DataPropertyName = "Grade";
- dataGridViewCellStyle3.Format = "N0";
- dataGridViewCellStyle3.NullValue = null;
- this.grade.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle31.Format = "N0";
+ dataGridViewCellStyle31.NullValue = null;
+ this.grade.DefaultCellStyle = dataGridViewCellStyle31;
this.grade.HeaderText = "등급";
this.grade.MinimumWidth = 6;
this.grade.Name = "grade";
@@ -656,24 +653,6 @@
this.bindingNavigatorCountItem.Text = "/{0}";
this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
//
- // 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";
@@ -694,24 +673,6 @@
this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
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 = "마지막으로 이동";
- //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -781,15 +742,12 @@
//
// panel6
//
+ this.panel6.Controls.Add(this.linkLabel1);
+ this.panel6.Controls.Add(this.uC_SelectGrade1);
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.btn_Save);
- this.panel6.Controls.Add(this.label6);
this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
this.panel6.Location = new System.Drawing.Point(0, 0);
this.panel6.Name = "panel6";
@@ -869,63 +827,15 @@
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
- // radD
- //
- 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(196, 46);
- this.radD.Name = "radD";
- this.radD.Size = new System.Drawing.Size(42, 27);
- this.radD.TabIndex = 323;
- this.radD.TabStop = true;
- this.radD.Text = "D";
- this.radD.UseVisualStyleBackColor = true;
- //
- // radC
- //
- 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(149, 46);
- this.radC.Name = "radC";
- this.radC.Size = new System.Drawing.Size(41, 27);
- this.radC.TabIndex = 322;
- 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(102, 46);
- this.radB.Name = "radB";
- this.radB.Size = new System.Drawing.Size(41, 27);
- this.radB.TabIndex = 321;
- 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(55, 46);
- this.radA.Name = "radA";
- this.radA.Size = new System.Drawing.Size(41, 27);
- this.radA.TabIndex = 320;
- this.radA.TabStop = true;
- this.radA.Text = "A";
- this.radA.UseVisualStyleBackColor = true;
- //
// lbl_SaveData
//
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.Font = new System.Drawing.Font("굴림체", 11F, 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(13, 78);
this.lbl_SaveData.Multiline = true;
this.lbl_SaveData.Name = "lbl_SaveData";
- this.lbl_SaveData.Size = new System.Drawing.Size(241, 131);
+ this.lbl_SaveData.Size = new System.Drawing.Size(241, 114);
this.lbl_SaveData.TabIndex = 319;
this.lbl_SaveData.Text = "[] []";
//
@@ -939,16 +849,6 @@
this.btn_Save.UseVisualStyleBackColor = true;
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
//
- // 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(14, 56);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(31, 12);
- this.label6.TabIndex = 223;
- this.label6.Text = "등급";
- //
// marcEditorControl1
//
this.marcEditorControl1.BackColor = System.Drawing.Color.Gray;
@@ -959,6 +859,67 @@
this.marcEditorControl1.Size = new System.Drawing.Size(1030, 658);
this.marcEditorControl1.TabIndex = 0;
//
+ // bs1
+ //
+ this.bs1.CurrentChanged += new System.EventHandler(this.bs1_CurrentChanged);
+ //
+ // 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 = "이전으로 이동";
+ //
+ // 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 = "마지막으로 이동";
+ //
+ // uC_SelectGrade1
+ //
+ this.uC_SelectGrade1.BackColor = System.Drawing.Color.White;
+ this.uC_SelectGrade1.Grade = -1;
+ this.uC_SelectGrade1.GradeName = "";
+ this.uC_SelectGrade1.Location = new System.Drawing.Point(13, 45);
+ this.uC_SelectGrade1.Name = "uC_SelectGrade1";
+ this.uC_SelectGrade1.Size = new System.Drawing.Size(241, 28);
+ this.uC_SelectGrade1.TabIndex = 407;
+ //
+ // linkLabel1
+ //
+ this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.linkLabel1.Location = new System.Drawing.Point(0, 201);
+ this.linkLabel1.Name = "linkLabel1";
+ this.linkLabel1.Size = new System.Drawing.Size(266, 14);
+ this.linkLabel1.TabIndex = 408;
+ this.linkLabel1.TabStop = true;
+ this.linkLabel1.Text = "search url";
+ this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+ //
// Marc2
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -982,12 +943,12 @@
((System.ComponentModel.ISupportInitialize)(this.bn1)).EndInit();
this.bn1.ResumeLayout(false);
this.bn1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit();
this.panel5.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.panel6.ResumeLayout(false);
this.panel6.PerformLayout();
this.tableLayoutPanel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.bs1)).EndInit();
this.ResumeLayout(false);
}
@@ -1055,13 +1016,10 @@
private System.Windows.Forms.Button btPrev;
private System.Windows.Forms.Button btn_Save;
private System.Windows.Forms.Button btn_FillBlank;
- private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox lbl_SaveData;
- private System.Windows.Forms.RadioButton radA;
- 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;
+ private UC_SelectGrade uC_SelectGrade1;
+ private System.Windows.Forms.LinkLabel linkLabel1;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc2.resx b/unimarc/unimarc/마크/Marc2.resx
index dcdca78..ad9d5c3 100644
--- a/unimarc/unimarc/마크/Marc2.resx
+++ b/unimarc/unimarc/마크/Marc2.resx
@@ -195,6 +195,9 @@
218, 13
+
+ 218, 13
+
108, 13
diff --git a/unimarc/unimarc/마크/MarcBookItem.cs b/unimarc/unimarc/마크/MarcBookItem.cs
index 2831db5..b4a4d28 100644
--- a/unimarc/unimarc/마크/MarcBookItem.cs
+++ b/unimarc/unimarc/마크/MarcBookItem.cs
@@ -44,6 +44,12 @@ namespace UniMarc
public string User { get; set; }
public string SaveDate { get; set; }
+ public string search_book_name { get; set; }
+ public string search_author { get; set; }
+ public string search_book_comp { get; set; }
+ public string search_description { get; set; }
+ public string search_url { get; set; }
+
public System.Drawing.Color ForeColor { get; set; } = System.Drawing.Color.Black;
public System.Drawing.Color BackColor { get; set; } = System.Drawing.Color.White;
diff --git a/unimarc/unimarc/마크/Marc_CopyForm.cs b/unimarc/unimarc/마크/Marc_CopyForm.cs
index 4ed9ae7..84a728a 100644
--- a/unimarc/unimarc/마크/Marc_CopyForm.cs
+++ b/unimarc/unimarc/마크/Marc_CopyForm.cs
@@ -23,12 +23,8 @@ namespace UniMarc
public RichTextBox etc2;
private Panel panel6;
private Button button3;
- private RadioButton radD;
- private RadioButton radC;
- private RadioButton radB;
- private RadioButton radA;
private Button btn_Save;
- private Label label6;
+ private UC_SelectGrade uC_SelectGrade1;
string base_midx = "";
public Marc_CopyForm(string marcstring, string m_idx = "0")
@@ -53,7 +49,7 @@ namespace UniMarc
var BookName = tags.Length > 0 ? tags[0] : "";
this.Text = $"마크 복제 - {BookName}";
- this.radC.Checked = true;
+ this.uC_SelectGrade1.GradeName = "C";
this.etc1.Text = string.Empty;
this.etc2.Text = string.Empty;
}
@@ -67,12 +63,8 @@ namespace UniMarc
this.etc2 = new System.Windows.Forms.RichTextBox();
this.panel6 = new System.Windows.Forms.Panel();
this.button3 = 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();
- this.radA = new System.Windows.Forms.RadioButton();
this.btn_Save = new System.Windows.Forms.Button();
- this.label6 = new System.Windows.Forms.Label();
+ this.uC_SelectGrade1 = new UniMarc.UC_SelectGrade();
this.panel5.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel6.SuspendLayout();
@@ -138,13 +130,9 @@ namespace UniMarc
//
// panel6
//
+ this.panel6.Controls.Add(this.uC_SelectGrade1);
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.btn_Save);
- this.panel6.Controls.Add(this.label6);
this.panel6.Dock = System.Windows.Forms.DockStyle.Top;
this.panel6.Location = new System.Drawing.Point(0, 0);
this.panel6.Name = "panel6";
@@ -161,54 +149,6 @@ namespace UniMarc
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
- // radD
- //
- 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(196, 46);
- this.radD.Name = "radD";
- this.radD.Size = new System.Drawing.Size(42, 27);
- this.radD.TabIndex = 323;
- this.radD.TabStop = true;
- this.radD.Text = "D";
- this.radD.UseVisualStyleBackColor = true;
- //
- // radC
- //
- 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(149, 46);
- this.radC.Name = "radC";
- this.radC.Size = new System.Drawing.Size(41, 27);
- this.radC.TabIndex = 322;
- 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(102, 46);
- this.radB.Name = "radB";
- this.radB.Size = new System.Drawing.Size(41, 27);
- this.radB.TabIndex = 321;
- 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(55, 46);
- this.radA.Name = "radA";
- this.radA.Size = new System.Drawing.Size(41, 27);
- this.radA.TabIndex = 320;
- this.radA.TabStop = true;
- this.radA.Text = "A";
- this.radA.UseVisualStyleBackColor = true;
- //
// btn_Save
//
this.btn_Save.Location = new System.Drawing.Point(11, 6);
@@ -219,15 +159,15 @@ namespace UniMarc
this.btn_Save.UseVisualStyleBackColor = true;
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
//
- // label6
+ // uC_SelectGrade1
//
- 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(14, 56);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(31, 12);
- this.label6.TabIndex = 223;
- this.label6.Text = "등급";
+ this.uC_SelectGrade1.BackColor = System.Drawing.Color.White;
+ this.uC_SelectGrade1.Grade = -1;
+ this.uC_SelectGrade1.GradeName = "";
+ this.uC_SelectGrade1.Location = new System.Drawing.Point(11, 47);
+ this.uC_SelectGrade1.Name = "uC_SelectGrade1";
+ this.uC_SelectGrade1.Size = new System.Drawing.Size(243, 29);
+ this.uC_SelectGrade1.TabIndex = 406;
//
// Marc_CopyForm
//
@@ -240,7 +180,6 @@ namespace UniMarc
this.panel5.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.panel6.ResumeLayout(false);
- this.panel6.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -286,11 +225,11 @@ namespace UniMarc
}
//등급추가
- string v_grade = "2";
- 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";
+ string v_grade = uC_SelectGrade1.Grade == -1 ? "2" : uC_SelectGrade1.Grade.ToString();
+ //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_remark1 = this.etc1.Text.Trim();
var v_remark2 = this.etc2.Text.Trim();
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs
index ff7df54..84e3cce 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.Designer.cs
@@ -54,10 +54,8 @@ namespace UniMarc
this.btn_OpenFile = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.bn1 = new System.Windows.Forms.BindingNavigator(this.components);
- this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bs1 = new System.Windows.Forms.BindingSource(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
- this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
@@ -212,7 +210,7 @@ namespace UniMarc
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.dataGridView1.Size = new System.Drawing.Size(805, 299);
+ this.dataGridView1.Size = new System.Drawing.Size(902, 500);
this.dataGridView1.TabIndex = 2;
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
@@ -272,7 +270,7 @@ namespace UniMarc
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(805, 33);
+ this.panel2.Size = new System.Drawing.Size(902, 33);
this.panel2.TabIndex = 3;
//
// btn_Morge
@@ -301,15 +299,15 @@ namespace UniMarc
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 33);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(805, 299);
+ this.panel3.Size = new System.Drawing.Size(902, 500);
this.panel3.TabIndex = 4;
//
// bn1
//
- this.bn1.AddNewItem = this.bindingNavigatorAddNewItem;
+ this.bn1.AddNewItem = null;
this.bn1.BindingSource = this.bs1;
this.bn1.CountItem = this.bindingNavigatorCountItem;
- this.bn1.DeleteItem = this.bindingNavigatorDeleteItem;
+ this.bn1.DeleteItem = null;
this.bn1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bn1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bindingNavigatorMoveFirstItem,
@@ -320,29 +318,18 @@ namespace UniMarc
this.bindingNavigatorSeparator1,
this.bindingNavigatorMoveNextItem,
this.bindingNavigatorMoveLastItem,
- this.bindingNavigatorSeparator2,
- this.bindingNavigatorAddNewItem,
- this.bindingNavigatorDeleteItem});
- this.bn1.Location = new System.Drawing.Point(0, 332);
+ this.bindingNavigatorSeparator2});
+ this.bn1.Location = new System.Drawing.Point(0, 533);
this.bn1.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn1.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn1.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn1.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn1.Name = "bn1";
this.bn1.PositionItem = this.bindingNavigatorPositionItem;
- this.bn1.Size = new System.Drawing.Size(805, 25);
+ this.bn1.Size = new System.Drawing.Size(902, 25);
this.bn1.TabIndex = 327;
this.bn1.Text = "bindingNavigator1";
//
- // bindingNavigatorAddNewItem
- //
- this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
- this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
- this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorAddNewItem.Text = "새로 추가";
- //
// bindingNavigatorCountItem
//
this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -350,15 +337,6 @@ namespace UniMarc
this.bindingNavigatorCountItem.Text = "/{0}";
this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수";
//
- // bindingNavigatorDeleteItem
- //
- this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
- this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
- this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
- this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22);
- this.bindingNavigatorDeleteItem.Text = "삭제";
- //
// bindingNavigatorMoveFirstItem
//
this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
@@ -424,7 +402,7 @@ namespace UniMarc
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(805, 357);
+ this.ClientSize = new System.Drawing.Size(902, 558);
this.Controls.Add(this.panel3);
this.Controls.Add(this.bn1);
this.Controls.Add(this.panel2);
@@ -472,10 +450,8 @@ namespace UniMarc
private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
private System.Windows.Forms.Button btn_OpenFile;
private System.Windows.Forms.BindingNavigator bn1;
- private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
private System.Windows.Forms.BindingSource bs1;
private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
- private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx
index 83cb40e..399b69e 100644
--- a/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx
+++ b/unimarc/unimarc/마크/Marc_Plan_Sub_SelectList.resx
@@ -135,34 +135,10 @@
17, 17
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAAVdJREFUOE/Nz0tLAmEUBmB3kWRoCUVEISFUJGb1OywiKrDsIpZdkJAkDUvDQkij
- UKSbVIvatKhNi9oERRAGEQXhjJdp7Hd83/eGs2jhLGQ20QtndTgP71Gp/m0KZ1XInlTjM6XG+4EG5fuK
- yaTUIN8bIMUQ0gmtcuBtX/MLPMT0yoHnuA6kuA4iruI20lAZ+DiswWuyFum4Dk+7dbiP6kHEFVDBg+tQ
- My4DLbjwG3DqbcORxygHXxJakGIQRFwDEf0gwjKI4AYtzIHmHaA5Oxg/CsYPIb7YIQced+qluvTLCyIs
- gRYWQPNO0NwkWNYGxg+DcYNgGSu2Z0xy4C7SiJtwE66kuq049xlAs2Ng/AiS7nbszXci6jIh4jQjPGWR
- A+U59hiluowbQMzVVfmgPKU/GdcPxlmx5TArB6KzJunf0gTtPcqBzeluhCYsCIz3wm/rUw78WX4AJCPY
- nlwVm9EAAAAASUVORK5CYII=
-
-
92, 17
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAAWtJREFUOE+1kE0ow2Ecx/9X5a2UiwtKOSCTmJBMhuQlMo3IvCUHDouEXHZwIOVC
- DrhIDiQl5USy07zNa2tKf2laaRf84/J8xBCetab4XL/f76fn+SnKX4DrGLqrwbHDzywkWJlHdJYjLEbY
- Wg8q4eYKlma+d1hbgF4TotWIaC+FuYmAktcXCksx2HrknBOHX1KbiTDngrXhW0kMdSBM2TA5Io+/wuI0
- oiz5TcRwB7hPYazfLx3rDz7+gCsXNBb4v1SdgajTQ19TaOMP2NtFmPSIilSo0v1y7FHBnAdZMWi6aO51
- kVCTGZoEzzWYciA/Dl9bBZwfvh3XmxIJy7PBJdx5odnAQ2E87qJUfPbtzwGjVpxJEWjH+4ElPD/BYBsY
- EjhKicW3sSoVb0vSUFsq0W6upUxhdxMtOxZnYhhqVz1oj3JJUZSdpCg0p0POmLKhJofjNqaDeikX3tFG
- uuHsQM65cML4ABzY5fA/eQGKIwMcVjm2bAAAAABJRU5ErkJggg==
-
-
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
diff --git a/unimarc/unimarc/마크/Search_Infor2.Designer.cs b/unimarc/unimarc/마크/Search_Infor2.Designer.cs
index 6126be5..6191435 100644
--- a/unimarc/unimarc/마크/Search_Infor2.Designer.cs
+++ b/unimarc/unimarc/마크/Search_Infor2.Designer.cs
@@ -29,7 +29,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Search_Infor2));
this.label1 = new System.Windows.Forms.Label();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
@@ -118,14 +118,14 @@
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
- dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle5.Font = new System.Drawing.Font("굴림", 9F, 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.False;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+ 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.False;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.idx,
diff --git a/unimarc/unimarc/마크/Search_Infor2.resx b/unimarc/unimarc/마크/Search_Infor2.resx
index 1ef9209..3e8cf3f 100644
--- a/unimarc/unimarc/마크/Search_Infor2.resx
+++ b/unimarc/unimarc/마크/Search_Infor2.resx
@@ -165,9 +165,6 @@
17, 17
-
- 17, 17
-
171, 17
@@ -175,7 +172,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+
+ vQAADr0BR/uQrQAAATFJREFUOE9jYBg0oHDW8/9NC57/z5z4+D+6HAyEtz/AKceQO/PZ/1VH3v/HpSi+
+8H/4IZrWOXAIGPK0/8L933Aqii+5+H/pfv///evvoAhBwcJPU/+T9vyHkNRRPt9sObMWf//e5WewG1A
ZNej/72rP6AoCm29B9bcuu7/f//Ov/9d8g/gNiCw+eH/uvnv4IqCW+7+X7T3//+Odf//Z8z5+d+u7ud/
+4ztuA3wqLr/P3/aGxRFdsW3/6fP+f3fv+vbf53Cd/8tEtbjNsC+9O7/7MmvMRTpp5z/b1L04r9K1qf/
@@ -186,7 +183,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33
+ vQAADr0BR/uQrQAAALtJREFUOE9jYBgyILz9wX90MaJBfPeD/8EN18gzIL7n4f+l+///96++QLoBEe33
wZozZ/3/71V6gjQDQlvvgTW3rvv/37/z73+X/APEGxDccvf/or3//3es+/8/Y87P/3Z1P//bZ2wn3gAQ
sCu+/T99zu///l3f/usUvvtvkbCeNANAQD/l/H+Tohf/VbI+/TeOXEa6ASBgkHTiv2za1/+6wfPIMwAE
9FMv/9fwnUa+ASCg4jGBMgMGLwAA0BRgmCws/7cAAAAASUVORK5CYII=
@@ -195,7 +192,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5
+ vQAADr0BR/uQrQAAAKRJREFUOE9jYBh0oHDW8//oYiSB3JnP/id03yPfkIwpT//P2//7f0LXHfIMSeh5
8n/2vl//O7f+/e9Wepl0QyK7Hv2fsu3X/5Klf/8nTP/73yb3LGmGBDY//N+69j1Ys3HJl//S0df+G0cu
I94Qj6r7/0vmvoNrVnTpIV4zCNiX3v0f2PKMPM0gYJF3579NwRXyNIOAYdZt8jWDgE7aDfI1D00AAKB+
X6Bjq5qXAAAAAElFTkSuQmCC
@@ -204,7 +201,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vgAADr4B6kKxwAAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe
+ vQAADr0BR/uQrQAAAStJREFUOE9jYBhUoHDW8//oYjAAkmta8Px/5sTHONUw5M589j+h+x5WBSC5VUfe
/w9vf4BVHgwypjz9P2//7/8JXXcwFIHkFu778D+44RqGHBwk9Dz5P3vfr/+dW//+dyu9jKIQJDdty/v/
/tUXcBsQ2fXo/5Rtv/6XLP37P2H63/82uWfhikFyvas//PcqPYHbgMDmh/9b174HazYu+fJfOvraf+PI
ZWANILm6+e/+u+QfwG2AR9X9/yVz38E1K7r0wBWD5PKnvflvn7EdtwH2pXf/B7Y8w9AMk8ue/Pq/RcJ6
diff --git a/unimarc/unimarc/마크/fMarc_Editor.Designer.cs b/unimarc/unimarc/마크/fMarc_Editor.Designer.cs
index f2a29be..c465ea5 100644
--- a/unimarc/unimarc/마크/fMarc_Editor.Designer.cs
+++ b/unimarc/unimarc/마크/fMarc_Editor.Designer.cs
@@ -35,15 +35,11 @@ namespace UniMarc
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();
- this.radA = new System.Windows.Forms.RadioButton();
- this.label6 = new System.Windows.Forms.Label();
this.lbl_SaveData = new System.Windows.Forms.TextBox();
this.btNext = new System.Windows.Forms.Button();
this.btPrev = new System.Windows.Forms.Button();
this.btn_Save = new System.Windows.Forms.Button();
+ this.uC_SelectGrade1 = new UniMarc.UC_SelectGrade();
this.panel5.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel6.SuspendLayout();
@@ -100,12 +96,8 @@ namespace UniMarc
//
// panel6
//
+ this.panel6.Controls.Add(this.uC_SelectGrade1);
this.panel6.Controls.Add(this.btn_FillBlank);
- 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.lbl_SaveData);
this.panel6.Controls.Add(this.btNext);
this.panel6.Controls.Add(this.btPrev);
@@ -126,64 +118,6 @@ namespace UniMarc
this.btn_FillBlank.UseVisualStyleBackColor = true;
this.btn_FillBlank.Click += new System.EventHandler(this.btn_FillBlank_Click);
//
- // radD
- //
- 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, 12);
- this.radD.Name = "radD";
- this.radD.Size = new System.Drawing.Size(42, 27);
- this.radD.TabIndex = 328;
- this.radD.TabStop = true;
- this.radD.Text = "D";
- this.radD.UseVisualStyleBackColor = true;
- //
- // radC
- //
- 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, 12);
- this.radC.Name = "radC";
- this.radC.Size = new System.Drawing.Size(41, 27);
- this.radC.TabIndex = 327;
- 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, 12);
- this.radB.Name = "radB";
- this.radB.Size = new System.Drawing.Size(41, 27);
- this.radB.TabIndex = 326;
- 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, 12);
- this.radA.Name = "radA";
- this.radA.Size = new System.Drawing.Size(41, 27);
- this.radA.TabIndex = 325;
- 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(28, 22);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(31, 12);
- this.label6.TabIndex = 324;
- 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)));
@@ -225,6 +159,16 @@ namespace UniMarc
this.btn_Save.UseVisualStyleBackColor = true;
this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
//
+ // uC_SelectGrade1
+ //
+ this.uC_SelectGrade1.BackColor = System.Drawing.Color.White;
+ this.uC_SelectGrade1.Grade = -1;
+ this.uC_SelectGrade1.GradeName = "";
+ this.uC_SelectGrade1.Location = new System.Drawing.Point(11, 10);
+ this.uC_SelectGrade1.Name = "uC_SelectGrade1";
+ this.uC_SelectGrade1.Size = new System.Drawing.Size(243, 29);
+ this.uC_SelectGrade1.TabIndex = 330;
+ //
// fMarc_Editor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -253,11 +197,7 @@ namespace UniMarc
private System.Windows.Forms.Button btNext;
private System.Windows.Forms.Button btPrev;
private System.Windows.Forms.Button btn_Save;
- 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 btn_FillBlank;
+ private UC_SelectGrade uC_SelectGrade1;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/fMarc_Editor.cs b/unimarc/unimarc/마크/fMarc_Editor.cs
index bdc7ae3..4a65b3f 100644
--- a/unimarc/unimarc/마크/fMarc_Editor.cs
+++ b/unimarc/unimarc/마크/fMarc_Editor.cs
@@ -39,12 +39,12 @@ namespace UniMarc
this.etc1.Text = etc1;
this.etc2.Text = etc2;
- //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 radC.Checked = true;
+ this.uC_SelectGrade1.Grade = grade;
+ //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 radC.Checked = true;
Target = _target;
marcEditorControl1 = new MarcEditorControl();
@@ -171,11 +171,11 @@ namespace UniMarc
string tag008Value = marcEditorControl1.text008.Text;
- var v_grade = "2";
- 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_grade = uC_SelectGrade1.Grade == -1 ? "2" : uC_SelectGrade1.Grade.ToString() ;
+ //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";
// Extract tags for metadata
string[] Search_Tag = {