Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

휴가신청구분 입력 불가 하게 함

Browse Source
This commit is contained in:
chi
2022-07-04 09:26:39 +09:00
parent f8c38ae031
commit 38a681000f
11 changed files with 2103 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Project/EETGW.csproj.user
View File

@@ -14,4 +14,9 @@
<PropertyGroup> <PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging> <EnableSecurityDebugging>false</EnableSecurityDebugging>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<RemoteDebugEnabled>false</RemoteDebugEnabled>
<RemoteDebugMachine>
</RemoteDebugMachine>
</PropertyGroup>
</Project> </Project>

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다. // 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("22.06.02.0930")] [assembly: AssemblyVersion("22.07.04.0930")]
[assembly: AssemblyFileVersion("22.06.02.0930")] [assembly: AssemblyFileVersion("22.07.04.0930")]

805
Project/_Common/fAddNewUser.Designer.cs generated
View File

@@ -28,399 +28,411 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.Label idLabel; System.Windows.Forms.Label idLabel;
System.Windows.Forms.Label passwordLabel; System.Windows.Forms.Label passwordLabel;
System.Windows.Forms.Label nameLabel; System.Windows.Forms.Label nameLabel;
System.Windows.Forms.Label deptLabel; System.Windows.Forms.Label deptLabel;
System.Windows.Forms.Label gradeLabel; System.Windows.Forms.Label gradeLabel;
System.Windows.Forms.Label emailLabel; System.Windows.Forms.Label emailLabel;
System.Windows.Forms.Label levelLabel; System.Windows.Forms.Label levelLabel;
System.Windows.Forms.Label indateLabel; System.Windows.Forms.Label indateLabel;
System.Windows.Forms.Label outdateLabel; System.Windows.Forms.Label outdateLabel;
System.Windows.Forms.Label memoLabel; System.Windows.Forms.Label memoLabel;
System.Windows.Forms.Label label1; System.Windows.Forms.Label label1;
System.Windows.Forms.Label label2; System.Windows.Forms.Label label2;
System.Windows.Forms.Label label3; System.Windows.Forms.Label label3;
System.Windows.Forms.Label label4; System.Windows.Forms.Label label4;
System.Windows.Forms.Label label5; System.Windows.Forms.Label label5;
System.Windows.Forms.Label label6; System.Windows.Forms.Label label6;
this.tbId = new System.Windows.Forms.TextBox(); this.tbId = new System.Windows.Forms.TextBox();
this.tbNameK = new System.Windows.Forms.TextBox(); this.tbNameK = new System.Windows.Forms.TextBox();
this.tbDept = new System.Windows.Forms.TextBox(); this.tbDept = new System.Windows.Forms.TextBox();
this.tbGrade = new System.Windows.Forms.TextBox(); this.tbGrade = new System.Windows.Forms.TextBox();
this.tbEmail = new System.Windows.Forms.TextBox(); this.tbEmail = new System.Windows.Forms.TextBox();
this.tbLevel = new System.Windows.Forms.TextBox(); this.tbLevel = new System.Windows.Forms.TextBox();
this.tbDateIn = new System.Windows.Forms.TextBox(); this.tbDateIn = new System.Windows.Forms.TextBox();
this.tbDateO = new System.Windows.Forms.TextBox(); this.tbDateO = new System.Windows.Forms.TextBox();
this.tbMemo = new System.Windows.Forms.TextBox(); this.tbMemo = new System.Windows.Forms.TextBox();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.tbTel = new System.Windows.Forms.TextBox(); this.tbTel = new System.Windows.Forms.TextBox();
this.tbHp = new System.Windows.Forms.TextBox(); this.tbHp = new System.Windows.Forms.TextBox();
this.tbNameE = new System.Windows.Forms.TextBox(); this.tbNameE = new System.Windows.Forms.TextBox();
this.tbKJPath = new System.Windows.Forms.TextBox(); this.tbKJPath = new System.Windows.Forms.TextBox();
this.tbProcess = new System.Windows.Forms.TextBox(); this.tbProcess = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.tbState = new System.Windows.Forms.TextBox(); this.tbState = new System.Windows.Forms.TextBox();
this.chkUserSt = new System.Windows.Forms.CheckBox(); this.chkJobReport = new System.Windows.Forms.CheckBox();
idLabel = new System.Windows.Forms.Label(); this.chkUseState = new System.Windows.Forms.CheckBox();
passwordLabel = new System.Windows.Forms.Label(); idLabel = new System.Windows.Forms.Label();
nameLabel = new System.Windows.Forms.Label(); passwordLabel = new System.Windows.Forms.Label();
deptLabel = new System.Windows.Forms.Label(); nameLabel = new System.Windows.Forms.Label();
gradeLabel = new System.Windows.Forms.Label(); deptLabel = new System.Windows.Forms.Label();
emailLabel = new System.Windows.Forms.Label(); gradeLabel = new System.Windows.Forms.Label();
levelLabel = new System.Windows.Forms.Label(); emailLabel = new System.Windows.Forms.Label();
indateLabel = new System.Windows.Forms.Label(); levelLabel = new System.Windows.Forms.Label();
outdateLabel = new System.Windows.Forms.Label(); indateLabel = new System.Windows.Forms.Label();
memoLabel = new System.Windows.Forms.Label(); outdateLabel = new System.Windows.Forms.Label();
label1 = new System.Windows.Forms.Label(); memoLabel = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label(); label2 = new System.Windows.Forms.Label();
label4 = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label();
label6 = new System.Windows.Forms.Label(); label5 = new System.Windows.Forms.Label();
this.SuspendLayout(); label6 = new System.Windows.Forms.Label();
// this.SuspendLayout();
// idLabel //
// // idLabel
idLabel.AutoSize = true; //
idLabel.Location = new System.Drawing.Point(26, 15); idLabel.AutoSize = true;
idLabel.Name = "idLabel"; idLabel.Location = new System.Drawing.Point(26, 15);
idLabel.Size = new System.Drawing.Size(74, 21); idLabel.Name = "idLabel";
idLabel.TabIndex = 0; idLabel.Size = new System.Drawing.Size(74, 21);
idLabel.Text = "사원번호"; idLabel.TabIndex = 0;
// idLabel.Text = "사원번호";
// passwordLabel //
// // passwordLabel
passwordLabel.AutoSize = true; //
passwordLabel.Location = new System.Drawing.Point(26, 49); passwordLabel.AutoSize = true;
passwordLabel.Name = "passwordLabel"; passwordLabel.Location = new System.Drawing.Point(26, 49);
passwordLabel.Size = new System.Drawing.Size(74, 21); passwordLabel.Name = "passwordLabel";
passwordLabel.TabIndex = 2; passwordLabel.Size = new System.Drawing.Size(74, 21);
passwordLabel.Text = "비밀번호"; passwordLabel.TabIndex = 2;
// passwordLabel.Text = "비밀번호";
// nameLabel //
// // nameLabel
nameLabel.AutoSize = true; //
nameLabel.Location = new System.Drawing.Point(58, 86); nameLabel.AutoSize = true;
nameLabel.Name = "nameLabel"; nameLabel.Location = new System.Drawing.Point(58, 86);
nameLabel.Size = new System.Drawing.Size(42, 21); nameLabel.Name = "nameLabel";
nameLabel.TabIndex = 4; nameLabel.Size = new System.Drawing.Size(42, 21);
nameLabel.Text = "이름"; nameLabel.TabIndex = 4;
// nameLabel.Text = "이름";
// deptLabel //
// // deptLabel
deptLabel.AutoSize = true; //
deptLabel.Location = new System.Drawing.Point(58, 123); deptLabel.AutoSize = true;
deptLabel.Name = "deptLabel"; deptLabel.Location = new System.Drawing.Point(58, 123);
deptLabel.Size = new System.Drawing.Size(42, 21); deptLabel.Name = "deptLabel";
deptLabel.TabIndex = 8; deptLabel.Size = new System.Drawing.Size(42, 21);
deptLabel.Text = "부서"; deptLabel.TabIndex = 8;
// deptLabel.Text = "부서";
// gradeLabel //
// // gradeLabel
gradeLabel.AutoSize = true; //
gradeLabel.Location = new System.Drawing.Point(360, 123); gradeLabel.AutoSize = true;
gradeLabel.Name = "gradeLabel"; gradeLabel.Location = new System.Drawing.Point(360, 123);
gradeLabel.Size = new System.Drawing.Size(42, 21); gradeLabel.Name = "gradeLabel";
gradeLabel.TabIndex = 10; gradeLabel.Size = new System.Drawing.Size(42, 21);
gradeLabel.Text = "직책"; gradeLabel.TabIndex = 10;
// gradeLabel.Text = "직책";
// emailLabel //
// // emailLabel
emailLabel.AutoSize = true; //
emailLabel.Location = new System.Drawing.Point(26, 159); emailLabel.AutoSize = true;
emailLabel.Name = "emailLabel"; emailLabel.Location = new System.Drawing.Point(26, 159);
emailLabel.Size = new System.Drawing.Size(74, 21); emailLabel.Name = "emailLabel";
emailLabel.TabIndex = 12; emailLabel.Size = new System.Drawing.Size(74, 21);
emailLabel.Text = "전자메일"; emailLabel.TabIndex = 12;
// emailLabel.Text = "전자메일";
// levelLabel //
// // levelLabel
levelLabel.AutoSize = true; //
levelLabel.Location = new System.Drawing.Point(360, 229); levelLabel.AutoSize = true;
levelLabel.Name = "levelLabel"; levelLabel.Location = new System.Drawing.Point(360, 229);
levelLabel.Size = new System.Drawing.Size(42, 21); levelLabel.Name = "levelLabel";
levelLabel.TabIndex = 18; levelLabel.Size = new System.Drawing.Size(42, 21);
levelLabel.Text = "권한"; levelLabel.TabIndex = 18;
// levelLabel.Text = "권한";
// indateLabel //
// // indateLabel
indateLabel.AutoSize = true; //
indateLabel.Location = new System.Drawing.Point(344, 15); indateLabel.AutoSize = true;
indateLabel.Name = "indateLabel"; indateLabel.Location = new System.Drawing.Point(344, 15);
indateLabel.Size = new System.Drawing.Size(58, 21); indateLabel.Name = "indateLabel";
indateLabel.TabIndex = 20; indateLabel.Size = new System.Drawing.Size(58, 21);
indateLabel.Text = "입사일"; indateLabel.TabIndex = 20;
// indateLabel.Text = "입사일";
// outdateLabel //
// // outdateLabel
outdateLabel.AutoSize = true; //
outdateLabel.Location = new System.Drawing.Point(344, 49); outdateLabel.AutoSize = true;
outdateLabel.Name = "outdateLabel"; outdateLabel.Location = new System.Drawing.Point(344, 49);
outdateLabel.Size = new System.Drawing.Size(58, 21); outdateLabel.Name = "outdateLabel";
outdateLabel.TabIndex = 22; outdateLabel.Size = new System.Drawing.Size(58, 21);
outdateLabel.Text = "퇴사일"; outdateLabel.TabIndex = 22;
// outdateLabel.Text = "퇴사일";
// memoLabel //
// // memoLabel
memoLabel.AutoSize = true; //
memoLabel.Location = new System.Drawing.Point(360, 156); memoLabel.AutoSize = true;
memoLabel.Name = "memoLabel"; memoLabel.Location = new System.Drawing.Point(360, 156);
memoLabel.Size = new System.Drawing.Size(42, 21); memoLabel.Name = "memoLabel";
memoLabel.TabIndex = 24; memoLabel.Size = new System.Drawing.Size(42, 21);
memoLabel.Text = "비고"; memoLabel.TabIndex = 24;
// memoLabel.Text = "비고";
// label1 //
// // label1
label1.AutoSize = true; //
label1.Location = new System.Drawing.Point(10, 193); label1.AutoSize = true;
label1.Name = "label1"; label1.Location = new System.Drawing.Point(10, 193);
label1.Size = new System.Drawing.Size(90, 21); label1.Name = "label1";
label1.TabIndex = 14; label1.Size = new System.Drawing.Size(90, 21);
label1.Text = "사무실전화"; label1.TabIndex = 14;
// label1.Text = "사무실전화";
// label2 //
// // label2
label2.AutoSize = true; //
label2.Location = new System.Drawing.Point(26, 229); label2.AutoSize = true;
label2.Name = "label2"; label2.Location = new System.Drawing.Point(26, 229);
label2.Size = new System.Drawing.Size(74, 21); label2.Name = "label2";
label2.TabIndex = 16; label2.Size = new System.Drawing.Size(74, 21);
label2.Text = "휴대전화"; label2.TabIndex = 16;
// label2.Text = "휴대전화";
// label3 //
// // label3
label3.AutoSize = true; //
label3.Location = new System.Drawing.Point(318, 86); label3.AutoSize = true;
label3.Name = "label3"; label3.Location = new System.Drawing.Point(318, 86);
label3.Size = new System.Drawing.Size(84, 21); label3.Name = "label3";
label3.TabIndex = 6; label3.Size = new System.Drawing.Size(84, 21);
label3.Text = "이름(영문)"; label3.TabIndex = 6;
// label3.Text = "이름(영문)";
// label4 //
// // label4
label4.AutoSize = true; //
label4.Location = new System.Drawing.Point(106, 361); label4.AutoSize = true;
label4.Name = "label4"; label4.Location = new System.Drawing.Point(106, 361);
label4.Size = new System.Drawing.Size(96, 21); label4.Name = "label4";
label4.TabIndex = 27; label4.Size = new System.Drawing.Size(96, 21);
label4.Text = "견적서 위치"; label4.TabIndex = 27;
// label4.Text = "견적서 위치";
// label5 //
// // label5
label5.AutoSize = true; //
label5.Location = new System.Drawing.Point(360, 193); label5.AutoSize = true;
label5.Name = "label5"; label5.Location = new System.Drawing.Point(360, 193);
label5.Size = new System.Drawing.Size(42, 21); label5.Name = "label5";
label5.TabIndex = 29; label5.Size = new System.Drawing.Size(42, 21);
label5.Text = "공정"; label5.TabIndex = 29;
// label5.Text = "공정";
// label6 //
// // label6
label6.AutoSize = true; //
label6.Location = new System.Drawing.Point(58, 264); label6.AutoSize = true;
label6.Name = "label6"; label6.Location = new System.Drawing.Point(58, 264);
label6.Size = new System.Drawing.Size(42, 21); label6.Name = "label6";
label6.TabIndex = 33; label6.Size = new System.Drawing.Size(42, 21);
label6.Text = "상태"; label6.TabIndex = 33;
// label6.Text = "상태";
// tbId //
// // tbId
this.tbId.Location = new System.Drawing.Point(105, 11); //
this.tbId.Name = "tbId"; this.tbId.Location = new System.Drawing.Point(105, 11);
this.tbId.Size = new System.Drawing.Size(145, 29); this.tbId.Name = "tbId";
this.tbId.TabIndex = 1; this.tbId.Size = new System.Drawing.Size(145, 29);
// this.tbId.TabIndex = 1;
// tbNameK //
// // tbNameK
this.tbNameK.Location = new System.Drawing.Point(105, 82); //
this.tbNameK.Name = "tbNameK"; this.tbNameK.Location = new System.Drawing.Point(105, 82);
this.tbNameK.Size = new System.Drawing.Size(200, 29); this.tbNameK.Name = "tbNameK";
this.tbNameK.TabIndex = 5; this.tbNameK.Size = new System.Drawing.Size(200, 29);
// this.tbNameK.TabIndex = 5;
// tbDept //
// // tbDept
this.tbDept.Location = new System.Drawing.Point(105, 119); //
this.tbDept.Name = "tbDept"; this.tbDept.Location = new System.Drawing.Point(105, 119);
this.tbDept.Size = new System.Drawing.Size(200, 29); this.tbDept.Name = "tbDept";
this.tbDept.TabIndex = 9; this.tbDept.Size = new System.Drawing.Size(200, 29);
// this.tbDept.TabIndex = 9;
// tbGrade //
// // tbGrade
this.tbGrade.Location = new System.Drawing.Point(407, 119); //
this.tbGrade.Name = "tbGrade"; this.tbGrade.Location = new System.Drawing.Point(407, 119);
this.tbGrade.Size = new System.Drawing.Size(189, 29); this.tbGrade.Name = "tbGrade";
this.tbGrade.TabIndex = 11; this.tbGrade.Size = new System.Drawing.Size(189, 29);
// this.tbGrade.TabIndex = 11;
// tbEmail //
// // tbEmail
this.tbEmail.Location = new System.Drawing.Point(105, 156); //
this.tbEmail.Name = "tbEmail"; this.tbEmail.Location = new System.Drawing.Point(105, 156);
this.tbEmail.Size = new System.Drawing.Size(200, 29); this.tbEmail.Name = "tbEmail";
this.tbEmail.TabIndex = 13; this.tbEmail.Size = new System.Drawing.Size(200, 29);
// this.tbEmail.TabIndex = 13;
// tbLevel //
// // tbLevel
this.tbLevel.Location = new System.Drawing.Point(407, 225); //
this.tbLevel.Name = "tbLevel"; this.tbLevel.Location = new System.Drawing.Point(407, 225);
this.tbLevel.ReadOnly = true; this.tbLevel.Name = "tbLevel";
this.tbLevel.Size = new System.Drawing.Size(189, 29); this.tbLevel.ReadOnly = true;
this.tbLevel.TabIndex = 19; this.tbLevel.Size = new System.Drawing.Size(189, 29);
// this.tbLevel.TabIndex = 19;
// tbDateIn //
// // tbDateIn
this.tbDateIn.Location = new System.Drawing.Point(407, 11); //
this.tbDateIn.Name = "tbDateIn"; this.tbDateIn.Location = new System.Drawing.Point(407, 11);
this.tbDateIn.Size = new System.Drawing.Size(189, 29); this.tbDateIn.Name = "tbDateIn";
this.tbDateIn.TabIndex = 21; this.tbDateIn.Size = new System.Drawing.Size(189, 29);
// this.tbDateIn.TabIndex = 21;
// tbDateO //
// // tbDateO
this.tbDateO.Location = new System.Drawing.Point(407, 45); //
this.tbDateO.Name = "tbDateO"; this.tbDateO.Location = new System.Drawing.Point(407, 45);
this.tbDateO.Size = new System.Drawing.Size(189, 29); this.tbDateO.Name = "tbDateO";
this.tbDateO.TabIndex = 23; this.tbDateO.Size = new System.Drawing.Size(189, 29);
// this.tbDateO.TabIndex = 23;
// tbMemo //
// // tbMemo
this.tbMemo.Location = new System.Drawing.Point(407, 156); //
this.tbMemo.Name = "tbMemo"; this.tbMemo.Location = new System.Drawing.Point(407, 156);
this.tbMemo.Size = new System.Drawing.Size(189, 29); this.tbMemo.Name = "tbMemo";
this.tbMemo.TabIndex = 25; this.tbMemo.Size = new System.Drawing.Size(189, 29);
// this.tbMemo.TabIndex = 25;
// button2 //
// // button2
this.button2.Location = new System.Drawing.Point(105, 295); //
this.button2.Name = "button2"; this.button2.Location = new System.Drawing.Point(105, 295);
this.button2.Size = new System.Drawing.Size(491, 54); this.button2.Name = "button2";
this.button2.TabIndex = 26; this.button2.Size = new System.Drawing.Size(491, 54);
this.button2.Text = "저장(&S)"; this.button2.TabIndex = 26;
this.button2.UseVisualStyleBackColor = true; this.button2.Text = "저장(&S)";
this.button2.Click += new System.EventHandler(this.button2_Click); this.button2.UseVisualStyleBackColor = true;
// this.button2.Click += new System.EventHandler(this.button2_Click);
// tbTel //
// // tbTel
this.tbTel.Location = new System.Drawing.Point(105, 190); //
this.tbTel.Name = "tbTel"; this.tbTel.Location = new System.Drawing.Point(105, 190);
this.tbTel.Size = new System.Drawing.Size(200, 29); this.tbTel.Name = "tbTel";
this.tbTel.TabIndex = 15; this.tbTel.Size = new System.Drawing.Size(200, 29);
// this.tbTel.TabIndex = 15;
// tbHp //
// // tbHp
this.tbHp.Location = new System.Drawing.Point(105, 225); //
this.tbHp.Name = "tbHp"; this.tbHp.Location = new System.Drawing.Point(105, 225);
this.tbHp.Size = new System.Drawing.Size(200, 29); this.tbHp.Name = "tbHp";
this.tbHp.TabIndex = 17; this.tbHp.Size = new System.Drawing.Size(200, 29);
// this.tbHp.TabIndex = 17;
// tbNameE //
// // tbNameE
this.tbNameE.Location = new System.Drawing.Point(407, 82); //
this.tbNameE.Name = "tbNameE"; this.tbNameE.Location = new System.Drawing.Point(407, 82);
this.tbNameE.Size = new System.Drawing.Size(189, 29); this.tbNameE.Name = "tbNameE";
this.tbNameE.TabIndex = 7; this.tbNameE.Size = new System.Drawing.Size(189, 29);
// this.tbNameE.TabIndex = 7;
// tbKJPath //
// // tbKJPath
this.tbKJPath.Location = new System.Drawing.Point(184, 358); //
this.tbKJPath.Name = "tbKJPath"; this.tbKJPath.Location = new System.Drawing.Point(184, 358);
this.tbKJPath.ReadOnly = true; this.tbKJPath.Name = "tbKJPath";
this.tbKJPath.Size = new System.Drawing.Size(177, 29); this.tbKJPath.ReadOnly = true;
this.tbKJPath.TabIndex = 28; this.tbKJPath.Size = new System.Drawing.Size(177, 29);
// this.tbKJPath.TabIndex = 28;
// tbProcess //
// // tbProcess
this.tbProcess.Location = new System.Drawing.Point(407, 190); //
this.tbProcess.Name = "tbProcess"; this.tbProcess.Location = new System.Drawing.Point(407, 190);
this.tbProcess.Size = new System.Drawing.Size(189, 29); this.tbProcess.Name = "tbProcess";
this.tbProcess.TabIndex = 30; this.tbProcess.Size = new System.Drawing.Size(189, 29);
// this.tbProcess.TabIndex = 30;
// textBox1 //
// // textBox1
this.textBox1.Location = new System.Drawing.Point(105, 45); //
this.textBox1.Name = "textBox1"; this.textBox1.Location = new System.Drawing.Point(105, 45);
this.textBox1.ReadOnly = true; this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(200, 29); this.textBox1.ReadOnly = true;
this.textBox1.TabIndex = 31; this.textBox1.Size = new System.Drawing.Size(200, 29);
this.textBox1.Text = "기본값 0"; this.textBox1.TabIndex = 31;
this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.textBox1.Text = "기본값 0";
// this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
// button1 //
// // 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.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.button1.Name = "button1"; this.button1.Location = new System.Drawing.Point(256, 11);
this.button1.Size = new System.Drawing.Size(49, 29); this.button1.Name = "button1";
this.button1.TabIndex = 32; this.button1.Size = new System.Drawing.Size(49, 29);
this.button1.Text = "조회"; this.button1.TabIndex = 32;
this.button1.UseVisualStyleBackColor = true; this.button1.Text = "조회";
this.button1.Click += new System.EventHandler(this.button1_Click); this.button1.UseVisualStyleBackColor = true;
// this.button1.Click += new System.EventHandler(this.button1_Click);
// tbState //
// // tbState
this.tbState.Location = new System.Drawing.Point(105, 260); //
this.tbState.Name = "tbState"; this.tbState.Location = new System.Drawing.Point(105, 260);
this.tbState.Size = new System.Drawing.Size(200, 29); this.tbState.Name = "tbState";
this.tbState.TabIndex = 34; this.tbState.Size = new System.Drawing.Size(200, 29);
// this.tbState.TabIndex = 34;
// chkUserSt //
// // chkUserSt
this.chkUserSt.AutoSize = true; //
this.chkUserSt.Location = new System.Drawing.Point(407, 262); this.chkJobReport.AutoSize = true;
this.chkUserSt.Name = "chkUserSt"; this.chkJobReport.Location = new System.Drawing.Point(407, 262);
this.chkUserSt.Size = new System.Drawing.Size(93, 25); this.chkJobReport.Name = "chkUserSt";
this.chkUserSt.TabIndex = 36; this.chkJobReport.Size = new System.Drawing.Size(93, 25);
this.chkUserSt.Text = "업무일지"; this.chkJobReport.TabIndex = 36;
this.chkUserSt.UseVisualStyleBackColor = true; this.chkJobReport.Text = "업무일지";
this.chkUserSt.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged); this.chkJobReport.UseVisualStyleBackColor = true;
// this.chkJobReport.CheckedChanged += new System.EventHandler(this.chkUserSt_CheckedChanged);
// fAddNewUser //
// // chkUseSta
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; //
this.ClientSize = new System.Drawing.Size(601, 355); this.chkUseState.AutoSize = true;
this.Controls.Add(this.chkUserSt); this.chkUseState.Location = new System.Drawing.Point(503, 260);
this.Controls.Add(label6); this.chkUseState.Name = "chkUseSta";
this.Controls.Add(this.tbState); this.chkUseState.Size = new System.Drawing.Size(93, 25);
this.Controls.Add(this.button1); this.chkUseState.TabIndex = 37;
this.Controls.Add(this.textBox1); this.chkUseState.Text = "계정사용";
this.Controls.Add(label5); this.chkUseState.UseVisualStyleBackColor = true;
this.Controls.Add(this.tbProcess); //
this.Controls.Add(label4); // fAddNewUser
this.Controls.Add(this.tbKJPath); //
this.Controls.Add(label3); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.tbNameE); this.ClientSize = new System.Drawing.Size(601, 355);
this.Controls.Add(label2); this.Controls.Add(this.chkUseState);
this.Controls.Add(this.tbHp); this.Controls.Add(this.chkJobReport);
this.Controls.Add(label1); this.Controls.Add(label6);
this.Controls.Add(this.tbTel); this.Controls.Add(this.tbState);
this.Controls.Add(this.button2); this.Controls.Add(this.button1);
this.Controls.Add(idLabel); this.Controls.Add(this.textBox1);
this.Controls.Add(this.tbId); this.Controls.Add(label5);
this.Controls.Add(passwordLabel); this.Controls.Add(this.tbProcess);
this.Controls.Add(nameLabel); this.Controls.Add(label4);
this.Controls.Add(this.tbNameK); this.Controls.Add(this.tbKJPath);
this.Controls.Add(deptLabel); this.Controls.Add(label3);
this.Controls.Add(this.tbDept); this.Controls.Add(this.tbNameE);
this.Controls.Add(gradeLabel); this.Controls.Add(label2);
this.Controls.Add(this.tbGrade); this.Controls.Add(this.tbHp);
this.Controls.Add(emailLabel); this.Controls.Add(label1);
this.Controls.Add(this.tbEmail); this.Controls.Add(this.tbTel);
this.Controls.Add(levelLabel); this.Controls.Add(this.button2);
this.Controls.Add(this.tbLevel); this.Controls.Add(idLabel);
this.Controls.Add(indateLabel); this.Controls.Add(this.tbId);
this.Controls.Add(this.tbDateIn); this.Controls.Add(passwordLabel);
this.Controls.Add(outdateLabel); this.Controls.Add(nameLabel);
this.Controls.Add(this.tbDateO); this.Controls.Add(this.tbNameK);
this.Controls.Add(memoLabel); this.Controls.Add(deptLabel);
this.Controls.Add(this.tbMemo); this.Controls.Add(this.tbDept);
this.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Controls.Add(gradeLabel);
this.MaximizeBox = false; this.Controls.Add(this.tbGrade);
this.MinimizeBox = false; this.Controls.Add(emailLabel);
this.Name = "fAddNewUser"; this.Controls.Add(this.tbEmail);
this.Text = "사용자추가"; this.Controls.Add(levelLabel);
this.Load += new System.EventHandler(this.fUserInfo_Load); this.Controls.Add(this.tbLevel);
this.ResumeLayout(false); this.Controls.Add(indateLabel);
this.PerformLayout(); 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.TextBox textBox1;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox tbState; private System.Windows.Forms.TextBox tbState;
private System.Windows.Forms.CheckBox chkUserSt; private System.Windows.Forms.CheckBox chkJobReport;
} private System.Windows.Forms.CheckBox chkUseState;
} }
}

12
Project/_Common/fAddNewUser.cs
View File

@@ -52,9 +52,12 @@ namespace Project._Common
{ {
tbProcess.Text = db_guser.Process; tbProcess.Text = db_guser.Process;
tbState.Text = db_guser.state; tbState.Text = db_guser.state;
//this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport); //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 = "사용자 정보 변경"; this.Text = "사용자 정보 변경";
} }
else this.Text = "사용자 정보 추가"; else this.Text = "사용자 정보 추가";
@@ -132,8 +135,8 @@ namespace Project._Common
{ {
drGuser.Process = this.tbProcess.Text.Trim(); drGuser.Process = this.tbProcess.Text.Trim();
drGuser.state = this.tbState.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 else
{ {
@@ -153,7 +156,8 @@ namespace Project._Common
drGuser.state = this.tbState.Text.Trim(); drGuser.state = this.tbState.Text.Trim();
drGuser.Process = this.tbProcess.Text.Trim(); drGuser.Process = this.tbProcess.Text.Trim();
//drGuser.useJobReport = this.chkJobReport.Checked; //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); db.EETGW_GroupUser.Add(drGuser);
} }

1290
SubProject/FBS0000/Holiday/rHolidaySummary.rdlc
View File

File diff suppressed because it is too large Load Diff

302
SubProject/FPJ0000/JobReport_/rJobReportOT.Designer.cs generated
View File

@@ -28,149 +28,160 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.bs = new System.Windows.Forms.BindingSource(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport(); this.dsReport = new FPJ0000.dsReport();
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter(); this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
this.dataGridView1 = new arCtl.arDatagridView(); this.dataGridView1 = new arCtl.arDatagridView();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.tbProcess = new System.Windows.Forms.ComboBox(); this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btRefresh = new System.Windows.Forms.Button(); this.btRefresh = new System.Windows.Forms.Button();
this.tbMon = new System.Windows.Forms.TextBox(); this.tbSd = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.tbEd = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout(); this.panel1.SuspendLayout();
// this.SuspendLayout();
// bs //
// // bs
this.bs.DataMember = "jobreport"; //
this.bs.DataSource = this.dsReport; this.bs.DataMember = "jobreport";
// this.bs.DataSource = this.dsReport;
// dsReport //
// // dsReport
this.dsReport.DataSetName = "dsReport"; //
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; this.dsReport.DataSetName = "dsReport";
// this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
// ta //
// // ta
this.ta.ClearBeforeFill = true; //
// this.ta.ClearBeforeFill = true;
// dataGridView1 //
// // dataGridView1
this.dataGridView1.A_DelCurrentCell = true; //
this.dataGridView1.A_EnterToTab = true; this.dataGridView1.A_DelCurrentCell = true;
this.dataGridView1.A_KoreanField = null; this.dataGridView1.A_EnterToTab = true;
this.dataGridView1.A_UpperField = null; this.dataGridView1.A_KoreanField = null;
this.dataGridView1.A_ViewRownumOnHeader = true; this.dataGridView1.A_UpperField = null;
this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.A_ViewRownumOnHeader = true;
this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Location = new System.Drawing.Point(0, 42); this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.Location = new System.Drawing.Point(0, 42);
this.dataGridView1.ReadOnly = true; this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.ReadOnly = true;
this.dataGridView1.Size = new System.Drawing.Size(1348, 657); this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.TabIndex = 2; this.dataGridView1.Size = new System.Drawing.Size(1348, 657);
// this.dataGridView1.TabIndex = 2;
// panel1 //
// // panel1
this.panel1.Controls.Add(this.button1); //
this.panel1.Controls.Add(this.tbProcess); this.panel1.Controls.Add(this.tbEd);
this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.linkLabel1); this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.btRefresh); this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.tbMon); this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Controls.Add(this.btRefresh);
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Controls.Add(this.tbSd);
this.panel1.Name = "panel1"; this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Padding = new System.Windows.Forms.Padding(5); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Size = new System.Drawing.Size(1348, 42); this.panel1.Name = "panel1";
this.panel1.TabIndex = 3; this.panel1.Padding = new System.Windows.Forms.Padding(5);
// this.panel1.Size = new System.Drawing.Size(1348, 42);
// button1 this.panel1.TabIndex = 3;
// //
this.button1.Dock = System.Windows.Forms.DockStyle.Right; // button1
this.button1.Location = new System.Drawing.Point(1193, 5); //
this.button1.Name = "button1"; this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Size = new System.Drawing.Size(75, 32); this.button1.Location = new System.Drawing.Point(1193, 5);
this.button1.TabIndex = 8; this.button1.Name = "button1";
this.button1.Text = "내보내기"; this.button1.Size = new System.Drawing.Size(75, 32);
this.button1.UseVisualStyleBackColor = true; this.button1.TabIndex = 8;
this.button1.Click += new System.EventHandler(this.button1_Click); this.button1.Text = "내보내기";
// this.button1.UseVisualStyleBackColor = true;
// tbProcess this.button1.Click += new System.EventHandler(this.button1_Click);
// //
this.tbProcess.FormattingEnabled = true; // tbProcess
this.tbProcess.Location = new System.Drawing.Point(222, 10); //
this.tbProcess.Name = "tbProcess"; this.tbProcess.FormattingEnabled = true;
this.tbProcess.Size = new System.Drawing.Size(158, 20); this.tbProcess.Location = new System.Drawing.Point(344, 10);
this.tbProcess.TabIndex = 7; this.tbProcess.Name = "tbProcess";
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged); this.tbProcess.Size = new System.Drawing.Size(158, 20);
// this.tbProcess.TabIndex = 7;
// label1 this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
// //
this.label1.AutoSize = true; // label1
this.label1.Location = new System.Drawing.Point(187, 15); //
this.label1.Name = "label1"; this.label1.AutoSize = true;
this.label1.Size = new System.Drawing.Size(29, 12); this.label1.Location = new System.Drawing.Point(309, 15);
this.label1.TabIndex = 6; this.label1.Name = "label1";
this.label1.Text = "공정"; this.label1.Size = new System.Drawing.Size(29, 12);
// this.label1.TabIndex = 6;
// linkLabel1 this.label1.Text = "공정";
// //
this.linkLabel1.AutoSize = true; // linkLabel1
this.linkLabel1.Location = new System.Drawing.Point(13, 15); //
this.linkLabel1.Name = "linkLabel1"; this.linkLabel1.AutoSize = true;
this.linkLabel1.Size = new System.Drawing.Size(45, 12); this.linkLabel1.Location = new System.Drawing.Point(13, 15);
this.linkLabel1.TabIndex = 0; this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.TabStop = true; this.linkLabel1.Size = new System.Drawing.Size(45, 12);
this.linkLabel1.Text = "조회 년"; this.linkLabel1.TabIndex = 0;
// this.linkLabel1.TabStop = true;
// btRefresh this.linkLabel1.Text = "조회 년";
// //
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right; // btRefresh
this.btRefresh.Location = new System.Drawing.Point(1268, 5); //
this.btRefresh.Name = "btRefresh"; this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.btRefresh.Size = new System.Drawing.Size(75, 32); this.btRefresh.Location = new System.Drawing.Point(1268, 5);
this.btRefresh.TabIndex = 2; this.btRefresh.Name = "btRefresh";
this.btRefresh.Text = "새로고침"; this.btRefresh.Size = new System.Drawing.Size(75, 32);
this.btRefresh.UseVisualStyleBackColor = true; this.btRefresh.TabIndex = 2;
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click); this.btRefresh.Text = "새로고침";
// this.btRefresh.UseVisualStyleBackColor = true;
// tbMon this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
// //
this.tbMon.Location = new System.Drawing.Point(66, 10); // tbSd
this.tbMon.Name = "tbMon"; //
this.tbMon.Size = new System.Drawing.Size(115, 21); this.tbSd.Location = new System.Drawing.Point(66, 10);
this.tbMon.TabIndex = 1; this.tbSd.Name = "tbSd";
this.tbMon.Text = "2020"; this.tbSd.Size = new System.Drawing.Size(115, 21);
this.tbMon.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbSd.TabIndex = 1;
// this.tbSd.Text = "2020";
// rJobReportOT this.tbSd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); // tbEd
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; //
this.ClientSize = new System.Drawing.Size(1348, 699); this.tbEd.Location = new System.Drawing.Point(187, 10);
this.Controls.Add(this.dataGridView1); this.tbEd.Name = "tbEd";
this.Controls.Add(this.panel1); this.tbEd.Size = new System.Drawing.Size(115, 21);
this.Name = "rJobReportOT"; this.tbEd.TabIndex = 9;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.tbEd.Text = "2020";
this.Text = "휴일/연장근무 집계표"; this.tbEd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Load += new System.EventHandler(this.rJobReport_Load); //
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); // rJobReportOT
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit(); //
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.panel1.ResumeLayout(false); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.panel1.PerformLayout(); this.ClientSize = new System.Drawing.Size(1348, 699);
this.ResumeLayout(false); this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.panel1);
this.Name = "rJobReportOT";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "휴일/연장근무 집계표";
this.Load += new System.EventHandler(this.rJobReport_Load);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
} }
@@ -182,9 +193,10 @@
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Button btRefresh; private System.Windows.Forms.Button btRefresh;
private System.Windows.Forms.TextBox tbMon; private System.Windows.Forms.TextBox tbSd;
private System.Windows.Forms.ComboBox tbProcess; private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
} private System.Windows.Forms.TextBox tbEd;
}
} }

301
SubProject/FPJ0000/JobReport_/rJobReportOT.cs
View File

@@ -9,140 +9,215 @@ using System.Windows.Forms;
namespace FPJ0000.JobReport_ namespace FPJ0000.JobReport_
{ {
public partial class rJobReportOT : Form public partial class rJobReportOT : Form
{ {
public rJobReportOT() public rJobReportOT()
{ {
InitializeComponent(); InitializeComponent();
//this.WindowState = FormWindowState.Maximized; //this.WindowState = FormWindowState.Maximized;
} }
private void rJobReport_Load(object sender, EventArgs e) private void rJobReport_Load(object sender, EventArgs e)
{ {
this.tbProcess.Items.Clear(); this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체"); tbProcess.Items.Add("전체");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter(); var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode); var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows) foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs); tbProcess.Items.Add(dr.processs);
//this.tbProcess.Text = FCOMMON.info.Login.process; //this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0; if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
this.tbMon.Text = DateTime.Now.Year.ToString(); this.tbSd.Text = DateTime.Now.Year.ToString() + "-01";
this.Show(); this.tbEd.Text = DateTime.Now.Year.ToString() + "-12";
Application.DoEvents(); this.Show();
Application.DoEvents();
refrehData(); refrehData();
} }
void refrehData() void refrehData()
{ {
////휴일데이터가 들어가 있음. ////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter(); //var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%"); //taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim(); string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.FillByOt2(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname); this.ta.FillByOt2(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
//그리드뷰 생성 //그리드뷰 생성
this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.Rows.Clear(); this.dataGridView1.Rows.Clear();
this.dataGridView1.Columns.Clear(); this.dataGridView1.Columns.Clear();
this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
this.dataGridView1.ColumnHeadersHeight = 35; this.dataGridView1.ColumnHeadersHeight = 35;
this.dataGridView1.Columns.Add("공정", "공정"); this.dataGridView1.Columns.Add("공정", "공정");
this.dataGridView1.Columns.Add("이름", "이름"); this.dataGridView1.Columns.Add("이름", "이름");
this.dataGridView1.Columns.Add("사번", "사번");
//이름/년도데이터추가
var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm);
foreach (var ym in ymlist)
{
var drYm = ym.FirstOrDefault();
var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", ""));
this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\r\n(" + basehr.ToString() + ")");
}
//이름으로 정렬해서 데이터를 가져온다 //이름/년도데이터추가
var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname); var ymlist = dsReport.jobReport.OrderBy(t => t.yymm).GroupBy(t => t.yymm);
foreach (var uname in namelist) foreach (var ym in ymlist)
{ {
var drName = uname.FirstOrDefault(); var drYm = ym.FirstOrDefault();
var basehr = int.Parse(drYm.yymm.Substring(drYm.yymm.IndexOf('(')).Replace("(", "").Replace(")", ""));
this.dataGridView1.Columns.Add(drYm.yymm, drYm.yymm.Substring(0, 7) + "\n휴일");// + "\r\n(" + basehr.ToString() + ")");
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n연장");
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].Tag = basehr;
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].Tag = basehr;
}
this.dataGridView1.Columns.Add("subtotal", "합계\n휴일");
this.dataGridView1.Columns.Add("subtotal", "합계\n연장");
List<string> rowdata = new List<string>(); //이름으로 정렬해서 데이터를 가져온다
rowdata.Add(drName.UserProcess); var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname);
rowdata.Add(drName.uname + "(" + drName.uid + ")"); foreach (var uname in namelist)
{
var drName = uname.FirstOrDefault();
List<Boolean> high = new List<bool>(); List<string> rowdata = new List<string>();
List<Boolean> low = new List<bool>(); rowdata.Add(drName.UserProcess);
for (int i = 2; i < this.dataGridView1.ColumnCount; i++) rowdata.Add(drName.uname);
{ rowdata.Add(drName.uid);
var coltitle = dataGridView1.Columns[i].HeaderText;
var basehr = int.Parse(coltitle.Split('\n')[1].Replace("(", "").Replace(")", ""));
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == dataGridView1.Columns[i].Name); if (drName.uid.Equals("221597"))
if (userDatas == null || userDatas.Count() == 0) {
{
//이달에는 데이터가없다
rowdata.Add("--");
high.Add(false);
low.Add(false);
}
else
{
////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
//var sumhr = 0f;
//var sumot = 0f;
//var sumholy = 0f;
//foreach(dsReport.jobReportRow item in userDatas)
//{
// dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
//}
var sumhr = userDatas.Sum(t => t.hrs); }
var sumot = userDatas.Sum(t => t.ot2);
var sumhl = userDatas.Sum(t => t.holyot2);
rowdata.Add($"휴일({sumhl})\r\n연장({sumot})"); double User_sumhl = 0;
double User_sumot = 0;
if (sumhr > basehr) high.Add(true); List<Boolean> high = new List<bool>();
else high.Add(false); List<Boolean> low = new List<bool>();
for (int i = 3; i < this.dataGridView1.ColumnCount; i += 2)
{
var col = dataGridView1.Columns[i];
var coltitle = col.HeaderText;
if (col.Tag == null) continue;
var basehr = int.Parse(col.Tag.ToString());
if (sumhr < basehr) low.Add(true); var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == col.Name);
else low.Add(false); if (userDatas == null || userDatas.Count() == 0)
} {
} //이달에는 데이터가없다
rowdata.Add(null); //휴일
rowdata.Add(null); //연장
high.Add(false);
low.Add(false);
}
else
{
////모든데이터를 확인해서 휴일이랑 데이터를 분리해야한다.
//var sumhr = 0f;
//var sumot = 0f;
//var sumholy = 0f;
//foreach(dsReport.jobReportRow item in userDatas)
//{
// dsReport.HolidayLIst.Where(t => t.pdate == item.yymm);
//}
dataGridView1.Rows.Add(rowdata.ToArray()); var sumhr = userDatas.Sum(t => t.hrs);
var sumot = userDatas.Sum(t => t.ot2);
var sumhl = userDatas.Sum(t => t.holyot2);
//이번에 추가한 줄의 셀 컬러를 지정한다 User_sumhl += sumhl;
var currentrow = dataGridView1.Rows.Count - 1; User_sumot += sumot;
for (int i = 2; i < this.dataGridView1.ColumnCount; i++)
{
if (high[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue;
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
}
}
this.dataGridView1.AutoResizeColumns();
} if (sumhl == 0.0) rowdata.Add(null);
else rowdata.Add($"{sumhl}");
private void btRefresh_Click(object sender, EventArgs e) if (sumot == 0.0) rowdata.Add(null);
{ else rowdata.Add($"{sumot}");
refrehData();
}
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e) if (sumhr > basehr) high.Add(true);
{ else high.Add(false);
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click(object sender, EventArgs e) if (sumhr < basehr) low.Add(true);
{ else low.Add(false);
dataGridView1.ExportData(string.Empty); }
} }
}
rowdata.Add($"{User_sumhl}"); //합게
rowdata.Add($"{User_sumot}"); //합게
dataGridView1.Rows.Add(rowdata.ToArray());
//이번에 추가한 줄의 셀 컬러를 지정한다
var currentrow = dataGridView1.Rows.Count - 1;
for (int i = 0; i < this.dataGridView1.ColumnCount; i++)
{
var col = this.dataGridView1.Columns[i];
if (col.Tag == null)
{
dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.WhiteSmoke;
continue;
}
else
{
if (col.HeaderText.Contains("연장"))
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.Linen;// 155,82,93);
else
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.White;
}
var idx = i - 2;
if (idx < high.Count)
{
if (high[idx]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Red;
else if (low[i - 2]) dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Blue;
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
}
else dataGridView1.Rows[currentrow].Cells[i].Style.ForeColor = Color.Black;
}
}
//총계추가
List<object> rowdata2 = new List<object>();
rowdata2.Add("합계");
rowdata2.Add(dataGridView1.Rows.Count);
rowdata2.Add(null);
for (int i = 0; i < this.dataGridView1.ColumnCount; i++)
{
var col = this.dataGridView1.Columns[i];
if (col.Tag == null && col.HeaderText.StartsWith("합계") == false) continue;
var sum = 0.0;
for (int r = 0; r < this.dataGridView1.RowCount; r++)
{
var cell = dataGridView1.Rows[r].Cells[i];
if (cell.Value != null) sum += double.Parse(cell.Value.ToString());
}
if (sum != 0.0) rowdata2.Add(sum);
else rowdata2.Add(null);
}
dataGridView1.Rows.Add(rowdata2.ToArray());
dataGridView1.Rows[dataGridView1.Rows.Count - 1].DefaultCellStyle.BackColor = Color.LightGray;
this.dataGridView1.AutoResizeColumns();
}
private void btRefresh_Click(object sender, EventArgs e)
{
refrehData();
}
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
private void button1_Click(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
} }

21
SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
View File

@@ -110,7 +110,8 @@ namespace FPJ0000.OtConfirm
if (curLevel >= 5) if (curLevel >= 5)
{ {
grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)"; grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)";
}
}
var 관리자사전멘트 = FCOMMON.DBM.getCodeList("54"); var 관리자사전멘트 = FCOMMON.DBM.getCodeList("54");
cmbPreset.Items.Clear(); cmbPreset.Items.Clear();
cmbPreset.Items.Add(" -- 저장된 문구를 선택하세요(공용:54) --"); cmbPreset.Items.Add(" -- 저장된 문구를 선택하세요(공용:54) --");
@@ -118,6 +119,14 @@ namespace FPJ0000.OtConfirm
cmbPreset.SelectedIndex = 0; cmbPreset.SelectedIndex = 0;
} }
if(curLevel >= 5)
{
tbCate.DropDownStyle = ComboBoxStyle.DropDown;
}
else
{
tbCate.DropDownStyle = ComboBoxStyle.DropDownList;
}
binit = true; binit = true;
} }
@@ -136,6 +145,14 @@ namespace FPJ0000.OtConfirm
return; return;
} }
//일반사용인데 내용이 대체 라는 문자라면 오류로 한다 220627
if (radTime.Checked == false && cate.Equals("대체"))
{
FCOMMON.Util.MsgE("일반 휴가 사용에 '대체' 문자는 입력할 수 없습니다\n대체 시간을 사용하는 경우 라면 '대체시간사용'을 입력하세요");
tbCate.Focus();
return;
}
if (tbED.Value.ToShortDateString().CompareTo(tbSD.Value.ToShortDateString()) < 0) if (tbED.Value.ToShortDateString().CompareTo(tbSD.Value.ToShortDateString()) < 0)
{ {
FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요"); FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요");
@@ -237,7 +254,7 @@ namespace FPJ0000.OtConfirm
dr.HolyBackup = tbBackup.Text.Trim(); dr.HolyBackup = tbBackup.Text.Trim();
dr.cate = cate;// tbCate.Text.Trim(); dr.cate = cate;// tbCate.Text.Trim();
if (dr.Remark.Contains(richTextBox1.Text) == false) if ( dr.RowState == DataRowState.Detached && dr.Remark.Contains(richTextBox1.Text) == false)
dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text; dr.Remark = tbRemark.Text.Trim() + "\r\n" + this.richTextBox1.Text;
else else
dr.Remark = tbRemark.Text.Trim(); dr.Remark = tbRemark.Text.Trim();

55
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -6052,13 +6052,14 @@ namespace FPJ0000.dsReportTableAdapters {
this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = @"SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2 this._commandCollection[1].CommandText = @"SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
FROM vUserWorkTimeList FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) > 0 OR
and (isnull(ot2,0) > 0 or isnull(holyot2,0) > 0 ) ISNULL(holyot2, 0) > 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
ORDER BY yymm"; ORDER BY yymm";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].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, "", "", "")); this._commandCollection[1].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, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@endM", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -6125,25 +6126,31 @@ ORDER BY yymm";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)]
public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) { public virtual int FillByOt2(dsReport.jobReportDataTable dataTable, string gcode, string userprocess, string startM, string endM) {
this.Adapter.SelectCommand = this.CommandCollection[1]; this.Adapter.SelectCommand = this.CommandCollection[1];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
}
if ((gcode == null)) { if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode"); throw new global::System.ArgumentNullException("gcode");
} }
else { else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
} }
if ((userprocess == null)) { if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess"); throw new global::System.ArgumentNullException("userprocess");
} }
else { else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess)); this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess));
}
if ((startM == null)) {
throw new global::System.ArgumentNullException("startM");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM));
}
if ((endM == null)) {
throw new global::System.ArgumentNullException("endM");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM));
} }
if ((this.ClearBeforeFill == true)) { if ((this.ClearBeforeFill == true)) {
dataTable.Clear(); dataTable.Clear();
@@ -6156,25 +6163,31 @@ ORDER BY yymm";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual dsReport.jobReportDataTable GetByOt2(string yyyy, string gcode, string userprocess) { public virtual dsReport.jobReportDataTable GetByOt2(string gcode, string userprocess, string startM, string endM) {
this.Adapter.SelectCommand = this.CommandCollection[1]; this.Adapter.SelectCommand = this.CommandCollection[1];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(yyyy));
}
if ((gcode == null)) { if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode"); throw new global::System.ArgumentNullException("gcode");
} }
else { else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
} }
if ((userprocess == null)) { if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess"); throw new global::System.ArgumentNullException("userprocess");
} }
else { else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess)); this.Adapter.SelectCommand.Parameters[1].Value = ((string)(userprocess));
}
if ((startM == null)) {
throw new global::System.ArgumentNullException("startM");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(startM));
}
if ((endM == null)) {
throw new global::System.ArgumentNullException("endM");
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(endM));
} }
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable(); dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
this.Adapter.Fill(dataTable); this.Adapter.Fill(dataTable);

27
SubProject/FPJ0000/dsReport.xsd
View File

@@ -43,13 +43,14 @@ ORDER BY yymm</CommandText>
<DbCommand CommandType="Text" ModifiedByUser="true"> <DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2 <CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess, holyot, ot2, holyot2
FROM vUserWorkTimeList FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) WHERE (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess) AND (ISNULL(ot2, 0) &gt; 0 OR
and (isnull(ot2,0) &gt; 0 or isnull(holyot2,0) &gt; 0 ) ISNULL(holyot2, 0) &gt; 0) AND (SUBSTRING(yymm, 1, 7) BETWEEN @startM AND @endM)
ORDER BY yymm</CommandText> ORDER BY yymm</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="yyyy" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yyyy" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="startM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@startM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="endM" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@endM" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</SelectCommand> </SelectCommand>
@@ -329,7 +330,7 @@ ORDER BY title, ww</CommandText>
<xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport"> <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
<xs:complexType> <xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent"> <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm"> <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
@@ -369,7 +370,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent"> <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid"> <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
@@ -412,7 +413,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent"> <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs"> <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -425,7 +426,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent"> <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0"> <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -466,7 +467,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent"> <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" /> <xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
@@ -478,7 +479,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow"> <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -508,7 +509,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent"> <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -625,7 +626,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_RowClassName="K5DailyFormRow"> <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_UserColumnName="Grp" type="xs:string" /> <xs:element name="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_UserColumnName="Grp" type="xs:string" />
@@ -639,7 +640,7 @@ ORDER BY title, ww</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="JobProjectTimes" msprop:Generator_TableClassName="JobProjectTimesDataTable" msprop:Generator_TableVarName="tableJobProjectTimes" msprop:Generator_RowChangedName="JobProjectTimesRowChanged" msprop:Generator_TablePropName="JobProjectTimes" msprop:Generator_RowDeletingName="JobProjectTimesRowDeleting" msprop:Generator_RowChangingName="JobProjectTimesRowChanging" msprop:Generator_RowEvHandlerName="JobProjectTimesRowChangeEventHandler" msprop:Generator_RowDeletedName="JobProjectTimesRowDeleted" msprop:Generator_RowClassName="JobProjectTimesRow" msprop:Generator_UserTableName="JobProjectTimes" msprop:Generator_RowEvArgName="JobProjectTimesRowChangeEvent"> <xs:element name="JobProjectTimes" msprop:Generator_TableClassName="JobProjectTimesDataTable" msprop:Generator_TableVarName="tableJobProjectTimes" msprop:Generator_TablePropName="JobProjectTimes" msprop:Generator_RowDeletingName="JobProjectTimesRowDeleting" msprop:Generator_RowChangingName="JobProjectTimesRowChanging" msprop:Generator_RowEvHandlerName="JobProjectTimesRowChangeEventHandler" msprop:Generator_RowDeletedName="JobProjectTimesRowDeleted" msprop:Generator_UserTableName="JobProjectTimes" msprop:Generator_RowChangedName="JobProjectTimesRowChanged" msprop:Generator_RowEvArgName="JobProjectTimesRowChangeEvent" msprop:Generator_RowClassName="JobProjectTimesRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="ww" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_UserColumnName="ww" minOccurs="0"> <xs:element name="ww" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ww" msprop:Generator_ColumnVarNameInTable="columnww" msprop:Generator_ColumnPropNameInTable="wwColumn" msprop:Generator_UserColumnName="ww" minOccurs="0">
@@ -658,7 +659,7 @@ ORDER BY title, ww</CommandText>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" /> <xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" minOccurs="0" /> <xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>

6
SubProject/FPJ0000/dsReport.xss
View File

@@ -6,13 +6,13 @@
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="3" X="494" Y="216" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" /> <Shape ID="DesignTable:jobReport" ZOrder="1" X="494" Y="216" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" /> <Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="9" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:ProcessList" ZOrder="9" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="8" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" /> <Shape ID="DesignTable:ProcessUserList" ZOrder="8" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="6" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:HolidayLIst" ZOrder="6" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" /> <Shape ID="DesignTable:vJobReportForUser" ZOrder="4" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobProjectTimes" ZOrder="1" X="537" Y="622" Height="191" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" /> <Shape ID="DesignTable:JobProjectTimes" ZOrder="2" X="537" Y="622" Height="191" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:PartSummary" ZOrder="7" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" /> <Shape ID="DesignTable:PartSummary" ZOrder="7" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
<Shape ID="DesignTable:K5DailyForm" ZOrder="5" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" /> <Shape ID="DesignTable:K5DailyForm" ZOrder="5" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
</Shapes> </Shapes>