diff --git a/.gitignore b/.gitignore index 8e1f540..6e9db0b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ Test_Project/ Test_HTML/ AuthorSymbol/ TestGrid/ -Split_Marc/ \ No newline at end of file +Split_Marc/ +Test_Update/ \ No newline at end of file diff --git a/Test_Project/.vs/Test_Project/v16/.suo b/Test_Project/.vs/Test_Project/v16/.suo index 1dba323..dc6e040 100644 Binary files a/Test_Project/.vs/Test_Project/v16/.suo and b/Test_Project/.vs/Test_Project/v16/.suo differ diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 64a1038..c05af93 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index b7c1c77..25fdcea 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 08f70aa..b93c42f 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index 6c3f376..495964e 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index 1e4c7e5..f5e894a 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index e977fcf..cdf7079 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index b7c1c77..25fdcea 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index 08f70aa..b93c42f 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 6c3f376..495964e 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs b/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs index 68349f4..3e9eebd 100644 --- a/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Stat_Stat.Designer.cs @@ -460,19 +460,19 @@ namespace UniMarc.마크 // // button4 // - this.button4.Location = new System.Drawing.Point(811, 6); + this.button4.Location = new System.Drawing.Point(806, 4); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(70, 23); + this.button4.Size = new System.Drawing.Size(75, 23); this.button4.TabIndex = 1; - this.button4.Text = "닫 기"; + this.button4.Text = "닫 기"; this.button4.UseVisualStyleBackColor = true; this.button4.Click += new System.EventHandler(this.button3_Click); // // button1 // - this.button1.Location = new System.Drawing.Point(735, 6); + this.button1.Location = new System.Drawing.Point(725, 4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(70, 23); + this.button1.Size = new System.Drawing.Size(75, 23); this.button1.TabIndex = 1; this.button1.Text = "조 회"; this.button1.UseVisualStyleBackColor = true; diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index 5594a2c..d9db81c 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -28,10 +28,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle 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(); this.NameLabel = new System.Windows.Forms.Label(); this.tb_sangho = new System.Windows.Forms.TextBox(); this.tb_addr = new System.Windows.Forms.TextBox(); @@ -101,18 +101,18 @@ this.btn_marc_expand = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); this.marcGrid = new System.Windows.Forms.DataGridView(); - this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.marcLabel = new System.Windows.Forms.Label(); this.gearLabel = new System.Windows.Forms.Label(); this.gearGrid = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tb_marcEmpty = new System.Windows.Forms.Button(); this.tb_gearEmpty = new System.Windows.Forms.Button(); this.tb_marcSave = new System.Windows.Forms.Button(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).BeginInit(); @@ -295,14 +295,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.True; - 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.True; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -330,14 +330,14 @@ this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.ControlDark; - dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.ControlDark; + 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.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.RowHeadersWidth = 21; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; @@ -761,14 +761,16 @@ // // marcGrid // - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.marcGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + this.marcGrid.AllowUserToAddRows = false; + this.marcGrid.AllowUserToDeleteRows = false; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.marcGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.marcGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.marcGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Column1, @@ -776,26 +778,12 @@ this.Column3}); this.marcGrid.Location = new System.Drawing.Point(987, 36); this.marcGrid.Name = "marcGrid"; - this.marcGrid.RowHeadersWidth = 21; + this.marcGrid.RowHeadersWidth = 31; this.marcGrid.RowTemplate.Height = 23; - this.marcGrid.Size = new System.Drawing.Size(442, 350); + this.marcGrid.Size = new System.Drawing.Size(601, 350); this.marcGrid.TabIndex = 48; - // - // Column1 - // - this.Column1.HeaderText = "분류"; - this.Column1.Name = "Column1"; - // - // Column2 - // - this.Column2.HeaderText = "내용"; - this.Column2.Name = "Column2"; - this.Column2.Width = 200; - // - // Column3 - // - this.Column3.HeaderText = "작성자"; - this.Column3.Name = "Column3"; + this.marcGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); + this.marcGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); // // marcLabel // @@ -821,14 +809,16 @@ // // gearGrid // - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + this.gearGrid.AllowUserToAddRows = false; + this.gearGrid.AllowUserToDeleteRows = false; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gearGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.gearGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gearGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, @@ -836,44 +826,32 @@ this.dataGridViewTextBoxColumn3}); this.gearGrid.Location = new System.Drawing.Point(987, 416); this.gearGrid.Name = "gearGrid"; - this.gearGrid.RowHeadersWidth = 21; + this.gearGrid.RowHeadersWidth = 31; this.gearGrid.RowTemplate.Height = 23; - this.gearGrid.Size = new System.Drawing.Size(442, 247); + this.gearGrid.Size = new System.Drawing.Size(601, 247); this.gearGrid.TabIndex = 48; - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.HeaderText = "분류"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.HeaderText = "내용"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.Width = 200; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.HeaderText = "작성자"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.gearGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); + this.gearGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); // // tb_marcEmpty // - this.tb_marcEmpty.Location = new System.Drawing.Point(1328, 11); + this.tb_marcEmpty.Location = new System.Drawing.Point(1487, 11); this.tb_marcEmpty.Name = "tb_marcEmpty"; this.tb_marcEmpty.Size = new System.Drawing.Size(101, 23); this.tb_marcEmpty.TabIndex = 50; this.tb_marcEmpty.Text = "마크 내용지우기"; this.tb_marcEmpty.UseVisualStyleBackColor = true; + this.tb_marcEmpty.Click += new System.EventHandler(this.tb_Empty_Click); // // tb_gearEmpty // - this.tb_gearEmpty.Location = new System.Drawing.Point(1328, 391); + this.tb_gearEmpty.Location = new System.Drawing.Point(1487, 391); this.tb_gearEmpty.Name = "tb_gearEmpty"; this.tb_gearEmpty.Size = new System.Drawing.Size(101, 23); this.tb_gearEmpty.TabIndex = 50; this.tb_gearEmpty.Text = "장비 내용지우기"; this.tb_gearEmpty.UseVisualStyleBackColor = true; + this.tb_gearEmpty.Click += new System.EventHandler(this.tb_Empty_Click); // // tb_marcSave // @@ -883,12 +861,45 @@ this.tb_marcSave.TabIndex = 50; this.tb_marcSave.Text = "저 장"; this.tb_marcSave.UseVisualStyleBackColor = true; + this.tb_marcSave.Click += new System.EventHandler(this.tb_marcSave_Click); + // + // Column1 + // + this.Column1.HeaderText = "날짜"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "내용"; + this.Column2.Name = "Column2"; + this.Column2.Width = 350; + // + // Column3 + // + this.Column3.HeaderText = "작성자"; + this.Column3.Name = "Column3"; + // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.HeaderText = "날짜"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.HeaderText = "내용"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.Width = 350; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.HeaderText = "작성자"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; // // Transaction_manage // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1441, 675); + this.ClientSize = new System.Drawing.Size(1600, 675); this.Controls.Add(this.tb_gearEmpty); this.Controls.Add(this.tb_marcSave); this.Controls.Add(this.tb_marcEmpty); @@ -982,17 +993,17 @@ private System.Windows.Forms.Button btn_marc_expand; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.DataGridView marcGrid; - private System.Windows.Forms.DataGridViewTextBoxColumn Column1; - private System.Windows.Forms.DataGridViewTextBoxColumn Column2; - private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.Label marcLabel; private System.Windows.Forms.Label gearLabel; private System.Windows.Forms.DataGridView gearGrid; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.Button tb_marcEmpty; private System.Windows.Forms.Button tb_gearEmpty; private System.Windows.Forms.Button tb_marcSave; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; } } \ No newline at end of file diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index acce016..8c3305b 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -15,7 +15,7 @@ namespace WindowsFormsApp1.Home { Helper_DB db = new Helper_DB(); public string compidx; - int grididx; + int grididx = -1; Main main; public Transaction_manage(Main _main) { @@ -244,6 +244,7 @@ namespace WindowsFormsApp1.Home cb_gubun2.Items.AddRange(gubun2); cb_gubun2.SelectedIndex = 2; } + lookup(marc_lookup); } private void tb_sangho_KeyDown(object sender, KeyEventArgs e) { @@ -367,6 +368,9 @@ namespace WindowsFormsApp1.Home bool marc_lookup = false; private void btn_marc_expand_Click(object sender, EventArgs e) { + if (grididx < 0) + return; + if(marc_lookup == false) { btn_marc_expand.Text = "마크 확장 >>"; @@ -380,10 +384,104 @@ namespace WindowsFormsApp1.Home marcLabel.Visible = marc_lookup; gearLabel.Visible = marc_lookup; marcGrid.Visible = marc_lookup; - gearGrid.Visible = marc_lookup; + gearGrid.Visible = marc_lookup; tb_marcEmpty.Visible = marc_lookup; tb_marcSave.Visible = marc_lookup; tb_gearEmpty.Visible = marc_lookup; + + lookup(marc_lookup); + } + + private void lookup(bool chk) + { + if (!chk) return; + + marcGrid.Columns[0].ReadOnly = true; + gearGrid.Columns[0].ReadOnly = true; + + string idx = dataGridView1.Rows[grididx].Cells["idx"].Value.ToString(); + string Area = "`c_marc`, `c_gear`"; + + string cmd = db.DB_Select_Search(Area, "Client", "idx", idx); + string res = db.DB_Send_CMD_Search(cmd); + string[] ary_res = res.Split('|'); + for (int a = 0; a < ary_res.Length; a++) + { + string[] ary_data = ary_res[a].Split('⊙'); + if (a % 2 == 0) + { + marcGrid.Rows.Add(ary_data); + } + else + { + gearGrid.Rows.Add(ary_data); + } + } + + int marc_count = marcGrid.Rows.Count; + int gear_count = gearGrid.Rows.Count; + + if (marc_count < 150) + marcGrid.Rows.Add(150 - marc_count); + + if (gear_count < 100) + gearGrid.Rows.Add(100 - gear_count); + } + + private void tb_marcSave_Click(object sender, EventArgs e) + { + string[] Edit_col = { "c_marc", "c_gear" }; + string[] Edit_data = { Griddata_ToString(marcGrid), Griddata_ToString(gearGrid) }; + string[] Search_col = { "idx" }; + string[] Search_data = { dataGridView1.Rows[grididx].Cells["idx"].Value.ToString() }; + + string cmd = db.More_Update("Client", Edit_col, Edit_data, Search_col, Search_data); + db.DB_Send_CMD_reVoid(cmd); + } + + private string Griddata_ToString(DataGridView datagrid) + { + string result = ""; + for (int a = 0; a < datagrid.Rows.Count; a++) + { + string date = datagrid.Rows[a].Cells[0].Value.ToString(); + string content = datagrid.Rows[a].Cells[1].Value.ToString(); + string charge = datagrid.Rows[a].Cells[2].Value.ToString(); + + if (date == "" && content == "" && charge == "") { + break; + } + else { + result += string.Format("{0}⊙{1}⊙{2}⊙", date, content, charge); + } + } + return result; + } + + private void marcGrid_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + + private void tb_Empty_Click(object sender, EventArgs e) + { + string name = ((Button)sender).Name; + + if (name.Contains("marc")) { + marcGrid.Rows.Clear(); + marcGrid.Rows.Add(150); + } + else { + gearGrid.Rows.Clear(); + gearGrid.Rows.Add(100); + } + } + + private void Grid_KeyDown(object sender, KeyEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.DataGrid_to_Delete(sender, e); } } }