diff --git a/Project/Dialog/fLogin.Designer.cs b/Project/Dialog/fLogin.Designer.cs index 189c55c..e178773 100644 --- a/Project/Dialog/fLogin.Designer.cs +++ b/Project/Dialog/fLogin.Designer.cs @@ -28,164 +28,165 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin)); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.cmbDept = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.tbID = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.tbPW = new System.Windows.Forms.TextBox(); - this.panel2 = new System.Windows.Forms.Panel(); - this.btLogin = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); - this.SuspendLayout(); - // - // pictureBox1 - // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(295, 25); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(80, 80); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 3; - this.pictureBox1.TabStop = false; - // - // panel1 - // - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.cmbDept); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.tbID); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.tbPW); - this.panel1.Controls.Add(this.pictureBox1); - 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(675, 377); - this.panel1.TabIndex = 0; - // - // cmbDept - // - this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F); - this.cmbDept.FormattingEnabled = true; - this.cmbDept.Location = new System.Drawing.Point(16, 136); - this.cmbDept.Name = "cmbDept"; - this.cmbDept.Size = new System.Drawing.Size(645, 41); - this.cmbDept.TabIndex = 9; - this.cmbDept.SelectedIndexChanged += new System.EventHandler(this.cmbDept_SelectedIndexChanged); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.Gray; - this.label3.Location = new System.Drawing.Point(13, 119); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(31, 15); - this.label3.TabIndex = 8; - this.label3.Text = "부서"; - // - // tbID - // - this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); - this.tbID.FormattingEnabled = true; - this.tbID.Location = new System.Drawing.Point(16, 213); - this.tbID.Name = "tbID"; - this.tbID.Size = new System.Drawing.Size(645, 41); - this.tbID.TabIndex = 3; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.label2.ForeColor = System.Drawing.Color.Gray; - this.label2.Location = new System.Drawing.Point(13, 269); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(31, 15); - this.label2.TabIndex = 4; - this.label2.Text = "암호"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(13, 196); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(55, 15); - this.label1.TabIndex = 2; - this.label1.Text = "사원번호"; - // - // tbPW - // - this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tbPW.Location = new System.Drawing.Point(16, 287); - this.tbPW.Name = "tbPW"; - this.tbPW.PasswordChar = '●'; - this.tbPW.Size = new System.Drawing.Size(645, 40); - this.tbPW.TabIndex = 5; - this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // panel2 - // - this.panel2.BackColor = System.Drawing.SystemColors.Control; - this.panel2.Controls.Add(this.btLogin); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 377); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(675, 34); - this.panel2.TabIndex = 6; - // - // btLogin - // - this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill; - this.btLogin.Location = new System.Drawing.Point(0, 0); - this.btLogin.Name = "btLogin"; - this.btLogin.Size = new System.Drawing.Size(675, 34); - this.btLogin.TabIndex = 0; - this.btLogin.Text = "접속"; - this.btLogin.UseVisualStyleBackColor = true; - this.btLogin.Click += new System.EventHandler(this.button1_Click); - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.label4.ForeColor = System.Drawing.Color.Teal; - this.label4.Location = new System.Drawing.Point(13, 342); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(243, 15); - this.label4.TabIndex = 10; - this.label4.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567"; - // - // fLogin - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.OrangeRed; - this.ClientSize = new System.Drawing.Size(675, 411); - this.Controls.Add(this.panel1); - this.Controls.Add(this.panel2); - this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fLogin"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "사용자확인"; - this.Load += new System.EventHandler(this.fLogin_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.panel2.ResumeLayout(false); - this.ResumeLayout(false); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin)); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.cmbDept = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.tbID = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.tbPW = new System.Windows.Forms.TextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btLogin = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(295, 25); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(80, 80); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBox1.TabIndex = 3; + this.pictureBox1.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.cmbDept); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.tbID); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.tbPW); + this.panel1.Controls.Add(this.pictureBox1); + 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(675, 404); + this.panel1.TabIndex = 0; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label4.ForeColor = System.Drawing.Color.Teal; + this.label4.Location = new System.Drawing.Point(13, 342); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(243, 15); + this.label4.TabIndex = 10; + this.label4.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567"; + // + // cmbDept + // + this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F); + this.cmbDept.FormattingEnabled = true; + this.cmbDept.Location = new System.Drawing.Point(16, 136); + this.cmbDept.Name = "cmbDept"; + this.cmbDept.Size = new System.Drawing.Size(645, 41); + this.cmbDept.TabIndex = 9; + this.cmbDept.SelectedIndexChanged += new System.EventHandler(this.cmbDept_SelectedIndexChanged); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.ForeColor = System.Drawing.Color.Gray; + this.label3.Location = new System.Drawing.Point(13, 119); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(31, 15); + this.label3.TabIndex = 8; + this.label3.Text = "부서"; + // + // tbID + // + this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); + this.tbID.FormattingEnabled = true; + this.tbID.Location = new System.Drawing.Point(16, 213); + this.tbID.Name = "tbID"; + this.tbID.Size = new System.Drawing.Size(645, 41); + this.tbID.TabIndex = 3; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label2.ForeColor = System.Drawing.Color.Gray; + this.label2.Location = new System.Drawing.Point(13, 269); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(31, 15); + this.label2.TabIndex = 4; + this.label2.Text = "암호"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.Gray; + this.label1.Location = new System.Drawing.Point(13, 196); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(55, 15); + this.label1.TabIndex = 2; + this.label1.Text = "사원번호"; + // + // tbPW + // + this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbPW.Location = new System.Drawing.Point(16, 287); + this.tbPW.Name = "tbPW"; + this.tbPW.PasswordChar = '●'; + this.tbPW.Size = new System.Drawing.Size(645, 40); + this.tbPW.TabIndex = 5; + this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.Control; + this.panel2.Controls.Add(this.btLogin); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 404); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(675, 105); + this.panel2.TabIndex = 6; + // + // btLogin + // + this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill; + this.btLogin.Font = new System.Drawing.Font("맑은 고딕", 40F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btLogin.Location = new System.Drawing.Point(0, 0); + this.btLogin.Name = "btLogin"; + this.btLogin.Size = new System.Drawing.Size(675, 105); + this.btLogin.TabIndex = 0; + this.btLogin.Text = "접속"; + this.btLogin.UseVisualStyleBackColor = true; + this.btLogin.Click += new System.EventHandler(this.button1_Click); + // + // fLogin + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.OrangeRed; + this.ClientSize = new System.Drawing.Size(675, 509); + this.Controls.Add(this.panel1); + this.Controls.Add(this.panel2); + this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fLogin"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "사용자확인"; + this.Load += new System.EventHandler(this.fLogin_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); } diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 44071ec..4db6b09 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -162,7 +162,7 @@ namespace Project.Dialog FCOMMON.info.Login.nameE = userdr.nameE; FCOMMON.info.Login.hp = userdr.hp; FCOMMON.info.Login.tel = userdr.tel; - FCOMMON.info.Login.title = userdr.ads_title; + FCOMMON.info.Login.title = userdr.dept + "(" + userdr.grade + ")"; FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView; //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index c141818..c6992b5 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -50,6 +50,8 @@ this.userAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator(); + this.그룹정보ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mn_kuntae = new System.Windows.Forms.ToolStripMenuItem(); this.메일양식ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -137,8 +139,6 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); - this.그룹정보ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -261,14 +261,14 @@ // this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.codesToolStripMenuItem.Text = "공용코드"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.itemsToolStripMenuItem.Text = "품목정보"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // @@ -281,41 +281,53 @@ this.toolStripMenuItem12, this.그룹정보ToolStripMenuItem}); this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.userInfoToolStripMenuItem.Text = "사용자"; // // userAccountToolStripMenuItem // this.userAccountToolStripMenuItem.Name = "userAccountToolStripMenuItem"; - this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.userAccountToolStripMenuItem.Text = "계정정보"; this.userAccountToolStripMenuItem.Click += new System.EventHandler(this.userAccountToolStripMenuItem_Click); // // myAccouserToolStripMenuItem // this.myAccouserToolStripMenuItem.Name = "myAccouserToolStripMenuItem"; - this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.myAccouserToolStripMenuItem.Text = "계정목록"; this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click); // // 권한설정ToolStripMenuItem // this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; - this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.권한설정ToolStripMenuItem.Text = "권한설정"; this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); // + // toolStripMenuItem12 + // + this.toolStripMenuItem12.Name = "toolStripMenuItem12"; + this.toolStripMenuItem12.Size = new System.Drawing.Size(131, 6); + // + // 그룹정보ToolStripMenuItem + // + this.그룹정보ToolStripMenuItem.Name = "그룹정보ToolStripMenuItem"; + this.그룹정보ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.그룹정보ToolStripMenuItem.Text = "그룹정보"; + this.그룹정보ToolStripMenuItem.Click += new System.EventHandler(this.그룹정보ToolStripMenuItem_Click); + // // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.customerToolStripMenuItem.Text = "업체정보"; this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); // // mn_kuntae // this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(180, 24); + this.mn_kuntae.Size = new System.Drawing.Size(153, 24); this.mn_kuntae.Text = "월별 근무표"; this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); // @@ -323,7 +335,7 @@ // this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.메일양식ToolStripMenuItem.Text = "메일 양식"; this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); // @@ -569,7 +581,7 @@ // this.휴가신청ToolStripMenuItem.Name = "휴가신청ToolStripMenuItem"; this.휴가신청ToolStripMenuItem.Size = new System.Drawing.Size(248, 24); - this.휴가신청ToolStripMenuItem.Text = "휴가 신청"; + this.휴가신청ToolStripMenuItem.Text = "휴가/외출 신청"; this.휴가신청ToolStripMenuItem.Click += new System.EventHandler(this.휴가신청ToolStripMenuItem_Click); // // 개인별근태원장ToolStripMenuItem @@ -1051,18 +1063,6 @@ this.toolStripButton3.ToolTipText = "휴가신청"; this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); // - // 그룹정보ToolStripMenuItem - // - this.그룹정보ToolStripMenuItem.Name = "그룹정보ToolStripMenuItem"; - this.그룹정보ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); - this.그룹정보ToolStripMenuItem.Text = "그룹정보"; - this.그룹정보ToolStripMenuItem.Click += new System.EventHandler(this.그룹정보ToolStripMenuItem_Click); - // - // toolStripMenuItem12 - // - this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(177, 6); - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/Project/fMain.resx b/Project/fMain.resx index 745e3c6..ea07bba 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -182,74 +182,6 @@ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 - - - - - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= - - - - - R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh - e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI - oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui - ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC - Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= - - - - - R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt - Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ - 8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW - GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R - v3gHemD5QK4HtBMSEyRplOTBgAA7 - - - - - R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// - /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY - JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP - jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA - Ow== - - - - - R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG - Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ - kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO - EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa - vQU5DIar2KFgxYEHBgQAOw== - - - - - R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c - hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg - USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP - GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE - DQ8eBAjwYKZhhQQPFoRMuXJAADs= - - - - - R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB - MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA - oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG - IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB - D4UNMwz8ISAAOw== @@ -365,6 +297,74 @@ h58L4755nzwWACmRSEixWEynl0gQtXWDq9efcWesTLPb7RZmkg1AikQiUigU0uklEoREZl63mEkW430F g0EHv2mdHpgsyzvNJMvHQ/n9fofX69XJ7HK5bGaSrfBQPNXBzU92nQFgfwCJli/+LKS33wAAAABJRU5E rkJggg== + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIQfAKnrVsfvlYnVOHy8KnfJLJneRWqyJLvth1W7GzGTEVWnHT2aFIPNMkuiGmrKJGKt + Io7eOXa5KU64GDiWE1yqIHK3KHa5J0WeGGC/IG+1JW/FKGjCJHnRLWrOIP///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqwA/CBTooeDAgwg9DFjoAWHCAQEAFBjQ0CHBAQAEFLBQ + 8WDBjxEARPjY8YPChREiZshg4EFJhQFiFmBQAAIECh8vLoTAgAEBAgIUeGhwoaHCghUE/NTAgcCFAxAW + GDWZQamGDRgwIEAgYUJBjh4MCODAAYODBRMkSEhQMAJLARQUNODgwGsCtiYjHBDgsuCCDl4NmqxQAK7R + v3gHemD5QK4HtBMSEyRplOTBgAA7 + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== + + + + + R0lGODlhEAAQAIQfAKxoR8VkLxFw1feVPITSWv+eQv7Qo0Cc6OyIN/v7+3PLTSCZEFy17Wa6XuT1x2bG + Q3nNUU6vRXPAa9mLXMTkwJZEHJt7LL5aJ/z8/O2KONx3L/ubP/r6+rtVI////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIpgA/CBxIsOBADBgEeljoweAHDB06eIi4QICAhRwOdjAQ + kaMDCgwELOiQ8WGHAQYMFIjIgMEBCBEzQkSwoUCBCR0OSGigIKZJDQM2cKxwoAGBBx0ykISoIcOGiAcO + EFCAVCkHphueAtgaIYKFpks7NM0qFIDFCxk0kPyQQCzZiB0CbLAqsO1YslnTrq0r9m4GvSUHcoioobDa + vQU5DIar2KFgxYEHBgQAOw== + + + + + R0lGODlhEAAQAIQfAGm6/idTd4yTmF+v8Xa37KvW+lyh3KHJ62aq41ee2bXZ98nm/2mt5W2Ck5XN/C1c + hEZieho8WXXA/2Gn4P39/W+y6V+l3qjP8Njt/lx2izxPYGyv51Oa1EJWZ////////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIqgA/CPzgoaBBDwMTEoQgoGGDBhAQKvSQAcOCBQUcaHwg + USBFDARCEqhQgYEEjh47gKxwweAFBAgkREDooYMCAhs8XGCAwMOEmB1o2qywYSdMnxMABCVocwMDngUP + GLAAYCZTBTARHPAgdWpVoQV+TrBgoGwCA1+ZOkgwduuBBAk4pCWogUBcDnjxAgjQkS4BAAMCD9jrgcJE + DQ8eBAjwYKZhhQQPFoRMuXJAADs= + + + + + R0lGODlhEAAQAIQAAP/99v/qaOvOSem4M+zSSv/ypf/ug//1w//2zP/xnv/te//zrf/0uv/41/nWdufB + MP/vkevTVf/rcv/0s//wlv/57OvRM//vi+/OQtaXIuuYEuvTLNyhJ+vHUP///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIoAA/CBxIsCBBDwgTKizogUCEhwQIYLBgYYOHgR4cKPQA + oMEBBAgsfsjoAQGDCQsKJEhAAcKBChYQajyZkiWECwYMAHiAkAAAlCop4FRA9ABPDxgqABVqQIGEpxQG + IMTQoCaEphICaFXAAaEABCmZZtUawECGi0gRHGigloFWCgzOYhRAt0OHASg1yD24cUAFDRcNMhwAWLBB + D4UNMwz8ISAAOw== @@ -452,14 +452,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/ - /U7m/E+5XP8/92TF/3lzYj/UbMr/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPpV5p+FZ8q+d/yc2e - /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtUb9vV7o9blnWyHc + /U7m/E+5XP8/92TF/3lzYj/UbMz/l3q54X/kubL/qtu8oIZo90F1QsEynQn8a8yPpVyp/1Z8q+d/yc2e + /4dm5vx/1Jn2/+qkzJ8gMRg22R16gmGJzjWoTihYqitYfKu7Dqao41D9/+ulEf+vtkb+vV7o9blnWyHc gOJbXRdA6qE6EaD4ZvdcmKLKSx3LzheGHLyc7PbtYpDa/20VTnuLL3Z8BMkV3Ox5B9WCCmAuKLrZUwLi - v2iNEH9c5vn/SobxnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu + v2iNEH9c5vn/SobRnyfZNmqFN3v1gbZ/LrrVcx6sAR0U3+kxLr7RdRzKZXhc7On5qNTjPxiXeHmAxICu LAVa1AJWgA0U3+kWgzIZnlR4ZcEMeFLpnQkSq79fz5F7ayIfWAEh8KjCs+9Judd/EH5c7tULFSYeAP2/ - Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+bbgd7fQPo/MoaKnQGr - 2d+jAdUG1LhtIjtQcP637S3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz - BQAb7qusmv24WgAAAABJRU5ErkJggg== + Ee6FUo8NUGHiwP/99RwvuqJOv+mJ+w/CLzsjT4HEoNLYwb8D/Zp/D/T2/T/Qe+brgd7fQPo/MoaKnQGr + 2d+jAdUG1LhtIjtQcP7Xbc3/0DXhwiC1fw/0zAPpZfi7v7cXmyJiMEgv0Ol9tkDTlgMFVpGCQXr+Heiz + BQAEJaue5HIBbgAAAABJRU5ErkJggg== diff --git a/SubProject/FCM0000/Mail/fMailform.Designer.cs b/SubProject/FCM0000/Mail/fMailform.Designer.cs index f87d55a..2f98895 100644 --- a/SubProject/FCM0000/Mail/fMailform.Designer.cs +++ b/SubProject/FCM0000/Mail/fMailform.Designer.cs @@ -35,10 +35,12 @@ System.Windows.Forms.Label subjectLabel; System.Windows.Forms.Label bodyLabel; System.Windows.Forms.Label label1; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMailform)); System.Windows.Forms.Label label2; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fMailform)); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL = new FCM0000.DSMail(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); @@ -51,7 +53,10 @@ this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.mailFormBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); this.mailFormDataGridView = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1 = new System.Windows.Forms.Panel(); + this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.htmlEditor1 = new YARTE.UI.HtmlEditor(); this.checkBox3 = new System.Windows.Forms.CheckBox(); @@ -61,13 +66,9 @@ this.bccTextBox = new System.Windows.Forms.TextBox(); this.ccTextBox = new System.Windows.Forms.TextBox(); this.subjectTextBox = new System.Windows.Forms.TextBox(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new FCM0000.DSMail(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ta = new FCM0000.DSMailTableAdapters.MailFormTableAdapter(); this.tam = new FCM0000.DSMailTableAdapters.TableAdapterManager(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); tolistLabel = new System.Windows.Forms.Label(); bccLabel = new System.Windows.Forms.Label(); ccLabel = new System.Windows.Forms.Label(); @@ -77,10 +78,10 @@ label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).BeginInit(); - this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // tolistLabel @@ -138,6 +139,16 @@ label1.TabIndex = 24; label1.Text = "제외메일(TO)"; // + // label2 + // + label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(15, 523); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(81, 12); + label2.TabIndex = 26; + label2.Text = "제외메일(CC)"; + // // bn // this.bn.AddNewItem = this.bindingNavigatorAddNewItem; @@ -157,7 +168,8 @@ this.bindingNavigatorSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, - this.mailFormBindingNavigatorSaveItem}); + this.mailFormBindingNavigatorSaveItem, + this.toolStripButton2}); this.bn.Location = new System.Drawing.Point(0, 591); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -178,6 +190,17 @@ this.bindingNavigatorAddNewItem.Text = "Add(&A)"; this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // + // bs + // + this.bs.DataMember = "MailForm"; + this.bs.DataSource = this.dsMSSQL; + this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMail"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -281,6 +304,20 @@ this.mailFormDataGridView.TabIndex = 2; this.mailFormDataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.mailFormDataGridView_DataError); // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "cate"; + this.dataGridViewTextBoxColumn2.HeaderText = "cate"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.Width = 54; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.dataGridViewTextBoxColumn3.DataPropertyName = "title"; + this.dataGridViewTextBoxColumn3.HeaderText = "title"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + // // panel1 // this.panel1.Controls.Add(label2); @@ -306,6 +343,17 @@ this.panel1.Size = new System.Drawing.Size(516, 591); this.panel1.TabIndex = 3; // + // textBox2 + // + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "exceptmailcc", true)); + this.textBox2.Location = new System.Drawing.Point(17, 538); + this.textBox2.Multiline = true; + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(487, 46); + this.textBox2.TabIndex = 27; + // // textBox1 // this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) @@ -408,31 +456,6 @@ this.subjectTextBox.Size = new System.Drawing.Size(430, 21); this.subjectTextBox.TabIndex = 13; // - // bs - // - this.bs.DataMember = "MailForm"; - this.bs.DataSource = this.dsMSSQL; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMail"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "cate"; - this.dataGridViewTextBoxColumn2.HeaderText = "cate"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.Width = 54; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.dataGridViewTextBoxColumn3.DataPropertyName = "title"; - this.dataGridViewTextBoxColumn3.HeaderText = "title"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - // // ta // this.ta.ClearBeforeFill = true; @@ -445,26 +468,15 @@ this.tam.MailFormTableAdapter = this.ta; this.tam.UpdateOrder = FCM0000.DSMailTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // label2 + // toolStripButton2 // - label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(15, 523); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(81, 12); - label2.TabIndex = 26; - label2.Text = "제외메일(CC)"; - // - // textBox2 - // - this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "exceptmailcc", true)); - this.textBox2.Location = new System.Drawing.Point(17, 538); - this.textBox2.Multiline = true; - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(487, 46); - this.textBox2.TabIndex = 27; + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(107, 22); + this.toolStripButton2.Text = "누락 항목 추가"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // fMailform // @@ -480,11 +492,11 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.mailFormDataGridView)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -523,5 +535,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/SubProject/FCM0000/Mail/fMailform.cs b/SubProject/FCM0000/Mail/fMailform.cs index 96d4caf..a3fd456 100644 --- a/SubProject/FCM0000/Mail/fMailform.cs +++ b/SubProject/FCM0000/Mail/fMailform.cs @@ -95,5 +95,20 @@ namespace FCM0000 { } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + var gcode = FCOMMON.info.Login.gcode; + var uid = FCOMMON.info.Login.no; + if (FCOMMON.Util.MsgQ("없는 목록을 기본값에서 생성 할까요?") != DialogResult.Yes) return; + + var sql = "insert into MailForm(gcode,cate,title,[subject],tail,body,selfcc,wuid,wdate)" + + $" select '{gcode}',cate,title,[subject],tail,body,selfcc,'{uid}',GETDATE() from MailForm" + + $" where gcode = 'EET1P'" + + $" and cate not in (select cate from MailForm where gcode = '{gcode}')"; + var cnt = FCOMMON.DBM.ExecuteNonQuery(sql); + FCOMMON.Util.MsgI($"{cnt}건의 목록이 생성 되었습니다"); + refreshData(); + } } } diff --git a/SubProject/FCM0000/Mail/fMailform.resx b/SubProject/FCM0000/Mail/fMailform.resx index 39c3450..ab6b8fc 100644 --- a/SubProject/FCM0000/Mail/fMailform.resx +++ b/SubProject/FCM0000/Mail/fMailform.resx @@ -135,6 +135,9 @@ False + + False + 319, 17 @@ -216,8 +219,23 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - False + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + 17, 17 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> @@ -227,9 +245,6 @@ <BODY></BODY></HTML> - - 17, 17 - 184, 17 diff --git a/SubProject/FCM0000/fCode.Designer.cs b/SubProject/FCM0000/fCode.Designer.cs index 5af4ba6..656c393 100644 --- a/SubProject/FCM0000/fCode.Designer.cs +++ b/SubProject/FCM0000/fCode.Designer.cs @@ -61,6 +61,7 @@ this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ta = new FCM0000.dsMSSQLTableAdapters.CommonTableAdapter(); this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); @@ -115,7 +116,8 @@ this.bindingNavigatorDeleteItem, this.commonBindingNavigatorSaveItem, this.toolStripSeparator1, - this.toolStripButton1}); + this.toolStripButton1, + this.toolStripButton2}); this.bn.Location = new System.Drawing.Point(0, 693); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -351,6 +353,16 @@ this.tam.StaffTableAdapter = null; this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(107, 22); + this.toolStripButton2.Text = "누락 항목 추가"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // fCode // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); @@ -411,5 +423,6 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel6; private System.Windows.Forms.ToolStripMenuItem title가져오기ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem s가져오기ToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fCode.cs b/SubProject/FCM0000/fCode.cs index 571eee5..cb1acfc 100644 --- a/SubProject/FCM0000/fCode.cs +++ b/SubProject/FCM0000/fCode.cs @@ -134,7 +134,7 @@ namespace FCM0000 { if (item.Trim().Equals("")) continue; - if(this.dsMSSQL.Common.Where(t=>t.memo == item.Trim()).Any()==false) + if (this.dsMSSQL.Common.Where(t => t.memo == item.Trim()).Any() == false) { var newdr = this.dsMSSQL.Common.NewCommonRow(); newdr.memo = item; @@ -162,7 +162,7 @@ namespace FCM0000 int r = 0; foreach (var item in lines) { - if(r < this.dsMSSQL.Common.Count) + if (r < this.dsMSSQL.Common.Count) this.dsMSSQL.Common.Rows[r]["svalue"] = item; r += 1; @@ -180,5 +180,38 @@ namespace FCM0000 } } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + //누락된 목록을 생성합니다 + var gcode = FCOMMON.info.Login.gcode; + var uid = FCOMMON.info.Login.no; + if (cmbList.SelectedIndex <= 0) + { + if (FCOMMON.Util.MsgQ("없는 목록을 기본값에서 생성 할까요?") != DialogResult.Yes) return; + + var sql = "insert into Common(gcode,grp,code,svalue,ivalue,fvalue,memo,wuid,wdate)" + + $" select '{gcode}',grp,code,svalue,ivalue,fvalue,memo,'{uid}',getdate() from Common where gcode = 'EET1P' and grp = '99'" + + $" and code not in (select code from Common where gcode = '{gcode}' and grp = '99')"; + var cnt = FCOMMON.DBM.ExecuteNonQuery(sql); + FCOMMON.Util.MsgI($"{cnt}건의 목록이 생성 되었습니다"); + RefreshCodeList(); + } + else + { + string grp = "99"; + var title = cmbList.Text.Split(']'); + grp = title[0].Substring(1); + if (FCOMMON.Util.MsgQ($"[{cmbList.Text}] 세부항목을 기본값에서 생성 할까요?") != DialogResult.Yes) return; + + var sql = "insert into Common(gcode,grp,code,svalue,ivalue,fvalue,memo,wuid,wdate)" + + $" select '{gcode}',grp,code,svalue,ivalue,fvalue,memo,'{uid}',getdate() from Common where gcode = 'EET1P' and grp = '{grp}'" + + $" and code not in (select code from Common where gcode = '{gcode}' and grp = '{grp}')"; + var cnt = FCOMMON.DBM.ExecuteNonQuery(sql); + FCOMMON.Util.MsgI($"{cnt}건의 목록이 생성 되었습니다"); + RefreshCodeData(); + } + + } } } diff --git a/SubProject/FCM0000/fCode.resx b/SubProject/FCM0000/fCode.resx index c40d815..e41ceba 100644 --- a/SubProject/FCM0000/fCode.resx +++ b/SubProject/FCM0000/fCode.resx @@ -211,6 +211,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== diff --git a/SubProject/FCOMMON/Auth.cs b/SubProject/FCOMMON/Auth.cs index 227a9fe..522222b 100644 --- a/SubProject/FCOMMON/Auth.cs +++ b/SubProject/FCOMMON/Auth.cs @@ -38,7 +38,7 @@ namespace FCOMMON int retval = 0; - string sql = string.Format("select isnull([{0}],0) from Auth where [user]= '{1}'",field,uid); + string sql = string.Format("select isnull([{0}],0) from Auth where gcode='{2}' and [user]= '{1}'",field,uid,FCOMMON.info.Login.gcode); var cmd = new SqlCommand(sql, cn); var rdr = cmd.ExecuteScalar(); if(rdr != null ) diff --git a/SubProject/FPJ0000/DSKuntae.Designer.cs b/SubProject/FPJ0000/DSKuntae.Designer.cs index d243f03..db54aac 100644 --- a/SubProject/FPJ0000/DSKuntae.Designer.cs +++ b/SubProject/FPJ0000/DSKuntae.Designer.cs @@ -323,6 +323,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnsendmail; + private global::System.Data.DataColumn columnstime; + + private global::System.Data.DataColumn columnetime; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_HolydayRequestDataTable() { @@ -532,6 +536,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn stimeColumn { + get { + return this.columnstime; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn etimeColumn { + get { + return this.columnetime; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -590,7 +610,9 @@ namespace FPJ0000 { string HolyLocation, int HolyDays, double HolyTimes, - bool sendmail) { + bool sendmail, + string stime, + string etime) { EETGW_HolydayRequestRow rowEETGW_HolydayRequestRow = ((EETGW_HolydayRequestRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -614,7 +636,9 @@ namespace FPJ0000 { HolyLocation, HolyDays, HolyTimes, - sendmail}; + sendmail, + stime, + etime}; rowEETGW_HolydayRequestRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_HolydayRequestRow); return rowEETGW_HolydayRequestRow; @@ -666,6 +690,8 @@ namespace FPJ0000 { this.columnHolyDays = base.Columns["HolyDays"]; this.columnHolyTimes = base.Columns["HolyTimes"]; this.columnsendmail = base.Columns["sendmail"]; + this.columnstime = base.Columns["stime"]; + this.columnetime = base.Columns["etime"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -715,6 +741,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnHolyTimes); this.columnsendmail = new global::System.Data.DataColumn("sendmail", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsendmail); + this.columnstime = new global::System.Data.DataColumn("stime", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnstime); + this.columnetime = new global::System.Data.DataColumn("etime", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnetime); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -743,6 +773,8 @@ namespace FPJ0000 { this.columnHolyReason.MaxLength = 100; this.columnHolyBackup.MaxLength = 100; this.columnHolyLocation.MaxLength = 100; + this.columnstime.MaxLength = 10; + this.columnetime.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1215,6 +1247,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string stime { + get { + if (this.IsstimeNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_HolydayRequest.stimeColumn])); + } + } + set { + this[this.tableEETGW_HolydayRequest.stimeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string etime { + get { + if (this.IsetimeNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableEETGW_HolydayRequest.etimeColumn])); + } + } + set { + this[this.tableEETGW_HolydayRequest.etimeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsuidNull() { @@ -1430,6 +1494,30 @@ namespace FPJ0000 { public void SetsendmailNull() { this[this.tableEETGW_HolydayRequest.sendmailColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsstimeNull() { + return this.IsNull(this.tableEETGW_HolydayRequest.stimeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetstimeNull() { + this[this.tableEETGW_HolydayRequest.stimeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsetimeNull() { + return this.IsNull(this.tableEETGW_HolydayRequest.etimeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetetimeNull() { + this[this.tableEETGW_HolydayRequest.etimeColumn] = global::System.Convert.DBNull; + } } /// @@ -1613,6 +1701,8 @@ namespace FPJ0000.DSKuntaeTableAdapters { tableMapping.ColumnMappings.Add("HolyDays", "HolyDays"); tableMapping.ColumnMappings.Add("HolyTimes", "HolyTimes"); tableMapping.ColumnMappings.Add("sendmail", "sendmail"); + tableMapping.ColumnMappings.Add("stime", "stime"); + tableMapping.ColumnMappings.Add("etime", "etime"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -1622,8 +1712,8 @@ namespace FPJ0000.DSKuntaeTableAdapters { this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; this._adapter.InsertCommand.CommandText = @"INSERT INTO EETGW_HolydayRequest - (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail) -VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail); + (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime) +VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = SCOPE_IDENTITY()) ORDER BY conf, sdate DESC"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1642,12 +1732,15 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@etime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "etime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = @"UPDATE EETGW_HolydayRequest SET gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response, - HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail -WHERE (idx = @Original_idx); + HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail, stime = @stime, + etime = @etime +WHERE (idx = @Original_idx); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = @idx) ORDER BY conf, sdate DESC"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -1666,6 +1759,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@etime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "etime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -1686,7 +1781,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW this._commandCollection[0].CommandText = @"SELECT EETGW_HolydayRequest.idx, EETGW_HolydayRequest.gcode, EETGW_HolydayRequest.uid, EETGW_HolydayRequest.cate, EETGW_HolydayRequest.sdate, EETGW_HolydayRequest.edate, EETGW_HolydayRequest.Remark, EETGW_HolydayRequest.wuid, EETGW_HolydayRequest.wdate, vGroupUser.dept, vGroupUser.name, vGroupUser.grade, vGroupUser.tel, vGroupUser.processs, EETGW_HolydayRequest.Response, EETGW_HolydayRequest.conf, EETGW_HolydayRequest.HolyReason, EETGW_HolydayRequest.HolyBackup, - EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail + EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail, EETGW_HolydayRequest.stime, + EETGW_HolydayRequest.etime FROM EETGW_HolydayRequest LEFT OUTER JOIN vGroupUser ON EETGW_HolydayRequest.uid = vGroupUser.id AND EETGW_HolydayRequest.gcode = vGroupUser.gcode WHERE (EETGW_HolydayRequest.gcode = @gcode) AND (EETGW_HolydayRequest.sdate >= @sd) AND (EETGW_HolydayRequest.sdate <= @ed) @@ -1828,7 +1924,9 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; string HolyLocation, global::System.Nullable HolyDays, global::System.Nullable HolyTimes, - global::System.Nullable sendmail) { + global::System.Nullable sendmail, + string stime, + string etime) { if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); } @@ -1920,6 +2018,18 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; else { this.Adapter.InsertCommand.Parameters[15].Value = global::System.DBNull.Value; } + if ((stime == null)) { + this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[16].Value = ((string)(stime)); + } + if ((etime == null)) { + this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[17].Value = ((string)(etime)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -1957,6 +2067,8 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; global::System.Nullable HolyDays, global::System.Nullable HolyTimes, global::System.Nullable sendmail, + string stime, + string etime, int Original_idx, int idx) { if ((gcode == null)) { @@ -2050,8 +2162,20 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC"; else { this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(idx)); + if ((stime == null)) { + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(stime)); + } + if ((etime == null)) { + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(etime)); + } + this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FPJ0000/DSKuntae.xsd b/SubProject/FPJ0000/DSKuntae.xsd index e22b768..11c8936 100644 --- a/SubProject/FPJ0000/DSKuntae.xsd +++ b/SubProject/FPJ0000/DSKuntae.xsd @@ -20,28 +20,30 @@ WHERE (idx = @Original_idx) - + INSERT INTO EETGW_HolydayRequest - (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail) -VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail); + (gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate, Response, HolyReason, HolyBackup, HolyLocation, HolyDays, HolyTimes, sendmail, stime, etime) +VALUES (@gcode,@uid,@cate,@sdate,@edate,@conf,@Remark,@wuid,@wdate,@Response,@HolyReason,@HolyBackup,@HolyLocation,@HolyDays,@HolyTimes,@sendmail,@stime,@etime); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = SCOPE_IDENTITY()) ORDER BY conf, sdate DESC - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -50,7 +52,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW SELECT EETGW_HolydayRequest.idx, EETGW_HolydayRequest.gcode, EETGW_HolydayRequest.uid, EETGW_HolydayRequest.cate, EETGW_HolydayRequest.sdate, EETGW_HolydayRequest.edate, EETGW_HolydayRequest.Remark, EETGW_HolydayRequest.wuid, EETGW_HolydayRequest.wdate, vGroupUser.dept, vGroupUser.name, vGroupUser.grade, vGroupUser.tel, vGroupUser.processs, EETGW_HolydayRequest.Response, EETGW_HolydayRequest.conf, EETGW_HolydayRequest.HolyReason, EETGW_HolydayRequest.HolyBackup, - EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail + EETGW_HolydayRequest.HolyLocation, EETGW_HolydayRequest.HolyDays, EETGW_HolydayRequest.HolyTimes, EETGW_HolydayRequest.sendmail, EETGW_HolydayRequest.stime, + EETGW_HolydayRequest.etime FROM EETGW_HolydayRequest LEFT OUTER JOIN vGroupUser ON EETGW_HolydayRequest.uid = vGroupUser.id AND EETGW_HolydayRequest.gcode = vGroupUser.gcode WHERE (EETGW_HolydayRequest.gcode = @gcode) AND (EETGW_HolydayRequest.sdate >= @sd) AND (EETGW_HolydayRequest.sdate <= @ed) @@ -66,8 +69,9 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC UPDATE EETGW_HolydayRequest SET gcode = @gcode, uid = @uid, cate = @cate, sdate = @sdate, edate = @edate, conf = @conf, Remark = @Remark, wuid = @wuid, wdate = @wdate, Response = @Response, - HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail -WHERE (idx = @Original_idx); + HolyReason = @HolyReason, HolyBackup = @HolyBackup, HolyLocation = @HolyLocation, HolyDays = @HolyDays, HolyTimes = @HolyTimes, sendmail = @sendmail, stime = @stime, + etime = @etime +WHERE (idx = @Original_idx); SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW_HolydayRequest WHERE (idx = @idx) ORDER BY conf, sdate DESC @@ -86,6 +90,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW + + @@ -116,6 +122,8 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW + + @@ -127,7 +135,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW - + @@ -248,6 +256,20 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 8d2ea29..f86fd51 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -403,6 +403,12 @@ fOTConfirmValue.cs + + Form + + + fOutCoomplete.cs + Model1.tt @@ -705,6 +711,9 @@ fOTConfirmValue.cs + + fOutCoomplete.cs + fLayoutEdit.cs diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs index c04eadf..4225ea9 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs @@ -31,11 +31,13 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyRequest)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dSKuntae = new FPJ0000.DSKuntae(); @@ -56,6 +58,8 @@ this.btAdd = new System.Windows.Forms.ToolStripButton(); this.btEdit = new System.Windows.Forms.ToolStripButton(); this.btDel = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); this.lbStt = new System.Windows.Forms.ToolStripLabel(); @@ -73,7 +77,6 @@ this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.dv1 = new arCtl.arDatagridView(); - this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -81,6 +84,8 @@ this.edateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyDays = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.stime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.etime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyReason = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyLocation = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -89,6 +94,9 @@ this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.외출완료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -99,6 +107,7 @@ this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // bn @@ -125,7 +134,9 @@ this.btSave, this.btAdd, this.btEdit, - this.btDel}); + this.btDel, + this.toolStripSeparator4, + this.toolStripButton1}); this.bn.Location = new System.Drawing.Point(0, 608); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -282,6 +293,20 @@ this.btDel.Text = "삭제(&D)"; this.btDel.Click += new System.EventHandler(this.btDel_Click); // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(79, 22); + this.toolStripButton1.Text = "외출 종료"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // toolStrip1 // this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); @@ -470,6 +495,8 @@ this.edateDataGridViewTextBoxColumn, this.HolyDays, this.HolyTimes, + this.stime, + this.etime, this.HolyReason, this.HolyLocation, this.telDataGridViewTextBoxColumn, @@ -478,16 +505,17 @@ this.Response, this.HolyBackup, this.remarkDataGridViewTextBoxColumn}); + this.dv1.ContextMenuStrip = this.contextMenuStrip1; this.dv1.DataSource = this.bs; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(3); - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv1.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle8.Padding = new System.Windows.Forms.Padding(3); + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle8; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 0); this.dv1.Name = "dv1"; @@ -497,10 +525,6 @@ this.dv1.TabIndex = 3; this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); // - // ta - // - this.ta.ClearBeforeFill = true; - // // uidDataGridViewTextBoxColumn // this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid"; @@ -559,6 +583,24 @@ this.HolyTimes.Name = "HolyTimes"; this.HolyTimes.Width = 88; // + // stime + // + this.stime.DataPropertyName = "stime"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.stime.DefaultCellStyle = dataGridViewCellStyle4; + this.stime.HeaderText = "외출시작"; + this.stime.Name = "stime"; + this.stime.Width = 88; + // + // etime + // + this.etime.DataPropertyName = "etime"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.etime.DefaultCellStyle = dataGridViewCellStyle5; + this.etime.HeaderText = "종료"; + this.etime.Name = "etime"; + this.etime.Width = 64; + // // HolyReason // this.HolyReason.DataPropertyName = "HolyReason"; @@ -591,8 +633,8 @@ // cmbCf // this.cmbCf.DataPropertyName = "conf"; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.cmbCf.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cmbCf.DefaultCellStyle = dataGridViewCellStyle6; this.cmbCf.HeaderText = "관리자 승인"; this.cmbCf.Items.AddRange(new object[] { "선택안함", @@ -605,8 +647,8 @@ // Response // this.Response.DataPropertyName = "Response"; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Response.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Response.DefaultCellStyle = dataGridViewCellStyle7; this.Response.HeaderText = "관리자 비고"; this.Response.Name = "Response"; this.Response.Width = 104; @@ -625,6 +667,24 @@ this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn"; this.remarkDataGridViewTextBoxColumn.Width = 64; // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.외출완료ToolStripMenuItem}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26); + // + // 외출완료ToolStripMenuItem + // + this.외출완료ToolStripMenuItem.Name = "외출완료ToolStripMenuItem"; + this.외출완료ToolStripMenuItem.Size = new System.Drawing.Size(126, 22); + this.외출완료ToolStripMenuItem.Text = "외출 완료"; + this.외출완료ToolStripMenuItem.Click += new System.EventHandler(this.외출완료ToolStripMenuItem_Click); + // + // ta + // + this.ta.ClearBeforeFill = true; + // // fHolyRequest // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -635,7 +695,7 @@ this.Controls.Add(this.bn); this.Name = "fHolyRequest"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "휴가 신청"; + this.Text = "휴가/외출 신청"; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); @@ -649,6 +709,7 @@ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -700,6 +761,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn edateDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn HolyDays; private System.Windows.Forms.DataGridViewTextBoxColumn HolyTimes; + private System.Windows.Forms.DataGridViewTextBoxColumn stime; + private System.Windows.Forms.DataGridViewTextBoxColumn etime; private System.Windows.Forms.DataGridViewTextBoxColumn HolyReason; private System.Windows.Forms.DataGridViewTextBoxColumn HolyLocation; private System.Windows.Forms.DataGridViewTextBoxColumn telDataGridViewTextBoxColumn; @@ -708,5 +771,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Response; private System.Windows.Forms.DataGridViewTextBoxColumn HolyBackup; private System.Windows.Forms.DataGridViewTextBoxColumn remarkDataGridViewTextBoxColumn; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; + private System.Windows.Forms.ToolStripMenuItem 외출완료ToolStripMenuItem; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs index 6a802c1..a240989 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs @@ -273,6 +273,8 @@ namespace FPJ0000 newdr.HolyDays = 0; newdr.HolyTimes = 0f; newdr.cate = "년차"; + newdr.stime = "00:00"; + newdr.etime = "00:00"; var f = new OtConfirm.fHolyRequestAdd(newdr); if (f.ShowDialog() == DialogResult.OK) { @@ -283,7 +285,6 @@ namespace FPJ0000 var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest); dSKuntae.EETGW_HolydayRequest.AcceptChanges(); FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다"); - refreshData(); } catch (Exception ex) @@ -396,5 +397,45 @@ namespace FPJ0000 dtSD.Text = sd.ToShortDateString(); dtED.Text = ed.ToShortDateString(); } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as DSKuntae.EETGW_HolydayRequestRow; + if(dr.cate.Equals("외출")==false) + { + FCOMMON.Util.MsgE("외출 자료만 완료할 수 있습니다"); + return; + } + if(dr.conf != 1) + { + FCOMMON.Util.MsgE("관리자 승인된 자료만 완료할 수 있습니다"); + return; + } + var f = new OtConfirm.fOutCoomplete(dr); + if(f.ShowDialog() == DialogResult.OK) + { + dr.stime = f.dtSD.Value.ToString("HH:mm"); + dr.etime = f.dtED.Value.ToString("HH:mm"); + dr.EndEdit(); + try + { + var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest); + dSKuntae.EETGW_HolydayRequest.AcceptChanges(); + FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다"); + refreshData(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE(ex.Message); + } + } + } + + private void 외출완료ToolStripMenuItem_Click(object sender, EventArgs e) + { + toolStripButton1.PerformClick(); + } } } diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx index aaefc00..2fe5b0d 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.resx @@ -187,6 +187,21 @@ AYRBCkE2N256AnY6SDMoUEF8FANAoQ0zAFkzCCNrhhkAor3CczENwGYzuu1JM8+BaQwDQAGITzOyASDs 4huPMAAkATIA3c/YNIdNPAHGKAaAUhUoBghphhng0rTnv71bGKoBoADE5mR0zVgNACUK9BgAGYbudJBG GNY0dEYYAMsgMAyKYxAGhTQIg/wLwiBbQRikGSUdkA/+/wcAgXJEf04PwQkAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -195,41 +210,41 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM - X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J - dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi - pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5 - jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz - 6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX - HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D - O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm - 3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1 - L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek - v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3 - UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq - 3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr - dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM - QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx + C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX + wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY + TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ + fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j + p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS + qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3 + ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG + 3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8 + UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv + UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb + mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4 + 6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo + JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA + BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH - 331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO - fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt - QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6 - pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH - T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS - FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q - elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U - 0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC - Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS - cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01 - AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs - tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm - QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK - IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18 + 8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5 + c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24 + VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS + /dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L + A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18 + CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK + ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP + uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi + 8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF + UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40 + 3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs + 613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN + t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH + UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC @@ -259,6 +274,12 @@ True + + True + + + True + True @@ -271,6 +292,9 @@ True + + 420, 17 + 358, 17 diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs index 1765afc..e0b6fa2 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.Designer.cs @@ -33,17 +33,23 @@ namespace FPJ0000.OtConfirm this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.tbCate = new System.Windows.Forms.ComboBox(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dSKuntae = new FPJ0000.DSKuntae(); this.tbSD = new System.Windows.Forms.DateTimePicker(); this.tbED = new System.Windows.Forms.DateTimePicker(); this.tbRemark = new System.Windows.Forms.RichTextBox(); this.grpUser = new System.Windows.Forms.GroupBox(); - this.cmbUser = new System.Windows.Forms.ComboBox(); - this.radioButton2 = new System.Windows.Forms.RadioButton(); - this.radTime = new System.Windows.Forms.RadioButton(); - this.tbTimes = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.radOut = new System.Windows.Forms.RadioButton(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.tbDays = new System.Windows.Forms.TextBox(); + this.tbTimes = new System.Windows.Forms.TextBox(); + this.cmbUser = new System.Windows.Forms.ComboBox(); + this.radDay = new System.Windows.Forms.RadioButton(); + this.radTime = new System.Windows.Forms.RadioButton(); this.label10 = new System.Windows.Forms.Label(); this.tbBackup = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); @@ -60,16 +66,14 @@ namespace FPJ0000.OtConfirm this.rad0 = new System.Windows.Forms.RadioButton(); this.tbResponse = new System.Windows.Forms.RichTextBox(); this.button1 = new System.Windows.Forms.Button(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSKuntae = new FPJ0000.DSKuntae(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.grpUser.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.grpAdmin.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); - this.grpUser.SuspendLayout(); - this.grpAdmin.SuspendLayout(); - this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // label1 @@ -102,16 +106,6 @@ namespace FPJ0000.OtConfirm this.tbCate.Size = new System.Drawing.Size(381, 35); this.tbCate.TabIndex = 7; // - // bs - // - this.bs.DataMember = "EETGW_HolydayRequest"; - this.bs.DataSource = this.dSKuntae; - // - // dSKuntae - // - this.dSKuntae.DataSetName = "DSKuntae"; - this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // tbSD // this.tbSD.Location = new System.Drawing.Point(143, 79); @@ -130,18 +124,22 @@ namespace FPJ0000.OtConfirm // tbRemark // this.tbRemark.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbRemark.Location = new System.Drawing.Point(144, 246); + this.tbRemark.Location = new System.Drawing.Point(144, 285); this.tbRemark.Name = "tbRemark"; this.tbRemark.Size = new System.Drawing.Size(578, 133); - this.tbRemark.TabIndex = 16; + this.tbRemark.TabIndex = 20; this.tbRemark.Text = ""; // // grpUser // + this.grpUser.Controls.Add(this.label7); + this.grpUser.Controls.Add(this.textBox2); + this.grpUser.Controls.Add(this.textBox1); + this.grpUser.Controls.Add(this.radOut); this.grpUser.Controls.Add(this.richTextBox1); this.grpUser.Controls.Add(this.groupBox1); this.grpUser.Controls.Add(this.cmbUser); - this.grpUser.Controls.Add(this.radioButton2); + this.grpUser.Controls.Add(this.radDay); this.grpUser.Controls.Add(this.radTime); this.grpUser.Controls.Add(this.label10); this.grpUser.Controls.Add(this.tbBackup); @@ -160,11 +158,113 @@ namespace FPJ0000.OtConfirm this.grpUser.Dock = System.Windows.Forms.DockStyle.Top; this.grpUser.Location = new System.Drawing.Point(3, 3); this.grpUser.Name = "grpUser"; - this.grpUser.Size = new System.Drawing.Size(957, 471); + this.grpUser.Size = new System.Drawing.Size(957, 521); this.grpUser.TabIndex = 0; this.grpUser.TabStop = false; this.grpUser.Text = "신청자"; // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(763, 167); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(33, 27); + this.label7.TabIndex = 11; + this.label7.Text = "~"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(802, 161); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(102, 38); + this.textBox2.TabIndex = 12; + this.textBox2.Text = "00:00"; + this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(655, 161); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(102, 38); + this.textBox1.TabIndex = 10; + this.textBox1.Text = "00:00"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // radOut + // + this.radOut.AutoSize = true; + this.radOut.Location = new System.Drawing.Point(565, 165); + this.radOut.Name = "radOut"; + this.radOut.Size = new System.Drawing.Size(84, 31); + this.radOut.TabIndex = 9; + this.radOut.TabStop = true; + this.radOut.Text = "외출"; + this.radOut.UseVisualStyleBackColor = true; + this.radOut.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // richTextBox1 + // + this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.richTextBox1.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.richTextBox1.Location = new System.Drawing.Point(143, 426); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(803, 87); + this.richTextBox1.TabIndex = 22; + this.richTextBox1.Text = ""; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.tbDays); + this.groupBox1.Controls.Add(this.tbTimes); + this.groupBox1.Location = new System.Drawing.Point(728, 288); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(218, 130); + this.groupBox1.TabIndex = 21; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "사용"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(8, 84); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(66, 27); + this.label6.TabIndex = 2; + this.label6.Text = "시간"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(35, 40); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(39, 27); + this.label3.TabIndex = 0; + this.label3.Text = "일"; + // + // tbDays + // + this.tbDays.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbDays.Location = new System.Drawing.Point(78, 37); + this.tbDays.Name = "tbDays"; + this.tbDays.Size = new System.Drawing.Size(130, 38); + this.tbDays.TabIndex = 1; + this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbTimes + // + this.tbTimes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbTimes.Location = new System.Drawing.Point(78, 81); + this.tbTimes.Name = "tbTimes"; + this.tbTimes.Size = new System.Drawing.Size(130, 38); + this.tbTimes.TabIndex = 3; + this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // cmbUser // this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -175,18 +275,18 @@ namespace FPJ0000.OtConfirm this.cmbUser.TabIndex = 1; this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); // - // radioButton2 + // radDay // - this.radioButton2.AutoSize = true; - this.radioButton2.Checked = true; - this.radioButton2.Location = new System.Drawing.Point(53, 123); - this.radioButton2.Name = "radioButton2"; - this.radioButton2.Size = new System.Drawing.Size(84, 31); - this.radioButton2.TabIndex = 6; - this.radioButton2.TabStop = true; - this.radioButton2.Text = "일반"; - this.radioButton2.UseVisualStyleBackColor = true; - this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + this.radDay.AutoSize = true; + this.radDay.Checked = true; + this.radDay.Location = new System.Drawing.Point(53, 123); + this.radDay.Name = "radDay"; + this.radDay.Size = new System.Drawing.Size(84, 31); + this.radDay.TabIndex = 6; + this.radDay.TabStop = true; + this.radDay.Text = "일반"; + this.radDay.UseVisualStyleBackColor = true; + this.radDay.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // // radTime // @@ -200,31 +300,13 @@ namespace FPJ0000.OtConfirm this.radTime.UseVisualStyleBackColor = true; this.radTime.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // - // tbTimes - // - this.tbTimes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbTimes.Location = new System.Drawing.Point(78, 81); - this.tbTimes.Name = "tbTimes"; - this.tbTimes.Size = new System.Drawing.Size(130, 38); - this.tbTimes.TabIndex = 19; - this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tbDays - // - this.tbDays.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbDays.Location = new System.Drawing.Point(78, 37); - this.tbDays.Name = "tbDays"; - this.tbDays.Size = new System.Drawing.Size(130, 38); - this.tbDays.TabIndex = 18; - this.tbDays.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // label10 // this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(12, 209); + this.label10.Location = new System.Drawing.Point(12, 248); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(120, 27); - this.label10.TabIndex = 13; + this.label10.TabIndex = 17; this.label10.Text = "백업인원"; // // tbBackup @@ -234,18 +316,18 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbBackup.Location = new System.Drawing.Point(144, 205); + this.tbBackup.Location = new System.Drawing.Point(144, 244); this.tbBackup.Name = "tbBackup"; this.tbBackup.Size = new System.Drawing.Size(802, 35); - this.tbBackup.TabIndex = 14; + this.tbBackup.TabIndex = 18; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(467, 167); + this.label9.Location = new System.Drawing.Point(467, 206); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(93, 27); - this.label9.TabIndex = 11; + this.label9.TabIndex = 15; this.label9.Text = "행선지"; // // tbLocation @@ -255,18 +337,18 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbLocation.Location = new System.Drawing.Point(565, 164); + this.tbLocation.Location = new System.Drawing.Point(565, 203); this.tbLocation.Name = "tbLocation"; this.tbLocation.Size = new System.Drawing.Size(381, 35); - this.tbLocation.TabIndex = 12; + this.tbLocation.TabIndex = 16; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(66, 167); + this.label8.Location = new System.Drawing.Point(66, 206); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(66, 27); - this.label8.TabIndex = 9; + this.label8.TabIndex = 13; this.label8.Text = "사유"; // // tbReason @@ -276,10 +358,10 @@ namespace FPJ0000.OtConfirm "년차", "하기", "대체"}); - this.tbReason.Location = new System.Drawing.Point(144, 164); + this.tbReason.Location = new System.Drawing.Point(144, 203); this.tbReason.Name = "tbReason"; this.tbReason.Size = new System.Drawing.Size(310, 35); - this.tbReason.TabIndex = 10; + this.tbReason.TabIndex = 14; // // label5 // @@ -293,10 +375,10 @@ namespace FPJ0000.OtConfirm // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(66, 249); + this.label4.Location = new System.Drawing.Point(66, 288); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(66, 27); - this.label4.TabIndex = 15; + this.label4.TabIndex = 19; this.label4.Text = "비고"; // // grpAdmin @@ -308,9 +390,9 @@ namespace FPJ0000.OtConfirm this.grpAdmin.Controls.Add(this.rad0); this.grpAdmin.Controls.Add(this.tbResponse); this.grpAdmin.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpAdmin.Location = new System.Drawing.Point(3, 474); + this.grpAdmin.Location = new System.Drawing.Point(3, 524); this.grpAdmin.Name = "grpAdmin"; - this.grpAdmin.Size = new System.Drawing.Size(957, 296); + this.grpAdmin.Size = new System.Drawing.Size(957, 246); this.grpAdmin.TabIndex = 1; this.grpAdmin.TabStop = false; this.grpAdmin.Text = "관리자"; @@ -384,7 +466,7 @@ namespace FPJ0000.OtConfirm | System.Windows.Forms.AnchorStyles.Right))); this.tbResponse.Location = new System.Drawing.Point(10, 115); this.tbResponse.Name = "tbResponse"; - this.tbResponse.Size = new System.Drawing.Size(936, 116); + this.tbResponse.Size = new System.Drawing.Size(936, 75); this.tbResponse.TabIndex = 3; this.tbResponse.Text = ""; // @@ -399,55 +481,20 @@ namespace FPJ0000.OtConfirm this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // bs + // + this.bs.DataMember = "EETGW_HolydayRequest"; + this.bs.DataSource = this.dSKuntae; + // + // dSKuntae + // + this.dSKuntae.DataSetName = "DSKuntae"; + this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // ta // this.ta.ClearBeforeFill = true; // - // groupBox1 - // - this.groupBox1.Controls.Add(this.label6); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.tbDays); - this.groupBox1.Controls.Add(this.tbTimes); - this.groupBox1.Location = new System.Drawing.Point(728, 249); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(218, 130); - this.groupBox1.TabIndex = 20; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "사용"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(35, 40); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(39, 27); - this.label3.TabIndex = 20; - this.label3.Text = "일"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(8, 84); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(66, 27); - this.label6.TabIndex = 21; - this.label6.Text = "시간"; - // - // richTextBox1 - // - this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.richTextBox1.Font = new System.Drawing.Font("굴림", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.richTextBox1.Location = new System.Drawing.Point(143, 385); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.ReadOnly = true; - this.richTextBox1.Size = new System.Drawing.Size(803, 78); - this.richTextBox1.TabIndex = 21; - this.richTextBox1.Text = ""; - // // fHolyRequestAdd // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -463,14 +510,14 @@ namespace FPJ0000.OtConfirm this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "fHolyRequestAdd"; this.Load += new System.EventHandler(this.fHolyRequestAdd_Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit(); this.grpUser.ResumeLayout(false); this.grpUser.PerformLayout(); - this.grpAdmin.ResumeLayout(false); - this.grpAdmin.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.grpAdmin.ResumeLayout(false); + this.grpAdmin.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit(); this.ResumeLayout(false); } @@ -506,11 +553,15 @@ namespace FPJ0000.OtConfirm private System.Windows.Forms.ComboBox cmbPreset; private System.Windows.Forms.CheckBox chkSendMail; private System.Windows.Forms.RadioButton radTime; - private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.RadioButton radDay; private System.Windows.Forms.ComboBox cmbUser; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label6; private System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.RadioButton radOut; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TextBox textBox2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 57f95af..ab55185 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -41,18 +41,19 @@ namespace FPJ0000.OtConfirm this.cmbUser.ValueMember = "id"; this.cmbUser.DisplayMember = "dispname"; - + this.textBox1.Text = dr.stime; + this.textBox2.Text = dr.etime; if (dr.RowState == DataRowState.Detached) { - this.Text = "휴가신청 추가"; + this.Text = "(휴가/외출)신청 추가"; cmbUser.Text = $"{FCOMMON.info.Login.nameK}({FCOMMON.info.Login.no})"; - //tbProcess.Text = FCOMMON.info.Login.process; //tbTel.Text = FCOMMON.info.Login.tel; } else { - this.Text = "휴가신청 편집"; + + this.Text = "(휴가/외출) 편집"; cmbUser.Text = $"{dr.name}({dr.uid})"; //dr.name; ////.Text = dr.processs; // tbTel.Text = dr.tel; @@ -80,13 +81,21 @@ namespace FPJ0000.OtConfirm tbCate.Enabled = false; radTime.Checked = true; } + else if (dr.cate == "외출") + { + radOut.Checked = true; + } else { tbCate.Enabled = true; tbTimes.Enabled = false; tbDays.Enabled = true; - radioButton2.Checked = true; + radDay.Checked = true; } + this.KeyDown += (s1, e1) => + { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; } int curLevel = 0; @@ -135,12 +144,14 @@ namespace FPJ0000.OtConfirm binit = true; cmbUser_SelectedIndexChanged(null, null); + radioButton1_CheckedChanged(null, null); } private void button1_Click(object sender, EventArgs e) { var cate = tbCate.Text.Trim(); if (radTime.Checked) cate = "대체"; + else if (radOut.Checked) cate = "외출"; var remark = tbRemark.Text.Trim(); var response = tbResponse.Text.Trim(); @@ -177,21 +188,75 @@ namespace FPJ0000.OtConfirm if (radTime.Checked) vDay = 0; else vTime = 0; - if (vDay > 0 && vTime > 0) + if (radOut.Checked == false) { - FCOMMON.Util.MsgE("사용일/시간을 동시에 입력할 수는 없습니다.\r\n" + - "대체휴가의 경우에만 시간을 입력하시기 바랍니다"); - return; - } + if (vDay > 0 && vTime > 0) + { + FCOMMON.Util.MsgE("사용일/시간을 동시에 입력할 수는 없습니다.\r\n" + + "대체휴가의 경우에만 시간을 입력하시기 바랍니다"); + return; + } - if (vDay < 1 && vTime < 0.1 && curLevel < 5) + if (vDay < 1 && vTime < 0.1 && curLevel < 5) + { + var dlg = FCOMMON.Util.MsgQ("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요\n값을 입력하지 않고 계속할까요?"); + if (dlg != DialogResult.Yes) return; + } + } + else { - var dlg = FCOMMON.Util.MsgQ("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요\n값을 입력하지 않고 계속할까요?"); - if (dlg != DialogResult.Yes) return; + if (textBox1.Text.IndexOf(":") == -1 || textBox1.Text.Equals("00:00")) + { + FCOMMON.Util.MsgE("외출 시작시간은 00:00 24시 표기법으로 입력하세요\n" + + "예) 오후2시 = 14:00"); + textBox1.Focus(); + textBox1.SelectAll(); + return; + } + + //추가시에는 종료시간을 입력하지 않게한다. + if(dr.RowState == DataRowState.Detached) + { + if (textBox2.Text.IndexOf(":") == -1 || textBox2.Text.Equals("00:00")) + { + + } + else + { + textBox2.Text = "00:00"; + FCOMMON.Util.MsgI("신청데이터에는 외출종료시간을 입력하지 않습니다\n외출종료 화면에서 시간을 입력하세요"); + } + } + + //if (textBox2.Text.IndexOf(":") == -1 || textBox2.Text.Equals("00:00")) + //{ + // FCOMMON.Util.MsgE("외출 종료시간은 00:00 24시 표기법으로 입력하세요\n" + + // "예) 오후2시 = 14:00"); + // textBox2.Focus(); + // textBox2.SelectAll(); + // return; + //} + // + + if (tbSD.Value.ToShortDateString().Equals(tbED.Value.ToShortDateString()) == false) + { + FCOMMON.Util.MsgE("외출은 시작일 종료일이 같아야 합니다, 종료일자를 시작일자로 자동 변경 합니다"); + tbED.Value = tbSD.Value; + return; + } + + if(textBox2.Text.Equals("00:00")==false) + { + var st = DateTime.Parse(tbSD.Value.ToShortDateString() + " " + textBox1.Text + ":00"); + var et = DateTime.Parse(tbED.Value.ToShortDateString() + " " + textBox2.Text + ":00"); + if (et <= st) + { + FCOMMON.Util.MsgE("외출 시간을 확인하세요.\n종료시간은 시작시간보다 커야 합니다"); + return; + } + } } - - var uid = this.cmbUser.SelectedValue; if (uid == null) { @@ -200,44 +265,48 @@ namespace FPJ0000.OtConfirm } //사용시간여부 확인 - var minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 문의 하세요"; - if (IsAdmin) - minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 권한으로 기록은 진행 됩니다"; + if (radOut.Checked == false) + { + var minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 문의 하세요"; + if (IsAdmin) + minmsg = "해당 항목 [{0}]의 신청 가능 일(시간)이 없습니다\n\n남은 일(시간) : {1} \n\n관리자 권한으로 기록은 진행 됩니다"; - bool oktime = false; - if (radTime.Checked) //대체사용 - { - minmsg = minmsg.Replace("{0}", "대체"); - if (holydata.ContainsKey("대체")) + bool oktime = false; + if (radTime.Checked) //대체사용 { - var data = holydata["대체"].Split('|'); - var 발생 = float.Parse(data[3]); - var 사용 = float.Parse(data[4]); - var 잔량 = float.Parse(data[5]); - if (vTime <= 잔량) oktime = true; - else minmsg = minmsg.Replace("{1}", 잔량.ToString()); + minmsg = minmsg.Replace("{0}", "대체"); + if (holydata.ContainsKey("대체")) + { + var data = holydata["대체"].Split('|'); + var 발생 = float.Parse(data[3]); + var 사용 = float.Parse(data[4]); + var 잔량 = float.Parse(data[5]); + if (vTime <= 잔량) oktime = true; + else minmsg = minmsg.Replace("{1}", 잔량.ToString()); + } + else minmsg = minmsg.Replace("{1}", "(자료없음)"); } - else minmsg = minmsg.Replace("{1}", "(자료없음)"); - } - else - { - var 항목 = tbCate.Text; - minmsg = minmsg.Replace("{0}", 항목); - if (holydata.ContainsKey(항목)) + else { - var data = holydata[항목].Split('|'); - var 발생 = float.Parse(data[0]); - var 사용 = float.Parse(data[1]); - var 잔량 = float.Parse(data[2]); - if (vDay <= 잔량) oktime = true; - else minmsg = minmsg.Replace("{1}", 잔량.ToString()); + var 항목 = tbCate.Text; + minmsg = minmsg.Replace("{0}", 항목); + if (holydata.ContainsKey(항목)) + { + var data = holydata[항목].Split('|'); + var 발생 = float.Parse(data[0]); + var 사용 = float.Parse(data[1]); + var 잔량 = float.Parse(data[2]); + if (vDay <= 잔량) oktime = true; + else minmsg = minmsg.Replace("{1}", 잔량.ToString()); + } + else minmsg = minmsg.Replace("{1}", "(자료없음)"); } - else minmsg = minmsg.Replace("{1}", "(자료없음)"); - } - if (oktime == false) - { - //FCOMMON.Util.MsgE(minmsg); - //if (IsAdmin == false) return; + if (oktime == false) + { + //FCOMMON.Util.MsgE(minmsg); + //if (IsAdmin == false) return; + } + } // return; @@ -261,7 +330,7 @@ namespace FPJ0000.OtConfirm { var db = new EEEntities(); string chkdt = tbSD.Value.ToShortDateString(); - var existdb = db.EETGW_HolydayRequest.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == uid.ToString() && t.sdate == chkdt).Any(); + var existdb = db.EETGW_HolydayRequest.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == cate && t.uid == uid.ToString() && t.sdate == chkdt).Any(); if (existdb) { FCOMMON.Util.MsgE("동일 날짜에 등록된 자료가 있습니다"); @@ -315,6 +384,9 @@ namespace FPJ0000.OtConfirm dr.edate = tbED.Value.ToShortDateString(); dr.sendmail = chkSendMail.Checked; //220104 + dr.stime = textBox1.Text.Trim(); + dr.etime = textBox2.Text.Trim(); + dr.HolyDays = vDay; dr.HolyTimes = vTime;// @@ -382,8 +454,14 @@ namespace FPJ0000.OtConfirm tbDays.BackColor = Color.DimGray; tbTimes.BackColor = Color.Gold; groupBox1.Text = "사용시간"; + radTime.BackColor = Color.Lime; + radDay.BackColor = SystemColors.Control; + radOut.BackColor = SystemColors.Control; + groupBox1.Enabled = true; + textBox1.Enabled = false; + textBox2.Enabled = textBox1.Enabled; } - else + else if (radDay.Checked) { tbCate.Enabled = true; tbDays.Enabled = true; @@ -391,7 +469,24 @@ namespace FPJ0000.OtConfirm tbTimes.BackColor = Color.DimGray; tbDays.BackColor = Color.Gold; groupBox1.Text = "사용일"; + radDay.BackColor = Color.Lime; + radTime.BackColor = SystemColors.Control; + radOut.BackColor = SystemColors.Control; + groupBox1.Enabled = true; + textBox1.Enabled = false; + textBox2.Enabled = textBox1.Enabled; } + else if (radOut.Checked) + { + radOut.BackColor = Color.Lime; + radTime.BackColor = SystemColors.Control; + radDay.BackColor = SystemColors.Control; + textBox1.Enabled = radOut.Checked; + if (dr.RowState == DataRowState.Detached) textBox2.Enabled = false; + else textBox2.Enabled = true; + groupBox1.Enabled = !textBox1.Enabled; + } + if (binit) UpdateStatus(); } @@ -435,5 +530,10 @@ namespace FPJ0000.OtConfirm if (holydata.Any()) updateuserinfo = uid; //업데이트한 사용자 id 기록 } + + private void radioButton1_CheckedChanged_1(object sender, EventArgs e) + { + + } } } diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx index 2751a7d..e995ea4 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.resx @@ -123,9 +123,6 @@ 17, 17 - - 17, 17 - 186, 17 diff --git a/SubProject/FPJ0000/OtConfirm/fOutCoomplete.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.Designer.cs new file mode 100644 index 0000000..9a58952 --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.Designer.cs @@ -0,0 +1,109 @@ + +namespace FPJ0000.OtConfirm +{ + partial class fOutCoomplete + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.dtSD = new System.Windows.Forms.DateTimePicker(); + this.dtED = new System.Windows.Forms.DateTimePicker(); + this.button1 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(26, 23); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(197, 54); + this.label1.TabIndex = 0; + this.label1.Text = "외출 시작"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(26, 100); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(197, 54); + this.label2.TabIndex = 0; + this.label2.Text = "외출 종료"; + // + // dtSD + // + this.dtSD.Format = System.Windows.Forms.DateTimePickerFormat.Time; + this.dtSD.Location = new System.Drawing.Point(239, 23); + this.dtSD.Name = "dtSD"; + this.dtSD.Size = new System.Drawing.Size(328, 61); + this.dtSD.TabIndex = 1; + // + // dtED + // + this.dtED.Format = System.Windows.Forms.DateTimePickerFormat.Time; + this.dtED.Location = new System.Drawing.Point(239, 100); + this.dtED.Name = "dtED"; + this.dtED.Size = new System.Drawing.Size(328, 61); + this.dtED.TabIndex = 1; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(35, 179); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(532, 79); + this.button1.TabIndex = 2; + this.button1.Text = "완료"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // fOutCoomplete + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(595, 275); + this.Controls.Add(this.button1); + this.Controls.Add(this.dtED); + this.Controls.Add(this.dtSD); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Font = new System.Drawing.Font("맑은 고딕", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.Name = "fOutCoomplete"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "외출 종료"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Button button1; + public System.Windows.Forms.DateTimePicker dtSD; + public System.Windows.Forms.DateTimePicker dtED; + } +} \ No newline at end of file diff --git a/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs new file mode 100644 index 0000000..d182c6d --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FPJ0000.OtConfirm +{ + public partial class fOutCoomplete : Form + { + public fOutCoomplete(DSKuntae.EETGW_HolydayRequestRow dr) + { + InitializeComponent(); + var sd = DateTime.Now; + var ed = DateTime.Now; + this.dtSD.Value = DateTime.Parse(sd.ToShortDateString() + " " + dr.stime + ":00"); + if (dr.etime.isEmpty() || dr.etime == "00:00") + this.dtED.Value = DateTime.Now; + else + this.dtED.Value = DateTime.Parse(ed.ToShortDateString() + " " + dr.etime + ":00"); + } + + private void button1_Click(object sender, EventArgs e) + { + if (FCOMMON.Util.MsgQ("완료 할까요? 관리자 완료 메일이 발송 됩니다") != DialogResult.Yes) return; + DialogResult = DialogResult.OK; + } + } +} diff --git a/SubProject/FPJ0000/OtConfirm/fOutCoomplete.resx b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FPJ0000/OtConfirm/fOutCoomplete.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/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 3f3b67a..677eb3f 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -210,6 +210,7 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); + this.toolStripButton8 = new System.Windows.Forms.ToolStripButton(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -715,7 +716,8 @@ this.btIO, this.btMailAddr, this.btPath, - this.btSendMail}); + this.btSendMail, + this.toolStripButton8}); this.bn.Location = new System.Drawing.Point(0, 726); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -2611,6 +2613,15 @@ // this.taToDo.ClearBeforeFill = true; // + // toolStripButton8 + // + this.toolStripButton8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton8.Image"))); + this.toolStripButton8.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton8.Name = "toolStripButton8"; + this.toolStripButton8.Size = new System.Drawing.Size(63, 22); + this.toolStripButton8.Text = "스케쥴"; + this.toolStripButton8.Click += new System.EventHandler(this.toolStripButton8_Click); + // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -2829,5 +2840,6 @@ private System.Windows.Forms.ComboBox cmbReqLine; private System.Windows.Forms.ComboBox cmbReqPlant; private System.Windows.Forms.TextBox tbPno; + private System.Windows.Forms.ToolStripButton toolStripButton8; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 09c4c90..123565c 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -130,6 +130,7 @@ namespace FPJ0000 btMailAddr.Enabled = false; btSendMail.Enabled = false; tabControl2.Enabled = false; + toolStripButton8.Enabled = false; } else { @@ -656,5 +657,12 @@ namespace FPJ0000 { SelectDate(textBox9); } + + private void toolStripButton8_Click(object sender, EventArgs e) + { + var f = new fProjectSchedule(int.Parse(tbIdx.Text),false); + f.MdiParent = this.MdiParent; + f.ShowDialog(); + } } } diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index aee615b..c55cf3f 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -336,6 +336,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index e35e641..8d72aaa 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,36 +30,36 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType26 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType69 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType71 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType72 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType73 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType27 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType28 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType74 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType75 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType76 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -88,6 +88,7 @@ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.sbCount = new System.Windows.Forms.ToolStripLabel(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -161,8 +162,8 @@ this.chk진행 = new System.Windows.Forms.ToolStripButton(); this.chk보류 = new System.Windows.Forms.ToolStripButton(); this.chk취소 = new System.Windows.Forms.ToolStripButton(); - this.chk완료보고 = new System.Windows.Forms.ToolStripButton(); this.chk완료 = new System.Windows.Forms.ToolStripButton(); + this.chk완료보고 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); @@ -172,7 +173,6 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); - this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -442,6 +442,16 @@ this.toolStripButton2.Visible = false; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); // + // toolStripButton5 + // + this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); + this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton5.Name = "toolStripButton5"; + this.toolStripButton5.Size = new System.Drawing.Size(143, 22); + this.toolStripButton5.Text = "프로젝트 스케쥴 현황"; + this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); + // // cm // this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); @@ -699,174 +709,174 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType25.DecimalPlaces = 0; - numberCellType25.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType25.MaximumValue = 2147483647D; - numberCellType25.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType25; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; - numberCellType26.DecimalPlaces = 0; - numberCellType26.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType26.MaximumValue = 2147483647D; - numberCellType26.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType26; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType67; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment"; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType68; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType69; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType70; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG"; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType71; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line"; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType72; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType73; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType27.DecimalPlaces = 0; - numberCellType27.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType27.MaximumValue = 2147483647D; - numberCellType27.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType27; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수율(%)"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType28.DecimalPlaces = 0; - numberCellType28.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType28.MaximumValue = 2147483647D; - numberCellType28.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType28; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Progress(%)"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType74; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType75; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "Start Date"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType76; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "ddate"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "Due Date"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType77; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "Done Date"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType29.DecimalPlaces = 0; - numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType29.MaximumValue = 2147483647D; - numberCellType29.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType29; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "Q\'ty"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Width = 42F; - numberCellType30.MaximumValue = 999999999999999D; - numberCellType30.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType30; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "Outsourced Cost ($K)/Set\r\n"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType31.MaximumValue = 999999999999999D; - numberCellType31.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType31; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType7; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "In-house Cost ($K/Set)"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType32.MaximumValue = 999999999999999D; - numberCellType32.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType32; + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Save ($k)/Set"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Width = 67F; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType78; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(19).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType79; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "name_software"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType80; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_design"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "Design"; this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType81; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_assembly"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "Assembly"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType82; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_epanel"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "ePanel"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType83; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_champion"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Label = "Champion"; this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType84; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory"; this.fpSpread1_Sheet1.Columns.Get(25).Label = "History"; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType85; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType86; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset"; this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType87; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#"; this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType88; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#"; @@ -1409,8 +1419,8 @@ this.chk진행, this.chk보류, this.chk취소, - this.chk완료보고, this.chk완료, + this.chk완료보고, this.btViewDel, this.toolStripSeparator3, this.toolStripLabel2, @@ -1454,6 +1464,7 @@ this.chk대기.Name = "chk대기"; this.chk대기.Size = new System.Drawing.Size(55, 24); this.chk대기.Text = "대기"; + this.chk대기.Visible = false; this.chk대기.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged); // // chk진행 @@ -1490,17 +1501,6 @@ this.chk취소.Text = "취소"; this.chk취소.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged); // - // chk완료보고 - // - this.chk완료보고.CheckOnClick = true; - this.chk완료보고.ForeColor = System.Drawing.Color.Green; - this.chk완료보고.Image = ((System.Drawing.Image)(resources.GetObject("chk완료보고.Image"))); - this.chk완료보고.ImageTransparentColor = System.Drawing.Color.Magenta; - this.chk완료보고.Name = "chk완료보고"; - this.chk완료보고.Size = new System.Drawing.Size(87, 24); - this.chk완료보고.Text = "완료(보고)"; - this.chk완료보고.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged); - // // chk완료 // this.chk완료.Checked = true; @@ -1513,6 +1513,17 @@ this.chk완료.Text = "완료"; this.chk완료.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged); // + // chk완료보고 + // + this.chk완료보고.CheckOnClick = true; + this.chk완료보고.ForeColor = System.Drawing.Color.Green; + this.chk완료보고.Image = ((System.Drawing.Image)(resources.GetObject("chk완료보고.Image"))); + this.chk완료보고.ImageTransparentColor = System.Drawing.Color.Magenta; + this.chk완료보고.Name = "chk완료보고"; + this.chk완료보고.Size = new System.Drawing.Size(87, 24); + this.chk완료보고.Text = "완료(보고)"; + this.chk완료보고.CheckedChanged += new System.EventHandler(this.chk검토_CheckedChanged); + // // btViewDel // this.btViewDel.CheckOnClick = true; @@ -1623,16 +1634,6 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // toolStripButton5 - // - this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image"))); - this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton5.Name = "toolStripButton5"; - this.toolStripButton5.Size = new System.Drawing.Size(143, 22); - this.toolStripButton5.Text = "프로젝트 스케쥴 현황"; - this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); - // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 838966d..94e3c24 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,17 +230,17 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqsL1RYuqZc5kpZay1GZbmlk6lpS1vSV/sy+7Ld2tzW2sronu4+O3S3/Kle8HBw7+d5ePPh - Tf03RsdHtN8MwGB9D/3API73v4GWefVIHEvoG43qekcWF3ofRmB2hdH9IAwqmf6FXNXTpzgxI4FxR7/n - eqmT3hYYPDroR7Q45mokP+tMzyBmJPS4v5J5/9xlMP5LMM9cAIUcBMOBi7OrFpiGw2SeDWXxhJAtwbD/ - vE9SUGVRqCqYHSjrkkPdrZD4Ket4UOzKEI6noTkztVxQZSlVKekSrnm4CW2jzSg/u40EBQbGgpkC+2QI - 9okgnNNBvP2SwO6OCVKg7itVKeitnPZuPXaZylF8ogDy1k0Y9IZgFTTO/r3B609xVLR6oWK2V5bRcq7R - WQcZXcgV0XlbjLcWEE8twTbJEq+d/5ICsgW/gY1XjXUflD0lqL62B4cdB7GRXsetp9duFjZqs31ALLkE - xxSL29MZUUNPWCRSKy+ruVIJvVuLQ/YaFNMFXH5TJizQMvgOi99+4o4vs8H9Gf6QnI9ZZEvdpYSsvRBF - +jzkH12zHBbQXZ8nBUN8UAiTghv8Q2TzIhCDxuhd9Q60V18iyhe4noaJ1+3nC4RArjZ0uH+LGQkNzHNE - Ej/AxtL4HEkhwCZB7TR4kCtZwz27mJFwxDw3VtvpT9Z2zqL6nA97T6/cyz9CUX8AkOYskbmj6aQAAAAA - SUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF + SKESs3bThtoYFRWWrimXuVLWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G5PyI9ltBGGzvoe+fx8m+N9Ayrx6LYwm9IzFdz/DiQs+jKCzuCLoeRkAl07+Qq3rayIkZCYwn9j3X + S532tcDg1UE/rMUJdyP5WWd+BjEjodvzlcz75q6ACVyGZeYiKOQgGA5dml2zwDwUIfNsKKs3jGwJhoMX + /JKCKqtCVcHsQlmnHOouhcRP2cZCYleGSCINzdnJlYIqa6lKSZdwzUNNaBtpRvm5HSQo0D8ayhQ4JsJw + jIfgmgrh7Zcl7DWOkwJ1b6lKQW/ntPfqscdcjuJTBZC3bsGALwyboDH27w1ef0qgotUHFbOzsoyWc42u + OsjoQq6Izttmur2ARGoZ9gmWeB38lxSQLfgN7LxqbAeg7C5B9fV9OOo8jM30Bm4jvX6rsFGb/QPiyWU4 + J1ncmcqIGnzCYim1+rKaq5XQe7Q44qhBMV3A5TdlwgItA++w+O0n7vozGzyY4Q/JNc0iW+pOJWTthSjS + 5yH/+LqVsIDuxjwpGOSDQpgU3OQfIpsXwTg0Jt+ad6C99hIxvsD9NEK8ngBfIARytcno+S1mJDQwzxFd + +gE2nsbnaApBNglqt8GLXMka7jvEjIRjlrnR2o5AsrZjFtXn/dh/ZvVe/hGK+gOGgSyOMlw1+wAAAABJ + RU5ErkJggg== @@ -290,9 +290,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 17, 17 - 387, 17 @@ -350,18 +347,12 @@ 561, 17 - - 561, 17 - 731, 17 647, 17 - - 731, 17 - 828, 17 @@ -455,7 +446,7 @@ AABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPbS5NxHMbfv6DrubX3LQ0vMi+KUVQK6UWE @@ -473,7 +464,7 @@ AABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKrSURBVDhPrZPbS5NxHMbfv6DrubX3LQ0vMi+KUVQK6UWE diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index 57f87e2..ed3e638 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -17,7 +17,7 @@ namespace FPJ0000 EEEntities db; Boolean bInit = false; - public fProjectSchedule(int project_) + public fProjectSchedule(int project_,bool enbEdit=true) { InitializeComponent(); projectindex = project_; @@ -30,6 +30,7 @@ namespace FPJ0000 //this.dsPRJ.EETGW_ProjectReson.TableNewRow += EETGW_ProjectReson_TableNewRow; this.KeyDown += FProjectSchedule_KeyDown; + button2.Enabled = enbEdit; } private void FProjectSchedule_KeyDown(object sender, KeyEventArgs e) diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index e4b5c39..ff3fefd 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -9185,8 +9185,9 @@ ORDER BY title, ww"; EETGW_ProjectsSchedule.progress FROM Projects LEFT OUTER JOIN EETGW_ProjectsSchedule ON Projects.gcode = EETGW_ProjectsSchedule.gcode AND Projects.idx = EETGW_ProjectsSchedule.project -WHERE (Projects.gcode = @gcode) AND (Projects.status = '진행') AND (ISNULL(Projects.isdel, 0) = 0) AND (dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) - = EETGW_ProjectsSchedule.no) AND (EETGW_ProjectsSchedule.uid LIKE @uidlike) +WHERE (Projects.gcode = @gcode) AND (Projects.status = '검토' OR + Projects.status = '진행') AND (ISNULL(Projects.isdel, 0) = 0) AND (dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) = EETGW_ProjectsSchedule.no) AND + (EETGW_ProjectsSchedule.uid LIKE @uidlike) ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSchedule.seq"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index ba9c628..209d0fa 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -337,8 +337,9 @@ ORDER BY title, ww EETGW_ProjectsSchedule.progress FROM Projects LEFT OUTER JOIN EETGW_ProjectsSchedule ON Projects.gcode = EETGW_ProjectsSchedule.gcode AND Projects.idx = EETGW_ProjectsSchedule.project -WHERE (Projects.gcode = @gcode) AND (Projects.status = '진행') AND (ISNULL(Projects.isdel, 0) = 0) AND (dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) - = EETGW_ProjectsSchedule.no) AND (EETGW_ProjectsSchedule.uid LIKE @uidlike) +WHERE (Projects.gcode = @gcode) AND (Projects.status = '검토' OR + Projects.status = '진행') AND (ISNULL(Projects.isdel, 0) = 0) AND (dbo.getLastProjectScheduleNo(Projects.gcode, Projects.idx) = EETGW_ProjectsSchedule.no) AND + (EETGW_ProjectsSchedule.uid LIKE @uidlike) ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSchedule.seq @@ -378,7 +379,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -418,7 +419,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -461,7 +462,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -474,7 +475,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -515,7 +516,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -527,7 +528,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -557,7 +558,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -674,7 +675,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -688,7 +689,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -725,7 +726,7 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - + @@ -803,15 +804,15 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch - - + + - +