diff --git a/Project/EETGW.csproj.user b/Project/EETGW.csproj.user index 9e6be46..0789c32 100644 --- a/Project/EETGW.csproj.user +++ b/Project/EETGW.csproj.user @@ -14,4 +14,9 @@ false + + false + + + \ No newline at end of file diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 6e502ea..7112e1e 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.06.02.0930")] -[assembly: AssemblyFileVersion("22.06.02.0930")] +[assembly: AssemblyVersion("22.07.04.0930")] +[assembly: AssemblyFileVersion("22.07.04.0930")] diff --git a/Project/_Common/fAddNewUser.Designer.cs b/Project/_Common/fAddNewUser.Designer.cs index 530d9d6..7193de0 100644 --- a/Project/_Common/fAddNewUser.Designer.cs +++ b/Project/_Common/fAddNewUser.Designer.cs @@ -28,399 +28,411 @@ /// private void InitializeComponent() { - System.Windows.Forms.Label idLabel; - System.Windows.Forms.Label passwordLabel; - System.Windows.Forms.Label nameLabel; - System.Windows.Forms.Label deptLabel; - System.Windows.Forms.Label gradeLabel; - System.Windows.Forms.Label emailLabel; - System.Windows.Forms.Label levelLabel; - System.Windows.Forms.Label indateLabel; - System.Windows.Forms.Label outdateLabel; - System.Windows.Forms.Label memoLabel; - System.Windows.Forms.Label label1; - System.Windows.Forms.Label label2; - System.Windows.Forms.Label label3; - System.Windows.Forms.Label label4; - System.Windows.Forms.Label label5; - System.Windows.Forms.Label label6; - this.tbId = new System.Windows.Forms.TextBox(); - this.tbNameK = new System.Windows.Forms.TextBox(); - this.tbDept = new System.Windows.Forms.TextBox(); - this.tbGrade = new System.Windows.Forms.TextBox(); - this.tbEmail = new System.Windows.Forms.TextBox(); - this.tbLevel = new System.Windows.Forms.TextBox(); - this.tbDateIn = new System.Windows.Forms.TextBox(); - this.tbDateO = new System.Windows.Forms.TextBox(); - this.tbMemo = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.tbTel = new System.Windows.Forms.TextBox(); - this.tbHp = new System.Windows.Forms.TextBox(); - this.tbNameE = new System.Windows.Forms.TextBox(); - this.tbKJPath = new System.Windows.Forms.TextBox(); - this.tbProcess = new System.Windows.Forms.TextBox(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.tbState = new System.Windows.Forms.TextBox(); - this.chkUserSt = new System.Windows.Forms.CheckBox(); - idLabel = new System.Windows.Forms.Label(); - passwordLabel = new System.Windows.Forms.Label(); - nameLabel = new System.Windows.Forms.Label(); - deptLabel = new System.Windows.Forms.Label(); - gradeLabel = new System.Windows.Forms.Label(); - emailLabel = new System.Windows.Forms.Label(); - levelLabel = new System.Windows.Forms.Label(); - indateLabel = new System.Windows.Forms.Label(); - outdateLabel = new System.Windows.Forms.Label(); - memoLabel = new System.Windows.Forms.Label(); - label1 = new System.Windows.Forms.Label(); - label2 = new System.Windows.Forms.Label(); - label3 = new System.Windows.Forms.Label(); - label4 = new System.Windows.Forms.Label(); - label5 = new System.Windows.Forms.Label(); - label6 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // idLabel - // - idLabel.AutoSize = true; - idLabel.Location = new System.Drawing.Point(26, 15); - idLabel.Name = "idLabel"; - idLabel.Size = new System.Drawing.Size(74, 21); - idLabel.TabIndex = 0; - idLabel.Text = "사원번호"; - // - // passwordLabel - // - passwordLabel.AutoSize = true; - passwordLabel.Location = new System.Drawing.Point(26, 49); - passwordLabel.Name = "passwordLabel"; - passwordLabel.Size = new System.Drawing.Size(74, 21); - passwordLabel.TabIndex = 2; - passwordLabel.Text = "비밀번호"; - // - // nameLabel - // - nameLabel.AutoSize = true; - nameLabel.Location = new System.Drawing.Point(58, 86); - nameLabel.Name = "nameLabel"; - nameLabel.Size = new System.Drawing.Size(42, 21); - nameLabel.TabIndex = 4; - nameLabel.Text = "이름"; - // - // deptLabel - // - deptLabel.AutoSize = true; - deptLabel.Location = new System.Drawing.Point(58, 123); - deptLabel.Name = "deptLabel"; - deptLabel.Size = new System.Drawing.Size(42, 21); - deptLabel.TabIndex = 8; - deptLabel.Text = "부서"; - // - // gradeLabel - // - gradeLabel.AutoSize = true; - gradeLabel.Location = new System.Drawing.Point(360, 123); - gradeLabel.Name = "gradeLabel"; - gradeLabel.Size = new System.Drawing.Size(42, 21); - gradeLabel.TabIndex = 10; - gradeLabel.Text = "직책"; - // - // emailLabel - // - emailLabel.AutoSize = true; - emailLabel.Location = new System.Drawing.Point(26, 159); - emailLabel.Name = "emailLabel"; - emailLabel.Size = new System.Drawing.Size(74, 21); - emailLabel.TabIndex = 12; - emailLabel.Text = "전자메일"; - // - // levelLabel - // - levelLabel.AutoSize = true; - levelLabel.Location = new System.Drawing.Point(360, 229); - levelLabel.Name = "levelLabel"; - levelLabel.Size = new System.Drawing.Size(42, 21); - levelLabel.TabIndex = 18; - levelLabel.Text = "권한"; - // - // indateLabel - // - indateLabel.AutoSize = true; - indateLabel.Location = new System.Drawing.Point(344, 15); - indateLabel.Name = "indateLabel"; - indateLabel.Size = new System.Drawing.Size(58, 21); - indateLabel.TabIndex = 20; - indateLabel.Text = "입사일"; - // - // outdateLabel - // - outdateLabel.AutoSize = true; - outdateLabel.Location = new System.Drawing.Point(344, 49); - outdateLabel.Name = "outdateLabel"; - outdateLabel.Size = new System.Drawing.Size(58, 21); - outdateLabel.TabIndex = 22; - outdateLabel.Text = "퇴사일"; - // - // memoLabel - // - memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(360, 156); - memoLabel.Name = "memoLabel"; - memoLabel.Size = new System.Drawing.Size(42, 21); - memoLabel.TabIndex = 24; - memoLabel.Text = "비고"; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new System.Drawing.Point(10, 193); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(90, 21); - label1.TabIndex = 14; - label1.Text = "사무실전화"; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(26, 229); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(74, 21); - label2.TabIndex = 16; - label2.Text = "휴대전화"; - // - // label3 - // - label3.AutoSize = true; - label3.Location = new System.Drawing.Point(318, 86); - label3.Name = "label3"; - label3.Size = new System.Drawing.Size(84, 21); - label3.TabIndex = 6; - label3.Text = "이름(영문)"; - // - // label4 - // - label4.AutoSize = true; - label4.Location = new System.Drawing.Point(106, 361); - label4.Name = "label4"; - label4.Size = new System.Drawing.Size(96, 21); - label4.TabIndex = 27; - label4.Text = "견적서 위치"; - // - // label5 - // - label5.AutoSize = true; - label5.Location = new System.Drawing.Point(360, 193); - label5.Name = "label5"; - label5.Size = new System.Drawing.Size(42, 21); - label5.TabIndex = 29; - label5.Text = "공정"; - // - // label6 - // - label6.AutoSize = true; - label6.Location = new System.Drawing.Point(58, 264); - label6.Name = "label6"; - label6.Size = new System.Drawing.Size(42, 21); - label6.TabIndex = 33; - label6.Text = "상태"; - // - // tbId - // - this.tbId.Location = new System.Drawing.Point(105, 11); - this.tbId.Name = "tbId"; - this.tbId.Size = new System.Drawing.Size(145, 29); - this.tbId.TabIndex = 1; - // - // tbNameK - // - this.tbNameK.Location = new System.Drawing.Point(105, 82); - this.tbNameK.Name = "tbNameK"; - this.tbNameK.Size = new System.Drawing.Size(200, 29); - this.tbNameK.TabIndex = 5; - // - // tbDept - // - this.tbDept.Location = new System.Drawing.Point(105, 119); - this.tbDept.Name = "tbDept"; - this.tbDept.Size = new System.Drawing.Size(200, 29); - this.tbDept.TabIndex = 9; - // - // tbGrade - // - this.tbGrade.Location = new System.Drawing.Point(407, 119); - this.tbGrade.Name = "tbGrade"; - this.tbGrade.Size = new System.Drawing.Size(189, 29); - this.tbGrade.TabIndex = 11; - // - // tbEmail - // - this.tbEmail.Location = new System.Drawing.Point(105, 156); - this.tbEmail.Name = "tbEmail"; - this.tbEmail.Size = new System.Drawing.Size(200, 29); - this.tbEmail.TabIndex = 13; - // - // tbLevel - // - this.tbLevel.Location = new System.Drawing.Point(407, 225); - this.tbLevel.Name = "tbLevel"; - this.tbLevel.ReadOnly = true; - this.tbLevel.Size = new System.Drawing.Size(189, 29); - this.tbLevel.TabIndex = 19; - // - // tbDateIn - // - this.tbDateIn.Location = new System.Drawing.Point(407, 11); - this.tbDateIn.Name = "tbDateIn"; - this.tbDateIn.Size = new System.Drawing.Size(189, 29); - this.tbDateIn.TabIndex = 21; - // - // tbDateO - // - this.tbDateO.Location = new System.Drawing.Point(407, 45); - this.tbDateO.Name = "tbDateO"; - this.tbDateO.Size = new System.Drawing.Size(189, 29); - this.tbDateO.TabIndex = 23; - // - // tbMemo - // - this.tbMemo.Location = new System.Drawing.Point(407, 156); - this.tbMemo.Name = "tbMemo"; - this.tbMemo.Size = new System.Drawing.Size(189, 29); - this.tbMemo.TabIndex = 25; - // - // button2 - // - this.button2.Location = new System.Drawing.Point(105, 295); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(491, 54); - this.button2.TabIndex = 26; - this.button2.Text = "저장(&S)"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // tbTel - // - this.tbTel.Location = new System.Drawing.Point(105, 190); - this.tbTel.Name = "tbTel"; - this.tbTel.Size = new System.Drawing.Size(200, 29); - this.tbTel.TabIndex = 15; - // - // tbHp - // - this.tbHp.Location = new System.Drawing.Point(105, 225); - this.tbHp.Name = "tbHp"; - this.tbHp.Size = new System.Drawing.Size(200, 29); - this.tbHp.TabIndex = 17; - // - // tbNameE - // - this.tbNameE.Location = new System.Drawing.Point(407, 82); - this.tbNameE.Name = "tbNameE"; - this.tbNameE.Size = new System.Drawing.Size(189, 29); - this.tbNameE.TabIndex = 7; - // - // tbKJPath - // - this.tbKJPath.Location = new System.Drawing.Point(184, 358); - this.tbKJPath.Name = "tbKJPath"; - this.tbKJPath.ReadOnly = true; - this.tbKJPath.Size = new System.Drawing.Size(177, 29); - this.tbKJPath.TabIndex = 28; - // - // tbProcess - // - this.tbProcess.Location = new System.Drawing.Point(407, 190); - this.tbProcess.Name = "tbProcess"; - this.tbProcess.Size = new System.Drawing.Size(189, 29); - this.tbProcess.TabIndex = 30; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(105, 45); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(200, 29); - this.textBox1.TabIndex = 31; - this.textBox1.Text = "기본값 0"; - this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // button1 - // - this.button1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.button1.Location = new System.Drawing.Point(256, 11); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(49, 29); - this.button1.TabIndex = 32; - this.button1.Text = "조회"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // tbState - // - this.tbState.Location = new System.Drawing.Point(105, 260); - this.tbState.Name = "tbState"; - this.tbState.Size = new System.Drawing.Size(200, 29); - this.tbState.TabIndex = 34; - // - // chkUserSt - // - this.chkUserSt.AutoSize = true; - this.chkUserSt.Location = new System.Drawing.Point(407, 262); - this.chkUserSt.Name = "chkUserSt"; - this.chkUserSt.Size = new System.Drawing.Size(93, 25); - this.chkUserSt.TabIndex = 36; - this.chkUserSt.Text = "업무일지"; - this.chkUserSt.UseVisualStyleBackColor = true; - this.chkUserSt.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged); - // - // fAddNewUser - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(601, 355); - this.Controls.Add(this.chkUserSt); - this.Controls.Add(label6); - this.Controls.Add(this.tbState); - this.Controls.Add(this.button1); - this.Controls.Add(this.textBox1); - this.Controls.Add(label5); - this.Controls.Add(this.tbProcess); - this.Controls.Add(label4); - this.Controls.Add(this.tbKJPath); - this.Controls.Add(label3); - this.Controls.Add(this.tbNameE); - this.Controls.Add(label2); - this.Controls.Add(this.tbHp); - this.Controls.Add(label1); - this.Controls.Add(this.tbTel); - this.Controls.Add(this.button2); - this.Controls.Add(idLabel); - this.Controls.Add(this.tbId); - this.Controls.Add(passwordLabel); - this.Controls.Add(nameLabel); - this.Controls.Add(this.tbNameK); - this.Controls.Add(deptLabel); - this.Controls.Add(this.tbDept); - this.Controls.Add(gradeLabel); - this.Controls.Add(this.tbGrade); - this.Controls.Add(emailLabel); - this.Controls.Add(this.tbEmail); - this.Controls.Add(levelLabel); - this.Controls.Add(this.tbLevel); - this.Controls.Add(indateLabel); - this.Controls.Add(this.tbDateIn); - this.Controls.Add(outdateLabel); - this.Controls.Add(this.tbDateO); - this.Controls.Add(memoLabel); - this.Controls.Add(this.tbMemo); - this.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fAddNewUser"; - this.Text = "사용자추가"; - this.Load += new System.EventHandler(this.fUserInfo_Load); - this.ResumeLayout(false); - this.PerformLayout(); + System.Windows.Forms.Label idLabel; + System.Windows.Forms.Label passwordLabel; + System.Windows.Forms.Label nameLabel; + System.Windows.Forms.Label deptLabel; + System.Windows.Forms.Label gradeLabel; + System.Windows.Forms.Label emailLabel; + System.Windows.Forms.Label levelLabel; + System.Windows.Forms.Label indateLabel; + System.Windows.Forms.Label outdateLabel; + System.Windows.Forms.Label memoLabel; + System.Windows.Forms.Label label1; + System.Windows.Forms.Label label2; + System.Windows.Forms.Label label3; + System.Windows.Forms.Label label4; + System.Windows.Forms.Label label5; + System.Windows.Forms.Label label6; + this.tbId = new System.Windows.Forms.TextBox(); + this.tbNameK = new System.Windows.Forms.TextBox(); + this.tbDept = new System.Windows.Forms.TextBox(); + this.tbGrade = new System.Windows.Forms.TextBox(); + this.tbEmail = new System.Windows.Forms.TextBox(); + this.tbLevel = new System.Windows.Forms.TextBox(); + this.tbDateIn = new System.Windows.Forms.TextBox(); + this.tbDateO = new System.Windows.Forms.TextBox(); + this.tbMemo = new System.Windows.Forms.TextBox(); + this.button2 = new System.Windows.Forms.Button(); + this.tbTel = new System.Windows.Forms.TextBox(); + this.tbHp = new System.Windows.Forms.TextBox(); + this.tbNameE = new System.Windows.Forms.TextBox(); + this.tbKJPath = new System.Windows.Forms.TextBox(); + this.tbProcess = new System.Windows.Forms.TextBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.tbState = new System.Windows.Forms.TextBox(); + this.chkJobReport = new System.Windows.Forms.CheckBox(); + this.chkUseState = new System.Windows.Forms.CheckBox(); + idLabel = new System.Windows.Forms.Label(); + passwordLabel = new System.Windows.Forms.Label(); + nameLabel = new System.Windows.Forms.Label(); + deptLabel = new System.Windows.Forms.Label(); + gradeLabel = new System.Windows.Forms.Label(); + emailLabel = new System.Windows.Forms.Label(); + levelLabel = new System.Windows.Forms.Label(); + indateLabel = new System.Windows.Forms.Label(); + outdateLabel = new System.Windows.Forms.Label(); + memoLabel = new System.Windows.Forms.Label(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + label4 = new System.Windows.Forms.Label(); + label5 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // idLabel + // + idLabel.AutoSize = true; + idLabel.Location = new System.Drawing.Point(26, 15); + idLabel.Name = "idLabel"; + idLabel.Size = new System.Drawing.Size(74, 21); + idLabel.TabIndex = 0; + idLabel.Text = "사원번호"; + // + // passwordLabel + // + passwordLabel.AutoSize = true; + passwordLabel.Location = new System.Drawing.Point(26, 49); + passwordLabel.Name = "passwordLabel"; + passwordLabel.Size = new System.Drawing.Size(74, 21); + passwordLabel.TabIndex = 2; + passwordLabel.Text = "비밀번호"; + // + // nameLabel + // + nameLabel.AutoSize = true; + nameLabel.Location = new System.Drawing.Point(58, 86); + nameLabel.Name = "nameLabel"; + nameLabel.Size = new System.Drawing.Size(42, 21); + nameLabel.TabIndex = 4; + nameLabel.Text = "이름"; + // + // deptLabel + // + deptLabel.AutoSize = true; + deptLabel.Location = new System.Drawing.Point(58, 123); + deptLabel.Name = "deptLabel"; + deptLabel.Size = new System.Drawing.Size(42, 21); + deptLabel.TabIndex = 8; + deptLabel.Text = "부서"; + // + // gradeLabel + // + gradeLabel.AutoSize = true; + gradeLabel.Location = new System.Drawing.Point(360, 123); + gradeLabel.Name = "gradeLabel"; + gradeLabel.Size = new System.Drawing.Size(42, 21); + gradeLabel.TabIndex = 10; + gradeLabel.Text = "직책"; + // + // emailLabel + // + emailLabel.AutoSize = true; + emailLabel.Location = new System.Drawing.Point(26, 159); + emailLabel.Name = "emailLabel"; + emailLabel.Size = new System.Drawing.Size(74, 21); + emailLabel.TabIndex = 12; + emailLabel.Text = "전자메일"; + // + // levelLabel + // + levelLabel.AutoSize = true; + levelLabel.Location = new System.Drawing.Point(360, 229); + levelLabel.Name = "levelLabel"; + levelLabel.Size = new System.Drawing.Size(42, 21); + levelLabel.TabIndex = 18; + levelLabel.Text = "권한"; + // + // indateLabel + // + indateLabel.AutoSize = true; + indateLabel.Location = new System.Drawing.Point(344, 15); + indateLabel.Name = "indateLabel"; + indateLabel.Size = new System.Drawing.Size(58, 21); + indateLabel.TabIndex = 20; + indateLabel.Text = "입사일"; + // + // outdateLabel + // + outdateLabel.AutoSize = true; + outdateLabel.Location = new System.Drawing.Point(344, 49); + outdateLabel.Name = "outdateLabel"; + outdateLabel.Size = new System.Drawing.Size(58, 21); + outdateLabel.TabIndex = 22; + outdateLabel.Text = "퇴사일"; + // + // memoLabel + // + memoLabel.AutoSize = true; + memoLabel.Location = new System.Drawing.Point(360, 156); + memoLabel.Name = "memoLabel"; + memoLabel.Size = new System.Drawing.Size(42, 21); + memoLabel.TabIndex = 24; + memoLabel.Text = "비고"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(10, 193); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(90, 21); + label1.TabIndex = 14; + label1.Text = "사무실전화"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(26, 229); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(74, 21); + label2.TabIndex = 16; + label2.Text = "휴대전화"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(318, 86); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(84, 21); + label3.TabIndex = 6; + label3.Text = "이름(영문)"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(106, 361); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(96, 21); + label4.TabIndex = 27; + label4.Text = "견적서 위치"; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(360, 193); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(42, 21); + label5.TabIndex = 29; + label5.Text = "공정"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new System.Drawing.Point(58, 264); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(42, 21); + label6.TabIndex = 33; + label6.Text = "상태"; + // + // tbId + // + this.tbId.Location = new System.Drawing.Point(105, 11); + this.tbId.Name = "tbId"; + this.tbId.Size = new System.Drawing.Size(145, 29); + this.tbId.TabIndex = 1; + // + // tbNameK + // + this.tbNameK.Location = new System.Drawing.Point(105, 82); + this.tbNameK.Name = "tbNameK"; + this.tbNameK.Size = new System.Drawing.Size(200, 29); + this.tbNameK.TabIndex = 5; + // + // tbDept + // + this.tbDept.Location = new System.Drawing.Point(105, 119); + this.tbDept.Name = "tbDept"; + this.tbDept.Size = new System.Drawing.Size(200, 29); + this.tbDept.TabIndex = 9; + // + // tbGrade + // + this.tbGrade.Location = new System.Drawing.Point(407, 119); + this.tbGrade.Name = "tbGrade"; + this.tbGrade.Size = new System.Drawing.Size(189, 29); + this.tbGrade.TabIndex = 11; + // + // tbEmail + // + this.tbEmail.Location = new System.Drawing.Point(105, 156); + this.tbEmail.Name = "tbEmail"; + this.tbEmail.Size = new System.Drawing.Size(200, 29); + this.tbEmail.TabIndex = 13; + // + // tbLevel + // + this.tbLevel.Location = new System.Drawing.Point(407, 225); + this.tbLevel.Name = "tbLevel"; + this.tbLevel.ReadOnly = true; + this.tbLevel.Size = new System.Drawing.Size(189, 29); + this.tbLevel.TabIndex = 19; + // + // tbDateIn + // + this.tbDateIn.Location = new System.Drawing.Point(407, 11); + this.tbDateIn.Name = "tbDateIn"; + this.tbDateIn.Size = new System.Drawing.Size(189, 29); + this.tbDateIn.TabIndex = 21; + // + // tbDateO + // + this.tbDateO.Location = new System.Drawing.Point(407, 45); + this.tbDateO.Name = "tbDateO"; + this.tbDateO.Size = new System.Drawing.Size(189, 29); + this.tbDateO.TabIndex = 23; + // + // tbMemo + // + this.tbMemo.Location = new System.Drawing.Point(407, 156); + this.tbMemo.Name = "tbMemo"; + this.tbMemo.Size = new System.Drawing.Size(189, 29); + this.tbMemo.TabIndex = 25; + // + // button2 + // + this.button2.Location = new System.Drawing.Point(105, 295); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(491, 54); + this.button2.TabIndex = 26; + this.button2.Text = "저장(&S)"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // tbTel + // + this.tbTel.Location = new System.Drawing.Point(105, 190); + this.tbTel.Name = "tbTel"; + this.tbTel.Size = new System.Drawing.Size(200, 29); + this.tbTel.TabIndex = 15; + // + // tbHp + // + this.tbHp.Location = new System.Drawing.Point(105, 225); + this.tbHp.Name = "tbHp"; + this.tbHp.Size = new System.Drawing.Size(200, 29); + this.tbHp.TabIndex = 17; + // + // tbNameE + // + this.tbNameE.Location = new System.Drawing.Point(407, 82); + this.tbNameE.Name = "tbNameE"; + this.tbNameE.Size = new System.Drawing.Size(189, 29); + this.tbNameE.TabIndex = 7; + // + // tbKJPath + // + this.tbKJPath.Location = new System.Drawing.Point(184, 358); + this.tbKJPath.Name = "tbKJPath"; + this.tbKJPath.ReadOnly = true; + this.tbKJPath.Size = new System.Drawing.Size(177, 29); + this.tbKJPath.TabIndex = 28; + // + // tbProcess + // + this.tbProcess.Location = new System.Drawing.Point(407, 190); + this.tbProcess.Name = "tbProcess"; + this.tbProcess.Size = new System.Drawing.Size(189, 29); + this.tbProcess.TabIndex = 30; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(105, 45); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(200, 29); + this.textBox1.TabIndex = 31; + this.textBox1.Text = "기본값 0"; + this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // button1 + // + this.button1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.button1.Location = new System.Drawing.Point(256, 11); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(49, 29); + this.button1.TabIndex = 32; + this.button1.Text = "조회"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // tbState + // + this.tbState.Location = new System.Drawing.Point(105, 260); + this.tbState.Name = "tbState"; + this.tbState.Size = new System.Drawing.Size(200, 29); + this.tbState.TabIndex = 34; + // + // chkUserSt + // + this.chkJobReport.AutoSize = true; + this.chkJobReport.Location = new System.Drawing.Point(407, 262); + this.chkJobReport.Name = "chkUserSt"; + this.chkJobReport.Size = new System.Drawing.Size(93, 25); + this.chkJobReport.TabIndex = 36; + this.chkJobReport.Text = "업무일지"; + this.chkJobReport.UseVisualStyleBackColor = true; + this.chkJobReport.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged); + // + // chkUseSta + // + this.chkUseState.AutoSize = true; + this.chkUseState.Location = new System.Drawing.Point(503, 260); + this.chkUseState.Name = "chkUseSta"; + this.chkUseState.Size = new System.Drawing.Size(93, 25); + this.chkUseState.TabIndex = 37; + this.chkUseState.Text = "계정사용"; + this.chkUseState.UseVisualStyleBackColor = true; + // + // fAddNewUser + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(601, 355); + this.Controls.Add(this.chkUseState); + this.Controls.Add(this.chkJobReport); + this.Controls.Add(label6); + this.Controls.Add(this.tbState); + this.Controls.Add(this.button1); + this.Controls.Add(this.textBox1); + this.Controls.Add(label5); + this.Controls.Add(this.tbProcess); + this.Controls.Add(label4); + this.Controls.Add(this.tbKJPath); + this.Controls.Add(label3); + this.Controls.Add(this.tbNameE); + this.Controls.Add(label2); + this.Controls.Add(this.tbHp); + this.Controls.Add(label1); + this.Controls.Add(this.tbTel); + this.Controls.Add(this.button2); + this.Controls.Add(idLabel); + this.Controls.Add(this.tbId); + this.Controls.Add(passwordLabel); + this.Controls.Add(nameLabel); + this.Controls.Add(this.tbNameK); + this.Controls.Add(deptLabel); + this.Controls.Add(this.tbDept); + this.Controls.Add(gradeLabel); + this.Controls.Add(this.tbGrade); + this.Controls.Add(emailLabel); + this.Controls.Add(this.tbEmail); + this.Controls.Add(levelLabel); + this.Controls.Add(this.tbLevel); + this.Controls.Add(indateLabel); + this.Controls.Add(this.tbDateIn); + this.Controls.Add(outdateLabel); + this.Controls.Add(this.tbDateO); + this.Controls.Add(memoLabel); + this.Controls.Add(this.tbMemo); + this.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fAddNewUser"; + this.Text = "사용자추가"; + this.Load += new System.EventHandler(this.fUserInfo_Load); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -443,6 +455,7 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Button button1; private System.Windows.Forms.TextBox tbState; - private System.Windows.Forms.CheckBox chkUserSt; - } -} \ No newline at end of file + private System.Windows.Forms.CheckBox chkJobReport; + private System.Windows.Forms.CheckBox chkUseState; + } +} diff --git a/Project/_Common/fAddNewUser.cs b/Project/_Common/fAddNewUser.cs index 45ad0f8..dc2eb09 100644 --- a/Project/_Common/fAddNewUser.cs +++ b/Project/_Common/fAddNewUser.cs @@ -52,9 +52,12 @@ namespace Project._Common { tbProcess.Text = db_guser.Process; tbState.Text = db_guser.state; + //this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport); - this.chkUserSt.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport); + this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport); + this.chkUseState.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState); } + this.Text = "사용자 정보 변경"; } else this.Text = "사용자 정보 추가"; @@ -132,8 +135,8 @@ namespace Project._Common { drGuser.Process = this.tbProcess.Text.Trim(); drGuser.state = this.tbState.Text.Trim(); - drGuser.useJobReport = chkUserSt.Checked; - //drGuser.useJobReport = chkJobReport.Checked; + drGuser.useJobReport = chkJobReport.Checked; + drGuser.useUserState = chkUseState.Checked; } else { @@ -153,7 +156,8 @@ namespace Project._Common drGuser.state = this.tbState.Text.Trim(); drGuser.Process = this.tbProcess.Text.Trim(); //drGuser.useJobReport = this.chkJobReport.Checked; - drGuser.useJobReport = this.chkUserSt.Checked; + drGuser.useJobReport = this.chkJobReport.Checked; + drGuser.useUserState = this.chkUseState.Checked; db.EETGW_GroupUser.Add(drGuser); } diff --git a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc index f081056..efecebc 100644 --- a/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc +++ b/SubProject/FBS0000/Holiday/rHolidaySummary.rdlc @@ -171,16 +171,189 @@ + + + + + true + true + + + + + + + + + Textbox9 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + Textbox10 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + + + + + Textbox11 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + - 3.95521cm + 2.42063cm + + + 2.10313cm + + + 2.20896cm 3.16146cm + + 2.5cm + + + 2.5cm + @@ -195,8 +368,7 @@ - =iif(Fields!cate.Value = "대체", iif(sum(Fields!DrTime.Value) > 0 , sum(Fields!DrTime.Value) & " / " & sum(fields!CrTime.Value) & " / " & Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) & "%" ,""), -iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & sum(fields!CrDay.Value) & " / " & Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1) & "%" ,"")) + =iif(Fields!cate.Value = "대체", sum(Fields!DrTime.Value) , sum(Fields!DrDay.Value) ) 1pt + =iif(fields!cate.Value = "대체", "Plum",iif(fields!cate.Value = "이월", "LightSteelBlue","White")) Middle 2pt 2pt @@ -246,14 +419,130 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - + true true - = iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & sum(fields!CrDay.Value) & " / " & Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1) & "%" ,"") + =iif(Fields!cate.Value = "대체", sum(Fields!CrTime.Value) , sum(Fields!CrDay.Value) ) + + + + + + + Textbox6 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + =iif(fields!cate.Value = "대체", "Plum",iif(fields!cate.Value = "이월", "LightSteelBlue","White")) + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =iif(Fields!cate.Value = "대체", +iif(sum(Fields!DrTime.Value) >0, Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) ,0) , +iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0)) + + + + + + + Textbox3 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + =iif(fields!cate.Value = "대체", "Plum",iif(fields!cate.Value = "이월", "LightSteelBlue","White")) + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!DrDay.Value) - DrDay2 + DrDay1 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!CrDay.Value) + + + + + + + CrDay + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =iif(sum(fields!DrDay.Value)> 0, (sum(fields!CrDay.Value)/sum(fields!DrDay.Value))*100,0) + + + + + + + Textbox23 - Textbox21 + Textbox7 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =iif(Fields!cate.Value = "대체", +iif(sum(Fields!DrTime.Value) >0, Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) ,0) , +iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0)) + + + + + + + Textbox4 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!DrDay.Value) + + + + + + + DrDay2 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Sum(Fields!CrDay.Value) + + + + + + + CrDay1 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + LightGrey + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =iif(sum(fields!DrDay.Value)> 0, (sum(fields!CrDay.Value)/sum(fields!DrDay.Value))*100,0) + + + + + + + Textbox24 + + + + + + Textbox8 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =iif(Fields!cate.Value = "대체", +iif(sum(Fields!DrTime.Value) >0, Math.Round( (sum(fields!CrTime.Value) / sum(Fields!DrTime.Value))*100,1) ,0) , +iif(sum(Fields!DrDay.Value) >0, Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1),0)) + + + + + + + Textbox5 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + @@ -494,7 +1243,7 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - = iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & sum(fields!CrDay.Value) & " / " & Math.Round( (sum(fields!CrDay.Value) / sum(Fields!DrDay.Value))*100,1) & "%" ,"") + =Sum(Fields!DrDay.Value) + + + + + + CrDay2 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =iif(sum(fields!DrDay.Value)> 0, (sum(fields!CrDay.Value)/sum(fields!DrDay.Value))*100,0) + + + + + + + Textbox25 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + true + + @@ -559,7 +1424,7 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - 휴가 이력 (발생/사용/사용률) + 휴가이력 + + + + + + Textbox13 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 0.6cm + + + true + true + + + + + 사용 + + + + + + + Textbox14 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 0.6cm + + + true + true + + + + + 사용률(%) + + + + + + + Textbox15 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + @@ -743,7 +1796,192 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - + + + 0.6cm + + + true + true + + + + + 발생 + + + + + + + Textbox18 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + 0.6cm + + + true + true + + + + + 사용 + + + + + + + Textbox28 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + true + true + + + + + 사용률(%) + + + + + + + Textbox22 + + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + + #181818 + + 1pt + + Silver + Middle + 2pt + 2pt + 2pt + 2pt + + + + + @@ -831,7 +2069,7 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - 2.79105cm + 2.23543cm true @@ -889,7 +2127,7 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - 2.94979cm + 2.31479cm true @@ -952,7 +2190,7 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - 5.74084cm + 4.55022cm true @@ -1014,7 +2252,7 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - 8.24084cm + 7.05022cm true @@ -1080,8 +2318,8 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s true true DataSet1 - 3.21167cm - 15.35751cm + 3.81167cm + 21.94439cm @@ -1089,10 +2327,10 @@ iif(sum(Fields!DrDay.Value) > 0 , sum(Fields!DrDay.Value) & " / " & s - 1.26444in + 1.50066in