Compare commits

...

10 Commits

Author SHA1 Message Date
backuppc
b4183e8283 add webtestversion 2025-07-09 17:40:50 +09:00
backuppc
99b1c3ff8e 구매시 sid검새 관련 오동작 수정,
구매시 sid,model 을 수정할수 없게 함
2025-07-09 15:42:53 +09:00
backuppc
59c5f900ee 프로젝트정보에 우선순위 항목 추가(김태경s)
powerbi  용 프로젝트 정보 view  에 우선순위 값을 0에서 필드연결
ot/휴일 근무 집계표에  미승인데이터 표시가능해지고,  ot+pms  같이 표시되게함(정봉석p)
2025-07-07 11:13:01 +09:00
backuppc
b52ef11ec1 오타수정 2025-07-04 17:25:28 +09:00
chi
4f4625b56b otPMS추가(테스트버젼) 2025-07-02 23:41:25 +09:00
chi
cc4430a553 .. 2025-07-01 13:24:51 +09:00
chi
3b0d3f0be5 .. 2025-06-18 13:24:44 +09:00
chi
ceffd28980 시간%추가 2025-06-18 13:23:46 +09:00
chi
a1477fcdd1 적정인원보고서 수정 2025-06-18 10:31:59 +09:00
chi
6f4b9355e1 add nativ webview 2025-06-04 15:08:11 +09:00
109 changed files with 19363 additions and 11264 deletions

3
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"dotnet.preferCSharpExtension": true
}

Binary file not shown.

Binary file not shown.

View File

@@ -1,93 +0,0 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class HomeController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Login()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -38,7 +38,7 @@
this.label1.ForeColor = System.Drawing.Color.DimGray;
this.label1.Location = new System.Drawing.Point(0, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(800, 450);
this.label1.Size = new System.Drawing.Size(1063, 567);
this.label1.TabIndex = 0;
this.label1.Text = "요약 화면 구성 중 입니다.\r\n\r\n업무일지는 \"관리->업무일지->목록\" 을 사용하세요";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -48,7 +48,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.ClientSize = new System.Drawing.Size(1063, 567);
this.Controls.Add(this.label1);
this.Name = "fDashboard";
this.Text = "요약";

View File

@@ -1,9 +1,13 @@
using FCOMMON;
using FCM0000.Mail;
using FCOMMON;
using Microsoft.Web.WebView2.Core;
using Microsoft.Web.WebView2.WinForms;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -13,11 +17,59 @@ namespace Project.Dialog
{
public partial class fDashboard : fBase
{
private WebView2 webView21;
public fDashboard()
{
InitializeComponent();
InitializeWebView2();
}
private void InitializeWebView2()
{
// 수동으로 WebView2 컨트롤 생성
this.webView21 = new WebView2();
// 기본 속성 설정
this.webView21.CreationProperties = null;
this.webView21.DefaultBackgroundColor = Color.White;
this.webView21.Dock = DockStyle.Fill;
this.webView21.Location = new Point(0, 0);
this.webView21.Name = "webView21";
this.webView21.Size = new Size(800, 600);
this.webView21.TabIndex = 0;
this.webView21.ZoomFactor = 1D;
// 폼에 추가
this.Controls.Add(this.webView21);
// 비동기 초기화
InitializeAsync();
}
private async void InitializeAsync()
{
try
{
// Fixed Version 경로 설정
string runtimePath = Path.Combine(Application.StartupPath, "WebView2Runtime");
if (Directory.Exists(runtimePath))
{
var env = await CoreWebView2Environment.CreateAsync(runtimePath);
await this.webView21.EnsureCoreWebView2Async(env);
}
else
{
// 시스템에 설치된 WebView2 사용
await this.webView21.EnsureCoreWebView2Async();
}
// OWIN 서버의 DashBoard 페이지로 연결
webView21.Source = new Uri("http://127.0.0.1:9000/DashBoard");
label1.Visible = false;
}
catch (Exception ex)
{
MessageBox.Show($"WebView2 초기화 실패: {ex.Message}");
}
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);

289
Project/Dialog/fLogin_WB.Designer.cs generated Normal file
View File

@@ -0,0 +1,289 @@
namespace Project.Dialog
{
partial class fLogin_WB
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin));
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.panel1 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.listView1 = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tabPage2 = new System.Windows.Forms.TabPage();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.label4 = new System.Windows.Forms.Label();
this.cmbDept = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
this.tbID = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tbPW = new System.Windows.Forms.TextBox();
this.panel2 = new System.Windows.Forms.Panel();
this.btLogin = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.panel2.SuspendLayout();
this.SuspendLayout();
//
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(405, 25);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(80, 80);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBox1.TabIndex = 3;
this.pictureBox1.TabStop = false;
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244)))));
this.panel1.Controls.Add(this.tabControl1);
this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.cmbDept);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.tbID);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.tbPW);
this.panel1.Controls.Add(this.pictureBox1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(888, 639);
this.panel1.TabIndex = 0;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(16, 288);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(860, 327);
this.tabControl1.TabIndex = 13;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.listView1);
this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(852, 291);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "FAQ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// listView1
//
this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1});
this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(3, 3);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(846, 285);
this.listView1.TabIndex = 13;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.listView1_MouseDoubleClick);
//
// columnHeader1
//
this.columnHeader1.Text = "제목";
this.columnHeader1.Width = 836;
//
// tabPage2
//
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(852, 301);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "PATCH";
this.tabPage2.UseVisualStyleBackColor = true;
//
// linkLabel1
//
this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(806, 110);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(70, 23);
this.linkLabel1.TabIndex = 11;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "신규가입";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.label4.ForeColor = System.Drawing.Color.Teal;
this.label4.Location = new System.Drawing.Point(13, 257);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(243, 15);
this.label4.TabIndex = 10;
this.label4.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567";
//
// cmbDept
//
this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F);
this.cmbDept.FormattingEnabled = true;
this.cmbDept.Location = new System.Drawing.Point(16, 136);
this.cmbDept.Name = "cmbDept";
this.cmbDept.Size = new System.Drawing.Size(860, 41);
this.cmbDept.TabIndex = 9;
this.cmbDept.SelectedIndexChanged += new System.EventHandler(this.cmbDept_SelectedIndexChanged);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.ForeColor = System.Drawing.Color.Gray;
this.label3.Location = new System.Drawing.Point(13, 119);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(31, 15);
this.label3.TabIndex = 8;
this.label3.Text = "부서";
//
// tbID
//
this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F);
this.tbID.FormattingEnabled = true;
this.tbID.ImeMode = System.Windows.Forms.ImeMode.Alpha;
this.tbID.Location = new System.Drawing.Point(16, 205);
this.tbID.Name = "tbID";
this.tbID.Size = new System.Drawing.Size(364, 41);
this.tbID.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.label2.ForeColor = System.Drawing.Color.Gray;
this.label2.Location = new System.Drawing.Point(509, 187);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(31, 15);
this.label2.TabIndex = 4;
this.label2.Text = "암호";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.Gray;
this.label1.Location = new System.Drawing.Point(13, 188);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(55, 15);
this.label1.TabIndex = 2;
this.label1.Text = "사원번호";
//
// tbPW
//
this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbPW.ImeMode = System.Windows.Forms.ImeMode.Alpha;
this.tbPW.Location = new System.Drawing.Point(512, 205);
this.tbPW.Name = "tbPW";
this.tbPW.PasswordChar = '●';
this.tbPW.Size = new System.Drawing.Size(364, 40);
this.tbPW.TabIndex = 5;
this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// panel2
//
this.panel2.BackColor = System.Drawing.SystemColors.Control;
this.panel2.Controls.Add(this.btLogin);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(0, 639);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(888, 82);
this.panel2.TabIndex = 6;
//
// btLogin
//
this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill;
this.btLogin.Font = new System.Drawing.Font("맑은 고딕", 25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btLogin.Location = new System.Drawing.Point(0, 0);
this.btLogin.Name = "btLogin";
this.btLogin.Size = new System.Drawing.Size(888, 82);
this.btLogin.TabIndex = 0;
this.btLogin.Text = "접속";
this.btLogin.UseVisualStyleBackColor = true;
this.btLogin.Click += new System.EventHandler(this.button1_Click);
//
// fLogin
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.OrangeRed;
this.ClientSize = new System.Drawing.Size(888, 721);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fLogin";
this.Text = "사용자확인";
this.Load += new System.EventHandler(this.fLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Button btLogin;
public System.Windows.Forms.TextBox tbPW;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox tbID;
private System.Windows.Forms.ComboBox cmbDept;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.TabPage tabPage2;
}
}

556
Project/Dialog/fLogin_WB.cs Normal file
View File

@@ -0,0 +1,556 @@
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
using System.Text;
using System.Windows.Forms;
using Microsoft.Web.WebView2.Core;
using Microsoft.Web.WebView2.WinForms;
using System.IO;
namespace Project.Dialog
{
public partial class fLogin_WB : fBase
{
private WebView2 webView21;
public fLogin_WB()
{
InitializeComponent();
InitializeWebView2();
this.tbID.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) tbPW.Focus(); };
this.tbPW.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Enter) btLogin.PerformClick(); };
this.KeyPreview = true;
this.KeyDown += (s1, e1) =>
{
if (e1.KeyCode == Keys.Escape) this.Close();
};
this.Text = string.Format("사용자 확인(v{0})", Application.ProductVersion);
var lv = this.listView1.Items.Add("[25-04-06] 데이터베이스 이전 작업 완료 (버그신고:chikyun.kim@amkor.co.kr)");
lv.Tag = "기존 데이터베이스 삭제 예정으로 인한 신규 데이터베이스 업데이트 작업 완료\n일부 기능에 문제가 발생할 수 있습니다. 문제 발생시에는 chikyun.kim@amkor.co.kr 로 문의 주세요";
}
private void InitializeWebView2()
{
// 수동으로 WebView2 컨트롤 생성
this.webView21 = new WebView2();
// 기본 속성 설정
this.webView21.CreationProperties = null;
this.webView21.DefaultBackgroundColor = Color.White;
this.webView21.Dock = DockStyle.Fill;
this.webView21.Location = new Point(0, 0);
this.webView21.Name = "webView21";
this.webView21.Size = new Size(800, 600);
this.webView21.TabIndex = 0;
this.webView21.ZoomFactor = 1D;
// 폼에 추가
this.Controls.Clear();
this.Controls.Add(this.webView21);
// 비동기 초기화
InitializeAsync();
}
private async void InitializeAsync()
{
try
{
// Fixed Version 경로 설정
string runtimePath = Path.Combine(Application.StartupPath, "WebView2Runtime");
if (Directory.Exists(runtimePath))
{
var env = await CoreWebView2Environment.CreateAsync(runtimePath);
await this.webView21.EnsureCoreWebView2Async(env);
}
else
{
// 시스템에 설치된 WebView2 사용
await this.webView21.EnsureCoreWebView2Async();
}
// OWIN 서버의 DashBoard 페이지로 연결
webView21.Source = new Uri("http://127.0.0.1:9000/Home/Login");
label1.Visible = false;
}
catch (Exception ex)
{
MessageBox.Show($"WebView2 초기화 실패: {ex.Message}");
}
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
EnsureVisibleAndUsableSize();
}
private void fLogin_Load(object sender, EventArgs e)
{
//EnsureVisibleAndUsableSize();
var list = Pub.setting.lastid.Split(';');
foreach (var item in list)
if (item != "") tbID.Items.Add(item);
if (tbID.Items.Count > 0) tbID.SelectedIndex = 0;
//S1 사용자 그룹목록 확인
//var tas1 = new S1ACCESS300Entities();
//var deptlist = tas1.VIEW_CARD_PERSON
// .Where(t => t.CardStatusID == 0 && string.IsNullOrEmpty(t.CardUser2) == false)
// .GroupBy(t => t.PersonUser2)
// .OrderBy(t => t.Key)
// .ToList();
//this.cmbDept.Items.Clear();
//foreach (var dept in deptlist)
// cmbDept.Items.Add(dept);
//그룹목록가져오기
//Util.MsgE(Properties.Settings.Default.CS);
var tagrp = new dsMSSQLTableAdapters.UserGroupTableAdapter();
//Util.MsgE(tagrp.Connection.ConnectionString);
var grplist = tagrp.GetData();
this.cmbDept.DataSource = grplist;
this.cmbDept.DisplayMember = "dept";
this.cmbDept.ValueMember = "gcode";
//마지막으로사용한 부서이름
if (Pub.setting.lastdpt.isEmpty()) this.cmbDept.SelectedIndex = -1;
else this.cmbDept.Text = Pub.setting.lastdpt;
if (cmbDept.SelectedIndex == -1 && Pub.setting.lastgcode.isEmpty() == false)
{
var dr = grplist.Where(t => t.gcode.Equals(Pub.setting.lastgcode)).FirstOrDefault();
if (dr != null) cmbDept.Text = dr.dept;
}
//foreach (var item in dlist)
// if (item != "") this.cmbDept.Items.Add(item);
//if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0;
this.Show();
Application.DoEvents();
if (this.tbID.Text.isEmpty() == false) tbPW.Focus();
else tbID.Focus();
}
private void button1_Click(object sender, EventArgs e)
{
DateTime dt = DateTime.Now;
//if(tbID.Text != "dev" && (dt.ToShortDateString() == "2025-04-05" ||
// dt.ToShortDateString() == "2025-04-06"))
//{
// Util.MsgE("4월 5일~6일은 데이터베이스 마이그레이션 기간이므로 프로그램 사용이 중단 됩니다\n문의 010-9155-9051 (EEDP:김치균)");
// return;
//}
if (this.tbID.Text.isEmpty())
{
tbID.Focus();
return;
}
if (this.tbPW.Text.isEmpty())
{
tbPW.Focus();
return;
}
if (cmbDept.SelectedIndex < 0)
{
FCOMMON.Util.MsgE("소속 부서를 선택하세요");
cmbDept.Focus();
return;
}
List<string> idlist = new List<string>();
idlist.Add(tbID.Text.Trim());
foreach (var item in this.tbID.Items)
if (idlist.Contains(item) == false) idlist.Add(item.ToString());
//List<string> deptlist = new List<string>();
//deptlist.Add(cmbDept.Text.Trim());
//foreach (var item in this.cmbDept.Items)
// if (deptlist.Contains(item) == false) deptlist.Add(item.ToString());
//180605
var vuserlist = "";
foreach (var item in idlist)
vuserlist += ";" + item;
//var vdeptlist = "";
//foreach(var item in deptlist)
// vdeptlist += ";" + item;
var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow;
Pub.setting.lastid = vuserlist;// tbID.Text.Trim();
Pub.setting.lastdpt = cmbDept.Text; //부서저장 201006
Pub.setting.lastgcode = gCode;
Pub.setting.Save();
var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim());
var id = tbID.Text.Trim();
//var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
try
{
if (id.ToUpper().Equals("DEV") == false)
{
var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
var drGrpUser = taGrpUser.GetbyID(gCode, id).FirstOrDefault();
if (drGrpUser == null)
{
Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
else if (drGrpUser.level == 0)
{
Util.MsgE($"해당 계정이 활성화되지 않았습니다\n계정 담당자 문의하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
//사용자테이블에서 암호를 확인합니다.
var taUser = new dsMSSQLTableAdapters.UsersTableAdapter();
var drUser = taUser.GetID(id).FirstOrDefault();
if (drUser == null)
{
Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
else if (drUser.password.Equals(encpass) == false)
{
Util.MsgE($"암호가 일치하지 않습니다.\n암호를 분실했을 경우에는 계정담당자에 초기화를 요청 하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
//이사용자의 부서 코드확인
//var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
//var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
if (MaxVerstion.isEmpty() == false)
{
var curversion = Application.ProductVersion;
var verchk = curversion.CompareTo(MaxVerstion);
if (verchk < 0)
{
//내버젼이 낮다
Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
}
}
FCOMMON.info.Login.no = drUser.id;
FCOMMON.info.Login.nameK = drUser.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = drGrpUser.level;
FCOMMON.info.Login.email = drUser.email;
FCOMMON.info.Login.nameE = drUser.nameE;
FCOMMON.info.Login.hp = drUser.hp;
FCOMMON.info.Login.tel = drUser.tel;
FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")";
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;// gcode;
FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process;
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
//FCOMMON.info.datapath = Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
}
else
{
if (tbPW.Text.Equals("123") == false)
{
return;
}
FCOMMON.info.Login.no = "dev";
FCOMMON.info.Login.nameK = "개발자";
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = 10;
FCOMMON.info.Login.email = "";
FCOMMON.info.Login.nameE = "DEVELOPER";
FCOMMON.info.Login.hp = "";
FCOMMON.info.Login.tel = "";
FCOMMON.info.Login.title = "업무일지 개발자";
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;
FCOMMON.info.Login.process = "개발자";
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
//var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
//FCOMMON.info.datapath = datapath;// Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
}
//if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
// FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
//using (var dbEnity = new EEEntitiesMain())
//{
// var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
// if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : "");
// else FCOMMON.info.Login.process = drGrpUser.Process;
//}
//로그인정보 기록
AddLoginInfo();
//210221
MakeAutoJobReportbyLogin();
//210613
MakeAutoJobReportByAuto();
DialogResult = DialogResult.OK;
FCOMMON.info.Login.loginusetime = (DateTime.Now - dt).TotalMilliseconds;
}
catch (Exception ex)
{
Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요");
DialogResult = System.Windows.Forms.DialogResult.Cancel;
}
}
/// <summary>
/// 무조건 업무일지를 자동으로 작성하는 경우
/// </summary>
void MakeAutoJobReportByAuto()
{
//누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다.
var dbAI = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();// EEEntitiesMain();
var dbGU = new dsMSSQLTableAdapters.vGroupUserTableAdapter();// EEEntitiesMain();
var dbHL = new dsMSSQLTableAdapters.HolidayLIstTableAdapter();
var dbJR = new dsMSSQLTableAdapters.JobReportTableAdapter();
var taQuery = new DSQueryTableAdapters.QueriesTableAdapter();
var nd = DateTime.Now.ToShortDateString();
//이 날짜가 휴일인지 체크한다.
var Holyinfo = dbHL.GetData(nd).FirstOrDefault();// db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
if (Holyinfo != null && Holyinfo.IsfreeNull() == false && Holyinfo.free == true) return;
//토,일은 처리하지 않음
if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
// db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
var rows = dbAI.GetActiveList(info.Login.gcode, "A", "%", nd);
foreach (var dr in rows)
{
//퇴사자 확인
var userdata = dbGU.GetByID(FCOMMON.info.Login.gcode, dr.uid).FirstOrDefault();// db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault();
if (userdata != null && userdata.IsoutdateNull() == false) continue;
//오늘자 자동생성된 데이터가 있다면 처리하지 않는다
if (taQuery.ExistAutoInputData(info.Login.gcode, dr.uid, nd) > 0) continue; //db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any())
//이데이터를 그대로 생성해준다.
var dtjr = new dsMSSQL.JobReportDataTable();
var newdr = dtjr.NewJobReportRow();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = dr.uid;// FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = nd;
newdr.import = false;
newdr.hrs = dr.hrs;
newdr.type = dr.type;//210305 누락분 추가
newdr.ot = dr.ot;
newdr.process = dr.process;
newdr.projectName = dr.projectName;
newdr.pidx = dr.pidx;
newdr.package = dr.package;
newdr.autoinput = true;
newdr.description = dr.description;
newdr.description2 = dr.description2;
newdr.remark = dr.remark;
newdr.requestpart = dr.requestpart;
newdr.status = dr.status;
newdr.tag = dr.tag;
newdr.uid = dr.uid;
dtjr.AddJobReportRow(newdr);
dbJR.Update(dtjr);
}
dbAI.Dispose();
dbGU.Dispose();
dbHL.Dispose();
dbJR.Dispose();
taQuery.Dispose();
}
/// <summary>
/// 로그인으로 업무일지를 작성하는 경우
/// </summary>
void MakeAutoJobReportbyLogin()
{
//자동로그인 업무일지 기록 기능 추가 = 210220
//select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
var nd = DateTime.Now.ToShortDateString();
var taQ = new DSQueryTableAdapters.QueriesTableAdapter();
var exist = taQ.ExistAutoInputData(info.Login.gcode, info.Login.no, nd) > 0;
//var db = new EEEntitiesMain();
if (exist == false)
{
var taM = new dsMSSQLTableAdapters.EETGW_JobReport_AutoInputTableAdapter();
var rows = taM.GetActiveList(info.Login.gcode, "L", info.Login.no, nd);
//var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode &&
//t.enable == true &&
//t.autoinput == "L" &&
//t.uid == FCOMMON.info.Login.no &&
//t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
var newjob = new dsMSSQL.JobReportDataTable();
foreach (var dr in rows)
{
//이데이터를 그대로 생성해준다.
var newdr = newjob.NewJobReportRow();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = nd;
newdr.import = false;
if (dr.IshrsNull() == false) newdr.hrs = dr.hrs;
if (dr.IstypeNull() == false) newdr.type = dr.type;//210305 누락분 추가
if (dr.IsotNull() == false) newdr.ot = dr.ot;
if (dr.IsprocessNull() == false) newdr.process = dr.process;
if (dr.IsprojectNameNull() == false) newdr.projectName = dr.projectName;
if (dr.IspidxNull() == false) newdr.pidx = dr.pidx;
if (dr.IspackageNull() == false) newdr.package = dr.package;
newdr.autoinput = true;
if (dr.IsdescriptionNull() == false) newdr.description = dr.description;
if (dr.Isdescription2Null() == false) newdr.description2 = dr.description2;
if (dr.IsremarkNull() == false) newdr.remark = dr.remark;
if (dr.IsrequestpartNull() == false) newdr.requestpart = dr.requestpart;
if (dr.IsstatusNull() == false) newdr.status = dr.status;
if (dr.IstagNull() == false) newdr.tag = dr.tag;
if (dr.IsuidNull() == false) newdr.uid = dr.uid;
newjob.AddJobReportRow(newdr);
}
if (newjob.Count() > 0)
{
var taJ = new dsMSSQLTableAdapters.JobReportTableAdapter();
var cnt = taJ.Update(newjob);
//db.SaveChanges();
Util.MsgI($"{cnt} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" +
"자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다");
}
}
}
void AddLoginInfo()
{
string ip = string.Empty;
string hostname = Dns.GetHostName();
string fullname = System.Net.Dns.GetHostEntry("").HostName;
var nif = NetworkInterface.GetAllNetworkInterfaces();
var host = Dns.GetHostEntry(hostname);
foreach (IPAddress r in host.AddressList)
{
string str = r.ToString();
if (str != "" && str.Substring(0, 3) == "10.")
{
ip = str;
break;
}
}
if (ip == "" || hostname == "") return;
try
{
var ta = new dsMSSQLTableAdapters.EETGW_LoginInfoTableAdapter();
ta.Insert(FCOMMON.info.Login.no, DateTime.Now, ip, fullname, info.Login.no, DateTime.Now);
}
catch (Exception ex)
{
FCOMMON.Util.MsgE(ex.Message);
Console.WriteLine(ex.Message);
}
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr");
}
private void cmbDept_SelectedIndexChanged(object sender, EventArgs e)
{
//부서명이 변경되었다
label4.Text = "문의) 정보없음(?)";
var sel = cmbDept.SelectedItem as DataRowView;
if (sel == null) return;
var dr = sel.Row as dsMSSQL.UserGroupRow;
if (dr == null) return;
var admin = dr.managerinfo;
if (string.IsNullOrEmpty(admin))
admin = "--";
var dev = dr.devinfo;
if (string.IsNullOrEmpty(dev))
dev = "chikyun.kim@amkor.co.kr(T8567)";
label4.Text = $"문의) 관리:{admin},개발:{dev}";
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
//if (System.Diagnostics.Debugger.IsAttached == false)
//{
// Util.MsgE("이 기능은 준비중 입니다");
// return;
//}
var gCode = this.cmbDept.SelectedValue.ToString();// as dsMSSQL.UserGroupRow;
FCOMMON.info.Login.gcode = gCode;
FCOMMON.info.Login.no = "new";
FCOMMON.info.Login.dept = this.cmbDept.Text;
var dlg = FCOMMON.Util.MsgQ($"현재 선택된 그룹[{this.cmbDept.Text}]의 사용자를 추가할까요?\n" +
"추가된 사용자는 담당자로부터 승인 완료되어야 접속이 가능 합니다\n" +
"사용자 추가 후 그룹담당자에게 문의 하시기 바랍니다");
if (dlg != DialogResult.Yes) return;
var f = new _Common.fAddNewUser(cmbDept.Text, string.Empty, 0);//.fUserInfo();
dlg = f.ShowDialog();
if (dlg == DialogResult.OK)
{
tbID.Text = f.tbId.Text.Trim();
}
}
private void listView1_MouseDoubleClick(object sender, MouseEventArgs e)
{
var lv = this.listView1.FocusedItem;
if (lv == null) return;
if (lv.Tag == null) return;
var msg = lv.Tag.ToString();
Util.MsgI(msg);
}
}
}

View File

@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAb
rQAAG60BIeRSlQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAeaSURBVHhe7Vrr
bxRVFK9+8ItRY/Qf8BE1auIravykRpjdlvcbFCMkxsREfACKxmCqobszW55CUikgL5ECkoLQIkTjB9md
2W6rQmm7te1SmijvtpQ3FMZzZs+F6fYMULZ3d7adX/ILZM+555z768w9985MngcPHoao1fcpochwRTNC
PlWvBDYD21PYpGh6BfyroW9+oXEvDR+cKCw071S0yGifGtkGolwEmn0kjDHKgaMwFoUdBDDNO/zByBQQ
oD5FkHRYB5xIGQYu8kPhR2Civ9om3q/0q5HdQ4KxhyndwAJddV2pk7bxkF+LLIdb+k1fSH9+xPzqB4cF
/7gfif9XgsYLlk3VS32a3pYy1s5OyDWB0g4AwC0Lkw8wE0V2gxhl+aHIq31Zx9DXH9Rf82nGZisGG9v4
GnPTkBwFTAAEKmEnGNR3FASij5HnbcOv7X2cunPvHJA7p0X0BSPfMBM7C1fO2+TSb4Arcpqi6ueYfBq5
5BaUoD6JmcwxXMvIpd/hD4ZfhBwnUnKacIW+RS65AbjyHoXCUxvG8fyA8SS5SINSFH4acp1MyX0qp7oz
bCd+S5nAeZ8WeYnM0uEPhF+BnBd61mD8QmZ3g7t1YW16n8wZA+SckVoHbG/GkNmdwO0FFNrQs/DITjJn
HJAfz9W2WvQ6Vx/74K+en1JwtxKIPEHmjMOnVj2FNdhrguXFR2b3AYrbYi8WBF1PpqwBtkw/2mvCjTuZ
3IWR2t57oMAeC7cS0F8mc9ZADeV6TbBXVIr33U1m98AfMArshQKbyJRd4GlI1RP22oYGDYWs7gHcGqq9
SGgey8iUdSiq8V3P2vQiMrkHeLa1F4lPX8iUdfhVY6q9NnyISyb3AAprtBc5NBR+lkxZR/JRmF1AvZ5M
7gEU1eP49EYg+gCZsg58nmivDXiMTO4BFHXJXuSEwrq7yJR1YC322oAXyOQepBRo0s+ugdvr8wRMF24v
0O31eQKmC7cX6Pb6PAH7gvxg5DnYzX8FheyBI1wt/HvUXlyO8CjVDnMw5srf+OP7XdWYDAl7nDgGFo04
PlHv91eh+P4WEtSIRBOXVpuBHQmzorbDjBw8ax44csk82Hk1p4g1Y+0Vte3WXCZ8W31NSL8aieGLMZp+
elBUfQQEPY2Bp5b8ZW6tOW4mOviicpk4J5wbzpGE7MLP6EiG2wOsDa9DIOuI9vmmRjN+optNPpAYP37Z
nFPWKES8iJ+dkBx9g/UllZZ8QFBc2WommGQDlXg1ahUHLRHhDjyhFEcfIlluEcmnuFEM8FlZfEDesjcj
znn2xri4EsN9aiyKZozHgZOW1liXNJdgMLD+2GWrYaIWt/5OOXn1We92N0SPsoEHE9frR8RVWEcK3Rj4
cSMOmLLsT7Ol4wobdDARNZi8rIZEjD5DMjkDHIvQOVTRygaUzXDijJV7+vK/zbGLYxanl+6zGlkY9m3c
GNlUqaHg53okkzPA8Xd03rm/nQ0mi80nr5jBnQkzXzPELdOLaMPJNLdn9s7Ysa/dyo8fTZFMzgDHf9A5
eugcG0wGUbyPf6hPihQyzNmbE+bq2GmzvP6SxdVVXfBbi1lA4n6yod4aw8WSQaP1LP0RjTjJ5AxwtE4d
mey+835usQocu6TGXFt92qxsvspyDYg6bnFyPcLjFxdLBlGLpIB6F8nkDHJkA8kgrnl+TTeHFUfNdTVn
WOHsRIELQlHrdo4kMrcmCl1IJmdkWkCxQH+xtZUVjOOcn5JjsLFwMWVQ6EIyOUM4ckFkcBp0W8yHax4n
FsfvYU3EMdiduZgyKHQhmZwhHLkgMjhyQZWVb3tjNysWx+3x5JqEY7mYMih0IZmcIRy5IDI4emFSwPKG
y6xYHLEz45gxi2JsTBkUupBMzhCOXBAZfHflfivfqugpViyOK4xT1pj3Vu1nY8qg0IVkcoZw5ILIIDYC
zDdrUwsrFseZ4Itj5u/ymohZBRt23MbgtmQlXFmcYHauMDotXxxT1XaejSmDrhUQuWj3ISvnqIUxSyBO
OGSp3glrZszyXbKnjY0li0IXkskZwpELIot4tp21scHKi8e1udvazMqm68JVNF0xvyxvu3aU+3RjPONP
ioQuJJMzhCMXRCZRELEe4vbEfuVVAIfPT3Zr9MnGYzahC8nkDOHIBZHNPQ2dVu5pKw70EBD5TmmtZUMf
bqxsCl1IJmcIRy6IbK7e+5+VG7tsqoAzy5Kdd034MDtWNoUuJJMzhCMXRDbxCQvmLtr1by8B58FvaMNn
htxY2RS6kEzOEI5cENn8YG2dlbsk3NFLwJJw8qHmjHV17FjZFLqQTM4QjlwQ2Ry3JPkGbEvthV4Cbobf
0DYefLixsil0IZmcIRy5IDJZe/iilXfkglgv8QTRhj7oy8WQSaELyeQM4cgFkcnd9c4dWBBt6JONTix0
IZmcIRy5IDJ5ow4smM1OLHQhmZwhHLkgMik6MHZbTjxkNjux0IVkcoZw5ILI5IfQXUXum/Gj9ZnvxCI3
yeQM4cgFkUnRgW+F6MvFkEmRm2RyhnDkggxmegKmSU/ANOkJmCY9AdOkJ2Ca9ARMk56AabLPAnrkSTI5
gxvk8TpJJg8ePHjwkJeX9z9IbqKdvJUGzgAAAABJRU5ErkJggg==
</value>
</data>
</root>

88
Project/Dialog/fUnZip.Designer.cs generated Normal file
View File

@@ -0,0 +1,88 @@
namespace Project.Dialog
{
partial class fUnZip
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// progressBar1
//
this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.progressBar1.Location = new System.Drawing.Point(10, 60);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(485, 23);
this.progressBar1.TabIndex = 0;
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Top;
this.label1.Location = new System.Drawing.Point(10, 10);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(485, 25);
this.label1.TabIndex = 1;
this.label1.Text = "label1";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Top;
this.label2.Location = new System.Drawing.Point(10, 35);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(485, 25);
this.label2.TabIndex = 2;
this.label2.Text = "label2";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// fUnZip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(505, 93);
this.ControlBox = false;
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.progressBar1);
this.MaximizeBox = false;
this.Name = "fUnZip";
this.Padding = new System.Windows.Forms.Padding(10);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Groupware Library Patch";
this.ResumeLayout(false);
}
#endregion
public System.Windows.Forms.ProgressBar progressBar1;
public System.Windows.Forms.Label label1;
public System.Windows.Forms.Label label2;
}
}

20
Project/Dialog/fUnZip.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Project.Dialog
{
public partial class fUnZip : Form
{
public fUnZip()
{
InitializeComponent();
}
}
}

120
Project/Dialog/fUnZip.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

39
Project/Dialog/fWebView2Test.Designer.cs generated Normal file
View File

@@ -0,0 +1,39 @@
namespace Project.Dialog
{
partial class fWebView2Test
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Text = "fWebView2Test";
}
#endregion
}
}

View File

@@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Microsoft.Web.WebView2.WinForms;
using Microsoft.Web.WebView2.Core;
namespace Project.Dialog
{
public partial class fWebView2Test : Form
{
private WebView2 webView21;
public fWebView2Test()
{
InitializeComponent();
InitializeWebView2();
}
private void InitializeWebView2()
{
// 수동으로 WebView2 컨트롤 생성
this.webView21 = new WebView2();
// 기본 속성 설정
this.webView21.CreationProperties = null;
this.webView21.DefaultBackgroundColor = Color.White;
this.webView21.Dock = DockStyle.Fill;
this.webView21.Location = new Point(0, 0);
this.webView21.Name = "webView21";
this.webView21.Size = new Size(800, 600);
this.webView21.TabIndex = 0;
this.webView21.ZoomFactor = 1D;
// 폼에 추가
this.Controls.Add(this.webView21);
// 비동기 초기화
InitializeAsync();
}
private async void InitializeAsync()
{
try
{
// Fixed Version 경로 설정
string runtimePath = Path.Combine(Application.StartupPath, "WebView2Runtime");
if (Directory.Exists(runtimePath))
{
var env = await CoreWebView2Environment.CreateAsync(runtimePath);
await this.webView21.EnsureCoreWebView2Async(env);
}
else
{
// 시스템에 설치된 WebView2 사용
await this.webView21.EnsureCoreWebView2Async();
}
this.webView21.CoreWebView2.Navigate("https://www.google.com");
}
catch (Exception ex)
{
MessageBox.Show($"WebView2 초기화 실패: {ex.Message}");
}
}
}
}

View File

@@ -188,6 +188,15 @@
<Reference Include="Microsoft.SqlServer.Types, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Core, Version=1.0.2210.55, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2210.55\lib\net45\Microsoft.Web.WebView2.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.WinForms, Version=1.0.2210.55, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2210.55\lib\net45\Microsoft.Web.WebView2.WinForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.WebView2.Wpf, Version=1.0.2210.55, Culture=neutral, PublicKeyToken=2a8ab48044d2601e, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.WebView2.1.0.2210.55\lib\net45\Microsoft.Web.WebView2.Wpf.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -205,6 +214,8 @@
<Reference Include="System.Core" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\netstandard1.1\System.Memory.dll</HintPath>
@@ -248,18 +259,25 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BaseController.cs" />
<Compile Include="Controller\APIController.cs" />
<Compile Include="Controller\ManualController.cs" />
<Compile Include="Controller\ProjectController.cs" />
<Compile Include="Controller\JobreportController.cs" />
<Compile Include="Controller\CustomerController.cs" />
<Compile Include="Controller\PurchaseController.cs" />
<Compile Include="Controller\ItemController.cs" />
<Compile Include="Controller\HomeController.cs" />
<Compile Include="Controller\ResourceController.cs" />
<Compile Include="Controller\ResultController.cs" />
<Compile Include="Controller\SettingController.cs" />
<Compile Include="Dialog\fLogin_WB.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fLogin_WB.Designer.cs">
<DependentUpon>fLogin_WB.cs</DependentUpon>
</Compile>
<Compile Include="Web\Controller\BaseController.cs" />
<Compile Include="Web\Controller\APIController.cs" />
<Compile Include="Web\Controller\DashBoardController.cs" />
<Compile Include="Web\Controller\ManualController.cs" />
<Compile Include="Web\Controller\ProjectController.cs" />
<Compile Include="Web\Controller\JobreportController.cs" />
<Compile Include="Web\Controller\CustomerController.cs" />
<Compile Include="Web\Controller\PurchaseController.cs" />
<Compile Include="Web\Controller\ItemController.cs" />
<Compile Include="Web\Controller\HomeController.cs" />
<Compile Include="Web\Controller\ResourceController.cs" />
<Compile Include="Web\Controller\ResultController.cs" />
<Compile Include="Web\Controller\SettingController.cs" />
<Compile Include="CResult.cs" />
<Compile Include="DataSet1.Designer.cs">
<AutoGen>True</AutoGen>
@@ -321,6 +339,18 @@
<Compile Include="Dialog\fTouchKeyFull.Designer.cs">
<DependentUpon>fTouchKeyFull.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fUnZip.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fUnZip.Designer.cs">
<DependentUpon>fUnZip.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fWebView2Test.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fWebView2Test.Designer.cs">
<DependentUpon>fWebView2Test.cs</DependentUpon>
</Compile>
<Compile Include="DSMail.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -368,9 +398,9 @@
<Compile Include="Manager\ModelManager.cs" />
<Compile Include="MessageWindow.cs" />
<Compile Include="MethodExtentions.cs" />
<Compile Include="Model\PageModel.cs" />
<Compile Include="OWIN\Startup.cs" />
<Compile Include="OWIN\StartupSSE.cs" />
<Compile Include="Web\Model\PageModel.cs" />
<Compile Include="Web\Startup.cs" />
<Compile Include="Web\StartupSSE.cs" />
<Compile Include="Program.cs" />
<Compile Include="Settings.cs" />
<Compile Include="SqlServerTypes\Loader.cs" />
@@ -439,6 +469,9 @@
<EmbeddedResource Include="Dialog\fDebug.resx">
<DependentUpon>fDebug.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fLogin_WB.resx">
<DependentUpon>fLogin_WB.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fMsgWindow.resx">
<DependentUpon>fMsgWindow.cs</DependentUpon>
</EmbeddedResource>
@@ -457,6 +490,9 @@
<EmbeddedResource Include="Dialog\fTouchKeyFull.resx">
<DependentUpon>fTouchKeyFull.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fUnZip.resx">
<DependentUpon>fUnZip.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="fLog.resx">
<DependentUpon>fLog.cs</DependentUpon>
</EmbeddedResource>
@@ -597,6 +633,18 @@
<Content Include="SqlServerTypes\x86\SqlServerSpatial140.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Web\wwwroot\DashBoard\index.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Web\wwwroot\login.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="Web\wwwroot\index.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Web\wwwroot\dashboard.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
@@ -679,5 +727,15 @@
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<Folder Include="Web\wwwroot\js\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2210.55\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2210.55\build\Microsoft.Web.WebView2.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2210.55\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2210.55\build\Microsoft.Web.WebView2.targets'))" />
</Target>
</Project>

View File

@@ -2,6 +2,8 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Project.Web.Model;
using System.Data;
namespace Project.Manager
{
@@ -14,6 +16,38 @@ namespace Project.Manager
cn.ConnectionString = cs;
return cn;
}
/// <summary>
/// 입력된 id의 그룹정보를 반환
/// </summary>
/// <param name="gcode"></param>
/// <param name="uid"></param>
/// <returns></returns>
public static GroupUserModel GetGroupUser(string gcode, string uid)
{
var retval = new GroupUserModel();
var cn = getCn();
var sql = "select * from EETGW_GroupUser where gcode = @gcode and uid = @uid";
var cmd = new System.Data.SqlClient.SqlCommand(sql,cn);
cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = gcode;
cmd.Parameters.Add("uid", SqlDbType.VarChar).Value = uid;
cn.Open();
var rdr = cmd.ExecuteReader();
var cnt = 0;
foreach(var dr in rdr)
{
cnt += 1;
}
retval.Gcode = gcode;
retval.uid = uid;
cn.Dispose();
return retval;
}
public static List<String> getGroupList(string GroupColumn, string table, string where = "")
{
List<string> retval = new List<string>();

View File

@@ -1,79 +0,0 @@
using Microsoft.Owin;
using Owin;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
using System.Web.Http.Routing;
namespace Project.OWIN
{
public class Startup
{
public void Configuration(IAppBuilder app)
{
// Configure Web API for Self-Host
HttpConfiguration config = new HttpConfiguration();
config.MapHttpAttributeRoutes();
//메인파일 처리 방법
IHttpRoute defaultRoute =
config.Routes.CreateRoute("{controller}/{action}/{id}",
new { controller = "home", action = "index", id = RouteParameter.Optional },
null);
//기타파일들 처리 방법
IHttpRoute cssRoute =
config.Routes.CreateRoute("{path}/{subdir}/{resource}.{ext}",
new { controller = "resource", action = "file", id = RouteParameter.Optional },
null);
IHttpRoute mifRoute =
config.Routes.CreateRoute("{path}/{resource}.{ext}",
new { controller = "resource", action = "file", id = RouteParameter.Optional },
null);
IHttpRoute icoRoute =
config.Routes.CreateRoute("{resource}.{ext}",
new { controller = "resource", action = "file", id = RouteParameter.Optional },
null);
config.Routes.Add("mifRoute", mifRoute);
config.Routes.Add("icoRoute", icoRoute);
config.Routes.Add("cssRoute", cssRoute);
config.Routes.Add("defaultRoute", defaultRoute);
app.UseStaticFiles();
app.UseCors(Microsoft.Owin.Cors.CorsOptions.AllowAll);
app.UseWebApi(config);
//appBuilder.UseFileServer(new FileServerOptions
//{
// RequestPath = new PathString(string.Empty),
// FileSystem = new PhysicalFileSystem("./MySubFolder"),
// EnableDirectoryBrowsing = true,
//});
//appBuilder.UseStageMarker(PipelineStage.MapHandler);
//config.Routes.MapHttpRoute(
// name: "ignore",
// routeTemplate: @".*\.(css|js|gif|jpg)(/.*)?",
// defaults: new
// {
// controller = "file",
// action = "readtext",
// id = RouteParameter.Optional
// }
// );
}
}
}

View File

@@ -2,6 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using System.IO.Compression;
using System.IO;
using System.DirectoryServices;
using System.ServiceModel.Configuration;
namespace Project
{
@@ -15,13 +19,90 @@ namespace Project
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
// Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
// AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
var fi = new System.IO.FileInfo("WebView2Runtime.zip");
if (fi.Exists)
{
var existlen = 0;
var webruntimepath = new System.IO.DirectoryInfo("WebView2Runtime");
if (webruntimepath.Exists)
{
var filen = new System.IO.FileInfo("WebView2Runtime\\version.txt");
if(filen.Exists)
{
var verstr = System.IO.File.ReadAllText(filen.FullName);
int.TryParse(verstr, out existlen);
}
}
if(existlen != fi.Length)
{
//fi 파일의 압축을 해제한다.
var fprogress = new Dialog.fUnZip();
fprogress.TopMost = true;
fprogress.Show();
Application.DoEvents();
try
{
if (webruntimepath.Exists)
{
fprogress.label1.Text = "기존폴더삭제";
Application.DoEvents();
webruntimepath.Delete(true);
}
var diruntime = new System.IO.DirectoryInfo("runtimes");
if (diruntime.Exists) diruntime.Delete(true);
webruntimepath.Create();
diruntime.Create();
using (var archive = ZipFile.OpenRead(fi.FullName))
{
int totalFiles = archive.Entries.Count;
int currentFile = 0;
long totalSize = archive.Entries.Sum(e => e.Length);
long extractedSize = 0;
foreach (var entry in archive.Entries)
{
currentFile++;
extractedSize += entry.Length;
int progress = (int)((extractedSize * 100) / totalSize);
fprogress.label1.Text = $"압축 해제 중... ({currentFile}/{totalFiles})";
fprogress.label2.Text = $"{entry.FullName} ({progress}%)";
fprogress.progressBar1.Value = progress;
Application.DoEvents();
string destinationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, entry.FullName);
string destinationDir = Path.GetDirectoryName(destinationPath);
if (!Directory.Exists(destinationDir))
Directory.CreateDirectory(destinationDir);
if (entry.Length > 0)
entry.ExtractToFile(destinationPath, true);
}
}
System.IO.File.WriteAllText("WebView2Runtime\\version.txt", fi.Length.ToString());
}
catch (Exception ex)
{
fprogress.Hide();
MessageBox.Show($"WebView2 Runtime 압축 해제 중 오류가 발생했습니다: {ex.Message}", "오류", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
finally {
fprogress.Dispose();
}
}
}
SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
Application.Run(new fMain());
}

View File

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

View File

@@ -1,148 +1,148 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using Newtonsoft.Json;
namespace Project
{
public class APIController : BaseController
{
[HttpGet]
public HttpResponseMessage Getdata()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var sql = string.Empty;
var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
else
{
var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
sql = "select * from {0} where gcode = '{gcode}'";
sql = string.Format(sql, p_table.Value, p_gcode.Value);
if (p_where.Key != null) sql += " and " + p_where.Value;
if (p_order.Key != null) sql += " order by " + p_order.Value;
}
if (FCOMMON.info.Login.gcode == null)
FCOMMON.info.Login.gcode = "EET1P";
sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
var cs = Properties.Settings.Default.gwcs; // "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!";
var cn = new System.Data.SqlClient.SqlConnection(cs);
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
var dt = new System.Data.DataTable();
da.Fill(dt);
da.Dispose();
cmd.Dispose();
cn.Dispose();
var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
});
var resp = new HttpResponseMessage()
{
Content = new StringContent(
txtjson,
System.Text.Encoding.UTF8,
"application/json")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Gettable()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var sql = string.Empty;
var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
else
{
var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
sql = "select * from {0} where gcode = '{gcode}'";
sql = string.Format(sql, p_table.Value, p_gcode.Value);
if (p_where.Key != null) sql += " and " + p_where.Value;
if (p_order.Key != null) sql += " order by " + p_order.Value;
}
if (FCOMMON.info.Login.gcode == null)
FCOMMON.info.Login.gcode = "EET1P";
sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!";
var cn = new System.Data.SqlClient.SqlConnection(cs);
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
var dt = new System.Data.DataTable();
da.Fill(dt);
da.Dispose();
cmd.Dispose();
cn.Dispose();
var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
});
var resp = new HttpResponseMessage()
{
Content = new StringContent(
txtjson,
System.Text.Encoding.UTF8,
"application/json")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using Newtonsoft.Json;
namespace Project.Web.Controllers
{
public class APIController : BaseController
{
[HttpGet]
public HttpResponseMessage Getdata()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var sql = string.Empty;
var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
else
{
var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
sql = "select * from {0} where gcode = '{gcode}'";
sql = string.Format(sql, p_table.Value, p_gcode.Value);
if (p_where.Key != null) sql += " and " + p_where.Value;
if (p_order.Key != null) sql += " order by " + p_order.Value;
}
if (FCOMMON.info.Login.gcode == null)
FCOMMON.info.Login.gcode = "EET1P";
sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
var cs = Properties.Settings.Default.gwcs; // "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!";
var cn = new System.Data.SqlClient.SqlConnection(cs);
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
var dt = new System.Data.DataTable();
da.Fill(dt);
da.Dispose();
cmd.Dispose();
cn.Dispose();
var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
});
var resp = new HttpResponseMessage()
{
Content = new StringContent(
txtjson,
System.Text.Encoding.UTF8,
"application/json")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Gettable()
{
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
var sql = string.Empty;
var p_sql = getParams.Where(t => t.Key == "sql").FirstOrDefault();
if (p_sql.Key.isEmpty() == false) sql = p_sql.Value;
else
{
var p_table = getParams.Where(t => t.Key == "table").FirstOrDefault();
var p_gcode = getParams.Where(t => t.Key == "gcode").FirstOrDefault();
var p_where = getParams.Where(t => t.Key == "w").FirstOrDefault();
var p_order = getParams.Where(t => t.Key == "o").FirstOrDefault();
sql = "select * from {0} where gcode = '{gcode}'";
sql = string.Format(sql, p_table.Value, p_gcode.Value);
if (p_where.Key != null) sql += " and " + p_where.Value;
if (p_order.Key != null) sql += " order by " + p_order.Value;
}
if (FCOMMON.info.Login.gcode == null)
FCOMMON.info.Login.gcode = "EET1P";
sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!";
var cn = new System.Data.SqlClient.SqlConnection(cs);
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
var dt = new System.Data.DataTable();
da.Fill(dt);
da.Dispose();
cmd.Dispose();
cn.Dispose();
var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
});
var resp = new HttpResponseMessage()
{
Content = new StringContent(
txtjson,
System.Text.Encoding.UTF8,
"application/json")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,318 +1,318 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Web.Http;
using agi = HtmlAgilityPack;
namespace Project
{
public struct MethodResult : IEquatable<MethodResult>
{
public string Content;
public byte[] Contentb;
public string Redirecturl;
public override bool Equals(object obj)
{
if (!(obj is MethodResult))
return false;
return Equals((MethodResult)obj);
}
public override int GetHashCode()
{
if (Contentb == null)
return Content.GetHashCode() ^ Redirecturl.GetHashCode();
else
return Content.GetHashCode() ^ Redirecturl.GetHashCode() ^ Contentb.GetHexString().GetHashCode();
}
public bool Equals(MethodResult other)
{
if (Content != other.Content)
return false;
if (Redirecturl != other.Redirecturl)
return false;
return Contentb == other.Contentb;
}
public static bool operator ==(MethodResult point1, MethodResult point2)
{
return point1.Equals(point2);
}
public static bool operator !=(MethodResult point1, MethodResult point2)
{
return !point1.Equals(point2);
}
}
sealed class PostRequest : Attribute
{
}
public class BaseController : ApiController
{
public string QueryString { get; set; }
public string PostData { get; set; }
public string ParamData { get; set; }
protected string Trig_Ctrl { get; set; }
protected string Trig_func { get; set; }
public PageModel GetGlobalModel()
{
var config = RequestContext.Configuration;
var routeData = config.Routes.GetRouteData(Request).Values.ToList();
var name_ctrl = routeData[0].Value.ToString();
var name_action = routeData[1].Value.ToString();
return new PageModel
{
RouteData = routeData,
urlcontrol = name_ctrl,
urlaction = name_action
};
}
public MethodResult View(bool nosubdir=false)
{
var config = RequestContext.Configuration;
if (config != null)
{
var routeData = config.Routes.GetRouteData(Request).Values.ToList();
var name_ctrl = routeData[0].Value.ToString();
if (nosubdir) name_ctrl = string.Empty;
var name_action = routeData[1].Value.ToString();
return View(name_ctrl, name_action);
}
else
{
return View(Trig_Ctrl + "/" + Trig_func);
}
}
public static void ApplyCommonValue(ref string contents)
{
//메뉴 푸터 - 개발자 정보
if (contents.Contains("{title}"))
contents = contents.Replace("{title}", FCOMMON.info.Login.gcode + " Groupware");
}
public MethodResult View(string Controller, string Action, Boolean applydefaultview = true)
{
var retval = new MethodResult();
if (Action.IndexOf(".") == -1)
Action += ".html"; //기본값 html 을 넣는다
var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", Controller, Action);
var contents = string.Empty;
if (System.IO.File.Exists(file) == false)
{
//error 폴더의 404.html 파일을 찾는다.
var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html");
if (System.IO.File.Exists(file404))
{
contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8);
contents = contents.Replace("{errorfilename}", file);
}
else
contents = "ERROR CODE - 404 (NOT FOUND) <br />" + file;
Console.WriteLine("view File not found : " + file);
}
else
{
//디폴트뷰의 내용을 가져온다 (있다면 적용한다)
if (applydefaultview)
{
//뷰파일이 있다면 그것을 적용한다
var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html");
if (System.IO.File.Exists(laytoutfile))
contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8);
var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
if (String.IsNullOrEmpty(contents)) contents = fileContents;
else contents = contents.Replace("{contents}", fileContents);
}
else
{
//해당 뷰를 가져와서 반환한다
contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
}
}
agi.HtmlDocument doc = new agi.HtmlDocument();
doc.LoadHtml(contents);
//파일참조 태그를 모두 가져옴
var tags_include = doc.QuerySelectorAll("include");
foreach (var item in tags_include)
{
var filename = item.InnerText;
var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\"));
load_file = load_file.Replace("\\\\", "\\");
String fileContents;// = String.Empty;
Console.WriteLine("## " + item.OuterHtml);
if (System.IO.File.Exists(load_file))
{
fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
}
else
{
fileContents = string.Format("<div class=\"fg-red\">#include Error:nofile:{0}</div>",
filename); //파일이없다면 해당 부분은 오류 처리한다.
}
contents = contents.Replace(item.OuterHtml, fileContents);
}
//콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다
//시스템변수 replace
contents = contents.Replace("{param_control}", Trig_Ctrl);
contents = contents.Replace("{param_function}", Trig_func);
retval.Content = contents;
return retval;
}
public MethodResult View(string viewfilename, Boolean applydefaultview = true)
{
var retval = new MethodResult();
if (viewfilename.IndexOf(".") == -1)
viewfilename += ".html"; //기본값 html 을 넣는다
var file = AppDomain.CurrentDomain.BaseDirectory + "View" + viewfilename.Replace("/", "\\");
var contents = string.Empty;
if (System.IO.File.Exists(file) == false)
{
//error 폴더의 404.html 파일을 찾는다.
var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html");
if (System.IO.File.Exists(file404))
{
contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8);
contents = contents.Replace("{errorfilename}", file);
}
else
contents = "ERROR CODE - 404 (NOT FOUND) <br />" + file;
Console.WriteLine("view File not found : " + file);
}
else
{
//디폴트뷰의 내용을 가져온다 (있다면 적용한다)
if (applydefaultview)
{
//뷰파일이 있다면 그것을 적용한다
var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html");
if (System.IO.File.Exists(laytoutfile))
contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8);
var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
if (String.IsNullOrEmpty(contents)) contents = fileContents;
else contents = contents.Replace("{contents}", fileContents);
}
else
{
//해당 뷰를 가져와서 반환한다
contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
}
}
agi.HtmlDocument doc = new agi.HtmlDocument();
doc.LoadHtml(contents);
//파일참조 태그를 모두 가져옴
var tags_include = doc.QuerySelectorAll("include");
foreach (var item in tags_include)
{
var filename = item.InnerText;
var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\"));
load_file = load_file.Replace("\\\\", "\\");
String fileContents;// = String.Empty;
Console.WriteLine("## " + item.OuterHtml);
if (System.IO.File.Exists(load_file))
{
fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
}
else
{
fileContents = string.Format("<div class=\"fg-red\">#include Error:nofile:{0}</div>",
filename); //파일이없다면 해당 부분은 오류 처리한다.
}
contents = contents.Replace(item.OuterHtml, fileContents);
}
//콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다
while (true)
{
var fileindexS = contents.IndexOf("{file:");
if (fileindexS == -1) break;
var fileindexE = contents.IndexOf("}", fileindexS);
if (fileindexE == -1) break;
if (fileindexE <= fileindexS + 5) break;
var inlinestr = contents.Substring(fileindexS, fileindexE - fileindexS + 1);
var filename = contents.Substring(fileindexS + 7, fileindexE - fileindexS - 8);
var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", "\\", filename.Replace("/", "\\"));
load_file = load_file.Replace("\\\\", "\\");
String fileContents;// = String.Empty;
Console.WriteLine("file impot : " + load_file);
if (System.IO.File.Exists(load_file))
{
fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
}
else
{
fileContents = "{FileNotFound:" + filename + "}"; //파일이없다면 해당 부분은 오류 처리한다.
}
contents = contents.Replace(inlinestr, fileContents);
}
//시스템변수 replace
contents = contents.Replace("{param_control}", Trig_Ctrl);
contents = contents.Replace("{param_function}", Trig_func);
retval.Content = contents;
return retval;
}
protected class Parameter
{
public string Key { get; set; }
public string Value { get; set; }
public Parameter(string key_, string value_)
{
Key = key_;
Value = value_;
}
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Web.Http;
using agi = HtmlAgilityPack;
namespace Project.Web.Controllers
{
public struct MethodResult : IEquatable<MethodResult>
{
public string Content;
public byte[] Contentb;
public string Redirecturl;
public override bool Equals(object obj)
{
if (!(obj is MethodResult))
return false;
return Equals((MethodResult)obj);
}
public override int GetHashCode()
{
if (Contentb == null)
return Content.GetHashCode() ^ Redirecturl.GetHashCode();
else
return Content.GetHashCode() ^ Redirecturl.GetHashCode() ^ Contentb.GetHexString().GetHashCode();
}
public bool Equals(MethodResult other)
{
if (Content != other.Content)
return false;
if (Redirecturl != other.Redirecturl)
return false;
return Contentb == other.Contentb;
}
public static bool operator ==(MethodResult point1, MethodResult point2)
{
return point1.Equals(point2);
}
public static bool operator !=(MethodResult point1, MethodResult point2)
{
return !point1.Equals(point2);
}
}
sealed class PostRequest : Attribute
{
}
public class BaseController : ApiController
{
public string QueryString { get; set; }
public string PostData { get; set; }
public string ParamData { get; set; }
protected string Trig_Ctrl { get; set; }
protected string Trig_func { get; set; }
public PageModel GetGlobalModel()
{
var config = RequestContext.Configuration;
var routeData = config.Routes.GetRouteData(Request).Values.ToList();
var name_ctrl = routeData[0].Value.ToString();
var name_action = routeData[1].Value.ToString();
return new PageModel
{
RouteData = routeData,
urlcontrol = name_ctrl,
urlaction = name_action
};
}
public MethodResult View(bool nosubdir=false)
{
var config = RequestContext.Configuration;
if (config != null)
{
var routeData = config.Routes.GetRouteData(Request).Values.ToList();
var name_ctrl = routeData[0].Value.ToString();
if (nosubdir) name_ctrl = string.Empty;
var name_action = routeData[1].Value.ToString();
return View(name_ctrl, name_action);
}
else
{
return View(Trig_Ctrl + "/" + Trig_func);
}
}
public static void ApplyCommonValue(ref string contents)
{
//메뉴 푸터 - 개발자 정보
if (contents.Contains("{title}"))
contents = contents.Replace("{title}", FCOMMON.info.Login.gcode + " Groupware");
}
public MethodResult View(string Controller, string Action, Boolean applydefaultview = true)
{
var retval = new MethodResult();
if (Action.IndexOf(".") == -1)
Action += ".html"; //기본값 html 을 넣는다
var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", Controller, Action);
var contents = string.Empty;
if (System.IO.File.Exists(file) == false)
{
//error 폴더의 404.html 파일을 찾는다.
var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html");
if (System.IO.File.Exists(file404))
{
contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8);
contents = contents.Replace("{errorfilename}", file);
}
else
contents = "ERROR CODE - 404 (NOT FOUND) <br />" + file;
Console.WriteLine("view File not found : " + file);
}
else
{
//디폴트뷰의 내용을 가져온다 (있다면 적용한다)
if (applydefaultview)
{
//뷰파일이 있다면 그것을 적용한다
var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html");
if (System.IO.File.Exists(laytoutfile))
contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8);
var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
if (String.IsNullOrEmpty(contents)) contents = fileContents;
else contents = contents.Replace("{contents}", fileContents);
}
else
{
//해당 뷰를 가져와서 반환한다
contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
}
}
agi.HtmlDocument doc = new agi.HtmlDocument();
doc.LoadHtml(contents);
//파일참조 태그를 모두 가져옴
var tags_include = doc.QuerySelectorAll("include");
foreach (var item in tags_include)
{
var filename = item.InnerText;
var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\"));
load_file = load_file.Replace("\\\\", "\\");
String fileContents;// = String.Empty;
Console.WriteLine("## " + item.OuterHtml);
if (System.IO.File.Exists(load_file))
{
fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
}
else
{
fileContents = string.Format("<div class=\"fg-red\">#include Error:nofile:{0}</div>",
filename); //파일이없다면 해당 부분은 오류 처리한다.
}
contents = contents.Replace(item.OuterHtml, fileContents);
}
//콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다
//시스템변수 replace
contents = contents.Replace("{param_control}", Trig_Ctrl);
contents = contents.Replace("{param_function}", Trig_func);
retval.Content = contents;
return retval;
}
public MethodResult View(string viewfilename, Boolean applydefaultview = true)
{
var retval = new MethodResult();
if (viewfilename.IndexOf(".") == -1)
viewfilename += ".html"; //기본값 html 을 넣는다
var file = AppDomain.CurrentDomain.BaseDirectory + "View" + viewfilename.Replace("/", "\\");
var contents = string.Empty;
if (System.IO.File.Exists(file) == false)
{
//error 폴더의 404.html 파일을 찾는다.
var file404 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Error", "404.html");
if (System.IO.File.Exists(file404))
{
contents = System.IO.File.ReadAllText(file404, System.Text.Encoding.UTF8);
contents = contents.Replace("{errorfilename}", file);
}
else
contents = "ERROR CODE - 404 (NOT FOUND) <br />" + file;
Console.WriteLine("view File not found : " + file);
}
else
{
//디폴트뷰의 내용을 가져온다 (있다면 적용한다)
if (applydefaultview)
{
//뷰파일이 있다면 그것을 적용한다
var laytoutfile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", "Layout", "default.html");
if (System.IO.File.Exists(laytoutfile))
contents = System.IO.File.ReadAllText(laytoutfile, System.Text.Encoding.UTF8);
var fileContents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
if (String.IsNullOrEmpty(contents)) contents = fileContents;
else contents = contents.Replace("{contents}", fileContents);
}
else
{
//해당 뷰를 가져와서 반환한다
contents = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
}
}
agi.HtmlDocument doc = new agi.HtmlDocument();
doc.LoadHtml(contents);
//파일참조 태그를 모두 가져옴
var tags_include = doc.QuerySelectorAll("include");
foreach (var item in tags_include)
{
var filename = item.InnerText;
var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\"));
load_file = load_file.Replace("\\\\", "\\");
String fileContents;// = String.Empty;
Console.WriteLine("## " + item.OuterHtml);
if (System.IO.File.Exists(load_file))
{
fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
}
else
{
fileContents = string.Format("<div class=\"fg-red\">#include Error:nofile:{0}</div>",
filename); //파일이없다면 해당 부분은 오류 처리한다.
}
contents = contents.Replace(item.OuterHtml, fileContents);
}
//콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다
while (true)
{
var fileindexS = contents.IndexOf("{file:");
if (fileindexS == -1) break;
var fileindexE = contents.IndexOf("}", fileindexS);
if (fileindexE == -1) break;
if (fileindexE <= fileindexS + 5) break;
var inlinestr = contents.Substring(fileindexS, fileindexE - fileindexS + 1);
var filename = contents.Substring(fileindexS + 7, fileindexE - fileindexS - 8);
var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", "\\", filename.Replace("/", "\\"));
load_file = load_file.Replace("\\\\", "\\");
String fileContents;// = String.Empty;
Console.WriteLine("file impot : " + load_file);
if (System.IO.File.Exists(load_file))
{
fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8);
}
else
{
fileContents = "{FileNotFound:" + filename + "}"; //파일이없다면 해당 부분은 오류 처리한다.
}
contents = contents.Replace(inlinestr, fileContents);
}
//시스템변수 replace
contents = contents.Replace("{param_control}", Trig_Ctrl);
contents = contents.Replace("{param_function}", Trig_func);
retval.Content = contents;
return retval;
}
protected class Parameter
{
public string Key { get; set; }
public string Value { get; set; }
public Parameter(string key_, string value_)
{
Key = key_;
Value = value_;
}
}
}
}

View File

@@ -1,198 +1,198 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class CustomerController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.CustomsTableAdapter();//.custrom EEEntitiesCommon();
var rows = db.GetData(FCOMMON.info.Login.gcode);// db.Customs.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.name}</th>");
tbody.AppendLine($"<td>{item.name2}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
//tbody.AppendLine($"<td>{item.model}</td>");
//if (item.price == null)
// tbody.AppendLine($"<td>--</td>");
//else
//{
// var price = (double)item.price / 1000.0;
// tbody.AppendLine($"<td>{price.ToString("N0")}</td>");
//}
//tbody.AppendLine($"<td>{item.manu}</td>");
//tbody.AppendLine($"<td>{item.supply}</td>");
//if (item.remark.Length > 10)
// tbody.AppendLine($"<td>{item.remark.Substring(0, 10)}...</td>");
//else
// tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.CustomsTableAdapter();// EEEntitiesCommon();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var rows = db.GetData(FCOMMON.info.Login.gcode);// .Customs.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t=>t.name);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.grp}</th>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.name2}</td>");
tbody.AppendLine($"<td>{item.tel}</td>");
tbody.AppendLine($"<td>{item.fax}</td>");
tbody.AppendLine($"<td>{item.email}</td>");
tbody.AppendLine($"<td>{item.address}</td>");
if (string.IsNullOrEmpty( item.memo)==false && item.memo.Length > 10) tbody.AppendLine($"<td>{item.memo.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.memo}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class CustomerController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.CustomsTableAdapter();//.custrom EEEntitiesCommon();
var rows = db.GetData(FCOMMON.info.Login.gcode);// db.Customs.Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t => t.name);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.name}</th>");
tbody.AppendLine($"<td>{item.name2}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
//tbody.AppendLine($"<td>{item.model}</td>");
//if (item.price == null)
// tbody.AppendLine($"<td>--</td>");
//else
//{
// var price = (double)item.price / 1000.0;
// tbody.AppendLine($"<td>{price.ToString("N0")}</td>");
//}
//tbody.AppendLine($"<td>{item.manu}</td>");
//tbody.AppendLine($"<td>{item.supply}</td>");
//if (item.remark.Length > 10)
// tbody.AppendLine($"<td>{item.remark.Substring(0, 10)}...</td>");
//else
// tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.CustomsTableAdapter();// EEEntitiesCommon();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var rows = db.GetData(FCOMMON.info.Login.gcode);// .Customs.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode).OrderBy(t=>t.name);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.grp}</th>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.name2}</td>");
tbody.AppendLine($"<td>{item.tel}</td>");
tbody.AppendLine($"<td>{item.fax}</td>");
tbody.AppendLine($"<td>{item.email}</td>");
tbody.AppendLine($"<td>{item.address}</td>");
if (string.IsNullOrEmpty( item.memo)==false && item.memo.Length > 10) tbody.AppendLine($"<td>{item.memo.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.memo}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -0,0 +1,116 @@
using FCOMMON;
using Newtonsoft.Json;
using System;
using System.Linq;
using System.Net.Http;
using System.Security.Cryptography;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class DashBoardController : BaseController
{
[HttpPost]
public void Index([FromBody] string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string TodayCountH()
{
var sql = "select count(*) from EETGW_HolydayRequest " +
"where gcode = 'EET1P' and conf = 1 and HolyDays > 0 and " +
"sdate <= GETDATE() and edate >= GETDATE()";
var cnt = DBM.ExecuteScalar(sql);
return cnt.ToString();
}
[HttpGet]
public HttpResponseMessage GetholyUser()
{
var sql = string.Empty;
sql = $"select uid,cate,sdate,edate,HolyReason " +
$"from EETGW_HolydayRequest " +
$"where gcode = '{FCOMMON.info.Login.gcode}'" +
$"and conf = 1 and HolyDays > 0 and sdate <= GETDATE() and edate >= GETDATE()";
if (info.Login.gcode == null)
info.Login.gcode = "EET1P";
sql = sql.Replace("{gcode}", FCOMMON.info.Login.gcode);
var cs = Properties.Settings.Default.gwcs;// "Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D!";
var cn = new System.Data.SqlClient.SqlConnection(cs);
var cmd = new System.Data.SqlClient.SqlCommand(sql, cn);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
var dt = new System.Data.DataTable();
da.Fill(dt);
da.Dispose();
cmd.Dispose();
cn.Dispose();
var txtjson = JsonConvert.SerializeObject(dt, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
});
var resp = new HttpResponseMessage()
{
Content = new StringContent(
txtjson,
System.Text.Encoding.UTF8,
"application/json")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
// 직접 파일을 읽어서 반환
var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "DashBoard", "index.html");
var contents = string.Empty;
if (System.IO.File.Exists(filePath))
{
contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
}
else
{
// 파일이 없으면 404 에러 페이지 또는 기본 메시지
contents = "<html><body><h1>404 - File Not Found</h1><p>The requested file was not found: " + filePath + "</p></body></html>";
}
//공용값 적용
ApplyCommonValue(ref contents);
var resp = new HttpResponseMessage()
{
Content = new StringContent(
contents,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -0,0 +1,299 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using Newtonsoft.Json;
using System.Collections.Generic;
namespace Project.Web.Controllers
{
// 로그인 요청 모델
public class LoginRequest
{
public string UserId { get; set; }
public string Password { get; set; }
public bool RememberMe { get; set; }
}
// 로그인 응답 모델
public class LoginResponse
{
public bool Success { get; set; }
public string Message { get; set; }
public string RedirectUrl { get; set; }
public object UserData { get; set; }
}
public class HomeController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpPost]
public HttpResponseMessage Login([FromBody] LoginRequest request)
{
var response = new LoginResponse();
try
{
// 입력값 검증
if (string.IsNullOrEmpty(request?.UserId) || string.IsNullOrEmpty(request?.Password))
{
response.Success = false;
response.Message = "사용자 ID와 비밀번호를 입력해주세요.";
return CreateJsonResponse(response);
}
// TODO: 여기에 실제 데이터베이스 로그인 로직을 구현하세요
// 예시: 데이터베이스에서 사용자 정보 확인
bool isValidUser = ValidateUser(request.UserId, request.Password);
if (isValidUser)
{
// 로그인 성공
response.Success = true;
response.Message = "로그인에 성공했습니다.";
response.RedirectUrl = "/DashBoard";
// 사용자 정보 설정 (세션 또는 쿠키)
SetUserSession(request.UserId, request.RememberMe);
// 사용자 데이터 반환
response.UserData = new
{
UserId = request.UserId,
LoginTime = DateTime.Now,
RememberMe = request.RememberMe
};
}
else
{
// 로그인 실패
response.Success = false;
response.Message = "사용자 ID 또는 비밀번호가 올바르지 않습니다.";
}
}
catch (Exception ex)
{
response.Success = false;
response.Message = "로그인 처리 중 오류가 발생했습니다: " + ex.Message;
}
return CreateJsonResponse(response);
}
[HttpPost]
public HttpResponseMessage Logout()
{
var response = new LoginResponse();
try
{
// TODO: 여기에 로그아웃 로직을 구현하세요
// 예시: 세션 정리, 쿠키 삭제 등
ClearUserSession();
response.Success = true;
response.Message = "로그아웃되었습니다.";
response.RedirectUrl = "/Login";
}
catch (Exception ex)
{
response.Success = false;
response.Message = "로그아웃 처리 중 오류가 발생했습니다: " + ex.Message;
}
return CreateJsonResponse(response);
}
[HttpGet]
public HttpResponseMessage CheckLoginStatus()
{
var response = new LoginResponse();
try
{
// TODO: 여기에 로그인 상태 확인 로직을 구현하세요
// 예시: 세션 또는 쿠키에서 사용자 정보 확인
var currentUser = GetCurrentUser();
if (currentUser != null)
{
response.Success = true;
response.Message = "로그인된 상태입니다.";
response.UserData = currentUser;
}
else
{
response.Success = false;
response.Message = "로그인되지 않은 상태입니다.";
response.RedirectUrl = "/Login";
}
}
catch (Exception ex)
{
response.Success = false;
response.Message = "로그인 상태 확인 중 오류가 발생했습니다: " + ex.Message;
}
return CreateJsonResponse(response);
}
// 헬퍼 메서드들
private bool ValidateUser(string userId, string password)
{
// TODO: 실제 데이터베이스 검증 로직을 여기에 구현하세요
// 예시: 데이터베이스에서 사용자 정보 조회 및 비밀번호 검증
var encpass = Pub.MakePasswordEnc(password.Trim());
// 임시 테스트용 (실제로는 데이터베이스에서 확인)
return userId == "admin" && password == "admin";
}
private void SetUserSession(string userId, bool rememberMe)
{
// TODO: 세션 또는 쿠키에 사용자 정보 저장
// 예시: HttpContext.Session["UserId"] = userId;
// 예시: 쿠키 설정 (rememberMe가 true인 경우)
//데이터베이스에서 해당 정보를 찾아와서 처리해야한다
FCOMMON.info.Login.no = userId;
FCOMMON.info.Login.nameK = drUser.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = drGrpUser.level;
FCOMMON.info.Login.email = drUser.email;
FCOMMON.info.Login.nameE = drUser.nameE;
FCOMMON.info.Login.hp = drUser.hp;
FCOMMON.info.Login.tel = drUser.tel;
FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")";
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;// gcode;
FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process;
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
//FCOMMON.info.datapath = Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
}
private void ClearUserSession()
{
// TODO: 세션 또는 쿠키에서 사용자 정보 삭제
FCOMMON.info.Login.no = string.Empty;
FCOMMON.info.Login.level = 0;
FCOMMON.info.Login.gcode = string.Empty;
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = 0;
Console.WriteLine("logout");
}
private object GetCurrentUser()
{
// TODO: 현재 로그인된 사용자 정보 반환
// 예시: HttpContext.Session["UserId"]에서 사용자 정보 조회
return null; // 임시로 null 반환
}
private HttpResponseMessage CreateJsonResponse(object data)
{
var json = JsonConvert.SerializeObject(data, new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
});
return new HttpResponseMessage()
{
Content = new StringContent(
json,
System.Text.Encoding.UTF8,
"application/json")
};
}
[HttpGet]
public HttpResponseMessage Login()
{
// 직접 파일을 읽어서 반환
var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "login.html");
var contents = string.Empty;
if (System.IO.File.Exists(filePath))
{
contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
}
else
{
// 파일이 없으면 404 에러 페이지 또는 기본 메시지
contents = "<html><body><h1>404 - File Not Found</h1><p>The requested file was not found: " + filePath + "</p></body></html>";
}
//공용값 적용
ApplyCommonValue(ref contents);
var resp = new HttpResponseMessage()
{
Content = new StringContent(
contents,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
// 직접 파일을 읽어서 반환
var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "index.html");
var contents = string.Empty;
if (System.IO.File.Exists(filePath))
{
contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
}
else
{
// 파일이 없으면 404 에러 페이지 또는 기본 메시지
contents = "<html><body><h1>404 - File Not Found</h1><p>The requested file was not found: " + filePath + "</p></body></html>";
}
//공용값 적용
ApplyCommonValue(ref contents);
var resp = new HttpResponseMessage()
{
Content = new StringContent(
contents,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,153 +1,153 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using System.Windows.Forms;
namespace Project
{
public class ItemController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
if (searchkey.isEmpty() == false && searchkey != "%")
{
if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey;
if (searchkey.EndsWith("%") == false) searchkey = searchkey + "%";
}
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain();
var rows = db.GetData(searchkey);// .vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.model.Contains(searchkey));
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.Location}</th>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.model}</td>");
if (item.IspriceNull())
tbody.AppendLine($"<td>--</td>");
else
{
var price = (double)item.price / 1000.0;
tbody.AppendLine($"<td>{price.ToString("N0")}</td>");
}
tbody.AppendLine($"<td>{item.manu}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.remark.Length > 10)
tbody.AppendLine($"<td>{item.remark.Substring(0, 10)}...</td>");
else
tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<td colspan='8'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using System.Windows.Forms;
namespace Project.Web.Controllers
{
public class ItemController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
if (searchkey.isEmpty() == false && searchkey != "%")
{
if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey;
if (searchkey.EndsWith("%") == false) searchkey = searchkey + "%";
}
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain();
var rows = db.GetData(searchkey);// .vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.model.Contains(searchkey));
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.Location}</th>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.model}</td>");
if (item.IspriceNull())
tbody.AppendLine($"<td>--</td>");
else
{
var price = (double)item.price / 1000.0;
tbody.AppendLine($"<td>{price.ToString("N0")}</td>");
}
tbody.AppendLine($"<td>{item.manu}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.remark.Length > 10)
tbody.AppendLine($"<td>{item.remark.Substring(0, 10)}...</td>");
else
tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<td colspan='8'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,380 +1,380 @@
using Microsoft.Owin;
using System;
using System.Linq;
using System.Net.Http;
using System.Web;
using System.Web.Http;
namespace Project
{
public class JobreportController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpPost]
public string Add(FormCollection tbpdate)
{
var vals = Request.GetQueryNameValuePairs();
return string.Empty;
}
//[HttpPost]
//public string Edit([FromBody] string value)
//{
// var vals = Request.GetQueryNameValuePairs();
// var req = Request.GetRequestContext();
// return string.Empty;
//}
[HttpPost]
public string Edit(FormCollection value)
{
var vals = Request.GetQueryNameValuePairs();
var req = Request.GetRequestContext();
return string.Empty;
}
[HttpGet]
public HttpResponseMessage Edit(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View("/jobreport/edit");
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();//. EEEntitiesJobreport();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Now.ToShortDateString();
var rows = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();//.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault();
var contents = result.Content;
if (rows == null)
{
//아이템이 없는 메시지를 표시한다
}
else
{
//치환작업을 진행한다
contents = contents.Replace("{pdate}", rows.pdate);
contents = contents.Replace("{status}", rows.status);
contents = contents.Replace("{name}", rows.name);
contents = contents.Replace("{package}", rows.package);
contents = contents.Replace("{process}", rows.process);
contents = contents.Replace("{type}", rows.type);
contents = contents.Replace("{userProcess}", rows.userProcess);
contents = contents.Replace("{projectName}", rows.projectName);
contents = contents.Replace("{hrs}", rows.hrs.ToString());
contents = contents.Replace("{ot}", rows.ot.ToString());
contents = contents.Replace("{requestpart}", rows.requestpart);
contents = contents.Replace("{description}", rows.description);
}
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Add()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View("/jobreport/add");
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Now.ToShortDateString();
var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed);
//vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
tbody.AppendLine($"<td>{item.ww}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
if (item.status == "진행 중" || item.status.EndsWith("%"))
tbody.AppendLine($"<td class='table-info text-center'>{item.status}</td>");
else
tbody.AppendLine($"<td class='text-center'>{item.status}</td>");
tbody.AppendLine($"<td>{item.type}</td>");
tbody.AppendLine($"<td>{item.projectName}</td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");
tbody.AppendLine("<td><span class='d-inline-block text-truncate' style='max-width: 150px;'>");
tbody.AppendLine(item.description);
tbody.AppendLine("</span></td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport();
var sd = DateTime.Now.ToShortDateString();
var rows = db.GetByToday(FCOMMON.info.Login.gcode, sd);//.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) == 0).OrderBy(t => t.name);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate}</th>");
tbody.AppendLine($"<td>{item.status}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.projectName}</td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");
tbody.AppendLine($"<td>{item.description}</td>");
if (item.description.Length > 10)
tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
else
tbody.AppendLine($"<td>{item.description}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport();
var sd = DateTime.Now.ToShortDateString();
var ed = DateTime.Now.ToShortDateString();
var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed);
//.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
tbody.AppendLine($"<td>{item.ww}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
if (item.status == "진행 중" || item.status.EndsWith("%"))
tbody.AppendLine($"<td class='table-info text-center'>{item.status}</td>");
else
tbody.AppendLine($"<td class='text-center'>{item.status}</td>");
tbody.AppendLine($"<td>{item.type}</td>");
tbody.AppendLine($"<td><a href='/jobreport/edit/{item.idx}'>{item.projectName}</a></td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");
tbody.AppendLine("<td><span class='d-inline-block text-truncate' style='max-width: 150px;'>");
tbody.AppendLine(item.description);
tbody.AppendLine("</span></td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using Microsoft.Owin;
using System;
using System.Linq;
using System.Net.Http;
using System.Web;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class JobreportController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpPost]
public string Add(FormCollection tbpdate)
{
var vals = Request.GetQueryNameValuePairs();
return string.Empty;
}
//[HttpPost]
//public string Edit([FromBody] string value)
//{
// var vals = Request.GetQueryNameValuePairs();
// var req = Request.GetRequestContext();
// return string.Empty;
//}
[HttpPost]
public string Edit(FormCollection value)
{
var vals = Request.GetQueryNameValuePairs();
var req = Request.GetRequestContext();
return string.Empty;
}
[HttpGet]
public HttpResponseMessage Edit(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View("/jobreport/edit");
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();//. EEEntitiesJobreport();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Now.ToShortDateString();
var rows = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();//.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault();
var contents = result.Content;
if (rows == null)
{
//아이템이 없는 메시지를 표시한다
}
else
{
//치환작업을 진행한다
contents = contents.Replace("{pdate}", rows.pdate);
contents = contents.Replace("{status}", rows.status);
contents = contents.Replace("{name}", rows.name);
contents = contents.Replace("{package}", rows.package);
contents = contents.Replace("{process}", rows.process);
contents = contents.Replace("{type}", rows.type);
contents = contents.Replace("{userProcess}", rows.userProcess);
contents = contents.Replace("{projectName}", rows.projectName);
contents = contents.Replace("{hrs}", rows.hrs.ToString());
contents = contents.Replace("{ot}", rows.ot.ToString());
contents = contents.Replace("{requestpart}", rows.requestpart);
contents = contents.Replace("{description}", rows.description);
}
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Add()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View("/jobreport/add");
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var ed = DateTime.Now.ToShortDateString();
var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed);
//vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
tbody.AppendLine($"<td>{item.ww}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
if (item.status == "진행 중" || item.status.EndsWith("%"))
tbody.AppendLine($"<td class='table-info text-center'>{item.status}</td>");
else
tbody.AppendLine($"<td class='text-center'>{item.status}</td>");
tbody.AppendLine($"<td>{item.type}</td>");
tbody.AppendLine($"<td>{item.projectName}</td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");
tbody.AppendLine("<td><span class='d-inline-block text-truncate' style='max-width: 150px;'>");
tbody.AppendLine(item.description);
tbody.AppendLine("</span></td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport();
var sd = DateTime.Now.ToShortDateString();
var rows = db.GetByToday(FCOMMON.info.Login.gcode, sd);//.vJobReportForUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) == 0).OrderBy(t => t.name);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate}</th>");
tbody.AppendLine($"<td>{item.status}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.projectName}</td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");
tbody.AppendLine($"<td>{item.description}</td>");
if (item.description.Length > 10)
tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
else
tbody.AppendLine($"<td>{item.description}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vJobReportForUserTableAdapter();// EEEntitiesJobreport();
var sd = DateTime.Now.ToShortDateString();
var ed = DateTime.Now.ToShortDateString();
var rows = db.GetByDate(FCOMMON.info.Login.gcode, FCOMMON.info.Login.no, sd, ed);
//.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
tbody.AppendLine($"<td>{item.ww}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
if (item.status == "진행 중" || item.status.EndsWith("%"))
tbody.AppendLine($"<td class='table-info text-center'>{item.status}</td>");
else
tbody.AppendLine($"<td class='text-center'>{item.status}</td>");
tbody.AppendLine($"<td>{item.type}</td>");
tbody.AppendLine($"<td><a href='/jobreport/edit/{item.idx}'>{item.projectName}</a></td>");
tbody.AppendLine($"<td>{item.hrs}</td>");
tbody.AppendLine($"<td>{item.ot}</td>");
tbody.AppendLine("<td><span class='d-inline-block text-truncate' style='max-width: 150px;'>");
tbody.AppendLine(item.description);
tbody.AppendLine("</span></td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,88 +1,88 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class ManualController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public HttpResponseMessage Page(string id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View($"\\Manual\\{id}");
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class ManualController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public HttpResponseMessage Page(string id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View($"\\Manual\\{id}");
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,471 +1,471 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class ProjectController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
//var db = new EEEntitiesProject();
//var rows = db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50);
//itemcnt = rows.Count();
//foreach (var item in rows)
//{
// tbody.AppendLine("<tr>");
// tbody.AppendLine($"<th scope='row'>{item.pdate}</th>");
// tbody.AppendLine($"<td>{item.name}</td>");
// //if (item.description.Length > 10)
// // tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
// //else
// // tbody.AppendLine($"<td>{item.description}</td>");
// tbody.AppendLine("</tr>");
//}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage ScheduleConfirm(int? id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var project = (int)id;
//데이터를 조회해서 표시를 해준다.
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var prjinfo = db.GetData(FCOMMON.info.Login.gcode, project).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == project).FirstOrDefault();
var taSch = new dsProjectsTableAdapters.EETGW_ProjectsScheduleTableAdapter();
var schrows = taSch.GetData(FCOMMON.info.Login.gcode, project);//. db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == project).OrderByDescending(t => t.project).OrderByDescending(t => t.no).OrderBy(t => t.seq);
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
System.Text.StringBuilder tinfo = new System.Text.StringBuilder();
//프로젝트정보를 표시합니다.
tinfo.AppendLine("<tr>");
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.idx));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.status));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.progress));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.name));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.reqstaff));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.userManager));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.orderno));
tinfo.AppendLine("</tr>");
var contents = result.Content.Replace("{search}", "");
contents = contents.Replace("{tableinfo}", tinfo.ToString());
tinfo.Clear();
foreach (var item in schrows)
{
tinfo.AppendLine("<tr>");
tinfo.AppendLine(string.Format("<td>{0}</td>", item.no));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.seq));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.title));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.sw));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.ew));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.swa));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.ewa));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.progress));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.uid));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.memo));
tinfo.AppendLine("</tr>");
}
contents = contents.Replace("{scheinfo}", tinfo.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);//.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.idx}</th>");
tbody.AppendLine($"<td>{item.status}</td>");
tbody.AppendLine($"<td>{item.progress}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.reqstaff}</td>");
tbody.AppendLine($"<td>{item.userManager}</td>");
tbody.AppendLine($"<td>{item.cnt}</td>");
tbody.AppendLine($"<td>{item.costo}</td>");
tbody.AppendLine($"<td>{item.costn}</td>");
tbody.AppendLine($"<td>{item.costo - item.costn}</td>");
tbody.AppendLine($"<td>{item.orderno}</td>");
if (item.memo != null)
tbody.AppendLine($"<td>{item.memo}</td>");
else
tbody.AppendLine($"<td>&nbsp;</td>");
//if (item.description.Length > 10)
// tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
//else
// tbody.AppendLine($"<td>{item.description}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage detail(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.idx}</th>");
tbody.AppendLine($"<td>{item.status}</td>");
tbody.AppendLine($"<td>{item.progress}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.reqstaff}</td>");
tbody.AppendLine($"<td>{item.userManager}</td>");
tbody.AppendLine($"<td>{item.cnt}</td>");
tbody.AppendLine($"<td>{item.costo}</td>");
tbody.AppendLine($"<td>{item.costn}</td>");
tbody.AppendLine($"<td>{item.costo - item.costn}</td>");
tbody.AppendLine($"<td>{item.orderno}</td>");
if (item.memo != null)
tbody.AppendLine($"<td>{item.memo}</td>");
else
tbody.AppendLine($"<td>&nbsp;</td>");
//if (item.description.Length > 10)
// tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
//else
// tbody.AppendLine($"<td>{item.description}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
contents = contents.Replace("{pidx}", id.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage partlist(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
var contents = result.Content.Replace("{search}", searchkey);
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var prjinfo = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault();
System.Text.StringBuilder tinfo = new System.Text.StringBuilder();
//프로젝트정보를 표시합니다.
tinfo.AppendLine("<tr>");
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.idx));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.status));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.progress));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.name));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.reqstaff));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.userManager));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.orderno));
tinfo.AppendLine("</tr>");
contents = contents.Replace("{tableinfo}", tinfo.ToString());
var taPart = new dsProjectsTableAdapters.ProjectsPartTableAdapter();
var rows = taPart.GetData(id);// db.ProjectsPart.Where(t => t.Project == id).OrderBy(t=>t.no);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.no}</th>");
tbody.AppendLine($"<td>{item.ItemGroup}</td>");
tbody.AppendLine($"<td>{item.ItemModel}</td>");
tbody.AppendLine($"<td>{item.ItemUnit}</td>");
tbody.AppendLine($"<td>{item.ItemName}</td>");
tbody.AppendLine($"<td>{item.ItemSid}</td>");
tbody.AppendLine($"<td>{item.ItemManu}</td>");
tbody.AppendLine($"<td>{item.qty}</td>");
tbody.AppendLine($"<td>{item.qtyn}</td>");
tbody.AppendLine($"<td>{item.price}</td>");
tbody.AppendLine($"<td>{item.amt}</td>");
tbody.AppendLine($"<td>{item.amtn}</td>");
tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine($"<td>{item.qtybuy}</td>");
tbody.AppendLine($"<td>{item.qtyin}</td>");
tbody.AppendLine($"<td>{item.bbuy}</td>");
tbody.AppendLine($"<td>{item.bconfirm}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
contents = contents.Replace("{pidx}", id.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class ProjectController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
//var db = new EEEntitiesProject();
//var rows = db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50);
//itemcnt = rows.Count();
//foreach (var item in rows)
//{
// tbody.AppendLine("<tr>");
// tbody.AppendLine($"<th scope='row'>{item.pdate}</th>");
// tbody.AppendLine($"<td>{item.name}</td>");
// //if (item.description.Length > 10)
// // tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
// //else
// // tbody.AppendLine($"<td>{item.description}</td>");
// tbody.AppendLine("</tr>");
//}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage ScheduleConfirm(int? id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var project = (int)id;
//데이터를 조회해서 표시를 해준다.
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var prjinfo = db.GetData(FCOMMON.info.Login.gcode, project).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == project).FirstOrDefault();
var taSch = new dsProjectsTableAdapters.EETGW_ProjectsScheduleTableAdapter();
var schrows = taSch.GetData(FCOMMON.info.Login.gcode, project);//. db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == project).OrderByDescending(t => t.project).OrderByDescending(t => t.no).OrderBy(t => t.seq);
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
System.Text.StringBuilder tinfo = new System.Text.StringBuilder();
//프로젝트정보를 표시합니다.
tinfo.AppendLine("<tr>");
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.idx));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.status));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.progress));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.name));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.reqstaff));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.userManager));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.orderno));
tinfo.AppendLine("</tr>");
var contents = result.Content.Replace("{search}", "");
contents = contents.Replace("{tableinfo}", tinfo.ToString());
tinfo.Clear();
foreach (var item in schrows)
{
tinfo.AppendLine("<tr>");
tinfo.AppendLine(string.Format("<td>{0}</td>", item.no));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.seq));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.title));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.sw));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.ew));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.swa));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.ewa));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.progress));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.uid));
tinfo.AppendLine(string.Format("<td>{0}</td>", item.memo));
tinfo.AppendLine("</tr>");
}
contents = contents.Replace("{scheinfo}", tinfo.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);//.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.idx}</th>");
tbody.AppendLine($"<td>{item.status}</td>");
tbody.AppendLine($"<td>{item.progress}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.reqstaff}</td>");
tbody.AppendLine($"<td>{item.userManager}</td>");
tbody.AppendLine($"<td>{item.cnt}</td>");
tbody.AppendLine($"<td>{item.costo}</td>");
tbody.AppendLine($"<td>{item.costn}</td>");
tbody.AppendLine($"<td>{item.costo - item.costn}</td>");
tbody.AppendLine($"<td>{item.orderno}</td>");
if (item.memo != null)
tbody.AppendLine($"<td>{item.memo}</td>");
else
tbody.AppendLine($"<td>&nbsp;</td>");
//if (item.description.Length > 10)
// tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
//else
// tbody.AppendLine($"<td>{item.description}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage detail(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var rows = db.GetNotCompleteTop50(FCOMMON.info.Login.gcode);// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.status.Contains("완료") == false).OrderByDescending(t => t.pdate).Take(50);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.idx}</th>");
tbody.AppendLine($"<td>{item.status}</td>");
tbody.AppendLine($"<td>{item.progress}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.reqstaff}</td>");
tbody.AppendLine($"<td>{item.userManager}</td>");
tbody.AppendLine($"<td>{item.cnt}</td>");
tbody.AppendLine($"<td>{item.costo}</td>");
tbody.AppendLine($"<td>{item.costn}</td>");
tbody.AppendLine($"<td>{item.costo - item.costn}</td>");
tbody.AppendLine($"<td>{item.orderno}</td>");
if (item.memo != null)
tbody.AppendLine($"<td>{item.memo}</td>");
else
tbody.AppendLine($"<td>&nbsp;</td>");
//if (item.description.Length > 10)
// tbody.AppendLine($"<td>{item.description.Substring(0, 10)}...</td>");
//else
// tbody.AppendLine($"<td>{item.description}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
contents = contents.Replace("{pidx}", id.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage partlist(int id)
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
var contents = result.Content.Replace("{search}", searchkey);
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
{
var db = new dsProjectsTableAdapters.ProjectsTableAdapter();// EEEntitiesProject();
var prjinfo = db.GetData(FCOMMON.info.Login.gcode, id).FirstOrDefault();// db.Projects.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.idx == id).FirstOrDefault();
System.Text.StringBuilder tinfo = new System.Text.StringBuilder();
//프로젝트정보를 표시합니다.
tinfo.AppendLine("<tr>");
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.idx));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.status));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.progress));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.name));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.reqstaff));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.userManager));
tinfo.AppendLine(string.Format("<td>{0}</td>", prjinfo.orderno));
tinfo.AppendLine("</tr>");
contents = contents.Replace("{tableinfo}", tinfo.ToString());
var taPart = new dsProjectsTableAdapters.ProjectsPartTableAdapter();
var rows = taPart.GetData(id);// db.ProjectsPart.Where(t => t.Project == id).OrderBy(t=>t.no);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.no}</th>");
tbody.AppendLine($"<td>{item.ItemGroup}</td>");
tbody.AppendLine($"<td>{item.ItemModel}</td>");
tbody.AppendLine($"<td>{item.ItemUnit}</td>");
tbody.AppendLine($"<td>{item.ItemName}</td>");
tbody.AppendLine($"<td>{item.ItemSid}</td>");
tbody.AppendLine($"<td>{item.ItemManu}</td>");
tbody.AppendLine($"<td>{item.qty}</td>");
tbody.AppendLine($"<td>{item.qtyn}</td>");
tbody.AppendLine($"<td>{item.price}</td>");
tbody.AppendLine($"<td>{item.amt}</td>");
tbody.AppendLine($"<td>{item.amtn}</td>");
tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine($"<td>{item.qtybuy}</td>");
tbody.AppendLine($"<td>{item.qtyin}</td>");
tbody.AppendLine($"<td>{item.bbuy}</td>");
tbody.AppendLine($"<td>{item.bconfirm}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
contents = contents.Replace("{pidx}", id.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,215 +1,215 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using System.Windows.Forms;
namespace Project
{
public class PurchaseController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
if(searchkey.isEmpty()==false && searchkey != "%")
{
if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey;
if (searchkey.EndsWith("%") == false) searchkey += "%";
}
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain();
var rows = db.GetData(searchkey);//.vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.manu.Contains(searchkey) || t.model.Contains(searchkey));
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.Location}</th>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.model}</td>");
if (item.IspriceNull())
tbody.AppendLine($"<td>--</td>");
else
{
var price = (double)item.price / 1000.0;
tbody.AppendLine($"<td>{price.ToString("N0")}</td>");
}
tbody.AppendLine($"<td>{item.manu}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.remark.Length > 10)
tbody.AppendLine($"<td>{item.remark.Substring(0, 10)}...</td>");
else
tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
//{
var db = new dsMSSQLTableAdapters.vPurchaseTableAdapter();// EEEntitiesPurchase();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var rows = db.GetAfter(FCOMMON.info.Login.gcode, sd);// .vPurchase.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) >= 0).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
if (item.state == "---") tbody.AppendLine($"<td class='table-info'>{item.state}</td>");
else if (item.state == "Received") tbody.AppendLine($"<td class='table-success'>{item.state}</td>");
else tbody.AppendLine($"<td>{item.state}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.pumname}</td>");
if (item.pumscale.Length > 10) tbody.AppendLine($"<td>{item.pumscale.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.pumscale}</td>");
tbody.AppendLine($"<td>{item.pumqty}</td>");
tbody.AppendLine($"<td>{item.pumprice}</td>");
tbody.AppendLine($"<td>{item.pumamt}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.project != null && item.project.Length > 10) tbody.AppendLine($"<td>{item.project.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.project}</td>");
if (item.bigo.Length > 10) tbody.AppendLine($"<td>{item.bigo.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.bigo}</td>");
tbody.AppendLine("</tr>");
}
//}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
using System.Windows.Forms;
namespace Project.Web.Controllers
{
public class PurchaseController : BaseController
{
// PUT api/values/5
public void Put(int id, [FromBody] string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Find()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
if(searchkey.isEmpty()==false && searchkey != "%")
{
if (searchkey.StartsWith("%") == false) searchkey = "%" + searchkey;
if (searchkey.EndsWith("%") == false) searchkey += "%";
}
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
if (searchkey.isEmpty() == false)
{
var db = new dsMSSQLTableAdapters.vFindSIDTableAdapter();// EEEntitiesMain();
var rows = db.GetData(searchkey);//.vFindSID.Where(t => t.sid.Contains(searchkey) || t.name.Contains(searchkey) || t.manu.Contains(searchkey) || t.model.Contains(searchkey));
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.Location}</th>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.model}</td>");
if (item.IspriceNull())
tbody.AppendLine($"<td>--</td>");
else
{
var price = (double)item.price / 1000.0;
tbody.AppendLine($"<td>{price.ToString("N0")}</td>");
}
tbody.AppendLine($"<td>{item.manu}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.remark.Length > 10)
tbody.AppendLine($"<td>{item.remark.Substring(0, 10)}...</td>");
else
tbody.AppendLine($"<td>{item.remark}</td>");
tbody.AppendLine("</tr>");
}
}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var gets = Request.GetQueryNameValuePairs();// GetParameters(data);
var key_search = gets.Where(t => t.Key == "search").FirstOrDefault();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var searchkey = string.Empty;
if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim();
var tbody = new System.Text.StringBuilder();
//테이블데이터생성
var itemcnt = 0;
//if (searchkey.isEmpty() == false)
//{
var db = new dsMSSQLTableAdapters.vPurchaseTableAdapter();// EEEntitiesPurchase();
var sd = DateTime.Now.ToString("yyyy-MM-01");
var rows = db.GetAfter(FCOMMON.info.Login.gcode, sd);// .vPurchase.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate.CompareTo(sd) >= 0).OrderByDescending(t => t.pdate);
itemcnt = rows.Count();
foreach (var item in rows)
{
tbody.AppendLine("<tr>");
tbody.AppendLine($"<th scope='row'>{item.pdate.Substring(5)}</th>");
if (item.state == "---") tbody.AppendLine($"<td class='table-info'>{item.state}</td>");
else if (item.state == "Received") tbody.AppendLine($"<td class='table-success'>{item.state}</td>");
else tbody.AppendLine($"<td>{item.state}</td>");
tbody.AppendLine($"<td>{item.name}</td>");
tbody.AppendLine($"<td>{item.sid}</td>");
tbody.AppendLine($"<td>{item.pumname}</td>");
if (item.pumscale.Length > 10) tbody.AppendLine($"<td>{item.pumscale.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.pumscale}</td>");
tbody.AppendLine($"<td>{item.pumqty}</td>");
tbody.AppendLine($"<td>{item.pumprice}</td>");
tbody.AppendLine($"<td>{item.pumamt}</td>");
tbody.AppendLine($"<td>{item.supply}</td>");
if (item.project != null && item.project.Length > 10) tbody.AppendLine($"<td>{item.project.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.project}</td>");
if (item.bigo.Length > 10) tbody.AppendLine($"<td>{item.bigo.Substring(0, 10)}...</td>");
else tbody.AppendLine($"<td>{item.bigo}</td>");
tbody.AppendLine("</tr>");
}
//}
//아잍쳄이 없는경우
if (itemcnt == 0)
{
tbody.AppendLine("<tr>");
tbody.AppendLine("<th scope='row'>1</th>");
tbody.AppendLine("<td colspan='6'>자료가 없습니다</td>");
tbody.AppendLine("</tr>");
}
var contents = result.Content.Replace("{search}", searchkey);
contents = contents.Replace("{tabledata}", tbody.ToString());
contents = contents.Replace("{cnt}", itemcnt.ToString());
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,155 +1,156 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
namespace Project
{
public class ResourceController : BaseController
{
//[HttpGet]
//public HttpResponseMessage Index()
//{
// //로그인이 되어있지않다면 로그인을 가져온다
// MethodResult result;
// result = View(true);
// var model = GetGlobalModel();
// var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
// //기본값을 찾아서 없애줘야한다
// var contents = result.Content;
// //공용값 적용
// ApplyCommonValue(ref contents);
// //최종문자 적용
// result.Content = contents;
// var resp = new HttpResponseMessage()
// {
// Content = new StringContent(
// result.Content,
// System.Text.Encoding.UTF8,
// "text/html")
// };
// return resp;
//}
[HttpGet]
public HttpResponseMessage file()
{
var config = RequestContext.Configuration;
var routeData = config.Routes.GetRouteData(Request).Values.ToList();
var p_resource = routeData.Where(t => t.Key == "resource").FirstOrDefault();
var p_path = routeData.Where(t => t.Key == "path").FirstOrDefault();
var p_ext = routeData.Where(t => t.Key == "ext").FirstOrDefault();
var p_subdir = routeData.Where(t => t.Key == "subdir").FirstOrDefault();
var v_resource = string.Empty;
var v_path = string.Empty;
var v_ext = string.Empty;
var v_subdir = string.Empty;
if (p_resource.Key == "resource") v_resource = p_resource.Value.ToString();
if (p_path.Key == "path") v_path = p_path.Value.ToString();
if (p_ext.Key == "ext") v_ext = p_ext.Value.ToString();
if (p_subdir.Key == "subdir") v_subdir = p_subdir.Value.ToString();
//var file_ext = routeData[0].Value.ToString();
//var name_resource = routeData[1].Value.ToString() + "." + file_ext;
//var name_action = routeData[3].Value.ToString();
Boolean isBinary = true;
string content_type = "text/plain";
if (v_ext == "json")
{
isBinary = false;
content_type = "application/json";
}
else if(v_ext == "vue")
{
isBinary = false;
content_type = "application/js";
}
else if (v_ext == "js")
{
isBinary = false;
content_type = "application/js";
}
else if (v_ext == "css")
{
isBinary = false;
content_type = "text/css";
}
else if (v_ext == "csv")
{
isBinary = false;
content_type = "text/csv";
}
else if (v_ext == "ico")
{
isBinary = true;
content_type = "image/x-icon";
}
else if(v_ext == "ttf" || v_ext == "otf")
{
isBinary = true;
content_type = "application/octet-stream";
}
HttpContent resultContent = null;
if (v_resource.isEmpty() && v_ext.isEmpty())
{
v_resource = "index";
v_ext = "html";
isBinary = false;
content_type = "text/html";
}
var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", v_path, v_subdir, v_resource + "." + v_ext);
if (isBinary)
{
if (System.IO.File.Exists(file))
{
var buffer = System.IO.File.ReadAllBytes(file);
resultContent = new ByteArrayContent(buffer);
Console.WriteLine(">>File(B) : " + file);
}
else Console.WriteLine("no resouoir file " + file);
}
else
{
if (System.IO.File.Exists(file))
{
var buffer = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
resultContent = new StringContent(buffer, System.Text.Encoding.UTF8, content_type);
Console.WriteLine(">>File(S) : " + file);
}
else Console.WriteLine("no resouoir file " + file);
}
return new HttpResponseMessage()
{
Content = resultContent
};
}
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class ResourceController : BaseController
{
//[HttpGet]
//public HttpResponseMessage Index()
//{
// //로그인이 되어있지않다면 로그인을 가져온다
// MethodResult result;
// result = View(true);
// var model = GetGlobalModel();
// var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
// //기본값을 찾아서 없애줘야한다
// var contents = result.Content;
// //공용값 적용
// ApplyCommonValue(ref contents);
// //최종문자 적용
// result.Content = contents;
// var resp = new HttpResponseMessage()
// {
// Content = new StringContent(
// result.Content,
// System.Text.Encoding.UTF8,
// "text/html")
// };
// return resp;
//}
[HttpGet]
public HttpResponseMessage file()
{
var config = RequestContext.Configuration;
var routeData = config.Routes.GetRouteData(Request).Values.ToList();
var p_resource = routeData.Where(t => t.Key == "resource").FirstOrDefault();
var p_path = routeData.Where(t => t.Key == "path").FirstOrDefault();
var p_ext = routeData.Where(t => t.Key == "ext").FirstOrDefault();
var p_subdir = routeData.Where(t => t.Key == "subdir").FirstOrDefault();
var v_resource = string.Empty;
var v_path = string.Empty;
var v_ext = string.Empty;
var v_subdir = string.Empty;
if (p_resource.Key == "resource") v_resource = p_resource.Value.ToString();
if (p_path.Key == "path") v_path = p_path.Value.ToString();
if (p_ext.Key == "ext") v_ext = p_ext.Value.ToString();
if (p_subdir.Key == "subdir") v_subdir = p_subdir.Value.ToString();
//var file_ext = routeData[0].Value.ToString();
//var name_resource = routeData[1].Value.ToString() + "." + file_ext;
//var name_action = routeData[3].Value.ToString();
Boolean isBinary = true;
string content_type = "text/plain";
if (v_ext == "json")
{
isBinary = false;
content_type = "application/json";
}
else if(v_ext == "vue")
{
isBinary = false;
content_type = "application/js";
}
else if (v_ext == "js")
{
isBinary = false;
content_type = "application/js";
}
else if (v_ext == "css")
{
isBinary = false;
content_type = "text/css";
}
else if (v_ext == "csv")
{
isBinary = false;
content_type = "text/csv";
}
else if (v_ext == "ico")
{
isBinary = true;
content_type = "image/x-icon";
}
else if(v_ext == "ttf" || v_ext == "otf")
{
isBinary = true;
content_type = "application/octet-stream";
}
HttpContent resultContent = null;
if (v_resource.isEmpty() && v_ext.isEmpty())
{
v_resource = "index";
v_ext = "html";
isBinary = false;
content_type = "text/html";
}
var file = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "View", v_path, v_subdir, v_resource + "." + v_ext);
if (isBinary)
{
if (System.IO.File.Exists(file))
{
var buffer = System.IO.File.ReadAllBytes(file);
resultContent = new ByteArrayContent(buffer);
Console.WriteLine(">>File(B) : " + file);
}
else Console.WriteLine("no resouoir file " + file);
}
else
{
if (System.IO.File.Exists(file))
{
var buffer = System.IO.File.ReadAllText(file, System.Text.Encoding.UTF8);
resultContent = new StringContent(buffer, System.Text.Encoding.UTF8, content_type);
Console.WriteLine(">>File(S) : " + file);
}
else Console.WriteLine("no resouoir file " + file);
}
return new HttpResponseMessage()
{
Content = resultContent
};
}
}
}

View File

@@ -1,64 +1,64 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class ResultController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class ResultController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,63 +1,63 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project
{
public class SettingController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}
using System;
using System.Linq;
using System.Net.Http;
using System.Web.Http;
namespace Project.Web.Controllers
{
public class SettingController : BaseController
{
[HttpPost]
public void Index([FromBody]string value)
{
}
// PUT api/values/5
public void Put(int id, [FromBody]string value)
{
}
// DELETE api/values/5
public void Delete(int id)
{
}
[HttpGet]
public string Test()
{
return "test";
}
[HttpGet]
public HttpResponseMessage Index()
{
//로그인이 되어있지않다면 로그인을 가져온다
MethodResult result;
result = View();
var model = GetGlobalModel();
var getParams = Request.GetQueryNameValuePairs();// GetParameters(data);
//기본값을 찾아서 없애줘야한다
var contents = result.Content;
//공용값 적용
ApplyCommonValue(ref contents);
//최종문자 적용
result.Content = contents;
var resp = new HttpResponseMessage()
{
Content = new StringContent(
result.Content,
System.Text.Encoding.UTF8,
"text/html")
};
return resp;
}
}
}

View File

@@ -1,18 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Project
{
public class PageModel
{
public List<KeyValuePair<string, object>> RouteData { get; set; }
public string urlcontrol { get; set; }
public string urlaction { get; set; }
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Project.Web.Model
{
public class GroupUserModel
{
public string Gcode { get; set; }
public string uid { get; set; }
}
public class UserModel
{
public string uid { get; set; }
public string password { get; set; }
}
public class PageModel
{
public List<KeyValuePair<string, object>> RouteData { get; set; }
public string urlcontrol { get; set; }
public string urlaction { get; set; }
}
}

88
Project/Web/Startup.cs Normal file
View File

@@ -0,0 +1,88 @@
using Microsoft.Owin;
using Microsoft.Owin.StaticFiles;
using Owin;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
using System.Web.Http.Routing;
using Project.Web.Controllers;
namespace Project.OWIN
{
public class Startup
{
public void Configuration(IAppBuilder app)
{
// Configure Web API for Self-Host
HttpConfiguration config = new HttpConfiguration();
//라우팅 설정
config.MapHttpAttributeRoutes();
config.Routes.MapHttpRoute(
name: "DefaultApi",
routeTemplate: "api/{controller}/{action}/{id}",
defaults: new { id = RouteParameter.Optional }
);
// JSON 포맷터 설정
config.Formatters.JsonFormatter.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
// 파일 업로드 설정
config.Formatters.Remove(config.Formatters.XmlFormatter);
app.UseCors(Microsoft.Owin.Cors.CorsOptions.AllowAll);
app.UseWebApi(config);
// 정적 파일 서빙 설정
var options = new FileServerOptions
{
EnableDefaultFiles = true,
DefaultFilesOptions = { DefaultFileNames = { "index.html" } },
FileSystem = new Microsoft.Owin.FileSystems.PhysicalFileSystem("Web/wwwroot")
};
app.UseFileServer(options);
// 캐시 방지 미들웨어 추가
app.Use(async (context, next) =>
{
if (context.Request.Path.Value.EndsWith(".js") || context.Request.Path.Value.EndsWith(".css"))
{
context.Response.Headers["Cache-Control"] = "no-cache, no-store, must-revalidate";
context.Response.Headers["Pragma"] = "no-cache";
context.Response.Headers["Expires"] = "0";
}
await next();
});
//appBuilder.UseFileServer(new FileServerOptions
//{
// RequestPath = new PathString(string.Empty),
// FileSystem = new PhysicalFileSystem("./MySubFolder"),
// EnableDirectoryBrowsing = true,
//});
//appBuilder.UseStageMarker(PipelineStage.MapHandler);
//config.Routes.MapHttpRoute(
// name: "ignore",
// routeTemplate: @".*\.(css|js|gif|jpg)(/.*)?",
// defaults: new
// {
// controller = "file",
// action = "readtext",
// id = RouteParameter.Optional
// }
// );
}
}
}

View File

@@ -1,101 +1,101 @@
using Microsoft.Owin;
using Owin;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
namespace Project.OWIN
{
public class StartupSSE
{
public void Configuration(IAppBuilder app)
{
var api = new Api();
app.Run(context => api.Invoke(context));
}
public class Subscriber
{
private StreamWriter _writer;
private TaskCompletionSource<bool> _tcs;
public Subscriber(Stream body, TaskCompletionSource<bool> tcs)
{
this._writer = new StreamWriter(body);
this._tcs = tcs;
}
public async void WriteAsync(string message)
{
try
{
_writer.Write(message);
_writer.Flush();
}
catch (Exception e)
{
if (e.HResult == -2146232800) // non-existent connection
_tcs.SetResult(true);
else
_tcs.SetException(e);
}
}
}
public class Api
{
System.Timers.Timer _timer = new System.Timers.Timer(500);
List<Subscriber> _subscribers = new List<Subscriber>();
public Api()
{
_timer.Elapsed += _timer_Elapsed;
}
void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
UpdateSubscribers();
}
public void UpdateSubscribers()
{
Console.WriteLine("updating {0} subscribers", _subscribers.Count);
var subscribersCopy = _subscribers.ToList<Subscriber>();
var msg = String.Format("Hello async at {0}\n", DateTime.Now);
subscribersCopy.ForEach(w => w.WriteAsync(msg));
_timer.Start();
}
public Task Invoke(IOwinContext context)
{
SetEventHeaders(context);
System.IO.Stream responseStream = context.Environment["owin.ResponseBody"] as Stream;
var tcs = new TaskCompletionSource<bool>();
var s = CreateSubscriber(responseStream, tcs);
tcs.Task.ContinueWith(_ => _subscribers.Remove(s));
Console.WriteLine("Add subscriber. Now have {0}", _subscribers.Count);
s.WriteAsync("Registered\n");
_timer.Start();
return tcs.Task;
}
private Subscriber CreateSubscriber(System.IO.Stream responseStream, TaskCompletionSource<bool> tcs)
{
var s = new Subscriber(responseStream, tcs);
_subscribers.Add(s);
return s;
}
private static void SetEventHeaders(IOwinContext context)
{
context.Response.ContentType = "text/eventstream";
context.Response.Headers["Transfer-Encoding"] = "chunked";
context.Response.Headers["cache-control"] = "no-cache";
}
}
}
}
using Microsoft.Owin;
using Owin;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
namespace Project.OWIN
{
public class StartupSSE
{
public void Configuration(IAppBuilder app)
{
var api = new Api();
app.Run(context => api.Invoke(context));
}
public class Subscriber
{
private StreamWriter _writer;
private TaskCompletionSource<bool> _tcs;
public Subscriber(Stream body, TaskCompletionSource<bool> tcs)
{
this._writer = new StreamWriter(body);
this._tcs = tcs;
}
public async void WriteAsync(string message)
{
try
{
_writer.Write(message);
_writer.Flush();
}
catch (Exception e)
{
if (e.HResult == -2146232800) // non-existent connection
_tcs.SetResult(true);
else
_tcs.SetException(e);
}
}
}
public class Api
{
System.Timers.Timer _timer = new System.Timers.Timer(500);
List<Subscriber> _subscribers = new List<Subscriber>();
public Api()
{
_timer.Elapsed += _timer_Elapsed;
}
void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
UpdateSubscribers();
}
public void UpdateSubscribers()
{
Console.WriteLine("updating {0} subscribers", _subscribers.Count);
var subscribersCopy = _subscribers.ToList<Subscriber>();
var msg = String.Format("Hello async at {0}\n", DateTime.Now);
subscribersCopy.ForEach(w => w.WriteAsync(msg));
_timer.Start();
}
public Task Invoke(IOwinContext context)
{
SetEventHeaders(context);
System.IO.Stream responseStream = context.Environment["owin.ResponseBody"] as Stream;
var tcs = new TaskCompletionSource<bool>();
var s = CreateSubscriber(responseStream, tcs);
tcs.Task.ContinueWith(_ => _subscribers.Remove(s));
Console.WriteLine("Add subscriber. Now have {0}", _subscribers.Count);
s.WriteAsync("Registered\n");
_timer.Start();
return tcs.Task;
}
private Subscriber CreateSubscriber(System.IO.Stream responseStream, TaskCompletionSource<bool> tcs)
{
var s = new Subscriber(responseStream, tcs);
_subscribers.Add(s);
return s;
}
private static void SetEventHeaders(IOwinContext context)
{
context.Response.ContentType = "text/eventstream";
context.Response.Headers["Transfer-Encoding"] = "chunked";
context.Response.Headers["cache-control"] = "no-cache";
}
}
}
}

View File

@@ -0,0 +1,311 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>근태현황 대시보드</title>
<script src="https://cdn.tailwindcss.com"></script>
<script>
tailwind.config = {
theme: {
extend: {
colors: {
primary: {
50: '#eff6ff',
100: '#dbeafe',
200: '#bfdbfe',
300: '#93c5fd',
400: '#60a5fa',
500: '#3b82f6',
600: '#2563eb',
700: '#1d4ed8',
800: '#1e40af',
900: '#1e3a8a',
},
success: {
50: '#f0fdf4',
100: '#dcfce7',
200: '#bbf7d0',
300: '#86efac',
400: '#4ade80',
500: '#22c55e',
600: '#16a34a',
700: '#15803d',
800: '#166534',
900: '#14532d',
},
warning: {
50: '#fffbeb',
100: '#fef3c7',
200: '#fde68a',
300: '#fcd34d',
400: '#fbbf24',
500: '#f59e0b',
600: '#d97706',
700: '#b45309',
800: '#92400e',
900: '#78350f',
},
danger: {
50: '#fef2f2',
100: '#fee2e2',
200: '#fecaca',
300: '#fca5a5',
400: '#f87171',
500: '#ef4444',
600: '#dc2626',
700: '#b91c1c',
800: '#991b1b',
900: '#7f1d1d',
}
},
animation: {
'fade-in': 'fadeIn 0.5s ease-in-out',
'slide-up': 'slideUp 0.3s ease-out',
'pulse-slow': 'pulse 3s cubic-bezier(0.4, 0, 0.6, 1) infinite',
},
keyframes: {
fadeIn: {
'0%': { opacity: '0' },
'100%': { opacity: '1' },
},
slideUp: {
'0%': { transform: 'translateY(10px)', opacity: '0' },
'100%': { transform: 'translateY(0)', opacity: '1' },
}
}
}
}
}
</script>
<style>
.glass-effect {
background: rgba(255, 255, 255, 0.25);
backdrop-filter: blur(10px);
border: 1px solid rgba(255, 255, 255, 0.18);
}
.gradient-bg {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
}
.card-hover {
transition: all 0.3s ease;
}
.card-hover:hover {
transform: translateY(-5px);
box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
}
</style>
</head>
<body class="gradient-bg min-h-screen">
<div class="container mx-auto px-4 py-8">
<!-- 헤더 -->
<div class="text-center mb-8 animate-fade-in">
<h1 class="text-4xl font-bold text-white mb-2">근태현황 대시보드</h1>
<p class="text-white/80 text-lg">실시간 근태 현황을 확인하세요</p>
</div>
<!-- 통계 카드 -->
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
<!-- 출근 카드 -->
<div class="glass-effect rounded-2xl p-6 card-hover animate-slide-up">
<div class="flex items-center justify-between">
<div>
<p class="text-white/70 text-sm font-medium">출근</p>
<p class="text-3xl font-bold text-white" id="presentCount">0</p>
</div>
<div class="w-12 h-12 bg-success-500/20 rounded-full flex items-center justify-center">
<svg class="w-6 h-6 text-success-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"></path>
</svg>
</div>
</div>
</div>
<!-- 휴가 카드 -->
<div class="glass-effect rounded-2xl p-6 card-hover animate-slide-up">
<div class="flex items-center justify-between">
<div>
<p class="text-white/70 text-sm font-medium">휴가</p>
<p class="text-3xl font-bold text-white" id="leaveCount">0</p>
</div>
<div class="w-12 h-12 bg-warning-500/20 rounded-full flex items-center justify-center">
<svg class="w-6 h-6 text-warning-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"></path>
</svg>
</div>
</div>
</div>
<!-- 휴가요청 카드 -->
<div class="glass-effect rounded-2xl p-6 card-hover animate-slide-up">
<div class="flex items-center justify-between">
<div>
<p class="text-white/70 text-sm font-medium">휴가요청</p>
<p class="text-3xl font-bold text-white" id="leaveRequestCount">0</p>
</div>
<div class="w-12 h-12 bg-primary-500/20 rounded-full flex items-center justify-center">
<svg class="w-6 h-6 text-primary-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"></path>
</svg>
</div>
</div>
</div>
<!-- 구매요청 카드 -->
<div class="glass-effect rounded-2xl p-6 card-hover animate-slide-up">
<div class="flex items-center justify-between">
<div>
<p class="text-white/70 text-sm font-medium">구매요청</p>
<p class="text-3xl font-bold text-white" id="purchaseCount">0</p>
</div>
<div class="w-12 h-12 bg-danger-500/20 rounded-full flex items-center justify-center">
<svg class="w-6 h-6 text-danger-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z"></path>
</svg>
</div>
</div>
</div>
</div>
<!-- 휴가자 현황 테이블 -->
<div class="glass-effect rounded-2xl overflow-hidden animate-slide-up">
<div class="px-6 py-4 border-b border-white/10">
<h2 class="text-xl font-semibold text-white flex items-center">
<svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z"></path>
</svg>
휴가자 현황
</h2>
</div>
<div class="overflow-x-auto">
<table class="w-full">
<thead class="bg-white/10">
<tr>
<th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">이름</th>
<th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">휴가 종류</th>
<th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">시작일</th>
<th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">종료일</th>
<th class="px-6 py-4 text-left text-xs font-medium text-white/70 uppercase tracking-wider">사유</th>
</tr>
</thead>
<tbody id="holidayTable" class="divide-y divide-white/10">
<!-- 데이터가 여기에 표시됩니다 -->
</tbody>
</table>
</div>
</div>
<!-- 로딩 인디케이터 -->
<div id="loadingIndicator" class="fixed top-4 right-4 bg-white/20 backdrop-blur-sm rounded-full px-4 py-2 text-white text-sm hidden">
<div class="flex items-center">
<div class="animate-spin rounded-full h-4 w-4 border-b-2 border-white mr-2"></div>
데이터 업데이트 중...
</div>
</div>
</div>
<script>
// 휴가 인원 Ajax 업데이트
function updateLeaveCount() {
showLoading();
fetch('http://127.0.0.1:9000/Dashboard/TodayCountH')
.then(response => response.text())
.then(data => {
const cleanData = data.replace(/"/g, '');
const count = parseInt(cleanData, 10);
animateNumberChange('leaveCount', count);
hideLoading();
})
.catch(error => {
console.error('휴가 인원 업데이트 중 오류 발생:', error);
hideLoading();
});
}
// 휴가자 목록 Ajax 업데이트
function updateHolidayList() {
showLoading();
fetch('http://127.0.0.1:9000/Dashboard/GetholyUser')
.then(response => response.json())
.then(data => {
let tableRows = '';
if (data && data.length > 0) {
data.forEach(item => {
tableRows += `
<tr class="hover:bg-white/5 transition-colors">
<td class="px-6 py-4 whitespace-nowrap text-white">${item.uid || '-'}</td>
<td class="px-6 py-4 whitespace-nowrap">
<span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-warning-500/20 text-warning-300">
${item.cate || '-'}
</span>
</td>
<td class="px-6 py-4 whitespace-nowrap text-white/80">${item.sdate || '-'}</td>
<td class="px-6 py-4 whitespace-nowrap text-white/80">${item.edate || '-'}</td>
<td class="px-6 py-4 text-white/80">${item.HolyReason || '-'}</td>
</tr>
`;
});
} else {
tableRows = `
<tr>
<td colspan="5" class="px-6 py-8 text-center text-white/50">
현재 휴가자가 없습니다
</td>
</tr>
`;
}
document.getElementById('holidayTable').innerHTML = tableRows;
hideLoading();
})
.catch(error => {
console.error('휴가자 목록 업데이트 중 오류 발생:', error);
document.getElementById('holidayTable').innerHTML = `
<tr>
<td colspan="5" class="px-6 py-8 text-center text-danger-400">
데이터를 불러오는 중 오류가 발생했습니다
</td>
</tr>
`;
hideLoading();
});
}
// 숫자 애니메이션
function animateNumberChange(elementId, newValue) {
const element = document.getElementById(elementId);
const currentValue = parseInt(element.textContent) || 0;
const increment = (newValue - currentValue) / 20;
let current = currentValue;
const timer = setInterval(() => {
current += increment;
if ((increment > 0 && current >= newValue) || (increment < 0 && current <= newValue)) {
element.textContent = newValue;
clearInterval(timer);
} else {
element.textContent = Math.floor(current);
}
}, 50);
}
// 로딩 표시
function showLoading() {
document.getElementById('loadingIndicator').classList.remove('hidden');
}
function hideLoading() {
document.getElementById('loadingIndicator').classList.add('hidden');
}
// 페이지 로드 시 데이터 업데이트
updateLeaveCount();
updateHolidayList();
// 30초마다 데이터 새로고침
setInterval(() => {
updateLeaveCount();
updateHolidayList();
}, 30000);
</script>
</body>
</html>

View File

@@ -0,0 +1,114 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>근태현황 대시보드</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
</head>
<body>
<div class="container py-5">
<div class="row mb-4">
<div class="col-md-3">
<div class="card text-center">
<div class="card-body">
<h5 class="card-title">출근</h5>
<p class="card-text fs-2" id="presentCount">0</p>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card text-center">
<div class="card-body">
<h5 class="card-title">휴가</h5>
<p class="card-text fs-2" id="leaveCount">0</p>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card text-center">
<div class="card-body">
<h5 class="card-title">휴가요청</h5>
<p class="card-text fs-2" id="leaveCount">0</p>
</div>
</div>
</div>
<div class="col-md-3">
<div class="card text-center">
<div class="card-body">
<h5 class="card-title">구매요청</h5>
<p class="card-text fs-2" id="leaveCount">0</p>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-header">
휴가자 현황
</div>
<div class="card-body p-0">
<table class="table mb-0">
<thead class="table-light">
<tr>
<th>이름</th>
<th>출근 시간</th>
<th>퇴근 시간</th>
<th>상태</th>
</tr>
</thead>
<tbody id="attendanceTable">
<!-- 데이터가 여기에 표시됩니다 -->
</tbody>
</table>
</div>
</div>
</div>
<script>
// 샘플 데이터
const attendanceData = [
{ name: '홍길동', checkIn: '09:01', checkOut: '18:00', status: '지각' },
{ name: '김철수', checkIn: '08:55', checkOut: '18:05', status: '정상' },
{ name: '이영희', checkIn: '-', checkOut: '-', status: '결근' },
{ name: '박민수', checkIn: '09:00', checkOut: '18:10', status: '정상' },
{ name: '최지우', checkIn: '09:20', checkOut: '18:00', status: '지각' }
];
function updateDashboard(data) {
let present = 0, leave = 0, late = 0, absent = 0;
let tableRows = '';
data.forEach(item => {
if (item.status === '정상' || item.status === '지각') present++;
if (item.checkOut !== '-') leave++;
if (item.status === '지각') late++;
if (item.status === '결근') absent++;
tableRows += `<tr>
<td>${item.name}</td>
<td>${item.checkIn}</td>
<td>${item.checkOut}</td>
<td>${item.status}</td>
</tr>`;
});
}
// 페이지 로드 시 대시보드 업데이트
updateDashboard(attendanceData);
// 휴가 인원 Ajax 업데이트
function updateLeaveCount() {
fetch('http://127.0.0.1:9000/Dashboard/TodayCountH')
.then(response => response.text())
.then(data => {
// 수신된 데이터가 "1" 형태로 반환되므로, 쌍따옴표를 제거하고 숫자로 변환
const cleanData = data.replace(/"/g, '');
document.getElementById('leaveCount').textContent = parseInt(cleanData, 10);
})
.catch(error => console.error('휴가 인원 업데이트 중 오류 발생:', error));
}
// 페이지 로드 시 휴가 인원 업데이트
updateLeaveCount();
</script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
</body>
</html>

View File

@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Expires" content="0">
<title>VNC 서버 목록 관리</title>
<script src="https://cdn.tailwindcss.com"></script>
<script>
tailwind.config = {
theme: {
extend: {
colors: {
primary: '#3B82F6',
secondary: '#6B7280',
success: '#10B981',
danger: '#EF4444',
warning: '#F59E0B'
}
}
}
}
</script>
</head>
<body class="bg-gray-50 min-h-screen">
intro file
</body>
</html>

View File

@@ -0,0 +1,354 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>로그인 - GroupWare</title>
<script src="https://cdn.tailwindcss.com"></script>
<script>
tailwind.config = {
theme: {
extend: {
colors: {
primary: {
50: '#eff6ff',
100: '#dbeafe',
200: '#bfdbfe',
300: '#93c5fd',
400: '#60a5fa',
500: '#3b82f6',
600: '#2563eb',
700: '#1d4ed8',
800: '#1e40af',
900: '#1e3a8a',
},
success: {
50: '#f0fdf4',
100: '#dcfce7',
200: '#bbf7d0',
300: '#86efac',
400: '#4ade80',
500: '#22c55e',
600: '#16a34a',
700: '#15803d',
800: '#166534',
900: '#14532d',
},
warning: {
50: '#fffbeb',
100: '#fef3c7',
200: '#fde68a',
300: '#fcd34d',
400: '#fbbf24',
500: '#f59e0b',
600: '#d97706',
700: '#b45309',
800: '#92400e',
900: '#78350f',
},
danger: {
50: '#fef2f2',
100: '#fee2e2',
200: '#fecaca',
300: '#fca5a5',
400: '#f87171',
500: '#ef4444',
600: '#dc2626',
700: '#b91c1c',
800: '#991b1b',
900: '#7f1d1d',
}
},
animation: {
'fade-in': 'fadeIn 0.6s ease-in-out',
'slide-up': 'slideUp 0.4s ease-out',
'bounce-in': 'bounceIn 0.6s ease-out',
'pulse-slow': 'pulse 3s cubic-bezier(0.4, 0, 0.6, 1) infinite',
},
keyframes: {
fadeIn: {
'0%': { opacity: '0' },
'100%': { opacity: '1' },
},
slideUp: {
'0%': { transform: 'translateY(20px)', opacity: '0' },
'100%': { transform: 'translateY(0)', opacity: '1' },
},
bounceIn: {
'0%': { transform: 'scale(0.3)', opacity: '0' },
'50%': { transform: 'scale(1.05)' },
'70%': { transform: 'scale(0.9)' },
'100%': { transform: 'scale(1)', opacity: '1' },
}
}
}
}
}
</script>
<style>
.glass-effect {
background: rgba(255, 255, 255, 0.25);
backdrop-filter: blur(10px);
border: 1px solid rgba(255, 255, 255, 0.18);
}
.gradient-bg {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
}
.card-hover {
transition: all 0.3s ease;
}
.card-hover:hover {
transform: translateY(-2px);
box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
}
.input-focus {
transition: all 0.3s ease;
}
.input-focus:focus {
transform: scale(1.02);
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
}
.floating-label {
transition: all 0.3s ease;
}
.input-field:focus + .floating-label,
.input-field:not(:placeholder-shown) + .floating-label {
transform: translateY(-1.5rem) scale(0.85);
color: #3b82f6;
}
</style>
</head>
<body class="gradient-bg min-h-screen flex items-center justify-center p-4">
<div class="w-full max-w-md">
<!-- 로그인 카드 -->
<div class="glass-effect rounded-3xl p-8 card-hover animate-bounce-in">
<!-- 로고 및 제목 -->
<div class="text-center mb-8 animate-fade-in">
<div class="w-16 h-16 bg-white/20 rounded-full flex items-center justify-center mx-auto mb-4">
<svg class="w-8 h-8 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"></path>
</svg>
</div>
<h1 class="text-2xl font-bold text-white mb-2">GroupWare</h1>
<p class="text-white/70 text-sm">로그인하여 시스템에 접속하세요</p>
</div>
<!-- 로그인 폼 -->
<form id="loginForm" class="space-y-6 animate-slide-up">
<!-- 사용자 ID 입력 -->
<div class="relative">
<input
type="text"
id="userId"
name="userId"
class="input-field w-full px-4 py-3 bg-white/10 border border-white/20 rounded-xl text-white placeholder-transparent focus:outline-none focus:border-primary-400 input-focus"
placeholder="사용자 ID"
required
>
<label for="userId" class="floating-label absolute left-4 top-3 text-white/60 text-sm pointer-events-none">
사용자 ID
</label>
<div class="absolute right-3 top-3">
<svg class="w-5 h-5 text-white/40" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z"></path>
</svg>
</div>
</div>
<!-- 비밀번호 입력 -->
<div class="relative">
<input
type="password"
id="password"
name="password"
class="input-field w-full px-4 py-3 bg-white/10 border border-white/20 rounded-xl text-white placeholder-transparent focus:outline-none focus:border-primary-400 input-focus"
placeholder="비밀번호"
required
>
<label for="password" class="floating-label absolute left-4 top-3 text-white/60 text-sm pointer-events-none">
비밀번호
</label>
<div class="absolute right-3 top-3">
<svg class="w-5 h-5 text-white/40" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"></path>
</svg>
</div>
</div>
<!-- 로그인 버튼 -->
<button
type="submit"
class="w-full bg-primary-500 hover:bg-primary-600 text-white font-semibold py-3 px-4 rounded-xl transition-all duration-300 transform hover:scale-105 focus:outline-none focus:ring-2 focus:ring-primary-400 focus:ring-offset-2 focus:ring-offset-transparent"
>
<span class="flex items-center justify-center">
<svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 16l-4-4m0 0l4-4m-4 4h14m-5 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h7a3 3 0 013 3v1"></path>
</svg>
로그인
</span>
</button>
</form>
<!-- 추가 옵션 -->
<div class="mt-6 text-center">
<div class="flex items-center justify-center space-x-4 text-sm">
<label class="flex items-center text-white/70 hover:text-white cursor-pointer transition-colors">
<input type="checkbox" class="mr-2 w-4 h-4 text-primary-500 bg-white/10 border-white/20 rounded focus:ring-primary-400 focus:ring-2">
로그인 정보 저장
</label>
<a href="#" class="text-primary-300 hover:text-primary-200 transition-colors">비밀번호 찾기</a>
</div>
</div>
</div>
<!-- 푸터 -->
<div class="text-center mt-6 animate-fade-in">
<p class="text-white/50 text-sm">
© 2024 GroupWare System. All rights reserved.
</p>
</div>
<!-- 로딩 인디케이터 -->
<div id="loadingIndicator" class="fixed top-4 right-4 bg-white/20 backdrop-blur-sm rounded-full px-4 py-2 text-white text-sm hidden">
<div class="flex items-center">
<div class="animate-spin rounded-full h-4 w-4 border-b-2 border-white mr-2"></div>
로그인 중...
</div>
</div>
<!-- 에러 메시지 -->
<div id="errorMessage" class="fixed top-4 left-1/2 transform -translate-x-1/2 bg-danger-500 text-white px-6 py-3 rounded-lg shadow-lg hidden">
<div class="flex items-center">
<svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
</svg>
<span id="errorText">로그인에 실패했습니다.</span>
</div>
</div>
<!-- 성공 메시지 -->
<div id="successMessage" class="fixed top-4 left-1/2 transform -translate-x-1/2 bg-success-500 text-white px-6 py-3 rounded-lg shadow-lg hidden">
<div class="flex items-center">
<svg class="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
</svg>
<span id="successText">로그인에 성공했습니다.</span>
</div>
</div>
</div>
<script>
// 폼 제출 처리
document.getElementById('loginForm').addEventListener('submit', function(e) {
e.preventDefault();
const userId = document.getElementById('userId').value;
const password = document.getElementById('password').value;
const rememberMe = document.querySelector('input[type="checkbox"]').checked;
if (!userId || !password) {
showError('사용자 ID와 비밀번호를 입력해주세요.');
return;
}
// 로딩 표시
showLoading();
// HomeController의 로그인 API 호출
fetch('http://127.0.0.1:9000/Home/Login', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
UserId: userId,
Password: password,
RememberMe: rememberMe
})
})
.then(response => response.json())
.then(data => {
hideLoading();
if (data.Success) {
// 로그인 성공
showSuccess(data.Message);
// 리다이렉트 URL이 있으면 이동
if (data.RedirectUrl) {
setTimeout(() => {
window.location.href = data.RedirectUrl;
}, 1000);
}
} else {
// 로그인 실패
showError(data.Message || '로그인에 실패했습니다.');
}
})
.catch(error => {
hideLoading();
console.error('로그인 요청 중 오류 발생:', error);
showError('서버 연결에 실패했습니다. 다시 시도해주세요.');
});
});
// 입력 필드 포커스 효과
document.querySelectorAll('.input-field').forEach(input => {
input.addEventListener('focus', function() {
this.parentElement.classList.add('ring-2', 'ring-primary-400');
});
input.addEventListener('blur', function() {
this.parentElement.classList.remove('ring-2', 'ring-primary-400');
});
});
// 로딩 표시 함수
function showLoading() {
document.getElementById('loadingIndicator').classList.remove('hidden');
}
function hideLoading() {
document.getElementById('loadingIndicator').classList.add('hidden');
}
// 에러 메시지 표시 함수
function showError(message) {
const errorDiv = document.getElementById('errorMessage');
const errorText = document.getElementById('errorText');
errorText.textContent = message;
errorDiv.classList.remove('hidden');
// 3초 후 자동 숨김
setTimeout(() => {
errorDiv.classList.add('hidden');
}, 3000);
}
// 성공 메시지 표시 함수
function showSuccess(message) {
const successDiv = document.getElementById('successMessage');
const successText = document.getElementById('successText');
successText.textContent = message;
successDiv.classList.remove('hidden');
// 3초 후 자동 숨김
setTimeout(() => {
successDiv.classList.add('hidden');
}, 3000);
}
// 페이지 로드 시 애니메이션
document.addEventListener('DOMContentLoaded', function() {
// 입력 필드에 자동 포커스
setTimeout(() => {
document.getElementById('userId').focus();
}, 500);
});
</script>
</body>
</html>

View File

@@ -3,26 +3,16 @@
<configSections>
</configSections>
<connectionStrings>
<add name="Project.Properties.Settings.gwcs" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
<add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True"
providerName="System.Data.EntityClient" />
<add name="EEEntities1" connectionString="metadata=res://*/ModelMain.csdl|res://*/ModelMain.ssdl|res://*/ModelMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;connect timeout=30;encrypt=False;trustservercertificate=True;MultipleActiveResultSets=True;App=EntityFramework&quot;"
providerName="System.Data.EntityClient" />
<add name="EEEntitiesMain" connectionString="metadata=res://*/AdoNetEFMain.csdl|res://*/AdoNetEFMain.ssdl|res://*/AdoNetEFMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;connect timeout=30;encrypt=False;trustservercertificate=True;MultipleActiveResultSets=True;App=EntityFramework&quot;"
providerName="System.Data.EntityClient" />
<add name="S1ACCESS300Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.141.18.50;initial catalog=S1ACCESS300;persist security info=True;user id=amkoruser;password=AmkorUser!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True"
providerName="System.Data.EntityClient" />
<add name="EEEntitiesPurchase" connectionString="metadata=res://*/ModelPurchase.csdl|res://*/ModelPurchase.ssdl|res://*/ModelPurchase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True"
providerName="System.Data.EntityClient" />
<add name="EEEntitiesCommon" connectionString="metadata=res://*/ModelCommon.csdl|res://*/ModelCommon.ssdl|res://*/ModelCommon.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True"
providerName="System.Data.EntityClient" />
<add name="EEEntitiesJobreport" connectionString="metadata=res://*/ModelJobreport.csdl|res://*/ModelJobreport.ssdl|res://*/ModelJobreport.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True"
providerName="System.Data.EntityClient" />
<add name="EEEntitiesProject" connectionString="metadata=res://*/ModelProject.csdl|res://*/ModelProject.ssdl|res://*/ModelProject.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True"
providerName="System.Data.EntityClient" />
<add name="Project.Properties.Settings.CS" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
<add name="Project.Properties.Settings.gwcs" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
<add name="EEEntities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True" providerName="System.Data.EntityClient" />
<add name="EEEntities1" connectionString="metadata=res://*/ModelMain.csdl|res://*/ModelMain.ssdl|res://*/ModelMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;connect timeout=30;encrypt=False;trustservercertificate=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<add name="EEEntitiesMain" connectionString="metadata=res://*/AdoNetEFMain.csdl|res://*/AdoNetEFMain.ssdl|res://*/AdoNetEFMain.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;connect timeout=30;encrypt=False;trustservercertificate=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
<add name="S1ACCESS300Entities" connectionString="metadata=res://*/Model1.csdl|res://*/Model1.ssdl|res://*/Model1.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.141.18.50;initial catalog=S1ACCESS300;persist security info=True;user id=amkoruser;password=AmkorUser!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True" providerName="System.Data.EntityClient" />
<add name="EEEntitiesPurchase" connectionString="metadata=res://*/ModelPurchase.csdl|res://*/ModelPurchase.ssdl|res://*/ModelPurchase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True" providerName="System.Data.EntityClient" />
<add name="EEEntitiesCommon" connectionString="metadata=res://*/ModelCommon.csdl|res://*/ModelCommon.ssdl|res://*/ModelCommon.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True" providerName="System.Data.EntityClient" />
<add name="EEEntitiesJobreport" connectionString="metadata=res://*/ModelJobreport.csdl|res://*/ModelJobreport.ssdl|res://*/ModelJobreport.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True" providerName="System.Data.EntityClient" />
<add name="EEEntitiesProject" connectionString="metadata=res://*/ModelProject.csdl|res://*/ModelProject.ssdl|res://*/ModelProject.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=K4FASQL.kr.ds.amkor.com,50150;initial catalog=EE;persist security info=True;user id=eeadm;password=uJnU8a8q&amp;DJ+ug-D!;MultipleActiveResultSets=True;App=EntityFramework&quot;TrustServerCertificate=True" providerName="System.Data.EntityClient" />
<add name="Project.Properties.Settings.CS" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

View File

@@ -63,6 +63,7 @@
this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NRCR기준금액입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mn_project = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -148,7 +149,8 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.NRCR기준금액입력ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem17 = new System.Windows.Forms.ToolStripSeparator();
this.webview2TestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cmTab.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@@ -429,6 +431,13 @@
this.ToolStripMenuItem.Text = "품목 입고";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 월별NRCR기준금액입력ToolStripMenuItem
//
this.NRCR기준금액입력ToolStripMenuItem.Name = "월별NRCR기준금액입력ToolStripMenuItem";
this.NRCR기준금액입력ToolStripMenuItem.Size = new System.Drawing.Size(246, 24);
this.NRCR기준금액입력ToolStripMenuItem.Text = "월별 NR,CR 기준금액 입력";
this.NRCR기준금액입력ToolStripMenuItem.Click += new System.EventHandler(this.NRCR기준금액입력ToolStripMenuItem_Click);
//
// mn_project
//
this.mn_project.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -830,7 +839,9 @@
//
this.ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.ToolStripMenuItem,
this.toolStripMenuItem17,
this.webview2TestToolStripMenuItem});
this.ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("기타ToolStripMenuItem.Image")));
this.ToolStripMenuItem.Name = "기타ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(65, 23);
@@ -839,14 +850,14 @@
// 품목검색ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "품목검색ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Text = "품목 검색";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 대쉬보드ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "대쉬보드ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(139, 24);
this.ToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.ToolStripMenuItem.Text = "대쉬보드";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -1150,12 +1161,17 @@
this.toolStripButton3.ToolTipText = "휴가신청";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// 월별NRCR기준금액입력ToolStripMenuItem
// toolStripMenuItem17
//
this.NRCR기준금액입력ToolStripMenuItem.Name = "월별NRCR기준금액입력ToolStripMenuItem";
this.NRCR기준금액입력ToolStripMenuItem.Size = new System.Drawing.Size(246, 24);
this.NRCR기준금액입력ToolStripMenuItem.Text = "월별 NR,CR 기준금액 입력";
this.NRCR기준금액입력ToolStripMenuItem.Click += new System.EventHandler(this.NRCR기준금액입력ToolStripMenuItem_Click);
this.toolStripMenuItem17.Name = "toolStripMenuItem17";
this.toolStripMenuItem17.Size = new System.Drawing.Size(177, 6);
//
// webview2TestToolStripMenuItem
//
this.webview2TestToolStripMenuItem.Name = "webview2TestToolStripMenuItem";
this.webview2TestToolStripMenuItem.Size = new System.Drawing.Size(180, 24);
this.webview2TestToolStripMenuItem.Text = "Webview2 Test";
this.webview2TestToolStripMenuItem.Click += new System.EventHandler(this.webview2TestToolStripMenuItem_Click);
//
// fMain
//
@@ -1306,6 +1322,8 @@
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem NRCR기준금액입력ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem17;
private System.Windows.Forms.ToolStripMenuItem webview2TestToolStripMenuItem;
}
}

View File

@@ -18,7 +18,8 @@ namespace Project
{
string SearchKey = string.Empty;
ServiceHost host;
private IDisposable webApp;
bool webok = false;
public fMain()
@@ -79,6 +80,7 @@ namespace Project
private void __Closing(object sender, FormClosingEventArgs e)
{
webApp?.Dispose();
MessageWindow.CloseAll();
if (closeforce == false)
{
@@ -148,47 +150,37 @@ namespace Project
tmDisplay.Start(); //display timer
Func_Login();
Update_Site();
UpdateControls();
//사용기록추적
Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
// Start OWIN host
try
{
WebApp.Start<OWIN.Startup>(url: "http://127.0.0.1:9000");
var options = new StartOptions("http://127.0.0.1:9000");
webApp = WebApp.Start<OWIN.Startup>(options);
Console.WriteLine("start webapp");
Pub.log.AddI("웹지원 서버 준비 완료");
webok = true;
}
catch (Exception ex)
{
//Util.MsgE("Web Interface Error\r\n" + ex.Message)/;
Console.WriteLine(ex.Message);
Pub.log.AddE("웹지원오류" + ex.Message);
webok = false;
}
Func_Login();
//// Address
//string address = "net.tcp://localhost:57900/eetgw";
///즐겨찾기 목록 갱신
Update_FavoriteSite();
//// Binding : TCP 사용
//NetTcpBinding binding = new NetTcpBinding();
UpdateControls();
//// Service Host 만들기
//host = new ServiceHost(typeof(MyService));
//사용기록추적
Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
//// End Point 추가
//host.AddServiceEndpoint(typeof(IMyContract), binding, address);
//// Service Host 시작
//host.Open();
}
void Update_Site()
void Update_FavoriteSite()
{
//즐겨찾기 없데이트 g=17
//타입
@@ -212,9 +204,19 @@ namespace Project
void Func_Login()
{
using (Dialog.fLogin flogIn = new Dialog.fLogin())
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
if (this.webok)
{
using (var flogIn = new Dialog.fLogin_WB())
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
}
else
{
using (var flogIn = new Dialog.fLogin())
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
Application.ExitThread();
}
this.mn_purchase.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_purchase);
this.mn_project.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_project);
@@ -253,40 +255,7 @@ namespace Project
var menu_kuntaeVisible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_workday);
var menu_logdata = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata);
this.Menu_Dashboard();
// Menu_Note();
////시작폼 확인
//if (Pub.setting.startForm == eFormList.NR구매관리 && menu_purchaseVisible == true)
//{
// menu_nrpurchase();
//}
//else if (Pub.setting.startForm == eFormList.업무일지 && menu_dailyhistoryVisible == true)
//{
// menu_work_report();
//}
//else if (Pub.setting.startForm == eFormList.프로젝트관리 && menu_projectVisible == true)
//{
// menu_projecT_list();
//}
//else if (Pub.setting.startForm == eFormList.재고관리 && menu_jagoVisible == true)
//{
// Menu_Inventory();
//}
//else if (Pub.setting.startForm == eFormList.재고현황 && menu_jagoVisible == true)
//{
// Menu_InventoryList();
//}
//else if(Pub.setting.startForm == eFormList.품목입고)
//{
// menu_itemin();
//}
//else if (Pub.setting.startForm == eFormList.근태입력)
//{
// Menu_WorkTable();
//}
}
void Menu_WorkTable()
{
@@ -668,6 +637,12 @@ namespace Project
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
CloseAllForm();
Func_Login();
}
void CloseAllForm()
{
while (tabControl1.TabPages.Count > 0)
{
@@ -679,7 +654,6 @@ namespace Project
this.tabControl1.Refresh();
}
Func_Login();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1513,5 +1487,11 @@ namespace Project
var f = new FEQ0000.fMonthAmount();//.fJobProcessSelect("", true);
f.Show();
}
private void webview2TestToolStripMenuItem_Click(object sender, EventArgs e)
{
using (var f = new Dialog.fWebView2Test())
f.ShowDialog();
}
}
}

View File

@@ -123,9 +123,6 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>124, 17</value>
</metadata>
<metadata name="bw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>221, 17</value>
</metadata>
<metadata name="cmTab.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>289, 17</value>
</metadata>
@@ -457,14 +454,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPY4CDmcasDEu1MxmW6ixgWKbTwrBYVx0svkqL
h2GZViHDMu15QPFWhmXqUmBxDLBUZzVQwX84Xqzzg2GJpifDMs3rKOJLtZ4ADZWA6oKCpVo2IEmBtZb/
/U7m/E+5XP8/92TF/3lzYj/U9Ob/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP
/U7m/E+5XP8/92TF/3lzYj/U9OT/S73c8D/yXNl/1W1eUEO0+6A6oWCZzgT+NebHkq/Ufyu+1fO/5GbP
/0Mzc/4/6kz7f3VS5k+QGAyb7A49wbBE5xpUJxQs1RUsvtVdB1PUcaj+//XSiP/7W+3/Xi/0+tyzrRBu
QPGtrgsg9VCdCFB8s3suTFHlpY5l5wtDDl5Odvt2MUjt/7YKp73FFzs+guQKbva8g2pBBTAXFN3sKQHx
X7RGiD8u8/x/JUPrz5NsG7XCm736QNs/F93qOQ/WgA6K7/QYF9/oOg7lMjwu9vR8VOrxH4xLvDxAYkBX
lgItagErwAaK73SLQZkMTyq8smAGPKn0zgSJ1d+v58i9NZEPrIAQeFTh2fek3Os/CD8u9+qFChMPgP7f
CPdCqccGqDBx4P/+eo4XXVGn3/TE/Qfhl52Rp0BiUGns4N+Bfs2/B3r7/h/oPXP/QO9vIP0fGUPFzoDV
7O/RgGoDatw2kR0oOP/ipPp/6JpwYZDavwd65oH0Mvzd39uLTRExGKQX6PQ+W6Bpy4ECq0jBID3/DvTZ
AgBdX6p9Y4+DIQAAAABJRU5ErkJggg==
7O/RgGoDatw2kR0oOP/CxPp/6JpwYZDavwd65oH0Mvzd39uLTRExGKQX6PQ+W6Bpy4ECq0jBID3/DvTZ
AgBXZap4/fGa+QAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -20,6 +20,7 @@
<package id="Microsoft.Owin.StaticFiles.ko" version="4.2.0" targetFramework="net46" />
<package id="Microsoft.ReportingServices.ReportViewerControl.Winforms" version="150.1586.0" targetFramework="net46" />
<package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net46" />
<package id="Microsoft.Web.WebView2" version="1.0.2210.55" targetFramework="net46" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net46" />
<package id="Owin" version="1.0" targetFramework="net452" />
<package id="System.Buffers" version="4.5.1" targetFramework="net46" />

View File

@@ -6307,11 +6307,11 @@ namespace Console_SendMail {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool SendOK2 {
get {
try {
return ((bool)(this[this.tableMailData.SendOK2Column]));
if (this.IsSendOK2Null()) {
return false;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'MailData\' 테이블의 \'SendOK2\' 열의 값이 DBNull입니다.", e);
else {
return ((bool)(this[this.tableMailData.SendOK2Column]));
}
}
set {
@@ -6323,11 +6323,11 @@ namespace Console_SendMail {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string SendMsg2 {
get {
try {
return ((string)(this[this.tableMailData.SendMsg2Column]));
if (this.IsSendMsg2Null()) {
return string.Empty;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("\'MailData\' 테이블의 \'SendMsg2\' 열의 값이 DBNull입니다.", e);
else {
return ((string)(this[this.tableMailData.SendMsg2Column]));
}
}
set {
@@ -9749,7 +9749,7 @@ namespace Console_SendMail.DSMailTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -10473,7 +10473,7 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -10602,28 +10602,47 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [fromlist], [tolist], [bcc], [cc], [body], [SendOK], [SendMsg], [aidx], [atime], [wuid], [wdate]) VALUES (@project, @gcode, @cate, @pdate, @subject, @fromlist, @tolist, @bcc, @cc, @body, @SendOK, @SendMsg, @aidx, @atime, @wuid, @wdate);
this._adapter.InsertCommand.CommandText = @"INSERT INTO MailData
(project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate, suid, sdate, SendOK2, SendMsg2, suid2, sdate2)
VALUES (@project,@gcode,@cate,@pdate,@subject,@fromlist,@tolist,@bcc,@cc,@body,@SendOK,@SendMsg,@aidx,@atime,@wuid,@wdate,@suid,@sdate,@SendOK2,@SendMsg2,@suid2,@sdate2);
SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate FROM MailData WHERE (idx = SCOPE_IDENTITY())";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@subject", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "subject", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fromlist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fromlist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bcc", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bcc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cc", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@body", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "body", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendOK", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SendOK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@subject", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "subject", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fromlist", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "fromlist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tolist", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "tolist", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bcc", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "bcc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cc", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "cc", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@body", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "body", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendOK", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "SendOK", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@aidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "aidx", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendOK2", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "SendOK2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg2", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid2", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "suid2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate2", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "sdate2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [fromlist] = @fromlist, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [SendOK] = @SendOK, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
this._adapter.UpdateCommand.CommandText = @"UPDATE MailData
SET project = @project, gcode = @gcode, cate = @cate, pdate = @pdate, subject = @subject, fromlist = @fromlist, tolist = @tolist, bcc = @bcc, cc = @cc, body = @body, SendOK = @SendOK,
SendMsg = @SendMsg, aidx = @aidx, atime = @atime, wuid = @wuid, wdate = @wdate, suid = @suid, sdate = @sdate, SendOK2 = @SendOK2, SendMsg2 = @SendMsg2, suid2 = @suid2,
sdate2 = @sdate2
WHERE (idx = @Original_idx) AND (@IsNull_project = 1 AND project IS NULL OR
project = @Original_project) AND (gcode = @Original_gcode) AND (@IsNull_cate = 1 AND cate IS NULL OR
cate = @Original_cate) AND (@IsNull_pdate = 1 AND pdate IS NULL OR
pdate = @Original_pdate) AND (@IsNull_SendOK = 1 AND SendOK IS NULL OR
SendOK = @Original_SendOK) AND (@IsNull_SendMsg = 1 AND SendMsg IS NULL OR
SendMsg = @Original_SendMsg) AND (@IsNull_aidx = 1 AND aidx IS NULL OR
aidx = @Original_aidx) AND (@IsNull_atime = 1 AND atime IS NULL OR
atime = @Original_atime) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate);
SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate FROM MailData WHERE (idx = @idx)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -10642,6 +10661,12 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@atime", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "suid", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendOK2", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "SendOK2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SendMsg2", global::System.Data.SqlDbType.VarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "SendMsg2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@suid2", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "suid2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate2", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "sdate2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -10660,14 +10685,14 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_atime", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "atime", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Variant, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitConnection() {
this._connection = new global::System.Data.SqlClient.SqlConnection();
this._connection.ConnectionString = global::Console_SendMail.Properties.Settings.Default.gwcs;
this._connection.ConnectionString = global::Console_SendMail.Properties.Settings.Default.cs;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10909,7 +10934,13 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)";
global::System.Nullable<int> aidx,
string atime,
string wuid,
System.DateTime wdate) {
System.DateTime wdate,
string suid,
global::System.Nullable<global::System.DateTime> sdate,
global::System.Nullable<bool> SendOK2,
string SendMsg2,
string suid2,
global::System.Nullable<global::System.DateTime> sdate2) {
if ((project.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[0].Value = ((int)(project.Value));
}
@@ -11001,6 +11032,42 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)";
this.Adapter.InsertCommand.Parameters[14].Value = ((string)(wuid));
}
this.Adapter.InsertCommand.Parameters[15].Value = ((System.DateTime)(wdate));
if ((suid == null)) {
this.Adapter.InsertCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[16].Value = ((string)(suid));
}
if ((sdate.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[17].Value = ((System.DateTime)(sdate.Value));
}
else {
this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value;
}
if ((SendOK2.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[18].Value = ((bool)(SendOK2.Value));
}
else {
this.Adapter.InsertCommand.Parameters[18].Value = global::System.DBNull.Value;
}
if ((SendMsg2 == null)) {
this.Adapter.InsertCommand.Parameters[19].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[19].Value = ((string)(SendMsg2));
}
if ((suid2 == null)) {
this.Adapter.InsertCommand.Parameters[20].Value = global::System.DBNull.Value;
}
else {
this.Adapter.InsertCommand.Parameters[20].Value = ((string)(suid2));
}
if ((sdate2.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[21].Value = ((System.DateTime)(sdate2.Value));
}
else {
this.Adapter.InsertCommand.Parameters[21].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -11038,6 +11105,12 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)";
string atime,
string wuid,
System.DateTime wdate,
string suid,
global::System.Nullable<global::System.DateTime> sdate,
global::System.Nullable<bool> SendOK2,
string SendMsg2,
string suid2,
global::System.Nullable<global::System.DateTime> sdate2,
int Original_idx,
global::System.Nullable<int> Original_project,
string Original_gcode,
@@ -11049,7 +11122,7 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)";
string Original_atime,
string Original_wuid,
System.DateTime Original_wdate,
object idx) {
int idx) {
if ((project.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(project.Value));
}
@@ -11141,82 +11214,113 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)";
this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(wuid));
}
this.Adapter.UpdateCommand.Parameters[15].Value = ((System.DateTime)(wdate));
this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx));
if ((Original_project.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_project.Value));
if ((suid == null)) {
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(suid));
}
if ((sdate.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[17].Value = ((System.DateTime)(sdate.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
}
if ((SendOK2.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(SendOK2.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
}
if ((SendMsg2 == null)) {
this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(SendMsg2));
}
if ((suid2 == null)) {
this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(suid2));
}
if ((sdate2.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[21].Value = ((System.DateTime)(sdate2.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
}
this.Adapter.UpdateCommand.Parameters[22].Value = ((int)(Original_idx));
if ((Original_project.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(Original_project.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[23].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[24].Value = global::System.DBNull.Value;
}
if ((Original_gcode == null)) {
throw new global::System.ArgumentNullException("Original_gcode");
}
else {
this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_gcode));
this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_gcode));
}
if ((Original_cate == null)) {
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_cate));
}
if ((Original_pdate == null)) {
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_pdate));
}
if ((Original_SendOK.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[25].Value = ((bool)(Original_SendOK.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
}
if ((Original_SendMsg == null)) {
this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_SendMsg));
this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_cate));
}
if ((Original_aidx.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_aidx.Value));
}
else {
if ((Original_pdate == null)) {
this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
}
if ((Original_atime == null)) {
else {
this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_pdate));
}
if ((Original_SendOK.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[31].Value = ((bool)(Original_SendOK.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value;
}
if ((Original_SendMsg == null)) {
this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_atime));
this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_SendMsg));
}
if ((Original_aidx.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[35].Value = ((int)(Original_aidx.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value;
}
if ((Original_atime == null)) {
this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_atime));
}
if ((Original_wuid == null)) {
throw new global::System.ArgumentNullException("Original_wuid");
}
else {
this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_wuid));
}
this.Adapter.UpdateCommand.Parameters[33].Value = ((System.DateTime)(Original_wdate));
if ((idx == null)) {
throw new global::System.ArgumentNullException("idx");
}
else {
this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(idx));
this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_wuid));
}
this.Adapter.UpdateCommand.Parameters[39].Value = ((System.DateTime)(Original_wdate));
this.Adapter.UpdateCommand.Parameters[40].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -11408,7 +11512,7 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -12090,7 +12194,7 @@ WHERE (enable = 1) AND (ISNULL(fromlist, '') <> '') AND (ISNULL(tolist, '') <>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -12286,7 +12390,7 @@ WHERE (enable = 1) AND (ISNULL(fromlist, '') <> '') AND (ISNULL(tolist, '') <>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -12535,7 +12639,7 @@ WHERE (enable = 1) AND (ISNULL(fromlist, '') <> '') AND (ISNULL(tolist, '') <>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -12785,7 +12889,7 @@ WHERE (enable = 1) AND (ISNULL(fromlist, '') <> '') AND (ISNULL(tolist, '') <>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -12967,7 +13071,7 @@ WHERE (enable = 1) AND (ISNULL(fromlist, '') <> '') AND (ISNULL(tolist, '') <>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -13112,7 +13216,7 @@ WHERE (enable = 1) AND (ISNULL(fromlist, '') <> '') AND (ISNULL(tolist, '') <>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitConnection() {
this._connection = new global::System.Data.SqlClient.SqlConnection();
this._connection.ConnectionString = global::Console_SendMail.Properties.Settings.Default.gwcs;
this._connection.ConnectionString = global::Console_SendMail.Properties.Settings.Default.cs;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -13473,7 +13577,7 @@ ORDER BY pdate";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -13918,7 +14022,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx)";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
@@ -14178,7 +14282,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx)";
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
public global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();

View File

@@ -4,7 +4,7 @@
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
<DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<Connections>
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.Console_SendMail.Properties.Settings.GlobalReference.Default.cs" Provider="System.Data.SqlClient" />
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Public" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.Console_SendMail.Properties.Settings.GlobalReference.Default.cs" Provider="System.Data.SqlClient" />
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="CS" IsAppSettingsProperty="true" Modifier="Assembly" Name="CS (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.Console_SendMail.Properties.Settings.GlobalReference.Default.gwcs" Provider="System.Data.SqlClient" />
</Connections>
<Tables>
@@ -166,26 +166,34 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [MailData] ([project], [gcode], [cate], [pdate], [subject], [fromlist], [tolist], [bcc], [cc], [body], [SendOK], [SendMsg], [aidx], [atime], [wuid], [wdate]) VALUES (@project, @gcode, @cate, @pdate, @subject, @fromlist, @tolist, @bcc, @cc, @body, @SendOK, @SendMsg, @aidx, @atime, @wuid, @wdate);
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO MailData
(project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate, suid, sdate, SendOK2, SendMsg2, suid2, sdate2)
VALUES (@project,@gcode,@cate,@pdate,@subject,@fromlist,@tolist,@bcc,@cc,@body,@SendOK,@SendMsg,@aidx,@atime,@wuid,@wdate,@suid,@sdate,@SendOK2,@SendMsg2,@suid2,@sdate2);
SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate FROM MailData WHERE (idx = SCOPE_IDENTITY())</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@subject" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="subject" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@fromlist" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="fromlist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@bcc" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="bcc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cc" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="cc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@body" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="body" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@SendOK" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="SendOK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SendMsg" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SendMsg" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@aidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="aidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@atime" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="atime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.MailData" 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="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="subject" ColumnName="subject" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@subject" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="subject" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="fromlist" ColumnName="fromlist" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@fromlist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="fromlist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="tolist" ColumnName="tolist" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bcc" ColumnName="bcc" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@bcc" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="bcc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="cc" ColumnName="cc" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@cc" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="cc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="body" ColumnName="body" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@body" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="body" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendOK" ColumnName="SendOK" DataSourceName="EE.dbo.MailData" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SendOK" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendMsg" ColumnName="SendMsg" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@SendMsg" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="aidx" ColumnName="aidx" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@aidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="aidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="atime" ColumnName="atime" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@atime" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="atime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="suid" ColumnName="suid" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@suid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="suid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendOK2" ColumnName="SendOK2" DataSourceName="EE.dbo.MailData" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SendOK2" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendMsg2" ColumnName="SendMsg2" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@SendMsg2" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="suid2" ColumnName="suid2" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@suid2" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="suid2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sdate2" ColumnName="sdate2" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@sdate2" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="sdate2" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
@@ -202,45 +210,62 @@ WHERE (gcode = @gcode) AND (pdate = @pdate) AND (cate = @cate)</CommandText>
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [MailData] SET [project] = @project, [gcode] = @gcode, [cate] = @cate, [pdate] = @pdate, [subject] = @subject, [fromlist] = @fromlist, [tolist] = @tolist, [bcc] = @bcc, [cc] = @cc, [body] = @body, [SendOK] = @SendOK, [SendMsg] = @SendMsg, [aidx] = @aidx, [atime] = @atime, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ([gcode] = @Original_gcode) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_SendOK = 1 AND [SendOK] IS NULL) OR ([SendOK] = @Original_SendOK)) AND ((@IsNull_SendMsg = 1 AND [SendMsg] IS NULL) OR ([SendMsg] = @Original_SendMsg)) AND ((@IsNull_aidx = 1 AND [aidx] IS NULL) OR ([aidx] = @Original_aidx)) AND ((@IsNull_atime = 1 AND [atime] IS NULL) OR ([atime] = @Original_atime)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>UPDATE MailData
SET project = @project, gcode = @gcode, cate = @cate, pdate = @pdate, subject = @subject, fromlist = @fromlist, tolist = @tolist, bcc = @bcc, cc = @cc, body = @body, SendOK = @SendOK,
SendMsg = @SendMsg, aidx = @aidx, atime = @atime, wuid = @wuid, wdate = @wdate, suid = @suid, sdate = @sdate, SendOK2 = @SendOK2, SendMsg2 = @SendMsg2, suid2 = @suid2,
sdate2 = @sdate2
WHERE (idx = @Original_idx) AND (@IsNull_project = 1 AND project IS NULL OR
project = @Original_project) AND (gcode = @Original_gcode) AND (@IsNull_cate = 1 AND cate IS NULL OR
cate = @Original_cate) AND (@IsNull_pdate = 1 AND pdate IS NULL OR
pdate = @Original_pdate) AND (@IsNull_SendOK = 1 AND SendOK IS NULL OR
SendOK = @Original_SendOK) AND (@IsNull_SendMsg = 1 AND SendMsg IS NULL OR
SendMsg = @Original_SendMsg) AND (@IsNull_aidx = 1 AND aidx IS NULL OR
aidx = @Original_aidx) AND (@IsNull_atime = 1 AND atime IS NULL OR
atime = @Original_atime) AND (wuid = @Original_wuid) AND (wdate = @Original_wdate);
SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, body, SendOK, SendMsg, aidx, atime, wuid, wdate FROM MailData WHERE (idx = @idx)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="" 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="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="subject" ColumnName="subject" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@subject" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="subject" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="fromlist" ColumnName="fromlist" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@fromlist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="fromlist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="tolist" ColumnName="tolist" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bcc" ColumnName="bcc" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@bcc" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="bcc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="cc" ColumnName="cc" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@cc" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="cc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="body" ColumnName="body" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@body" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="body" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendOK" ColumnName="SendOK" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SendOK" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendMsg" ColumnName="SendMsg" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@SendMsg" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="aidx" ColumnName="aidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@aidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="aidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="atime" ColumnName="atime" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@atime" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="atime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="project" ColumnName="project" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.MailData" 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="true" AutogeneratedName="cate" ColumnName="cate" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="pdate" ColumnName="pdate" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="subject" ColumnName="subject" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@subject" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="subject" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="fromlist" ColumnName="fromlist" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@fromlist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="fromlist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="tolist" ColumnName="tolist" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@tolist" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="tolist" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="bcc" ColumnName="bcc" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@bcc" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="bcc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="cc" ColumnName="cc" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@cc" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="cc" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="body" ColumnName="body" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@body" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="body" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendOK" ColumnName="SendOK" DataSourceName="EE.dbo.MailData" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SendOK" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendMsg" ColumnName="SendMsg" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@SendMsg" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="aidx" ColumnName="aidx" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@aidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="aidx" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="atime" ColumnName="atime" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@atime" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="atime" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wuid" ColumnName="wuid" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="wdate" ColumnName="wdate" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="suid" ColumnName="suid" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@suid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="suid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sdate" ColumnName="sdate" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@sdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendOK2" ColumnName="SendOK2" DataSourceName="EE.dbo.MailData" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SendOK2" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="SendMsg2" ColumnName="SendMsg2" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@SendMsg2" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="suid2" ColumnName="suid2" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@suid2" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="suid2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sdate2" ColumnName="sdate2" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@sdate2" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="sdate2" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_project" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_project" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="project" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_project" ColumnName="project" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_project" ColumnName="project" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_project" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="project" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_gcode" ColumnName="gcode" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_cate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_cate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="cate" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_cate" ColumnName="cate" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_cate" ColumnName="cate" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_cate" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="cate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_pdate" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_pdate" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="pdate" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_pdate" ColumnName="pdate" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_pdate" ColumnName="pdate" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@Original_pdate" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="pdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_SendOK" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_SendOK" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SendOK" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_SendOK" ColumnName="SendOK" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Original_SendOK" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_SendOK" ColumnName="SendOK" DataSourceName="EE.dbo.MailData" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Original_SendOK" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SendOK" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_SendMsg" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_SendMsg" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SendMsg" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_SendMsg" ColumnName="SendMsg" DataSourceName="" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Original_SendMsg" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_SendMsg" ColumnName="SendMsg" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(255)" DbType="AnsiString" Direction="Input" ParameterName="@Original_SendMsg" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="SendMsg" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_aidx" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_aidx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="aidx" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_aidx" ColumnName="aidx" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_aidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="aidx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_aidx" ColumnName="aidx" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_aidx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="aidx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="IsNull_atime" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IsNull_atime" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="atime" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_atime" ColumnName="atime" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_atime" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="atime" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_wuid" ColumnName="wuid" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_wdate" ColumnName="wdate" DataSourceName="" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@idx" Precision="0" Scale="0" Size="1024" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="Original_atime" ColumnName="atime" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_atime" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="atime" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_wuid" ColumnName="wuid" DataSourceName="EE.dbo.MailData" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="Original_wdate" ColumnName="wdate" DataSourceName="EE.dbo.MailData" DataTypeServer="smalldatetime" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="4" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.MailData" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
@@ -272,7 +297,7 @@ SELECT idx, project, gcode, cate, pdate, subject, fromlist, tolist, bcc, cc, bod
<Mapping SourceColumn="sdate2" DataSetColumn="sdate2" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckAutoExist" Modifier="Public" Name="CheckAutoExist" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="CheckAutoExist">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="CheckAutoExist" Modifier="Public" Name="CheckAutoExist" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="CheckAutoExist">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT COUNT(*) AS Expr1
@@ -287,7 +312,7 @@ WHERE (aidx = @aidx) AND (pdate = @pdate) AND (atime = @atime) AND (cate = @cat
</DbCommand>
</SelectCommand>
</DbSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="FindAutoData" Modifier="Public" Name="FindAutoData" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="FindAutoData">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="FindAutoData" Modifier="Public" Name="FindAutoData" QueryType="Scalar" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="FindAutoData">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT COUNT(*) AS cnt
@@ -1015,8 +1040,8 @@ ORDER BY pdate</CommandText>
</xs:simpleType>
</xs:element>
<xs:element name="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
<xs:element name="SendOK2" msprop:Generator_ColumnPropNameInTable="SendOK2Column" msprop:Generator_ColumnPropNameInRow="SendOK2" msprop:Generator_UserColumnName="SendOK2" msprop:Generator_ColumnVarNameInTable="columnSendOK2" type="xs:boolean" minOccurs="0" />
<xs:element name="SendMsg2" msprop:Generator_ColumnPropNameInTable="SendMsg2Column" msprop:Generator_ColumnPropNameInRow="SendMsg2" msprop:Generator_UserColumnName="SendMsg2" msprop:Generator_ColumnVarNameInTable="columnSendMsg2" minOccurs="0">
<xs:element name="SendOK2" msprop:Generator_ColumnPropNameInTable="SendOK2Column" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="SendOK2" msprop:Generator_UserColumnName="SendOK2" msprop:Generator_ColumnVarNameInTable="columnSendOK2" type="xs:boolean" minOccurs="0" />
<xs:element name="SendMsg2" msprop:Generator_ColumnPropNameInTable="SendMsg2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="SendMsg2" msprop:Generator_UserColumnName="SendMsg2" msprop:Generator_ColumnVarNameInTable="columnSendMsg2" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />

View File

@@ -4,16 +4,16 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="477" ViewPortY="20" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:MailForm" ZOrder="4" X="24" Y="30" Height="305" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:MailData" ZOrder="5" X="262" Y="96" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:MailForm" ZOrder="5" X="24" Y="30" Height="305" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:MailData" ZOrder="1" X="262" Y="96" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:MailAuto" ZOrder="6" X="514" Y="130" Height="324" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:vMailingProjectSchedule" ZOrder="3" X="95" Y="183" Height="305" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:vMailingProjectSchedule" ZOrder="4" X="95" Y="183" Height="305" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ProjectsIngList" ZOrder="11" X="372" Y="176" Height="305" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="1" X="643" Y="413" Height="96" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:EETGW_ProjectsSchedule" ZOrder="2" X="643" Y="413" Height="96" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="8" X="815" Y="102" Height="229" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:JobReport" ZOrder="2" X="622" Y="57" Height="400" Width="318" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="332" />
<Shape ID="DesignTable:JobReport" ZOrder="3" X="622" Y="57" Height="400" Width="318" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="332" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="10" X="813" Y="358" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vGroupUser" ZOrder="9" X="783" Y="300" Height="324" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:JobReportDateList" ZOrder="7" X="89" Y="43" Height="96" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />

View File

@@ -15,6 +15,28 @@ namespace Console_SendMail
cn.ConnectionString = cs;
return cn;
}
public static bool GetGroupEnableMail(string GroupColumn)
{
List<string> retval = new List<string>();
var cn = getCn();
cn.Open();
var sql = "select isnull(usemail,'False') " +
" from UserGroup WITH (nolock) " +
$" where gcode='{GroupColumn}' ";
var cmd = new SqlCommand(sql, cn);
var value = cmd.ExecuteScalar().ToString().ToUpper();
cmd.Dispose();
cn.Close();
cn.Dispose();
return value == "TRUE";
}
public static List<String> getGroupListWithoutGcode(string GroupColumn, string table, string where = "", Boolean desc = false, Boolean useColumncover = true)
{
List<string> retval = new List<string>();

View File

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

View File

@@ -38,6 +38,10 @@ namespace Console_SendMail
foreach (var vGcode in gcodelist)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//메일정보가 등록되지 않았다면 처리하지 않는다
var MailForm = taMailForm.GetData(vGcode, vCate).FirstOrDefault();
if (MailForm == null) continue;
@@ -139,7 +143,7 @@ namespace Console_SendMail
mail_body = mail_body.Replace("{사번}", userinfo.Value.id);
//메일본문을 생성해서 진행해야함
var mail_content = "<p>일자별 정보</p>";
var mail_content = $"<p>일자별 정보({vGcode})</p>";
mail_content += $"<br/>조회기간 : {str_sd}~{str_ed}";
mail_content += "<br/><table border='1' cellspacing='1' cellpadding='1'><tr><td>날짜</td><td>요일</td><td>시간</td></tr>";
foreach (var warnitem in WarnList)
@@ -258,6 +262,11 @@ namespace Console_SendMail
var gcodelist = DatabaseManager.getGroupListWithoutGcode("gcode", "MailForm", "gcode is not null and gcode <> 'DEV'");
foreach (var vGcode in gcodelist)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//메일양식이 지정되어있는지 체크
var MailForm = taMailForm.GetData(vGcode, vCate).FirstOrDefault();
if (MailForm == null) continue;
@@ -443,6 +452,10 @@ namespace Console_SendMail
var gcodelist = DatabaseManager.getGroupListWithoutGcode("gcode", "MailForm", "gcode is not null and gcode <> 'DEV'");
foreach (var vGcode in gcodelist)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//메일양식이 지정되어있는지 체크
var MailForm = taForm.GetData(vGcode, vCate).FirstOrDefault();
if (MailForm == null) continue;
@@ -542,7 +555,7 @@ namespace Console_SendMail
}
newdr.EndEdit();
dt.AddMailDataRow(newdr);
taMailData.Update(dt);
var CNT = taMailData.Update(newdr);
}
}
@@ -605,6 +618,10 @@ namespace Console_SendMail
var gcodelist = DatabaseManager.getGroupListWithoutGcode("gcode", "MailForm", "gcode is not null and gcode <> 'DEV'");
foreach (var vGcode in gcodelist)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//메일양식이 지정되어있는지 체크
var MailForm = taForm.GetData(vGcode, vCate).FirstOrDefault();
if (MailForm == null) continue;
@@ -790,6 +807,10 @@ namespace Console_SendMail
foreach (var vGcode in gcodelist)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//메일양식이 지정되어있는지 체크
var MailJD = taForm.GetData(vGcode, vCate).FirstOrDefault();
if (MailJD == null) continue;
@@ -1137,6 +1158,11 @@ namespace Console_SendMail
foreach (DSMail.MailAutoRow dr in dtList)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var vGcode = dr.gcode;
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//시간정보가 없는 애들은 처리 하지 않음
if (dr.stime.IndexOf(":") == -1) continue;
if (dr.sday == null || dr.sday.Length < 2) continue;
@@ -1248,6 +1274,11 @@ namespace Console_SendMail
foreach (var vGcode in gcodelist)
{
//메일기능이 꺼져있다면 처리하지 않는다.
var usemail = DatabaseManager.GetGroupEnableMail(vGcode);
if (usemail == false) continue;
//메일양식이 지정되어있는지 체크
var MailJD = taForm.GetData(vGcode, vCate).FirstOrDefault();
if (MailJD == null) continue;

View File

@@ -0,0 +1 @@
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl","ProjectFileName":"StaffLayoutCtl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"grid.cs"},{"SourceFile":"grid.Designer.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.dll","OutputItemRelativePath":"StaffLayoutCtl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\StaffLayoutCtl\\bin\\Debug\\StaffLayoutCtl.pdb","OutputItemRelativePath":"StaffLayoutCtl.pdb"}],"CopyToOutputEntries":[]}

View File

@@ -0,0 +1 @@
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE","ProjectFileName":"YARTE.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Buttons\\BoldButton.cs"},{"SourceFile":"Buttons\\CheckboxButton.cs"},{"SourceFile":"Buttons\\ForecolorButton.cs"},{"SourceFile":"Buttons\\IButton.cs"},{"SourceFile":"Buttons\\IFunctionButton.cs"},{"SourceFile":"Buttons\\IHTMLEditorButton.cs"},{"SourceFile":"Buttons\\InsertLinkedImageButton.cs"},{"SourceFile":"Buttons\\ItalicButton.cs"},{"SourceFile":"Buttons\\JustifyCenterButton.cs"},{"SourceFile":"Buttons\\JustifyLeftButton.cs"},{"SourceFile":"Buttons\\JustifyRightButton.cs"},{"SourceFile":"Buttons\\LinkButton.cs"},{"SourceFile":"Buttons\\OrderedListButton.cs"},{"SourceFile":"Buttons\\PredefinedButtonSets.cs"},{"SourceFile":"Buttons\\ReadOnlyButton.cs"},{"SourceFile":"Buttons\\UnderlineButton.cs"},{"SourceFile":"Buttons\\UnlinkButton.cs"},{"SourceFile":"Buttons\\UnorderedListButton.cs"},{"SourceFile":"CheckboxItem.cs"},{"SourceFile":"HtmlEditor.cs"},{"SourceFile":"HTMLEditor.Designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.VisualBasic.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.dll","OutputItemRelativePath":"YARTE.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\Sub\\YARTE\\bin\\Debug\\YARTE.pdb","OutputItemRelativePath":"YARTE.pdb"}],"CopyToOutputEntries":[]}

View File

@@ -0,0 +1 @@
{"RootPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl","ProjectFileName":"UMSControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"cmsview.cs"},{"SourceFile":"EventArgs.cs"},{"SourceFile":"Item.cs"},{"SourceFile":"Slot.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.0.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.dll","OutputItemRelativePath":"UMSControl.dll"},{"OutputItemFullPath":"D:\\Source\\##### 완료아이템\\(0014#) GroupWare\\Source\\SubProject\\CMSControl\\bin\\Debug\\UMSControl.pdb","OutputItemRelativePath":"UMSControl.pdb"}],"CopyToOutputEntries":[]}

View File

@@ -305,6 +305,7 @@
<None Include="dsReport.xsd">
<Generator>MSDataSetGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>dsReport1.Designer.cs</LastGenOutput>
</None>
<None Include="dsReport.xss">
<DependentUpon>dsReport.xsd</DependentUpon>

View File

@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayData));
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
this.bsDay = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FBS0000.dsReport();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -82,7 +82,7 @@
this.cmbType});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1059, 37);
this.toolStrip1.Size = new System.Drawing.Size(1028, 37);
this.toolStrip1.TabIndex = 6;
this.toolStrip1.Text = "toolStrip1";
//
@@ -108,7 +108,6 @@
// tbMon
//
this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbMon.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbMon.Name = "tbMon";
this.tbMon.Size = new System.Drawing.Size(90, 37);
this.tbMon.Text = "1982";
@@ -164,9 +163,11 @@
//
// cmbType
//
this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbType.Items.AddRange(new object[] {
"일반 원장",
"대체 원장"});
"대체 원장",
"PMS 원장"});
this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(150, 37);
this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
@@ -175,14 +176,14 @@
// reportViewer1
//
this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
reportDataSource2.Name = "DataSet1";
reportDataSource2.Value = this.bsDay;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
reportDataSource1.Name = "DataSet1";
reportDataSource1.Value = this.bsDay;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyData.rdlc";
this.reportViewer1.Location = new System.Drawing.Point(0, 37);
this.reportViewer1.Name = "reportViewer1";
this.reportViewer1.ServerReport.BearerToken = null;
this.reportViewer1.Size = new System.Drawing.Size(1059, 543);
this.reportViewer1.Size = new System.Drawing.Size(1028, 543);
this.reportViewer1.TabIndex = 7;
this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load);
//
@@ -203,11 +204,10 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1059, 580);
this.ClientSize = new System.Drawing.Size(1028, 580);
this.Controls.Add(this.reportViewer1);
this.Controls.Add(this.toolStrip1);
this.Name = "fHolyDayData";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "근태 원장";
this.Load += new System.EventHandler(this.rJobReport_Load);
((System.ComponentModel.ISupportInitialize)(this.bsDay)).EndInit();

View File

@@ -70,7 +70,7 @@ namespace FBS0000
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
}
else
else if (cmbType.SelectedIndex == 1) //대체
{
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
dsReport.Holydata_Day.Clear();
@@ -78,10 +78,19 @@ namespace FBS0000
dsReport.Holydata_Day.AcceptChanges();
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
}
else //PMS
{
var tapms = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
tapms.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
dsReport.Holydata_Day.AcceptChanges();
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
}
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;

View File

@@ -123,9 +123,6 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
</metadata>

View File

@@ -30,7 +30,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fHolyDayDataSum));
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
this.bsDay = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FBS0000.dsReport();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -143,9 +143,11 @@
//
// cmbType
//
this.cmbType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbType.Items.AddRange(new object[] {
"일반 원장",
"대체 원장"});
"대체 원장",
"PMS 원장"});
this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(150, 37);
this.cmbType.SelectedIndexChanged += new System.EventHandler(this.cmbType_SelectedIndexChanged);
@@ -154,9 +156,9 @@
// reportViewer1
//
this.reportViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
reportDataSource1.Name = "DataSet1";
reportDataSource1.Value = this.bsDay;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource1);
reportDataSource2.Name = "DataSet1";
reportDataSource2.Value = this.bsDay;
this.reportViewer1.LocalReport.DataSources.Add(reportDataSource2);
this.reportViewer1.LocalReport.ReportEmbeddedResource = "FBS0000.Holiday.rHolyDataSum.rdlc";
this.reportViewer1.Location = new System.Drawing.Point(0, 37);
this.reportViewer1.Name = "reportViewer1";

View File

@@ -85,7 +85,7 @@ namespace FBS0000
taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay));
}
else
else if(cmbType.SelectedIndex == 1)
{
taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
dsReport.Holydata_Day.Clear();
@@ -93,8 +93,16 @@ namespace FBS0000
dsReport.Holydata_Day.AcceptChanges();
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
}
else //pms
{
var taPMS = new dsReportTableAdapters.Holydata_TimePMSTableAdapter();
taPMS.Fill(this.dsReport.Holydata_TimePMS, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString());
dsReport.Holydata_Day.Clear();
dsReport.Holydata_Day.Merge(dsReport.Holydata_TimePMS);
dsReport.Holydata_Day.AcceptChanges();
//this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsTime));
}
this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.Percent;
this.reportViewer1.PageCountMode = Microsoft.Reporting.WinForms.PageCountMode.Actual;

View File

@@ -123,6 +123,9 @@
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
</metadata>

View File

@@ -49,6 +49,7 @@
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType3 = new FarPoint.Win.Spread.CellType.DateTimeCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -151,7 +152,7 @@
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(1333, 27);
this.bn.Size = new System.Drawing.Size(1028, 27);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -189,7 +190,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -370,7 +370,7 @@
this.toolStripButton6});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1333, 31);
this.toolStrip1.Size = new System.Drawing.Size(1028, 31);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
this.toolStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.toolStrip1_ItemClicked);
@@ -397,7 +397,6 @@
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(100, 31);
this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -421,7 +420,6 @@
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(100, 31);
this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -484,7 +482,7 @@
this.fpSpread1.RangeDragFillMode = FarPoint.Win.Spread.DragFillMode.Series;
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(1333, 628);
this.fpSpread1.Size = new System.Drawing.Size(1028, 628);
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 4;
this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
@@ -502,7 +500,7 @@
this.ToolStripMenuItem,
this.ToolStripMenuItem});
this.cmO.Name = "cm1";
this.cmO.Size = new System.Drawing.Size(305, 118);
this.cmO.Size = new System.Drawing.Size(307, 118);
//
// toolStripMenuItem2
//
@@ -512,14 +510,14 @@
this.toolStripMenuItem5,
this.toolStripMenuItem6});
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(304, 36);
this.toolStripMenuItem2.Size = new System.Drawing.Size(306, 36);
this.toolStripMenuItem2.Text = "Column Size";
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image")));
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(147, 36);
this.toolStripMenuItem3.Size = new System.Drawing.Size(149, 36);
this.toolStripMenuItem3.Text = "Auto";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
@@ -527,7 +525,7 @@
//
this.toolStripMenuItem4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem4.Image")));
this.toolStripMenuItem4.Name = "toolStripMenuItem4";
this.toolStripMenuItem4.Size = new System.Drawing.Size(147, 36);
this.toolStripMenuItem4.Size = new System.Drawing.Size(149, 36);
this.toolStripMenuItem4.Text = "Reset";
this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
//
@@ -535,7 +533,7 @@
//
this.toolStripMenuItem5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem5.Image")));
this.toolStripMenuItem5.Name = "toolStripMenuItem5";
this.toolStripMenuItem5.Size = new System.Drawing.Size(147, 36);
this.toolStripMenuItem5.Size = new System.Drawing.Size(149, 36);
this.toolStripMenuItem5.Text = "Save";
this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
//
@@ -543,27 +541,27 @@
//
this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image")));
this.toolStripMenuItem6.Name = "toolStripMenuItem6";
this.toolStripMenuItem6.Size = new System.Drawing.Size(147, 36);
this.toolStripMenuItem6.Size = new System.Drawing.Size(149, 36);
this.toolStripMenuItem6.Text = "Load";
this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(301, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(303, 6);
//
// 복사ToolStripMenuItem
//
this.ToolStripMenuItem.Enabled = false;
this.ToolStripMenuItem.Name = "복사ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
this.ToolStripMenuItem.Size = new System.Drawing.Size(306, 36);
this.ToolStripMenuItem.Text = "복사";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 현재사원원장보기ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "현재사원원장보기ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
this.ToolStripMenuItem.Size = new System.Drawing.Size(306, 36);
this.ToolStripMenuItem.Text = "현재 사원 원장 보기";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -586,7 +584,7 @@
this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.textBox1.Location = new System.Drawing.Point(0, 659);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(1333, 21);
this.textBox1.Size = new System.Drawing.Size(1028, 21);
this.textBox1.TabIndex = 5;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@@ -596,7 +594,7 @@
this.fpSpread1_Sheet1.SheetName = "WorkTable";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 19;
this.fpSpread1_Sheet1.ColumnCount = 20;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
@@ -619,6 +617,7 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "전일(H)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "소스";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "등록";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "등록일시";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
@@ -632,7 +631,7 @@
dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType1.TimeDefault = new System.DateTime(2024, 3, 3, 10, 46, 54, 215);
dateTimeCellType1.TimeDefault = new System.DateTime(2025, 7, 7, 14, 21, 54, 857);
this.fpSpread1_Sheet1.Columns.Get(2).CellType = dateTimeCellType1;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sdate";
this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작일";
@@ -641,7 +640,7 @@
dateTimeCellType2.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType2.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType2.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType2.TimeDefault = new System.DateTime(2024, 3, 3, 10, 46, 54, 215);
dateTimeCellType2.TimeDefault = new System.DateTime(2025, 7, 7, 14, 21, 54, 857);
this.fpSpread1_Sheet1.Columns.Get(3).CellType = dateTimeCellType2;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -772,6 +771,13 @@
this.fpSpread1_Sheet1.Columns.Get(18).Label = "등록";
this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).Width = 70F;
dateTimeCellType3.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized);
dateTimeCellType3.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText;
dateTimeCellType3.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999");
dateTimeCellType3.TimeDefault = new System.DateTime(2025, 7, 7, 14, 21, 54, 857);
this.fpSpread1_Sheet1.Columns.Get(19).CellType = dateTimeCellType3;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "wdate";
this.fpSpread1_Sheet1.Columns.Get(19).Label = "등록일시";
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.FrozenColumnCount = 1;
@@ -785,7 +791,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1333, 707);
this.ClientSize = new System.Drawing.Size(1028, 707);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.toolStrip1);

View File

@@ -214,35 +214,35 @@
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF
H4dz4P+8v/O85+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN
NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4
gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur
WvRdKhfSef7fVU0G7+po3G6lhQ78fn+uqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg
6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+
A88cCzchEOXQ5QzD5/OhpKTkhGhgfqiAo1kOQ3WpWGLbcBh0nINnloGLZjAcTIP6yeGdYwGxWGyrwQQx
6K06IJbYRd55apGFYzo/zDMxz0E78GPrl2i+L4fthQy9ZzYD7L4oRukUvpIhbziDcbK72ZdGi96EecpS
3KDntAS5XE44ieUVFt7vcXSTLj64o9ANhfBaP4CAVYdxrRL1NfsaBQO1Wi3prD4Ew7Vj6D4lAU3TCAaD
mJyc5M9bKCwQCAhXx6c3GG29hbnBZhiaKjPEIr9kZbtOPjqy57FcultBbov9uiJ1NXsbP2suckPPzuEv
0DnH8T7GGj4AAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNbSFNxHMd7kJ7rqaeopc4eIogoegsKQlGi
CwURXWRzo6eoiVlKI3sI6iGQqJxDzCVZmmPeNhfTzXZh0xO7iC097tJ06VwK2znteBnf/ucsjw334B8+
HP4Hft//53zPObv4RVFU+dgLOUbqK2CuPgxy6+QOOcgPH3U4HIzHZQflssF0qwwbGxs7QghRq9W7DQbD
7eFnSjg0SphuliGTyeTBsiwYhhFJpVJYX1/PBeQbWGG8Lt0WsBmySTqdxtraWr6B8akS9hYFjNek4DhO
4FFnFPW6KB4Q6joiqGuPoJbAW4gBooEzZzB4VYrV1VUBflhnTaCD8G40gfaRBO61hYUA3irPYLBJga+v
azBwpVRI5/n/VBUZvK+lcbeVFjrwer3ZggZ9l0qFgvgAjsvA5o+ixzmN9tEoPtjnMUTFsPJ7EcvLywwJ
OL5loK7B2Cs5+i6W/Bvm0GGZwQC1iJlfLMJJDu7ZFEzeJQx7QkgmkwU6cFphOF8sBPAdfHLGMTWXhify
B84QCwchEOfQNRaBz+dDUVHRKdGgv1EOW7MM+spiscQ2SwR0goNzloGdZmAJpkH95PDeNoeFhYXtBhPE
oLfikFhiF3nmqXkWtuncMM9EjINm6Mf2L7H/oQyjL6vRe24rwOqLw02n8I0MuSIZjJPT+31ptOj6EKOM
hQ16zkqQzWaFN7G0wsL1PYFu0sVHRxxacxhvdEMImLQY1yhQV3WgQTBQqVSSzsoj0N84ge4zEtA0jWAw
iMnJSfj9fqGwQCAgXG2f38Ldegeh4Wbom8ozxCK3qkv2nH58bN8TmXSvnGwL/boitVX7G76oL3Pm5xfw
F8JZx+vnJq2PAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ5SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
Dwoi+hibG11FTcwyGtlFUBeBROUcYi7J0hzb1E1D99E+8ONE28SWHt2WuuZcE7Zz2pk6nt5zlseGu/CF
H4dz4P+8v/c55+zgF0VRlc7nCow0VGFIdhDk0fFtsp8fPux2u5kxrwuU1wHrjQqsr69vCyFEo9HsNBqN
NwefquDWqmC9XoFMJlMAy7JgGEYklUphbW0tH1BoYIflqnRLwEbIBul0Gqurq4UGlicquFqUsFyRguM4
gQedETToI7hHqO8Io749jDoCbyEGiAaevEH/ZSmy2awAP6y3x9FBeGuLo30kjjttISGAtyow6G9S4sur
WvRdKhfSef7fVU0G7+po3G6lhQ58Pl+uqIHpQrlQEB/AcRk4/BH0eKbRbovgvWsRA9Q8Vn4vIZlMMiTg
6KaBphbOlwqYzpf9G+bQMTyDPmoJM79YhBIcRmdTsH5bxuDYHBKJRJEOPHYYz5YKAXwHHz1RTC2kMRb+
A88cCzchEOXQ5QzzR0BJSckJ0cD8UAFHsxyG6lKxxLbhMOg4B88sAxfNYDiYBvWTwzvHAmKx2FaDCWLQ
W3VALLGLnHlqkYVjOj/MMzHPQTvwY+uXaL4vh+2FDL1nNgPsvihG6RS+kiFvOINxsrvZl0aL3oR5ylLc
oOe0BLlcTngTyyssvN/j6CZdfHBHoRsK4bV+AAGrDuNaJepr9jUKBmq1WtJZfQiGa8fQfUoCmqYRDAYx
OTkJv98vFBYIBISr49MbjLbewtxgMwxNlRlikV+ysl0nHx3Z81gu3a0gt8V+XZG6mr2NnzUXuaFn5/AX
yUnH7pGap3AAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ6SURBVDhPjZNdSFNhHMa7kK7rqquopc4uIogougsKQlGi
Dwoi+hjOSVdRE7OMRnYR1EUgUTmH2JZkacqcumnMfbQP/DjZPrClR91Sl841YTunnenG03vO8tjYLnzh
x+E98H/e33nOOTv4RVFUuf25HCMNFRiWHQS5dXyb7OeHDzudTmbM7QDltsF0owzpdHpbCCEqlWqnXq+/
OfS0Fk51LUzXy5BMJnNgWRYMw4jE43FsbGxkA3INrDBeleYFbIZskkgksL6+nmtgfFILR4sCxitScBwn
8KAjhAZdCPcI9dog6tuDqCPwFmKAaODKGgxcliKVSgnwwzprBFrCW0sE7SMR3GmbFwJ4qxyDgSYFvryq
Qf+lUiGd5/9TlWTwrobG7VZa6GBycjJT0KDvQqlQEB/AcUnYvCF0u6bRbgnhvWMJg9QC1n6vIBaLMSTg
6JaBqgb2l3L0nS/5N8xBa55BP7WCmV8s5qMcRmfjMH1bxdDYHKLRaIEOXFbozxYLAXwHH11hTC0mMBb8
A9ccCyfBF+bQaQ/C4/GgqKjohGhgeCiHrbkavZXFYolt5iDoCAfXLAMHzcAcSID6yeGdbRHLy8v5BhPE
oKfigFhiJ3nmqSUWtunsMM/EAgf14I/8L9FwvxqWFzL0nNkKsHrCGKXj+EqG3MEkxsnpBk8CLbo+LFDG
wgbdpyXIZDLCm1hdY+H+HkEX6eKDMwzN8Dxe6wbhM2kwrlagvmpfo2CgVColHZWH0HvtGLpOSUDTNAKB
APx+P7xer1CYz+cTrrZPbzDaegtzQ83obSpPEovskpXsOvnoyJ7H1dLdcrIt9OuK1FXtbfysusgNPzuH
v7tpx+hjqiqnAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -284,41 +284,41 @@
<data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB0KBRRxA9doTEyM
X8AXUWOMCEIRZWuhtOwgqCwqiWtE2tKVAmUtPqEmoEaCUSNG2WSV4510mlAf6L1DAi89yX2+v8zMuf/J
dXPFFVcE5PHJN5cenWgff3i8F3XHyDpqRe0RK2rie1Ad14MHh7tx/1A37h0k60AXqvZ3oTK2E3f3daIi
pgPleztQtqcdpdFkRVlQEmlBsdiCoog2FIa3oUDUCmUYWaEtUIS0ID/YPJ4XZErgt3eeZcZBHmRGTqB5
jN/eeZYblxdoRm5AM/jtnWclcDJ/FuAScCVRbVBGGJErakK+yICC8FYqnMzPRA9cypNTiPXoffoJM5Nz
6K7/CFmIjgon3c0AFIrjnlxL+XssTGGcngqXs8tIDxSCKxSb8eRKF+b/zvM04NfQBKRhaipcti8DkBVX
HNmKijMmTI3N8DRgdnoOVeebIQ9upsJl+RjogWw4UooYPX58GOVptryS9CI32ECNy/RmANLiuKNEHq7D
O90XnmVLZ90AOXi1TLgMLxYgJU4RboS5zLEUg73D5LvTMOMyPPX0QBpcQQQpxWXHUox8/QNFrJZ8dyZm
3J2dDEBnuCIxX4rxWZ5mK0XluWaQoS8Id9tDRw9cDMeNL3mYAQOt33iaLS+SrZAF6QXj0ncwABfDcbM1
L9SA/hZH4POkHkgD9YJxt9y19MDFcNzgV4rMKD1ldHzFU3MoP0tA/kZBuLTtDMDFcPbBLw8xoj6h06Ek
v0lJZNEaSP0MzDjJtiZ6oDOcfbZKg3QwFr/lebZ8tg4jw7+RGZe6lQVIgbOfc5n+avQ1DfE8WyzV/Uj3
UTHhUrdo6IG0OK4QsgATskVqfB8Y4Xm2PEvsRrqXhhqXspkBSIuzt5X75pTxOkyOLvhZIKUpPk1Qnloq
3M1NDEAWnL2tmb5a1F5ocyjNz8ExSLwbqHDJG9X0QFacvRDp3mrolH08z5asCBUVLmkDA1AIzl4Iiddr
dJC/memJWVhq+pHi3kCFu7FeRQ8UirMXQuKhQrL7S4JrRJp7ExUucR0LcAk42kL8j0tc20gPXAnc9TUM
QIIbX27c1dUN9Fcf3EUOd1eynLhrqxou8tu74oor9HFz+wdfrj3zDzZ6jwAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX
wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY
TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ
fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j
p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS
qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3
ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG
3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8
UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv
UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb
mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4
6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo
JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA
BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7djZTxNRGAVw/gjjvq8tawtYEAqCO+6J0cQH
331RMTEqKC5YC5SlFLAIuLNpVEyUpdvQaSullO1JggkKiVuiRhOpkUU5zjDTCDGh944JvvQk9/n+MnfO
fDcTEkwwwUjI/X296fV7Pb66PT2o3c2tXd2o2dmN6rQu3NvRhbvbO3FnWydub+XWFi9ubfbi5qYO3Ejt
QFWKB5UbPahIbsf1JG6p3ShPdMOY4Ma1DW0oi29DadxzlKi4td4FQ6wLxTFOX1E0e0LcPnBmGQd9tBM6
pXNY3D5wZhtXpHSiUOGAuH3g/A9cQRQNkBBXleqBMdkBg9qKMjWL8iS3ZFxBJEsOJH1yZUkseh4NYuzH
T/Q2DKEkkZGMy4+gABIf634WU+Oq7Ich3i4Jpwu3kwNJ37nSFAZf330XecDErwk8POmFIc5BjcsLowCS
FsKobsPdI67JI/Zn1DeOyoMsDConFS43tJUcSILzt7U0wYGnWT0iT8jnoWHoky0ojnUS43LkFEBSnL8Q
elUrvPWvRJ6Ql+wH6KLNxDitjAZIgfMXoiDOjEHvJ5EnxG7sQ57CRoTTrmPIgbQ4vhAGFfeupVjw9e2U
0kwAD9I9yI20BcRdXUsBpMX526qPceDGYRbjI39KMzI8htJdNugiWmfEadbYyIFScP625isZPMnsEnlC
Xjo+QBNqmhF3ZTUFUCqOL4ROwaAhYzqw3/6eA5pnxGWvspIDpeIKFCwqDtn/OmJDmhU5ocyMuMsrKYBS
cIVKB/LVJnx54xNpQknqj7VDIzcHxF1aYSEH0uL475xW0YzX3o8iTQhT8gJX5CYi3MXlNEBKXE6kBe01
AyJLSB/zDtmhTcS4i8vM5EAaXF6UDY/PdIosIZ9ef4M2thlaOUOMu7CUAkiKy4+yo/yAfdplYYS7LJTs
tFLjspZQAElw/PjKUbZMLwV33ao+2gaNzEKNO7/YRA4kwfGzVZ9qEWlC+FJky0yScOcWUQBJcPxsvRpm
QkfdAEa/j8NTO4DL8ibJuMyFLeRAEhw/+PPCWycnxCXZs396cjwuYwENkAAXaPDT4jLmN5MD/wfu7DwK
IIfzzTbu1NxG8l8f/I8c/l/JbOJOz2k8Lm4fTDDBkCck5Df9Wj6YCpGtogAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
/dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK
ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP
uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi
8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF
UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40
3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -379,7 +379,7 @@
</value>
</data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>587, 17</value>
<value>17, 56</value>
</metadata>
<data name="dateTimeCellType1.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
@@ -399,6 +399,16 @@
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
AAD/////AQgAAP////8AAQgAAAs=
</value>
</data>
<data name="dateTimeCellType3.Calendar" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh
cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1
cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4
AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+////
K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA
AAD/////AQgAAP////8AAQgAAAs=
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -748,6 +748,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -786,6 +787,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -801,6 +803,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -839,6 +842,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -854,6 +858,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -892,6 +897,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -946,6 +952,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -1173,6 +1180,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -1212,6 +1220,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -1227,6 +1236,7 @@
<Style>
<FontFamily>맑은 고딕</FontFamily>
<FontWeight>Normal</FontWeight>
<Format>N1</Format>
<Color>#333333</Color>
</Style>
</TextRun>
@@ -1266,6 +1276,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -1321,6 +1332,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>

View File

@@ -81,7 +81,9 @@
<TextRuns>
<TextRun>
<Value>=Sum(Fields!Dr.Value)</Value>
<Style />
<Style>
<Format>N1</Format>
</Style>
</TextRun>
</TextRuns>
<Style />
@@ -112,7 +114,9 @@
<TextRuns>
<TextRun>
<Value>=Sum(Fields!Cr.Value)</Value>
<Style />
<Style>
<Format>N1</Format>
</Style>
</TextRun>
</TextRuns>
<Style />
@@ -229,7 +233,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
@@ -262,7 +265,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
</TablixCells>
@@ -661,7 +663,6 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixHeader>
<TablixMembers>

View File

@@ -3121,6 +3121,8 @@ namespace FBS0000 {
private global::System.Data.DataColumn columnoutdate;
private global::System.Data.DataColumn columnotPMS;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public vJobReportForUserDataTable() {
@@ -3346,6 +3348,14 @@ namespace FBS0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn otPMSColumn {
get {
return this.columnotPMS;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -3407,7 +3417,8 @@ namespace FBS0000 {
string otReason,
string grade,
string indate,
string outdate) {
string outdate,
double otPMS) {
vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
idx,
@@ -3433,7 +3444,8 @@ namespace FBS0000 {
otReason,
grade,
indate,
outdate};
outdate,
otPMS};
rowvJobReportForUserRow.ItemArray = columnValuesArray;
this.Rows.Add(rowvJobReportForUserRow);
return rowvJobReportForUserRow;
@@ -3480,6 +3492,7 @@ namespace FBS0000 {
this.columngrade = base.Columns["grade"];
this.columnindate = base.Columns["indate"];
this.columnoutdate = base.Columns["outdate"];
this.columnotPMS = base.Columns["otPMS"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3533,6 +3546,8 @@ namespace FBS0000 {
base.Columns.Add(this.columnindate);
this.columnoutdate = new global::System.Data.DataColumn("outdate", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnoutdate);
this.columnotPMS = new global::System.Data.DataColumn("otPMS", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnotPMS);
this.columnidx.AllowDBNull = false;
this.columnpdate.MaxLength = 10;
this.columngcode.AllowDBNull = false;
@@ -6352,6 +6367,22 @@ namespace FBS0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public double otPMS {
get {
if (this.IsotPMSNull()) {
return 0D;
}
else {
return ((double)(this[this.tablevJobReportForUser.otPMSColumn]));
}
}
set {
this[this.tablevJobReportForUser.otPMSColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IspdateNull() {
@@ -6615,6 +6646,18 @@ namespace FBS0000 {
public void SetoutdateNull() {
this[this.tablevJobReportForUser.outdateColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsotPMSNull() {
return this.IsNull(this.tablevJobReportForUser.otPMSColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetotPMSNull() {
this[this.tablevJobReportForUser.otPMSColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -10887,6 +10930,7 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM
tableMapping.ColumnMappings.Add("grade", "grade");
tableMapping.ColumnMappings.Add("indate", "indate");
tableMapping.ColumnMappings.Add("outdate", "outdate");
tableMapping.ColumnMappings.Add("otPMS", "otPMS");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -10903,7 +10947,8 @@ SELECT idx, gcode, grp, seq, grade, empno, name, wuid, wdate, indate, email FROM
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate
this._commandCollection[0].CommandText = @"SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate,
otPMS
FROM vJobReportForUser
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
ORDER BY pdate";

View File

@@ -708,7 +708,8 @@ WHERE (gcode = @gcode) AND (empno = @empno)</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vJobReportForUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate
<CommandText>SELECT idx, pdate, gcode, id, name, process, type, svalue, hrs, ot, requestpart, package, userProcess, status, projectName, description, ww, otStart, otEnd, ot2, otReason, grade, indate, outdate,
otPMS
FROM vJobReportForUser
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed)
ORDER BY pdate</CommandText>
@@ -746,6 +747,7 @@ ORDER BY pdate</CommandText>
<Mapping SourceColumn="grade" DataSetColumn="grade" />
<Mapping SourceColumn="indate" DataSetColumn="indate" />
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
<Mapping SourceColumn="otPMS" DataSetColumn="otPMS" />
</Mappings>
<Sources />
</TableAdapter>
@@ -1120,7 +1122,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
</xs:element>
<xs:element name="extidx" msprop:Generator_ColumnPropNameInTable="extidxColumn" msprop:nullValue="-1" msprop:Generator_ColumnPropNameInRow="extidx" msprop:Generator_UserColumnName="extidx" msprop:Generator_ColumnVarNameInTable="columnextidx" type="xs:int" minOccurs="0" />
<xs:element name="lock" msprop:Generator_ColumnPropNameInTable="lockColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="_lock" msprop:Generator_UserColumnName="lock" msprop:Generator_ColumnVarNameInTable="columnlock" type="xs:boolean" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnVarNameInTable="columniwol" msprop:Generator_UserColumnName="iwol" type="xs:boolean" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -1382,6 +1384,7 @@ WHERE (gcode = @gcode) AND (uid = @uid) AND (CONVERT(CHAR(10), sdate, 23) &gt;=
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="otPMS" msprop:Generator_ColumnPropNameInTable="otPMSColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="otPMS" msprop:Generator_UserColumnName="otPMS" msprop:Generator_ColumnVarNameInTable="columnotPMS" type="xs:double" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="114" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:minutes" ZOrder="10" X="70" Y="70" Height="324" Width="192" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Board" ZOrder="9" X="332" Y="70" Height="267" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />

File diff suppressed because it is too large Load Diff

View File

@@ -139,7 +139,7 @@ FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN
EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
Users WITH (NOLOCK) ON Holyday.uid = Users.id
WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) &lt;&gt; 0) AND
(EETGW_GroupUser.useUserState = 1)
(EETGW_GroupUser.useUserState = 1) AND (Holyday.cate &lt;&gt; 'PMS')
ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -167,6 +167,45 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Holydata_TimePMSTableAdapter" GeneratorDataComponentClassName="Holydata_TimePMSTableAdapter" Name="Holydata_TimePMS" UserDataComponentName="Holydata_TimePMSTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT Holyday.gcode, Holyday.idx, Holyday.sdate, Holyday.uid, Holyday.cate, dbo.GetKuntaeJan_TimePMS(Holyday.gcode, Holyday.uid, Holyday.sdate, Holyday.idx - 1) AS jun,
Holyday.DrTimePMS AS Dr, Holyday.CrTime AS Cr, Holyday.contents, Users.name, EETGW_GroupUser.Process, Holyday.iwol
FROM Holyday WITH (NOLOCK) LEFT OUTER JOIN
EETGW_GroupUser WITH (NOLOCK) ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
Users WITH (NOLOCK) ON Holyday.uid = Users.id
WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (EETGW_GroupUser.useUserState = 1) AND (Holyday.cate = 'PMS') AND
(ISNULL(Holyday.DrTimePMS, 0) + ISNULL(Holyday.CrTime, 0) &lt;&gt; 0)
ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" 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="true" AutogeneratedName="uid" ColumnName="uid" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@uid" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="uid" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sd" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@sd" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ed" ColumnName="sdate" DataSourceName="EE.dbo.Holyday" DataTypeServer="date" DbType="AnsiString" Direction="Input" ParameterName="@ed" Precision="0" ProviderType="Date" Scale="0" Size="3" SourceColumn="sdate" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
<Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="sdate" DataSetColumn="sdate" />
<Mapping SourceColumn="uid" DataSetColumn="uid" />
<Mapping SourceColumn="cate" DataSetColumn="cate" />
<Mapping SourceColumn="jun" DataSetColumn="jun" />
<Mapping SourceColumn="Dr" DataSetColumn="Dr" />
<Mapping SourceColumn="Cr" DataSetColumn="Cr" />
<Mapping SourceColumn="contents" DataSetColumn="contents" />
<Mapping SourceColumn="name" DataSetColumn="name" />
<Mapping SourceColumn="Process" DataSetColumn="Process" />
<Mapping SourceColumn="iwol" DataSetColumn="iwol" />
</Mappings>
<Sources />
</TableAdapter>
</Tables>
<Sources />
</DataSource>
@@ -344,7 +383,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<xs:element name="jan" msprop:Generator_ColumnPropNameInTable="janColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="jan" msprop:Generator_UserColumnName="jan" msprop:Generator_ColumnVarNameInTable="columnjan" type="xs:double" minOccurs="0" />
<xs:element name="add" msprop:Generator_ColumnPropNameInTable="addColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="add" msprop:Generator_UserColumnName="add" msprop:Generator_ColumnVarNameInTable="columnadd" type="xs:double" minOccurs="0" />
<xs:element name="rate" msprop:Generator_ColumnPropNameInTable="rateColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="rate" msprop:Generator_UserColumnName="rate" msprop:Generator_ColumnVarNameInTable="columnrate" type="xs:double" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:double" minOccurs="0" />
<xs:element name="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:double" minOccurs="0" />
<xs:element name="drday" msprop:Generator_ColumnPropNameInTable="drdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="drday" msprop:Generator_UserColumnName="drday" msprop:Generator_ColumnVarNameInTable="columndrday" type="xs:double" minOccurs="0" />
<xs:element name="crday" msprop:Generator_ColumnPropNameInTable="crdayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="crday" msprop:Generator_UserColumnName="crday" msprop:Generator_ColumnVarNameInTable="columncrday" type="xs:double" minOccurs="0" />
<xs:element name="janday" msprop:Generator_ColumnPropNameInTable="jandayColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="janday" msprop:Generator_UserColumnName="janday" msprop:Generator_ColumnVarNameInTable="columnjanday" type="xs:double" minOccurs="0" />
@@ -355,6 +394,60 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Holydata_TimePMS" msprop:Generator_RowClassName="Holydata_TimePMSRow" msprop:Generator_RowEvHandlerName="Holydata_TimePMSRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimePMSRowDeleted" msprop:Generator_RowDeletingName="Holydata_TimePMSRowDeleting" msprop:Generator_RowEvArgName="Holydata_TimePMSRowChangeEvent" msprop:Generator_TablePropName="Holydata_TimePMS" msprop:Generator_RowChangedName="Holydata_TimePMSRowChanged" msprop:Generator_UserTableName="Holydata_TimePMS" msprop:Generator_RowChangingName="Holydata_TimePMSRowChanging" msprop:Generator_TableClassName="Holydata_TimePMSDataTable" msprop:Generator_TableVarName="tableHolydata_TimePMS">
<xs:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="sdate" msprop:Generator_UserColumnName="sdate" msprop:Generator_ColumnPropNameInTable="sdateColumn" msprop:Generator_ColumnPropNameInRow="sdate" msprop:Generator_ColumnVarNameInTable="columnsdate" type="xs:dateTime" minOccurs="0" />
<xs:element name="uid" msprop:Generator_UserColumnName="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnVarNameInTable="columnuid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="cate" msprop:Generator_UserColumnName="cate" msprop:Generator_ColumnPropNameInTable="cateColumn" msprop:Generator_ColumnPropNameInRow="cate" msprop:Generator_ColumnVarNameInTable="columncate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="jun" msdata:ReadOnly="true" msprop:Generator_UserColumnName="jun" msprop:Generator_ColumnPropNameInTable="junColumn" msprop:Generator_ColumnPropNameInRow="jun" msprop:Generator_ColumnVarNameInTable="columnjun" type="xs:double" minOccurs="0" />
<xs:element name="Dr" msprop:Generator_UserColumnName="Dr" msprop:Generator_ColumnPropNameInTable="DrColumn" msprop:Generator_ColumnPropNameInRow="Dr" msprop:Generator_ColumnVarNameInTable="columnDr" type="xs:double" minOccurs="0" />
<xs:element name="Cr" msprop:Generator_UserColumnName="Cr" msprop:Generator_ColumnPropNameInTable="CrColumn" msprop:Generator_ColumnPropNameInRow="Cr" msprop:Generator_ColumnVarNameInTable="columnCr" type="xs:double" minOccurs="0" />
<xs:element name="contents" msprop:Generator_UserColumnName="contents" msprop:Generator_ColumnPropNameInTable="contentsColumn" msprop:Generator_ColumnPropNameInRow="contents" msprop:Generator_ColumnVarNameInTable="columncontents" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="2147483647" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="Process" msprop:Generator_UserColumnName="Process" msprop:Generator_ColumnPropNameInTable="ProcessColumn" msprop:Generator_ColumnPropNameInRow="Process" msprop:Generator_ColumnVarNameInTable="columnProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="iwol" msprop:Generator_UserColumnName="iwol" msprop:Generator_ColumnPropNameInTable="iwolColumn" msprop:Generator_ColumnPropNameInRow="iwol" msprop:Generator_ColumnVarNameInTable="columniwol" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
@@ -370,5 +463,9 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<xs:field xpath="mstns:uid" />
<xs:field xpath="mstns:cate" />
</xs:unique>
<xs:unique name="Holydata_TimePMS_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:Holydata_TimePMS" />
<xs:field xpath="mstns:idx" />
</xs:unique>
</xs:element>
</xs:schema>

View File

@@ -6,10 +6,11 @@
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:holydata" ZOrder="1" X="807" Y="56" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:Holydata_Day" ZOrder="4" X="535" Y="46" Height="514" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="446" />
<Shape ID="DesignTable:Holydata_Time" ZOrder="3" X="213" Y="50" Height="286" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:holydatasum" ZOrder="2" X="0" Y="0" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
<Shape ID="DesignTable:holydata" ZOrder="3" X="1148" Y="73" Height="343" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
<Shape ID="DesignTable:Holydata_Day" ZOrder="1" X="732" Y="58" Height="474" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="406" />
<Shape ID="DesignTable:Holydata_Time" ZOrder="5" X="213" Y="50" Height="647" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="579" />
<Shape ID="DesignTable:Holydata_TimePMS" ZOrder="2" X="445" Y="98" Height="628" Width="245" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:holydatasum" ZOrder="4" X="36" Y="35" Height="257" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="253" />
</Shapes>
<Connectors />
</DiagramLayout>

View File

@@ -365,6 +365,8 @@ namespace FCM0000 {
private global::System.Data.DataColumn columndevinfo;
private global::System.Data.DataColumn columnusemail;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public UserGroupDataTable() {
@@ -462,6 +464,14 @@ namespace FCM0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn usemailColumn {
get {
return this.columnusemail;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -499,7 +509,7 @@ namespace FCM0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, int permission, bool advpurchase, bool advkisul, string managerinfo, string devinfo) {
public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, int permission, bool advpurchase, bool advkisul, string managerinfo, string devinfo, bool usemail) {
UserGroupRow rowUserGroupRow = ((UserGroupRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
dept,
@@ -509,7 +519,8 @@ namespace FCM0000 {
advpurchase,
advkisul,
managerinfo,
devinfo};
devinfo,
usemail};
rowUserGroupRow.ItemArray = columnValuesArray;
this.Rows.Add(rowUserGroupRow);
return rowUserGroupRow;
@@ -547,6 +558,7 @@ namespace FCM0000 {
this.columnadvkisul = base.Columns["advkisul"];
this.columnmanagerinfo = base.Columns["managerinfo"];
this.columndevinfo = base.Columns["devinfo"];
this.columnusemail = base.Columns["usemail"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -568,6 +580,8 @@ namespace FCM0000 {
base.Columns.Add(this.columnmanagerinfo);
this.columndevinfo = new global::System.Data.DataColumn("devinfo", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columndevinfo);
this.columnusemail = new global::System.Data.DataColumn("usemail", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnusemail);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columndept}, true));
this.columndept.AllowDBNull = false;
@@ -1895,6 +1909,22 @@ namespace FCM0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool usemail {
get {
if (this.IsusemailNull()) {
return false;
}
else {
return ((bool)(this[this.tableUserGroup.usemailColumn]));
}
}
set {
this[this.tableUserGroup.usemailColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsgcodeNull() {
@@ -1978,6 +2008,18 @@ namespace FCM0000 {
public void SetdevinfoNull() {
this[this.tableUserGroup.devinfoColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsusemailNull() {
return this.IsNull(this.tableUserGroup.usemailColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetusemailNull() {
this[this.tableUserGroup.usemailColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -3196,10 +3238,11 @@ namespace FCM0000.DSUserTableAdapters {
tableMapping.ColumnMappings.Add("advkisul", "advkisul");
tableMapping.ColumnMappings.Add("managerinfo", "managerinfo");
tableMapping.ColumnMappings.Add("devinfo", "devinfo");
tableMapping.ColumnMappings.Add("usemail", "usemail");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)))";
this._adapter.DeleteCommand.CommandText = @"DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)) AND ((@IsNull_usemail = 1 AND [usemail] IS NULL) OR ([usemail] = @Original_usemail)))";
this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -3216,10 +3259,12 @@ namespace FCM0000.DSUserTableAdapters {
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_devinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usemail", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usemail", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usemail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usemail", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
this._adapter.InsertCommand.CommandText = @"INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission], [advpurchase], [advkisul], [managerinfo], [devinfo]) VALUES (@dept, @gcode, @path_kj, @permission, @advpurchase, @advkisul, @managerinfo, @devinfo);
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept)";
this._adapter.InsertCommand.CommandText = @"INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission], [advpurchase], [advkisul], [managerinfo], [devinfo], [usemail]) VALUES (@dept, @gcode, @path_kj, @permission, @advpurchase, @advkisul, @managerinfo, @devinfo, @usemail);
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, usemail FROM UserGroup WITH (nolock) WHERE (dept = @dept)";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3229,10 +3274,11 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usemail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usemail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = @"UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission, [advpurchase] = @advpurchase, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)));
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept)";
this._adapter.UpdateCommand.CommandText = @"UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission, [advpurchase] = @advpurchase, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo, [usemail] = @usemail WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)) AND ((@IsNull_usemail = 1 AND [usemail] IS NULL) OR ([usemail] = @Original_usemail)));
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, usemail FROM UserGroup WITH (nolock) WHERE (dept = @dept)";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3242,6 +3288,7 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usemail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usemail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
@@ -3257,6 +3304,8 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_devinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_usemail", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usemail", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_usemail", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usemail", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3273,12 +3322,12 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev" +
"info\r\nFROM UserGroup WITH (nolock)";
"info, usemail\r\nFROM UserGroup WITH (nolock)";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
this._commandCollection[1].CommandText = "SELECT advkisul, advpurchase, dept, devinfo, gcode, managerinfo, path_kj, permis" +
"sion\r\nFROM UserGroup WITH (nolock)\r\nWHERE (gcode = @gcode)";
"sion, usemail\r\nFROM UserGroup WITH (nolock)\r\nWHERE (gcode = @gcode)";
this._commandCollection[1].CommandType = global::System.Data.CommandType.Text;
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, "", "", ""));
}
@@ -3376,7 +3425,7 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)]
public virtual int Delete(string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable<int> Original_permission, global::System.Nullable<bool> Original_advpurchase, global::System.Nullable<bool> Original_advkisul, string Original_managerinfo, string Original_devinfo) {
public virtual int Delete(string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable<int> Original_permission, global::System.Nullable<bool> Original_advpurchase, global::System.Nullable<bool> Original_advkisul, string Original_managerinfo, string Original_devinfo, global::System.Nullable<bool> Original_usemail) {
if ((Original_dept == null)) {
throw new global::System.ArgumentNullException("Original_dept");
}
@@ -3439,6 +3488,14 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_devinfo));
}
if ((Original_usemail.HasValue == true)) {
this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0));
this.Adapter.DeleteCommand.Parameters[16].Value = ((bool)(Original_usemail.Value));
}
else {
this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1));
this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State;
if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -3459,7 +3516,7 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)]
public virtual int Insert(string dept, string gcode, string path_kj, global::System.Nullable<int> permission, global::System.Nullable<bool> advpurchase, global::System.Nullable<bool> advkisul, string managerinfo, string devinfo) {
public virtual int Insert(string dept, string gcode, string path_kj, global::System.Nullable<int> permission, global::System.Nullable<bool> advpurchase, global::System.Nullable<bool> advkisul, string managerinfo, string devinfo, global::System.Nullable<bool> usemail) {
if ((dept == null)) {
throw new global::System.ArgumentNullException("dept");
}
@@ -3508,6 +3565,12 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
else {
this.Adapter.InsertCommand.Parameters[7].Value = ((string)(devinfo));
}
if ((usemail.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[8].Value = ((bool)(usemail.Value));
}
else {
this.Adapter.InsertCommand.Parameters[8].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -3537,6 +3600,7 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
global::System.Nullable<bool> advkisul,
string managerinfo,
string devinfo,
global::System.Nullable<bool> usemail,
string Original_dept,
string Original_gcode,
string Original_path_kj,
@@ -3544,7 +3608,8 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
global::System.Nullable<bool> Original_advpurchase,
global::System.Nullable<bool> Original_advkisul,
string Original_managerinfo,
string Original_devinfo) {
string Original_devinfo,
global::System.Nullable<bool> Original_usemail) {
if ((dept == null)) {
throw new global::System.ArgumentNullException("dept");
}
@@ -3593,67 +3658,81 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
else {
this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(devinfo));
}
if ((usemail.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[8].Value = ((bool)(usemail.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value;
}
if ((Original_dept == null)) {
throw new global::System.ArgumentNullException("Original_dept");
}
else {
this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_dept));
this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_dept));
}
if ((Original_gcode == null)) {
this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_gcode));
this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode));
}
if ((Original_path_kj == null)) {
this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_path_kj));
this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_path_kj));
}
if ((Original_permission.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_permission.Value));
this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_permission.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value;
}
if ((Original_advpurchase.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[16].Value = ((bool)(Original_advpurchase.Value));
this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[17].Value = ((bool)(Original_advpurchase.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value;
}
if ((Original_advkisul.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(Original_advkisul.Value));
this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[19].Value = ((bool)(Original_advkisul.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value;
}
if ((Original_managerinfo == null)) {
this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_managerinfo));
this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_managerinfo));
}
if ((Original_devinfo == null)) {
this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value;
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_devinfo));
this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_devinfo));
}
if ((Original_usemail.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0));
this.Adapter.UpdateCommand.Parameters[25].Value = ((bool)(Original_usemail.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value;
}
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
@@ -3675,8 +3754,25 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)]
public virtual int Update(string gcode, string path_kj, global::System.Nullable<int> permission, global::System.Nullable<bool> advpurchase, global::System.Nullable<bool> advkisul, string managerinfo, string devinfo, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable<int> Original_permission, global::System.Nullable<bool> Original_advpurchase, global::System.Nullable<bool> Original_advkisul, string Original_managerinfo, string Original_devinfo) {
return this.Update(Original_dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, Original_dept, Original_gcode, Original_path_kj, Original_permission, Original_advpurchase, Original_advkisul, Original_managerinfo, Original_devinfo);
public virtual int Update(
string gcode,
string path_kj,
global::System.Nullable<int> permission,
global::System.Nullable<bool> advpurchase,
global::System.Nullable<bool> advkisul,
string managerinfo,
string devinfo,
global::System.Nullable<bool> usemail,
string Original_dept,
string Original_gcode,
string Original_path_kj,
global::System.Nullable<int> Original_permission,
global::System.Nullable<bool> Original_advpurchase,
global::System.Nullable<bool> Original_advkisul,
string Original_managerinfo,
string Original_devinfo,
global::System.Nullable<bool> Original_usemail) {
return this.Update(Original_dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, usemail, Original_dept, Original_gcode, Original_path_kj, Original_permission, Original_advpurchase, Original_advkisul, Original_managerinfo, Original_devinfo, Original_usemail);
}
}

View File

@@ -12,7 +12,7 @@
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.UserGroup" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DeleteCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)))</CommandText>
<CommandText>DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)) AND ((@IsNull_usemail = 1 AND [usemail] IS NULL) OR ([usemail] = @Original_usemail)))</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
@@ -29,13 +29,15 @@
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_managerinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="managerinfo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_devinfo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="devinfo" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_devinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="devinfo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_usemail" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="usemail" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_usemail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="usemail" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</DeleteCommand>
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission], [advpurchase], [advkisul], [managerinfo], [devinfo]) VALUES (@dept, @gcode, @path_kj, @permission, @advpurchase, @advkisul, @managerinfo, @devinfo);
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept)</CommandText>
<CommandText>INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [permission], [advpurchase], [advkisul], [managerinfo], [devinfo], [usemail]) VALUES (@dept, @gcode, @path_kj, @permission, @advpurchase, @advkisul, @managerinfo, @devinfo, @usemail);
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, usemail FROM UserGroup WITH (nolock) WHERE (dept = @dept)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -45,20 +47,21 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@advkisul" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="advkisul" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@managerinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="managerinfo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@devinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="devinfo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@usemail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="usemail" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo
<CommandText>SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, usemail
FROM UserGroup WITH (nolock)</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
<UpdateCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission, [advpurchase] = @advpurchase, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)));
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept)</CommandText>
<CommandText>UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [permission] = @permission, [advpurchase] = @advpurchase, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo, [usemail] = @usemail WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)) AND ((@IsNull_usemail = 1 AND [usemail] IS NULL) OR ([usemail] = @Original_usemail)));
SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, devinfo, usemail FROM UserGroup WITH (nolock) WHERE (dept = @dept)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -68,6 +71,7 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@advkisul" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="advkisul" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@managerinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="managerinfo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@devinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="devinfo" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@usemail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="usemail" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_dept" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="dept" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_gcode" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
@@ -83,6 +87,8 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_managerinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="managerinfo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_devinfo" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="devinfo" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_devinfo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="devinfo" SourceColumnNullMapping="false" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_usemail" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="usemail" SourceColumnNullMapping="true" SourceVersion="Original" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_usemail" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="usemail" SourceColumnNullMapping="false" SourceVersion="Original" />
</Parameters>
</DbCommand>
</UpdateCommand>
@@ -97,12 +103,13 @@ SELECT dept, gcode, path_kj, permission, advpurchase, advkisul, managerinfo, dev
<Mapping SourceColumn="advkisul" DataSetColumn="advkisul" />
<Mapping SourceColumn="managerinfo" DataSetColumn="managerinfo" />
<Mapping SourceColumn="devinfo" DataSetColumn="devinfo" />
<Mapping SourceColumn="usemail" DataSetColumn="usemail" />
</Mappings>
<Sources>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.UserGroup" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByID" GeneratorSourceName="FillByID" GetMethodModifier="Public" GetMethodName="GetByID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByID" UserSourceName="FillByID">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT advkisul, advpurchase, dept, devinfo, gcode, managerinfo, path_kj, permission
<CommandText>SELECT advkisul, advpurchase, dept, devinfo, gcode, managerinfo, path_kj, permission, usemail
FROM UserGroup WITH (nolock)
WHERE (gcode = @gcode)</CommandText>
<Parameters>
@@ -456,10 +463,10 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
<xs:element name="DSUser" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="DSUser" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSUser">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="UserGroup" msprop:Generator_RowClassName="UserGroupRow" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup">
<xs:element name="UserGroup" msprop:Generator_RowEvHandlerName="UserGroupRowChangeEventHandler" msprop:Generator_RowDeletedName="UserGroupRowDeleted" msprop:Generator_RowDeletingName="UserGroupRowDeleting" msprop:Generator_RowEvArgName="UserGroupRowChangeEvent" msprop:Generator_TablePropName="UserGroup" msprop:Generator_RowChangedName="UserGroupRowChanged" msprop:Generator_UserTableName="UserGroup" msprop:Generator_RowChangingName="UserGroupRowChanging" msprop:Generator_RowClassName="UserGroupRow" msprop:Generator_TableClassName="UserGroupDataTable" msprop:Generator_TableVarName="tableUserGroup">
<xs:complexType>
<xs:sequence>
<xs:element name="dept" msprop:Generator_UserColumnName="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnVarNameInTable="columndept">
<xs:element name="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_UserColumnName="dept" msprop:Generator_ColumnVarNameInTable="columndept">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
@@ -497,13 +504,14 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="usemail" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="usemailColumn" msprop:Generator_ColumnVarNameInTable="columnusemail" msprop:Generator_UserColumnName="usemail" msprop:Generator_ColumnPropNameInRow="usemail" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Users" msprop:Generator_RowClassName="UsersRow" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_TablePropName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers">
<xs:element name="Users" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_TablePropName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowClassName="UsersRow" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers">
<xs:complexType>
<xs:sequence>
<xs:element name="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnVarNameInTable="columnid">
<xs:element name="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnVarNameInTable="columnid">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
@@ -623,15 +631,15 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
<xs:element name="gcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_UserColumnName="gcode" minOccurs="0">
<xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
<xs:element name="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="processs" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_UserColumnName="processs" minOccurs="0">
<xs:element name="processs" msprop:Generator_UserColumnName="processs" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
@@ -641,10 +649,10 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Auth" msprop:Generator_RowClassName="AuthRow" msprop:Generator_RowEvHandlerName="AuthRowChangeEventHandler" msprop:Generator_RowDeletedName="AuthRowDeleted" msprop:Generator_RowDeletingName="AuthRowDeleting" msprop:Generator_RowEvArgName="AuthRowChangeEvent" msprop:Generator_TablePropName="Auth" msprop:Generator_RowChangedName="AuthRowChanged" msprop:Generator_UserTableName="Auth" msprop:Generator_RowChangingName="AuthRowChanging" msprop:Generator_TableClassName="AuthDataTable" msprop:Generator_TableVarName="tableAuth">
<xs:element name="Auth" msprop:Generator_RowEvHandlerName="AuthRowChangeEventHandler" msprop:Generator_RowDeletedName="AuthRowDeleted" msprop:Generator_RowDeletingName="AuthRowDeleting" msprop:Generator_RowEvArgName="AuthRowChangeEvent" msprop:Generator_TablePropName="Auth" msprop:Generator_RowChangedName="AuthRowChanged" msprop:Generator_UserTableName="Auth" msprop:Generator_RowChangingName="AuthRowChanging" msprop:Generator_RowClassName="AuthRow" msprop:Generator_TableClassName="AuthDataTable" msprop:Generator_TableVarName="tableAuth">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="user" msprop:Generator_ColumnPropNameInTable="userColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="user" msprop:Generator_UserColumnName="user" msprop:Generator_ColumnVarNameInTable="columnuser" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">

View File

@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</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="-13" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-13" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:UserGroup" ZOrder="3" X="0" Y="0" Height="343" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:Users" ZOrder="2" X="210" Y="-1" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />

View File

@@ -30,14 +30,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserGroupDev));
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType4 = new FarPoint.Win.Spread.CellType.CheckBoxCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dSUser = new FCM0000.DSUser();
this.taStaff = new FCM0000.dsMSSQLTableAdapters.StaffTableAdapter();
@@ -64,18 +56,25 @@
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.bsStaff = new System.Windows.Forms.BindingSource(this.components);
this.ta = new FCM0000.DSUserTableAdapters.UserGroupTableAdapter();
this.dv1 = new System.Windows.Forms.DataGridView();
this.deptDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gcodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pathkjDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.permissionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.advpurchaseDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.advkisulDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.managerinfoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.devinfoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.usemailDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
this.cm1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsStaff)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
this.SuspendLayout();
//
// bs
@@ -117,14 +116,14 @@
this.toolStripLabel2,
this.tbFind,
this.btFind});
this.bn.Location = new System.Drawing.Point(0, 570);
this.bn.Location = new System.Drawing.Point(0, 614);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(910, 25);
this.bn.Size = new System.Drawing.Size(999, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -297,83 +296,95 @@
this.ToolStripMenuItem.Text = "권한설정";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// fpSpread1
//
this.fpSpread1.AccessibleDescription = "";
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fpSpread1.Location = new System.Drawing.Point(0, 0);
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(910, 570);
this.fpSpread1.TabIndex = 2;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 8;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "부서명";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "부서코드";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "권한";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 38F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "dept";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Label = "부서명";
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "gcode";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "부서코드";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "path_kj";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Visible = false;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F;
this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType2.DecimalPlaces = 0;
numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType2.MaximumValue = 2147483647D;
numberCellType2.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "permission";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "권한";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 88F;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = checkBoxCellType3;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "advpurchase";
this.fpSpread1_Sheet1.Columns.Get(5).CellType = checkBoxCellType4;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "advkisul";
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "managerinfo";
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "devinfo";
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// dv1
//
this.dv1.AllowUserToAddRows = false;
this.dv1.AutoGenerateColumns = false;
this.dv1.ColumnHeadersHeight = 35;
this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.deptDataGridViewTextBoxColumn,
this.gcodeDataGridViewTextBoxColumn,
this.pathkjDataGridViewTextBoxColumn,
this.permissionDataGridViewTextBoxColumn,
this.advpurchaseDataGridViewCheckBoxColumn,
this.advkisulDataGridViewCheckBoxColumn,
this.managerinfoDataGridViewTextBoxColumn,
this.devinfoDataGridViewTextBoxColumn,
this.usemailDataGridViewCheckBoxColumn});
this.dv1.ContextMenuStrip = this.cm1;
this.dv1.DataSource = this.bs;
this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv1.Location = new System.Drawing.Point(0, 0);
this.dv1.Name = "dv1";
this.dv1.RowTemplate.Height = 23;
this.dv1.Size = new System.Drawing.Size(999, 614);
this.dv1.TabIndex = 1;
//
// deptDataGridViewTextBoxColumn
//
this.deptDataGridViewTextBoxColumn.DataPropertyName = "dept";
this.deptDataGridViewTextBoxColumn.HeaderText = "dept";
this.deptDataGridViewTextBoxColumn.Name = "deptDataGridViewTextBoxColumn";
//
// gcodeDataGridViewTextBoxColumn
//
this.gcodeDataGridViewTextBoxColumn.DataPropertyName = "gcode";
this.gcodeDataGridViewTextBoxColumn.HeaderText = "gcode";
this.gcodeDataGridViewTextBoxColumn.Name = "gcodeDataGridViewTextBoxColumn";
//
// pathkjDataGridViewTextBoxColumn
//
this.pathkjDataGridViewTextBoxColumn.DataPropertyName = "path_kj";
this.pathkjDataGridViewTextBoxColumn.HeaderText = "path_kj";
this.pathkjDataGridViewTextBoxColumn.Name = "pathkjDataGridViewTextBoxColumn";
//
// permissionDataGridViewTextBoxColumn
//
this.permissionDataGridViewTextBoxColumn.DataPropertyName = "permission";
this.permissionDataGridViewTextBoxColumn.HeaderText = "permission";
this.permissionDataGridViewTextBoxColumn.Name = "permissionDataGridViewTextBoxColumn";
//
// advpurchaseDataGridViewCheckBoxColumn
//
this.advpurchaseDataGridViewCheckBoxColumn.DataPropertyName = "advpurchase";
this.advpurchaseDataGridViewCheckBoxColumn.HeaderText = "advpurchase";
this.advpurchaseDataGridViewCheckBoxColumn.Name = "advpurchaseDataGridViewCheckBoxColumn";
//
// advkisulDataGridViewCheckBoxColumn
//
this.advkisulDataGridViewCheckBoxColumn.DataPropertyName = "advkisul";
this.advkisulDataGridViewCheckBoxColumn.HeaderText = "advkisul";
this.advkisulDataGridViewCheckBoxColumn.Name = "advkisulDataGridViewCheckBoxColumn";
//
// managerinfoDataGridViewTextBoxColumn
//
this.managerinfoDataGridViewTextBoxColumn.DataPropertyName = "managerinfo";
this.managerinfoDataGridViewTextBoxColumn.HeaderText = "managerinfo";
this.managerinfoDataGridViewTextBoxColumn.Name = "managerinfoDataGridViewTextBoxColumn";
//
// devinfoDataGridViewTextBoxColumn
//
this.devinfoDataGridViewTextBoxColumn.DataPropertyName = "devinfo";
this.devinfoDataGridViewTextBoxColumn.HeaderText = "devinfo";
this.devinfoDataGridViewTextBoxColumn.Name = "devinfoDataGridViewTextBoxColumn";
//
// usemailDataGridViewCheckBoxColumn
//
this.usemailDataGridViewCheckBoxColumn.DataPropertyName = "usemail";
this.usemailDataGridViewCheckBoxColumn.HeaderText = "usemail";
this.usemailDataGridViewCheckBoxColumn.Name = "usemailDataGridViewCheckBoxColumn";
//
// fUserGroupDev
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(910, 595);
this.ClientSize = new System.Drawing.Size(999, 639);
this.ContextMenuStrip = this.cm1;
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.dv1);
this.Controls.Add(this.bn);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "fUserGroupDev";
@@ -385,9 +396,8 @@
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
this.cm1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bsStaff)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -410,7 +420,6 @@
private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
private System.Windows.Forms.ToolStripButton customsBindingNavigatorSaveItem;
private System.Windows.Forms.ContextMenuStrip cm1;
private FarPoint.Win.Spread.FpSpread fpSpread1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripTextBox tbFind;
@@ -422,8 +431,17 @@
private dsMSSQLTableAdapters.StaffTableAdapter taStaff;
private DSUser dSUser;
private DSUserTableAdapters.UserGroupTableAdapter ta;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem;
private System.Windows.Forms.DataGridView dv1;
private System.Windows.Forms.DataGridViewTextBoxColumn deptDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn gcodeDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn pathkjDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn permissionDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn advpurchaseDataGridViewCheckBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn advkisulDataGridViewCheckBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn managerinfoDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn devinfoDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewCheckBoxColumn usemailDataGridViewCheckBoxColumn;
}
}

View File

@@ -25,7 +25,7 @@ namespace FCM0000
refreshData();
this.dSUser.UserGroup.TableNewRow += Customs_TableNewRow;
}
void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e)
{
//e.Row["wuid"] = FCOMMON.info.Login.no;
@@ -39,14 +39,15 @@ namespace FCM0000
try
{
this.ta.Fill(this.dSUser.UserGroup);
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize1);
}catch (Exception ex)
dv1.AutoResizeColumns();
}
catch (Exception ex)
{
FCOMMON.Util.MsgE(ex.Message);
}
}
private void customsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
this.Validate();
@@ -56,7 +57,7 @@ namespace FCM0000
{
FCOMMON.Util.MsgI("변경된 내역이 없습니다.");
}
else FCOMMON.Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.",cnt));
else FCOMMON.Util.MsgI(string.Format("{0} 건의 자료가 업데이트 되었습니다.", cnt));
}
@@ -67,10 +68,7 @@ namespace FCM0000
private void autoResizeColummsToolStripMenuItem_Click(object sender, EventArgs e)
{
this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true;
for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
this.fpSpread1.ActiveSheet.SetRowHeight(i, 25);
dv1.AutoResizeColumns();
}
private void btFind_Click(object sender, EventArgs e)
@@ -107,31 +105,15 @@ namespace FCM0000
{
if (e.KeyCode == Keys.Enter) btFind.PerformClick();
}
private void autoToolStripMenuItem_Click(object sender, EventArgs e)
{
this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true;
for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
this.fpSpread1.ActiveSheet.SetRowHeight(i, 25);
}
private void resetToolStripMenuItem_Click(object sender, EventArgs e)
{
foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns)
{
col.Width = 100;
}
}
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize1);
//FCOMMON.Util.FPColsizeSave(this.fpSpread1, fn_fpcolsize1);
}
private void loadToolStripMenuItem_Click(object sender, EventArgs e)
{
FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize1);
//FCOMMON.Util.FPColSizeLoad(ref this.fpSpread1, fn_fpcolsize1);
}
@@ -142,8 +124,8 @@ namespace FCM0000
var dr = drv.Row as DSUser.UserGroupRow;
if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) this.bs.RemoveCurrent();
var dlg =FCOMMON.Util.MsgQ("다음 자료를 삭제하시겠습니까?");
if(dlg == System.Windows.Forms.DialogResult.Yes)
var dlg = FCOMMON.Util.MsgQ("다음 자료를 삭제하시겠습니까?");
if (dlg == System.Windows.Forms.DialogResult.Yes)
{
this.bs.RemoveCurrent();
}
@@ -152,7 +134,7 @@ namespace FCM0000
//private int selcectIDX = -1;
private void bs_CurrentChanged(object sender, EventArgs e)
{
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -161,13 +143,13 @@ namespace FCM0000
if (drv == null) return;
var dr = drv.Row as DSUser.UserGroupRow;
var f = new fUserGroupPermission(dr.permission);
if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
dr.permission = f.permission;
dr.EndEdit();
}
}
}
}

View File

@@ -136,7 +136,7 @@
<data name="bindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
/5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
@@ -148,7 +148,7 @@
<data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
@@ -159,7 +159,7 @@
<data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
@@ -168,7 +168,7 @@
<data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
oAc0QjgAAAAASUVORK5CYII=
@@ -177,7 +177,7 @@
<data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
@@ -188,7 +188,7 @@
<data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
@@ -200,7 +200,7 @@
<data name="customsBindingNavigatorSaveItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
</value>
</data>
@@ -238,9 +238,6 @@
vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
</value>
</data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>551, 17</value>
</metadata>
<metadata name="bsStaff.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>222, 17</value>
</metadata>

View File

@@ -543,6 +543,16 @@ namespace FEQ0000
{
var newdro = this.dsPurchase.EETGW_PurchaseCR.NewEETGW_PurchaseCRRow();
FCOMMON.Util.CopyData(newdr, newdro);
newdro.SetpumidxNull();
newdro.SetpumnameNull();
newdro.SetpumamtNull();
newdro.SetpumpriceDNull();
newdro.SetpumpriceNull();
newdro.SetpumscaleNull();
newdro.SetpumunitNull();
newdro.SetsidNull();
newdro.idx = -1;
newdro.wdate = DateTime.Now;
newdr = newdro; //change
@@ -1058,6 +1068,16 @@ namespace FEQ0000
{
var newdro = this.dsPurchase.EETGW_PurchaseCR.NewEETGW_PurchaseCRRow();
FCOMMON.Util.CopyData(newdr, newdro);
newdro.SetpumidxNull();
newdro.SetpumnameNull();
newdro.SetpumamtNull();
newdro.SetpumpriceDNull();
newdro.SetpumpriceNull();
newdro.SetpumscaleNull();
newdro.SetpumunitNull();
newdro.SetsidNull();
newdro.idx = -1;
newdro.wdate = DateTime.Now;
newdr = newdro; //change

View File

@@ -20,7 +20,7 @@ namespace FEQ0000
public Boolean repeatAdd = false;
Boolean binit = false;
string sidchk1 = string.Empty;
string dbchk1 = string.Empty;
string namechk1 = string.Empty;
public fPurchaseCR_Add(dsPurchase.EETGW_PurchaseCRRow dr_)
{
@@ -59,6 +59,8 @@ namespace FEQ0000
//this.purchaseTableAdapter.Fill(this.dsPurchase.Purchase);
// this.Show();
// Application.DoEvents();
tbSID.Enabled = false;
tbPumModel.Enabled = false;
advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv);
tbPumName.ImeMode = ImeMode.Alpha;
@@ -321,22 +323,19 @@ namespace FEQ0000
if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
{
sidchk1 = string.Empty;
dbchk1 = string.Empty;
namechk1 = string.Empty;
//복사된 자료는 isd가 잇으면 sid가 잇다면 자동 처리해준다.
if (tbSID.Text.StartsWith("10") && tbSID.TextLength == 9)
dbchk1 = tbPumName.Text.Trim();
if (tbSID.Text.isEmpty() == false && tbSID.TextLength == 9)
namechk1 = tbPumName.Text.Trim();
}
else
{
sidchk1 = tbSID.Text.Trim();
dbchk1 = tbPumName.Text.Trim();
namechk1 = tbPumName.Text.Trim();
}
timer1.Start();
}
string sidTrim(string sid)
@@ -389,7 +388,7 @@ namespace FEQ0000
{
if (search == "" && allowAll == false)
{
dbchk1 = string.Empty;
namechk1 = string.Empty;
sidchk1 = string.Empty;
FCOMMON.Util.MsgE("품명은 필수 값 입니다");
tbPumName.Focus();
@@ -400,7 +399,7 @@ namespace FEQ0000
var f = new FCM0000.fLovItem(search);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
dbchk1 = f.itemName;
namechk1 = f.itemName;
sidchk1 = string.Empty;
//인덱스값이 다르면 모델 및 가격을 업데이트 한다.
@@ -501,7 +500,7 @@ namespace FEQ0000
tbSID.Text = sidTrim(tbSID.Text);
if (dbchk1.isEmpty())
if (namechk1.isEmpty())
{
Util.MsgE("품목 검사가 진행되지 않았습니다\n품명을 입력한 후 엔터를 누르거나 [품명] 버튼을 눌러서 검색을 수행한 후 다시 시도하세요");
tbPumName.Focus();
@@ -510,11 +509,11 @@ namespace FEQ0000
}
//시드검사한 자료와 현재 입력된 시드가 다르면 검사를 다시 하게 한다
if (this.tbPumName.Text.Trim().Equals(this.dbchk1) == false)
if (this.tbPumName.Text.Trim().Equals(this.namechk1) == false)
{
Util.MsgE("품명검사 자료가 변경되었습니다. 다시 검사 하세요");
Lov_Item("", true);
dbchk1 = string.Empty;
namechk1 = string.Empty;
return false;
}
@@ -915,6 +914,7 @@ namespace FEQ0000
private void button1_Click(object sender, EventArgs e)
{
if (!saveData()) return;
this.repeatAdd = false;
DialogResult = System.Windows.Forms.DialogResult.OK;
}

View File

@@ -367,7 +367,7 @@ namespace FEQ0000
break;
case "---":
case "----":
if (str_place.Contains("SPR") || str_pumname.ToUpper().Contains("SPR"))
if (str_place.Contains("SPR") || str_pumname.ToUpper().Contains("[SPR]"))
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Violet;
else
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Blue;
@@ -570,6 +570,15 @@ namespace FEQ0000
{
var newdro = this.dsPurchase.Purchase.NewPurchaseRow();
FCOMMON.Util.CopyData(newdr, newdro);
newdro.SetpumidxNull();
newdro.SetpumnameNull();
newdro.SetpumamtNull();
newdro.SetpumpriceDNull();
newdro.SetpumpriceNull();
newdro.SetpumscaleNull();
newdro.SetpumunitNull();
newdro.SetsidNull();
newdro.idx = -1;
newdro.wdate = DateTime.Now;
newdr = newdro; //change
@@ -889,6 +898,16 @@ namespace FEQ0000
{
var newdro = this.dsPurchase.Purchase.NewPurchaseRow();
FCOMMON.Util.CopyData(newdr, newdro);
newdro.SetpumidxNull();
newdro.SetpumnameNull();
newdro.SetpumamtNull();
newdro.SetpumpriceDNull();
newdro.SetpumpriceNull();
newdro.SetpumscaleNull();
newdro.SetpumunitNull();
newdro.SetsidNull();
newdro.idx = -1;
newdro.wdate = DateTime.Now;
newdr = newdro; //change

View File

@@ -21,7 +21,7 @@ namespace FEQ0000
public Boolean repeatAdd = false;
Boolean binit = false;
string sidchk1 = string.Empty;
string dbchk1 = string.Empty;
string namechk1 = string.Empty;
public fPurchase_Add(dsPurchase.PurchaseRow dr_)
{
@@ -31,6 +31,9 @@ namespace FEQ0000
this.bs.DataSource = dr_;
tbSID.Enabled = false; //입력못하게
tbPumModel.Enabled = false;
bsManu = new BindingSource();
bsModel = new BindingSource();
this.dr = dr_;
@@ -380,19 +383,19 @@ namespace FEQ0000
if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
{
sidchk1 = string.Empty;
dbchk1 = string.Empty;
namechk1 = string.Empty;
//복사된 자료는 isd가 잇으면 sid가 잇다면 자동 처리해준다.
if (tbSID.Text.StartsWith("10") && tbSID.TextLength == 9)
if (tbSID.Text.isEmpty()==false && tbSID.TextLength == 9)
{
//sidchk1 = tbSID.Text;
dbchk1 = tbPumName.Text.Trim();
namechk1 = tbPumName.Text.Trim();
}
}
else
{
sidchk1 = tbSID.Text.Trim();
dbchk1 = tbPumName.Text.Trim();
namechk1 = tbPumName.Text.Trim();
}
timer1.Start();
@@ -449,7 +452,7 @@ namespace FEQ0000
{
if (search == "" && allowAll == false)
{
dbchk1 = string.Empty;
namechk1 = string.Empty;
sidchk1 = string.Empty;
FCOMMON.Util.MsgE("품명은 필수 값 입니다");
tbPumName.Focus();
@@ -460,7 +463,7 @@ namespace FEQ0000
var f = new FCM0000.fLovItem(search);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
dbchk1 = f.itemName;
namechk1 = f.itemName;
sidchk1 = string.Empty;
//인덱스값이 다르면 모델 및 가격을 업데이트 한다.
@@ -562,7 +565,7 @@ namespace FEQ0000
tbSID.Text = sidTrim(tbSID.Text);
if (dbchk1.isEmpty())
if (namechk1.isEmpty())
{
Util.MsgE("품목 검사가 진행되지 않았습니다\n품명을 입력한 후 엔터를 누르거나 [품명] 버튼을 눌러서 검색을 수행한 후 다시 시도하세요");
tbPumName.Focus();
@@ -571,11 +574,11 @@ namespace FEQ0000
}
//시드검사한 자료와 현재 입력된 시드가 다르면 검사를 다시 하게 한다
if (this.tbPumName.Text.Trim().Equals(this.dbchk1.Trim()) == false)
if (this.tbPumName.Text.Trim().Equals(this.namechk1.Trim()) == false)
{
Util.MsgE("품명검사 자료가 변경되었습니다. 다시 검사 하세요");
Lov_Item("", true);
dbchk1 = string.Empty;
namechk1 = string.Empty;
return false;
}
@@ -1005,6 +1008,7 @@ namespace FEQ0000
private void button1_Click(object sender, EventArgs e)
{
if (!saveData()) return;
repeatAdd = false;
DialogResult = System.Windows.Forms.DialogResult.OK;
}

View File

@@ -628,7 +628,7 @@ namespace FPJ0000 {
string HolyReason,
string HolyBackup,
string HolyLocation,
int HolyDays,
double HolyDays,
double HolyTimes,
bool sendmail,
string stime,
@@ -761,7 +761,7 @@ namespace FPJ0000 {
base.Columns.Add(this.columnHolyBackup);
this.columnHolyLocation = new global::System.Data.DataColumn("HolyLocation", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnHolyLocation);
this.columnHolyDays = new global::System.Data.DataColumn("HolyDays", typeof(int), null, global::System.Data.MappingType.Element);
this.columnHolyDays = new global::System.Data.DataColumn("HolyDays", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnHolyDays);
this.columnHolyTimes = new global::System.Data.DataColumn("HolyTimes", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnHolyTimes);
@@ -1232,13 +1232,13 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public int HolyDays {
public double HolyDays {
get {
if (this.IsHolyDaysNull()) {
return 0;
return 0D;
}
else {
return ((int)(this[this.tableEETGW_HolydayRequest.HolyDaysColumn]));
return ((double)(this[this.tableEETGW_HolydayRequest.HolyDaysColumn]));
}
}
set {
@@ -1818,7 +1818,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyReason", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyReason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyBackup", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyBackup", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyLocation", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyLocation", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -1847,7 +1847,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyReason", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyReason", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyBackup", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyBackup", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyLocation", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "HolyLocation", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyDays", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyDays", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@HolyTimes", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "HolyTimes", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sendmail", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sendmail", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stime", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "stime", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -2015,7 +2015,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
string HolyReason,
string HolyBackup,
string HolyLocation,
global::System.Nullable<int> HolyDays,
global::System.Nullable<double> HolyDays,
global::System.Nullable<double> HolyTimes,
global::System.Nullable<bool> sendmail,
string stime,
@@ -2096,7 +2096,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
this.Adapter.InsertCommand.Parameters[12].Value = ((string)(HolyLocation));
}
if ((HolyDays.HasValue == true)) {
this.Adapter.InsertCommand.Parameters[13].Value = ((int)(HolyDays.Value));
this.Adapter.InsertCommand.Parameters[13].Value = ((double)(HolyDays.Value));
}
else {
this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value;
@@ -2171,7 +2171,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
string HolyReason,
string HolyBackup,
string HolyLocation,
global::System.Nullable<int> HolyDays,
global::System.Nullable<double> HolyDays,
global::System.Nullable<double> HolyTimes,
global::System.Nullable<bool> sendmail,
string stime,
@@ -2254,7 +2254,7 @@ ORDER BY EETGW_HolydayRequest.conf, EETGW_HolydayRequest.sdate DESC";
this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(HolyLocation));
}
if ((HolyDays.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(HolyDays.Value));
this.Adapter.UpdateCommand.Parameters[13].Value = ((double)(HolyDays.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value;

View File

@@ -39,7 +39,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
<Parameter AllowDbNull="true" AutogeneratedName="HolyReason" ColumnName="HolyReason" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyReason" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyReason" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyBackup" ColumnName="HolyBackup" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyBackup" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyBackup" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyLocation" ColumnName="HolyLocation" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyLocation" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyLocation" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Double" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyTimes" ColumnName="HolyTimes" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@HolyTimes" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyTimes" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sendmail" ColumnName="sendmail" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@sendmail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="sendmail" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="stime" ColumnName="stime" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@stime" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="stime" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -89,7 +89,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
<Parameter AllowDbNull="true" AutogeneratedName="HolyReason" ColumnName="HolyReason" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyReason" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyReason" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyBackup" ColumnName="HolyBackup" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyBackup" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyBackup" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyLocation" ColumnName="HolyLocation" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@HolyLocation" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="HolyLocation" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyDays" ColumnName="HolyDays" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="int" DbType="Double" Direction="Input" ParameterName="@HolyDays" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyDays" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="HolyTimes" ColumnName="HolyTimes" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@HolyTimes" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="HolyTimes" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="sendmail" ColumnName="sendmail" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@sendmail" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="sendmail" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="stime" ColumnName="stime" DataSourceName="EE.dbo.EETGW_HolydayRequest" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@stime" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="stime" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -144,7 +144,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
<xs:element name="EETGW_HolydayRequest" msprop:Generator_RowEvHandlerName="EETGW_HolydayRequestRowChangeEventHandler" msprop:Generator_RowDeletedName="EETGW_HolydayRequestRowDeleted" msprop:Generator_RowDeletingName="EETGW_HolydayRequestRowDeleting" msprop:Generator_RowEvArgName="EETGW_HolydayRequestRowChangeEvent" msprop:Generator_TablePropName="EETGW_HolydayRequest" msprop:Generator_RowChangedName="EETGW_HolydayRequestRowChanged" msprop:Generator_UserTableName="EETGW_HolydayRequest" msprop:Generator_RowChangingName="EETGW_HolydayRequestRowChanging" msprop:Generator_RowClassName="EETGW_HolydayRequestRow" msprop:Generator_TableClassName="EETGW_HolydayRequestDataTable" msprop:Generator_TableVarName="tableEETGW_HolydayRequest">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_UserColumnName="idx" msprop:Generator_ColumnVarNameInTable="columnidx" type="xs:int" />
<xs:element name="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_UserColumnName="gcode" msprop:Generator_ColumnVarNameInTable="columngcode">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -187,14 +187,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
<xs:element name="wuid" msprop:Generator_ColumnPropNameInTable="wuidColumn" msprop:Generator_ColumnPropNameInRow="wuid" msprop:Generator_UserColumnName="wuid" msprop:Generator_ColumnVarNameInTable="columnwuid">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
<xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
<xs:element name="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_UserColumnName="dept" msprop:Generator_ColumnVarNameInTable="columndept" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
@@ -259,7 +259,7 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="HolyDays" msprop:Generator_ColumnPropNameInTable="HolyDaysColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyDays" msprop:Generator_UserColumnName="HolyDays" msprop:Generator_ColumnVarNameInTable="columnHolyDays" type="xs:int" minOccurs="0" />
<xs:element name="HolyDays" msprop:Generator_ColumnPropNameInTable="HolyDaysColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyDays" msprop:Generator_UserColumnName="HolyDays" msprop:Generator_ColumnVarNameInTable="columnHolyDays" type="xs:double" minOccurs="0" />
<xs:element name="HolyTimes" msprop:Generator_ColumnPropNameInTable="HolyTimesColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="HolyTimes" msprop:Generator_UserColumnName="HolyTimes" msprop:Generator_ColumnVarNameInTable="columnHolyTimes" type="xs:double" minOccurs="0" />
<xs:element name="sendmail" msprop:Generator_ColumnPropNameInTable="sendmailColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sendmail" msprop:Generator_UserColumnName="sendmail" msprop:Generator_ColumnVarNameInTable="columnsendmail" type="xs:boolean" minOccurs="0" />
<xs:element name="stime" msprop:Generator_ColumnPropNameInTable="stimeColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="stime" msprop:Generator_UserColumnName="stime" msprop:Generator_ColumnVarNameInTable="columnstime" minOccurs="0">
@@ -276,14 +276,14 @@ SELECT idx, gcode, uid, cate, sdate, edate, conf, Remark, wuid, wdate FROM EETGW
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="conf_id" msprop:Generator_ColumnPropNameInRow="conf_id" msprop:Generator_ColumnPropNameInTable="conf_idColumn" msprop:Generator_ColumnVarNameInTable="columnconf_id" msprop:Generator_UserColumnName="conf_id" minOccurs="0">
<xs:element name="conf_id" msprop:Generator_ColumnPropNameInTable="conf_idColumn" msprop:Generator_ColumnPropNameInRow="conf_id" msprop:Generator_UserColumnName="conf_id" msprop:Generator_ColumnVarNameInTable="columnconf_id" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="conf_time" msprop:Generator_ColumnPropNameInRow="conf_time" msprop:Generator_ColumnPropNameInTable="conf_timeColumn" msprop:Generator_ColumnVarNameInTable="columnconf_time" msprop:Generator_UserColumnName="conf_time" type="xs:dateTime" minOccurs="0" />
<xs:element name="conf_time" msprop:Generator_ColumnPropNameInTable="conf_timeColumn" msprop:Generator_ColumnPropNameInRow="conf_time" msprop:Generator_UserColumnName="conf_time" msprop:Generator_ColumnVarNameInTable="columnconf_time" type="xs:dateTime" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

View File

@@ -28,160 +28,223 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport();
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
this.dataGridView1 = new arCtl.arDatagridView();
this.panel1 = new System.Windows.Forms.Panel();
this.button1 = new System.Windows.Forms.Button();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btRefresh = new System.Windows.Forms.Button();
this.tbSd = new System.Windows.Forms.TextBox();
this.tbEd = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// bs
//
this.bs.DataMember = "jobreport";
this.bs.DataSource = this.dsReport;
//
// dsReport
//
this.dsReport.DataSetName = "dsReport";
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// dataGridView1
//
this.dataGridView1.A_DelCurrentCell = true;
this.dataGridView1.A_EnterToTab = true;
this.dataGridView1.A_KoreanField = null;
this.dataGridView1.A_UpperField = null;
this.dataGridView1.A_ViewRownumOnHeader = true;
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 42);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1348, 657);
this.dataGridView1.TabIndex = 2;
//
// panel1
//
this.panel1.Controls.Add(this.tbEd);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.btRefresh);
this.panel1.Controls.Add(this.tbSd);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.panel1.Size = new System.Drawing.Size(1348, 42);
this.panel1.TabIndex = 3;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(1193, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 32);
this.button1.TabIndex = 8;
this.button1.Text = "내보내기";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tbProcess
//
this.tbProcess.FormattingEnabled = true;
this.tbProcess.Location = new System.Drawing.Point(344, 10);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(158, 20);
this.tbProcess.TabIndex = 7;
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(309, 15);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 6;
this.label1.Text = "공정";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(13, 15);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(45, 12);
this.linkLabel1.TabIndex = 0;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "조회 년";
//
// btRefresh
//
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.btRefresh.Location = new System.Drawing.Point(1268, 5);
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(75, 32);
this.btRefresh.TabIndex = 2;
this.btRefresh.Text = "새로고침";
this.btRefresh.UseVisualStyleBackColor = true;
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
//
// tbSd
//
this.tbSd.Location = new System.Drawing.Point(66, 10);
this.tbSd.Name = "tbSd";
this.tbSd.Size = new System.Drawing.Size(115, 21);
this.tbSd.TabIndex = 1;
this.tbSd.Text = "2020";
this.tbSd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// tbEd
//
this.tbEd.Location = new System.Drawing.Point(187, 10);
this.tbEd.Name = "tbEd";
this.tbEd.Size = new System.Drawing.Size(115, 21);
this.tbEd.TabIndex = 9;
this.tbEd.Text = "2020";
this.tbEd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// rJobReportOT
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1348, 699);
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);
this.components = new System.ComponentModel.Container();
this.dataGridView1 = new arCtl.arDatagridView();
this.panel1 = new System.Windows.Forms.Panel();
this.radTypePMS = new System.Windows.Forms.RadioButton();
this.radType = new System.Windows.Forms.RadioButton();
this.tbEd = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btRefresh = new System.Windows.Forms.Button();
this.tbSd = new System.Windows.Forms.TextBox();
this.radTypeAll = new System.Windows.Forms.RadioButton();
this.label2 = new System.Windows.Forms.Label();
this.cmbApploval = new System.Windows.Forms.ComboBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsReport = new FPJ0000.dsReport();
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.SuspendLayout();
//
// dataGridView1
//
this.dataGridView1.A_DelCurrentCell = true;
this.dataGridView1.A_EnterToTab = true;
this.dataGridView1.A_KoreanField = null;
this.dataGridView1.A_UpperField = null;
this.dataGridView1.A_ViewRownumOnHeader = true;
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 36);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1028, 663);
this.dataGridView1.TabIndex = 2;
//
// panel1
//
this.panel1.Controls.Add(this.cmbApploval);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.radTypeAll);
this.panel1.Controls.Add(this.radTypePMS);
this.panel1.Controls.Add(this.radType);
this.panel1.Controls.Add(this.tbEd);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.btRefresh);
this.panel1.Controls.Add(this.tbSd);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.panel1.Size = new System.Drawing.Size(1028, 36);
this.panel1.TabIndex = 3;
//
// radTypePMS
//
this.radTypePMS.AutoSize = true;
this.radTypePMS.Location = new System.Drawing.Point(693, 11);
this.radTypePMS.Name = "radTypePMS";
this.radTypePMS.Size = new System.Drawing.Size(50, 16);
this.radTypePMS.TabIndex = 11;
this.radTypePMS.Text = "PMS";
this.radTypePMS.UseVisualStyleBackColor = true;
//
// radType
//
this.radType.AutoSize = true;
this.radType.Checked = true;
this.radType.Location = new System.Drawing.Point(637, 11);
this.radType.Name = "radType";
this.radType.Size = new System.Drawing.Size(47, 16);
this.radType.TabIndex = 10;
this.radType.TabStop = true;
this.radType.Text = "대체";
this.radType.UseVisualStyleBackColor = true;
//
// tbEd
//
this.tbEd.Location = new System.Drawing.Point(187, 9);
this.tbEd.Name = "tbEd";
this.tbEd.Size = new System.Drawing.Size(115, 21);
this.tbEd.TabIndex = 9;
this.tbEd.Text = "2020";
this.tbEd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(873, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 26);
this.button1.TabIndex = 8;
this.button1.Text = "내보내기";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// tbProcess
//
this.tbProcess.FormattingEnabled = true;
this.tbProcess.Location = new System.Drawing.Point(344, 9);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(158, 20);
this.tbProcess.TabIndex = 7;
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(309, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 6;
this.label1.Text = "공정";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(13, 13);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(45, 12);
this.linkLabel1.TabIndex = 0;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "조회 년";
//
// btRefresh
//
this.btRefresh.Dock = System.Windows.Forms.DockStyle.Right;
this.btRefresh.Location = new System.Drawing.Point(948, 5);
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(75, 26);
this.btRefresh.TabIndex = 2;
this.btRefresh.Text = "새로고침";
this.btRefresh.UseVisualStyleBackColor = true;
this.btRefresh.Click += new System.EventHandler(this.btRefresh_Click);
//
// tbSd
//
this.tbSd.Location = new System.Drawing.Point(66, 9);
this.tbSd.Name = "tbSd";
this.tbSd.Size = new System.Drawing.Size(115, 21);
this.tbSd.TabIndex = 1;
this.tbSd.Text = "2020";
this.tbSd.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// radTypeAll
//
this.radTypeAll.AutoSize = true;
this.radTypeAll.Location = new System.Drawing.Point(749, 11);
this.radTypeAll.Name = "radTypeAll";
this.radTypeAll.Size = new System.Drawing.Size(78, 16);
this.radTypeAll.TabIndex = 12;
this.radTypeAll.Text = "대체,PMS";
this.radTypeAll.UseVisualStyleBackColor = true;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(508, 13);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 12);
this.label2.TabIndex = 13;
this.label2.Text = "승인";
//
// cmbApploval
//
this.cmbApploval.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbApploval.FormattingEnabled = true;
this.cmbApploval.Items.AddRange(new object[] {
"승인완료",
"미승인"});
this.cmbApploval.Location = new System.Drawing.Point(543, 9);
this.cmbApploval.Name = "cmbApploval";
this.cmbApploval.Size = new System.Drawing.Size(85, 20);
this.cmbApploval.TabIndex = 14;
this.cmbApploval.SelectedIndexChanged += new System.EventHandler(this.cmbApploval_SelectedIndexChanged);
//
// bs
//
this.bs.DataMember = "jobreport";
this.bs.DataSource = this.dsReport;
//
// dsReport
//
this.dsReport.DataSetName = "dsReport";
this.dsReport.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// rJobReportOT
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1028, 699);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.panel1);
this.Name = "rJobReportOT";
this.Text = "휴일/연장근무 집계표";
this.Load += new System.EventHandler(this.rJobReport_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).EndInit();
this.ResumeLayout(false);
}
@@ -198,5 +261,10 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox tbEd;
}
private System.Windows.Forms.RadioButton radTypePMS;
private System.Windows.Forms.RadioButton radType;
private System.Windows.Forms.RadioButton radTypeAll;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox cmbApploval;
}
}

View File

@@ -10,216 +10,329 @@ using System.Windows.Forms;
namespace FPJ0000.JobReport_
{
public partial class rJobReportOT : fBase
{
public rJobReportOT()
{
InitializeComponent();
//this.WindowState = FormWindowState.Maximized;
}
public partial class rJobReportOT : fBase
{
public rJobReportOT()
{
InitializeComponent();
//this.WindowState = FormWindowState.Maximized;
}
private void rJobReport_Load(object sender, EventArgs e)
private void rJobReport_Load(object sender, EventArgs e)
{
EnsureVisibleAndUsableSize();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체");
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode);
tbProcess.Items.Add("전체");
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
tbProcess.Items.Add(dr);
//this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
//this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
this.cmbApploval.SelectedIndex = 0; //default : 승인
this.tbSd.Text = DateTime.Now.Year.ToString() + "-01";
this.tbEd.Text = DateTime.Now.Year.ToString() + "-12";
this.Show();
Application.DoEvents();
this.tbSd.Text = DateTime.Now.Year.ToString() + "-01";
this.tbEd.Text = DateTime.Now.Year.ToString() + "-12";
this.Show();
Application.DoEvents();
refrehData();
}
refrehData();
}
void refrehData()
{
////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
void refrehData()
{
////휴일데이터가 들어가 있음.
//var taH = new dsReportTableAdapters.HolidayLIstTableAdapter();
//taH.Fill(this.dsReport.HolidayLIst, tbMon.Text + "%");
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.FillByOt2(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
var isReqData = cmbApploval.SelectedIndex > 0;
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
if (isReqData)
{
this.ta.FillByOtReq(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
}
else
{
if (radType.Checked)
this.ta.FillByOt2(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
else if (radTypePMS.Checked)
this.ta.FillByOtPMS(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
else
this.ta.FillByOTAll(this.dsReport.jobReport, FCOMMON.info.Login.gcode, prcname, tbSd.Text, tbEd.Text);
}
//그리드뷰 생성
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.Rows.Clear();
this.dataGridView1.Columns.Clear();
this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
this.dataGridView1.ColumnHeadersHeight = 35;
this.dataGridView1.Columns.Add("공정", "공정");
this.dataGridView1.Columns.Add("이름", "이름");
this.dataGridView1.Columns.Add("사번", "사번");
//그리드뷰 생성
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.Rows.Clear();
this.dataGridView1.Columns.Clear();
this.dataGridView1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
this.dataGridView1.ColumnHeadersHeight = 35;
this.dataGridView1.Columns.Add("공정", "공정");
this.dataGridView1.Columns.Add("이름", "이름");
this.dataGridView1.Columns.Add("사번", "사번");
//var otTitle = radType.Checked ? "연장" : "PMS";
//이름/년도데이터추가
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) + "\n휴일");// + "\r\n(" + basehr.ToString() + ")");
if (isReqData)
{
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n요청");
}
else if (radTypeAll.Checked)
{
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n연장");
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\nPMS");
}
else if (radType.Checked)
{
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\n연장");
}
else
{
this.dataGridView1.Columns.Add(drYm.yymm, $"({basehr})\nPMS");
}
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].Tag = basehr;
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].Tag = basehr;
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 2].DefaultCellStyle.Format = "N1";
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].DefaultCellStyle.Format = "N1";
if (radTypeAll.Checked)
{
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 3].Tag = basehr;
this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 3].DefaultCellStyle.Format = "N1";
}
}
this.dataGridView1.Columns.Add("subtotal", "합계\n휴일");
if (isReqData)
{
this.dataGridView1.Columns.Add($"subtotal", $"합계\n요청");
}
else if (radTypeAll.Checked)
{
this.dataGridView1.Columns.Add($"subtotal", $"합계\n연장");
this.dataGridView1.Columns.Add($"subtotal", $"합계\nPMS");
}
else if (radType.Checked)
{
this.dataGridView1.Columns.Add($"subtotal", $"합계\n연장");
}
else
{
this.dataGridView1.Columns.Add($"subtotal", $"합계\nPMS");
}
//이름으로 정렬해서 데이터를 가져온다
var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname);
foreach (var uname in namelist)
{
var drName = uname.FirstOrDefault();
List<string> rowdata = new List<string>();
rowdata.Add(drName.UserProcess);
rowdata.Add(drName.uname);
rowdata.Add(drName.uid);
double User_sumhlOne = 0;
double User_sumotOne = 0;
double User_sumhlAll = 0;
double User_sumotAll = 0;
List<Boolean> high = new List<bool>();
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());
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == col.Name);
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);
//}
var sumhr = userDatas.Sum(t => t.hrs);
double sumotOne = 0.0;
double sumhlOne = 0.0;
double sumotAll = 0.0;
double sumhlAll = 0.0;
if (isReqData)
{
sumotOne = userDatas.Sum(t => t.ot);
sumhlOne = userDatas.Sum(t => t.holyot);
}
else if (radType.Checked)
{
sumotOne = userDatas.Sum(t => t.ot2);
sumhlOne = userDatas.Sum(t => t.holyot2);
}
else if (radTypePMS.Checked)
{
sumotOne = userDatas.Sum(t => t.otPMS);
sumhlOne = userDatas.Sum(t => t.holyotPMS);
}
else
{
sumotOne = userDatas.Sum(t => t.ot2);
sumhlOne = userDatas.Sum(t => t.holyot2);
sumotAll = userDatas.Sum(t => t.otPMS);
sumhlAll = userDatas.Sum(t => t.holyotPMS);
}
User_sumhlOne += sumhlOne;
User_sumotOne += sumotOne;
if (radTypeAll.Checked)
{
User_sumhlAll += sumhlAll;
User_sumotAll += sumotAll;
}
//이름/년도데이터추가
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) + "\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연장");
if (sumhlOne == 0.0) rowdata.Add(null);
else rowdata.Add($"{Math.Round(sumhlOne, 1)}");
//이름으로 정렬해서 데이터를 가져온다
var namelist = this.dsReport.jobReport.OrderBy(t => t.UserProcess + t.uname).GroupBy(t => t.uname);
foreach (var uname in namelist)
{
var drName = uname.FirstOrDefault();
if (sumotOne == 0.0) rowdata.Add(null);
else rowdata.Add($"{Math.Round(sumotOne, 1)}");
List<string> rowdata = new List<string>();
rowdata.Add(drName.UserProcess);
rowdata.Add(drName.uname);
rowdata.Add(drName.uid);
//전체라면 합계를 추가
if (isReqData == false && radTypeAll.Checked)
{
if (sumhlAll == 0.0) rowdata.Add(null);
else rowdata.Add($"{Math.Round(sumhlAll, 1)}");
if (drName.uid.Equals("221597"))
{
}
double User_sumhl = 0;
double User_sumot = 0;
List<Boolean> high = new List<bool>();
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());
var userDatas = dsReport.jobReport.Where(t => t.uid == drName.uid && t.yymm == col.Name);
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);
//}
var sumhr = userDatas.Sum(t => t.hrs);
var sumot = userDatas.Sum(t => t.ot2);
var sumhl = userDatas.Sum(t => t.holyot2);
User_sumhl += sumhl;
User_sumot += sumot;
if (sumhl == 0.0) rowdata.Add(null);
else rowdata.Add($"{sumhl}");
if (sumot == 0.0) rowdata.Add(null);
else rowdata.Add($"{sumot}");
if (sumhr > basehr) high.Add(true);
else high.Add(false);
if (sumhr < basehr) low.Add(true);
else low.Add(false);
}
}
if (sumotAll == 0.0) rowdata.Add(null);
else rowdata.Add($"{Math.Round(sumotAll, 1)}");
}
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;
}
if (sumhr > basehr) high.Add(true);
else high.Add(false);
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;
}
}
//총계추가
if (sumhr < basehr) low.Add(true);
else low.Add(false);
}
}
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;
rowdata.Add($"{Math.Round(User_sumhlOne, 1)}"); //합게
rowdata.Add($"{Math.Round(User_sumotOne, 1)}"); //합게
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;
if (isReqData == false && radTypeAll.Checked)
{
rowdata.Add($"{Math.Round(User_sumhlAll, 1)}"); //합게
rowdata.Add($"{Math.Round(User_sumotAll, 1)}"); //합게
}
this.dataGridView1.AutoResizeColumns();
}
dataGridView1.Rows.Add(rowdata.ToArray());
private void btRefresh_Click(object sender, EventArgs e)
{
refrehData();
}
//이번에 추가한 줄의 셀 컬러를 지정한다
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("요청") || col.HeaderText.Contains("연장") || col.HeaderText.Contains("PMS"))
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.Linen;// 155,82,93);
else
dataGridView1.Rows[currentrow].Cells[i].Style.BackColor = Color.White;
}
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
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;
}
}
private void button1_Click(object sender, EventArgs e)
{
dataGridView1.ExportData(string.Empty);
}
}
//총계추가
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);
}
private void cmbApploval_SelectedIndexChanged(object sender, EventArgs e)
{
radType.Enabled = cmbApploval.SelectedIndex == 0;
radTypeAll.Enabled = cmbApploval.SelectedIndex == 0;
radTypePMS.Enabled = cmbApploval.SelectedIndex == 0;
}
}
}

View File

@@ -1,5 +1,7 @@
using FarPoint.Win;
using FCOMMON;
using GrapeCity.Win.Spread.InputMan.CellType;
using NetOffice.Attributes;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -105,6 +107,7 @@ namespace FPJ0000.JobReport_
var taCommon = new dsJobReportTableAdapters.CommonTableAdapter();
this.fpSpread1.Sheets[0].ColumnCount = 12;
//조회공정
this.fpSpread1.Sheets[0].Cells[3, 2].Value = tbProcess.Text;
@@ -117,6 +120,14 @@ namespace FPJ0000.JobReport_
//종료일:G4
this.fpSpread1.Sheets[0].Cells[3, 6].Value = dte.Value;
this.fpSpread1.Sheets[0].Cells[5, 11].BackColor = this.fpSpread1.Sheets[0].Cells[5, 10].BackColor;
this.fpSpread1.Sheets[0].Cells[5, 11].ForeColor = this.fpSpread1.Sheets[0].Cells[5, 10].ForeColor;
this.fpSpread1.Sheets[0].Cells[5, 11].Value = "총투입\n시간(%)";
fpSpread1.Sheets[0].Columns[11].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
fpSpread1.Sheets[0].Columns[11].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
fpSpread1.Sheets[0].AddSpanCell(5, 11, 2, 1);
//근문일수,시간
var vSD = dts.Value.ToShortDateString();
var vED = dte.Value.ToShortDateString();
@@ -243,14 +254,30 @@ namespace FPJ0000.JobReport_
col = 2;
var orTypeName = baseData.Where(t => t.svalue != "휴가" && string.IsNullOrEmpty(t.svalue) == false).OrderBy(t => t.svalue).GroupBy(t => t.svalue);
this.fpSpread1.ActiveSheetIndex = 0;
var maxcol = 6;
bool useOther = false;
foreach (var item in orTypeName)
{
var dr = item.FirstOrDefault();
this.fpSpread1.Sheets[0].Cells[6, col++].Value = dr.svalue;
//col += 1;
if (col == maxcol + 1) //엑셀파일 특성상 5개가 최고이다
{
this.fpSpread1.Sheets[0].Cells[6, col - 1].Value = "[ Other ]";
useOther = true;
}
else if (col > maxcol + 1)
{
useOther = true;
}
else
{
this.fpSpread1.Sheets[0].Cells[6, col].Value = dr.svalue;
}
col++;
}
for (int i = col; i <= 6; i++)
//항목이 6개 미만일 경우 제목을 * 로 변경해준다
for (int i = col; i <= maxcol; i++)
this.fpSpread1.Sheets[0].Cells[6, i].Value = "*";
System.Globalization.CultureInfo cultureInfo = new System.Globalization.CultureInfo("ko-KR", false);
@@ -272,75 +299,85 @@ namespace FPJ0000.JobReport_
foreach (var prcitem in prclist)
{
this.progressBar2.Value += 1;
var item = baseData.Where(t => t.type == prcitem.memo); //해당 프로세스에 해당하는 아이템을 가져온다
//}
if (prcitem.memo == null) prcitem.memo = string.Empty;
if (prcitem.memo.StartsWith("ASM Feeder Center"))
Console.WriteLine("sdf");
var item = baseData.Where(t => t.type.Replace(" ", "") == prcitem.memo.Replace(" ", "")); //해당 프로세스에 해당하는 아이템을 가져온다
//foreach (var item in orProcess)
//{
var processName = prcitem.memo; // item.FirstOrDefault().process;
//프로세스 이름 확인
if (prcitem.memo == null) prcitem.memo = string.Empty;
var processName = prcitem.memo.Trim();
this.fpSpread1.Sheets[0].Cells[row, 1].Value = processName;
if (processName == "Documentation (문서작업)")
{
}
//2번부터는 데이터를 넣어야 한다
double sumOt = 0.0;
//double holytime = 0.0;
int coldata = 2;
for (int i = 2; i <= 6; i++)
var sumvalue_hrs = 0.0;
var sumvalue_ot = 0.0;
for (int i = 2; i <= (useOther ? maxcol - 1 : maxcol); i++) //외부엑셀을 쓰다보니 열갯수가 5개로 제한되어있다.
{
if (item.Any() == false)
if (item.Any() == false) //자료가없다면 0으로 채운다
{
//자료가없다면 0으로 채운다
fpSpread1.Sheets[0].Cells[row, coldata].Value = null;
fpSpread1.Sheets[0].Cells[row, i].Value = null;
}
else
{
var colData = fpSpread1.Sheets[0].Cells[6, i].Value;
var colName = string.Empty;// fpSpread1.Sheets[0].Cells[6, i].Value.ToString();
if (colData != null) colName = colData.ToString();
var colData = fpSpread1.Sheets[0].Cells[6, i].Value; //해당 열의 제목을 취함
var colName = colData?.ToString() ?? string.Empty;// string.Empty;// fpSpread1.Sheets[0].Cells[6, i].Value.ToString();
//이 이름에 해당하는 데이터의 시간을 가져온다
double ot = 0.0;
double hrs = 0.0;
if (colName != "*" && String.IsNullOrEmpty(colName) == false)
if (colName != "*" && colName.isEmpty() == false)
{
//double holytime = 0.0;
var timeList = item.Where(t => t.svalue == colName);
//해당 이름에 해당하는 데이트 취합
var timeList = item.Where(t => t.svalue.Replace(" ", "") == colName.Replace(" ", ""));
if (timeList != null)
{
hrs = (double)timeList.Sum(t => t.hrs);
ot = (double)timeList.Sum(t => t.ot);
sumOt += ot;
sumvalue_hrs += hrs;
sumvalue_ot += ot;
}
}
if (ot + hrs == 0.0) fpSpread1.Sheets[0].Cells[row, coldata].Value = null;
else fpSpread1.Sheets[0].Cells[row, coldata].Value = ot + hrs; //없음으로한다
if (ot + hrs == 0.0) fpSpread1.Sheets[0].Cells[row, i].Value = null; //값이 없는 경우는 nul 처리
else fpSpread1.Sheets[0].Cells[row, i].Value = ot + hrs;
}
coldata += 1;
}
//other 칸이 활성화되었다면 총량에서 뺴야한다 (lee jong myoung)
if (useOther)
{
var tot_hr = item.Sum(t => t.hrs);
var tot_ot = item.Sum(t => t.ot);
var othervalue = (tot_hr + tot_ot) - (sumvalue_hrs + sumvalue_ot); //total - displayvalue
if (othervalue == 0.0) fpSpread1.Sheets[0].Cells[row, maxcol].Value = null; //값이 없는 경우는 nul 처리
else fpSpread1.Sheets[0].Cells[row, maxcol].Value = othervalue;
}
fpSpread1.Sheets[0].Cells[row, 7].CellType = numberCellType1;
fpSpread1.Sheets[0].Cells[row, 7].ParseFormatString = "N1";
fpSpread1.Sheets[0].Cells[row, 8].CellType = numberCellType1;
fpSpread1.Sheets[0].Cells[row, 8].ParseFormatString = "N1";
fpSpread1.Sheets[0].Cells[row, 7].Formula = string.Format("SUM(C{0}:G{0})+K{0}+J{0}", row + 1);
fpSpread1.Sheets[0].Cells[row, 7].Formula = string.Format("SUM(C{0}:G{0})+K{0}", row + 1);
fpSpread1.Sheets[0].Cells[row, 8].Formula = string.Format("H{0}/$I$4", row + 1);
//H8 /$I$4
if (sumOt == 0.0) fpSpread1.Sheets[0].Cells[row, 9].Value = null; //OT합계
else fpSpread1.Sheets[0].Cells[row, 9].Value = sumOt; //OT합계
var tot_process_ot = item.Sum(t => t.ot);
var tot_process_hrs = item.Sum(t => t.hrs);
var tot_time = baseData.Sum(t => t.hrs) + baseData.Sum(t => t.ot);
if (tot_process_ot == 0.0) fpSpread1.Sheets[0].Cells[row, 9].Value = null; //OT합계
else fpSpread1.Sheets[0].Cells[row, 9].Value = tot_process_ot; //OT합계
var perc = ((tot_process_ot + tot_process_hrs) / tot_time) * 100.0; //총투입시간(%)
if (perc == 0.0) fpSpread1.Sheets[0].Cells[row, 11].Value = null;
else fpSpread1.Sheets[0].Cells[row, 11].Value = Math.Round(perc, 2);
this.fpSpread1.Sheets[0].Cells[row, 11].Border = this.fpSpread1.Sheets[0].Cells[row, 3].Border;
// process 의 휴가시간을 다시 계산한다.
var = baseData.Where(t => t.process == processName && t.svalue == "휴가");
var = baseData.Where(t => t.process.Replace(" ", "") == processName.Replace(" ", "") && t.svalue.Replace(" ", "") == "휴가");
if ( == null || .Count() < 1)
{
fpSpread1.Sheets[0].Cells[row, 10].Value = null;// 0.0; //휴가시간
@@ -354,11 +391,12 @@ namespace FPJ0000.JobReport_
fpSpread1.Sheets[0].Cells[row, i].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
fpSpread1.Sheets[0].Cells[row, i].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
}
row += 1;
}
var total_value = baseData.Sum(t => t.hrs) + baseData.Sum(t => t.ot);
//합계데이터
fpSpread1.Sheets[0].Cells[row, 1].Value = "합계";
fpSpread1.Sheets[0].Cells[row, 1].BackColor = Color.LightGray;
@@ -388,110 +426,6 @@ namespace FPJ0000.JobReport_
this.fpSpread1.Sheets[0].RowCount = row + 1;
// this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode);
// //this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
// //this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
// //this.reportViewer1.RefreshReport();
// //그리드뷰 생성
// this.dataGridView1.Rows.Clear();
// this.dataGridView1.Columns.Clear();
// var Process = tbProcess.Text.Trim();
// if (Process == "%" || tbProcess.SelectedIndex == 0) Process = "";
// var wekklist = new string[] { "일","월","화","수","목","금","토" };
// //날짜에 해당하는 열을 먼저 생성한다
// dataGridView1.Columns.Add("dvcu_damdang", "사원명");
//// dataGridView1.Columns.Add("dvcu_process", "공정");
// var daylist = dsReport.JobReportDay.OrderBy(t=>t.pdate).GroupBy(t => t.pdate);
// foreach (var dayitem in daylist)
// {
// var dtValue = DateTime.Parse(dayitem.Key);
// if(dtValue.DayOfWeek == DayOfWeek.Saturday || dtValue.DayOfWeek == DayOfWeek.Sunday)
// {
// var week = wekklist[(int)dtValue.DayOfWeek];
// this.dataGridView1.Columns.Add("dvcu_pdate", dayitem.Key.Substring(8, 2) + "(" + week.ToString() + ")");
// }
// else
// {
// this.dataGridView1.Columns.Add("dvcu_pdate", dayitem.Key.Substring(8, 2) );
// }
// this.dataGridView1.Columns[this.dataGridView1.Columns.Count -1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
// }
// dataGridView1.Columns.Add("dvcu_sum", "합계");
// this.dataGridView1.Columns[this.dataGridView1.Columns.Count - 1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
// foreach (var item in dsReport.JobReportDay.Where(t=>t.processs.Contains(Process)).OrderBy(t => t.uname + t.uid).GroupBy(t => t.uname))
// {
// //사용자별로 데이터를 가져온다.
// var username = item.Key;
// var userid = item.FirstOrDefault().uid;
// List<string> rowdata = new List<string>();
// rowdata.Add(username);
// // rowdata.Add(item.FirstOrDefault().processs);
// //이 사용자의 데이터를 날짜별로 정렬해서 가져온다.
// var sum = 0.0;
// var sumOT = 0.0;
// for (int i = 1; i < this.dataGridView1.Columns.Count-1; i++)
// {
// var col = this.dataGridView1.Columns[i];
// var dayStr = col.HeaderText.Substring(0, 2);
// var daydata = dsReport.JobReportDay.Where(t => t.uid == userid && t.pdate.EndsWith(dayStr)).FirstOrDefault();
// if (daydata != null)
// {
// sum += daydata.hrs;
// sumOT += daydata.ot;
// rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
// }
// else rowdata.Add("--");
// }
// rowdata.Add(sum.ToString() + "+" + sumOT.ToString());
// this.dataGridView1.Rows.Add(rowdata.ToArray());
// }
// foreach(DataGridViewRow dvrow in this.dataGridView1.Rows)
// {
// for(int i = 1;i < this.dataGridView1.ColumnCount-1;i++)
// {
// var cellvalue = "--";
// if(dvrow.Cells[i].Value != null) cellvalue= dvrow.Cells[i].Value.ToString();
// if (cellvalue == "--") dvrow.Cells[i].Style.ForeColor = Color.Gray;
// else
// {
// var datasplbu = cellvalue.Split('+');
// double hrs;
// double ot;
// if (double.TryParse(datasplbu[1], out ot) == false) ot = 0;
// if(double.TryParse(datasplbu[0],out hrs))
// {
// if (hrs > 8.0) dvrow.Cells[i].Style.ForeColor = Color.Blue;
// else if (hrs < 8.0) dvrow.Cells[i].Style.ForeColor = Color.Red;
// else
// {
// if (ot == 0)
// dvrow.Cells[i].Style.ForeColor = Color.Black;
// else
// dvrow.Cells[i].Style.ForeColor = Color.Magenta;
// }
// }
// else
// {
// FCOMMON.Util.MsgE("숫자변경실패 " + cellvalue);
// dvrow.Cells[i].Style.ForeColor = Color.Red;
// }
// }
// }
// }
// this.dataGridView1.AutoResizeColumns();
}
private void button1_Click(object sender, EventArgs e)
{

View File

@@ -77,9 +77,6 @@
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.dv1 = new arCtl.arDatagridView();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -97,6 +94,9 @@
this.Response = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.HolyBackup = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -144,7 +144,7 @@
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(1213, 25);
this.bn.Size = new System.Drawing.Size(1028, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -193,7 +193,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -236,7 +235,6 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(100, 25);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -326,7 +324,7 @@
this.sbtime});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1213, 37);
this.toolStrip1.Size = new System.Drawing.Size(1028, 37);
this.toolStrip1.TabIndex = 4;
this.toolStrip1.Text = "toolStrip1";
//
@@ -352,7 +350,6 @@
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(90, 37);
this.dtSD.Text = "1982-11-23";
@@ -376,7 +373,6 @@
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(90, 37);
this.dtED.Text = "1982-11-23";
@@ -442,7 +438,7 @@
this.richTextBox1.Location = new System.Drawing.Point(0, 0);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(1213, 74);
this.richTextBox1.Size = new System.Drawing.Size(1028, 74);
this.richTextBox1.TabIndex = 5;
this.richTextBox1.Text = "";
//
@@ -460,7 +456,7 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.richTextBox1);
this.splitContainer1.Size = new System.Drawing.Size(1213, 571);
this.splitContainer1.Size = new System.Drawing.Size(1028, 571);
this.splitContainer1.SplitterDistance = 487;
this.splitContainer1.SplitterWidth = 10;
this.splitContainer1.TabIndex = 6;
@@ -521,28 +517,10 @@
this.dv1.Name = "dv1";
this.dv1.RowTemplate.Height = 30;
this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dv1.Size = new System.Drawing.Size(1213, 487);
this.dv1.Size = new System.Drawing.Size(1028, 487);
this.dv1.TabIndex = 3;
this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError);
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26);
//
// 외출완료ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "외출완료ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.ToolStripMenuItem.Text = "외출 완료";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// uidDataGridViewTextBoxColumn
//
this.uidDataGridViewTextBoxColumn.DataPropertyName = "uid";
@@ -686,11 +664,29 @@
this.remarkDataGridViewTextBoxColumn.Name = "remarkDataGridViewTextBoxColumn";
this.remarkDataGridViewTextBoxColumn.Width = 64;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(127, 26);
//
// 외출완료ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "외출완료ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(126, 22);
this.ToolStripMenuItem.Text = "외출 완료";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// fHolyRequest
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1213, 633);
this.ClientSize = new System.Drawing.Size(1028, 633);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.bn);

View File

@@ -61,13 +61,13 @@ namespace FPJ0000.OtConfirm
this.grpAdmin = new System.Windows.Forms.GroupBox();
this.chkSendMail = new System.Windows.Forms.CheckBox();
this.cmbPreset = new System.Windows.Forms.ComboBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dSKuntae = new FPJ0000.DSKuntae();
this.rad2 = new System.Windows.Forms.RadioButton();
this.rad1 = new System.Windows.Forms.RadioButton();
this.rad0 = new System.Windows.Forms.RadioButton();
this.tbResponse = new System.Windows.Forms.RichTextBox();
this.button1 = new System.Windows.Forms.Button();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dSKuntae = new FPJ0000.DSKuntae();
this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
this.grpUser.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -264,6 +264,7 @@ namespace FPJ0000.OtConfirm
this.tbTimes.Size = new System.Drawing.Size(130, 38);
this.tbTimes.TabIndex = 3;
this.tbTimes.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbTimes.TextChanged += new System.EventHandler(this.tbTimes_TextChanged);
//
// cmbUser
//
@@ -425,6 +426,17 @@ namespace FPJ0000.OtConfirm
this.cmbPreset.TabIndex = 6;
this.cmbPreset.SelectedIndexChanged += new System.EventHandler(this.cmbPreset_SelectedIndexChanged);
//
// bs
//
this.bs.DataMember = "EETGW_HolydayRequest";
this.bs.DataSource = this.dSKuntae;
//
// dSKuntae
//
this.dSKuntae.DataSetName = "DSKuntae";
this.dSKuntae.Namespace = "http://tempuri.org/DSKuntae.xsd";
this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// rad2
//
this.rad2.AutoSize = true;
@@ -481,16 +493,6 @@ namespace FPJ0000.OtConfirm
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// bs
//
this.bs.DataMember = "EETGW_HolydayRequest";
this.bs.DataSource = this.dSKuntae;
//
// dSKuntae
//
this.dSKuntae.DataSetName = "DSKuntae";
this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// ta
//
this.ta.ClearBeforeFill = true;
@@ -507,7 +509,6 @@ namespace FPJ0000.OtConfirm
this.MinimizeBox = false;
this.Name = "fHolyRequestAdd";
this.Padding = new System.Windows.Forms.Padding(3);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "fHolyRequestAdd";
this.Load += new System.EventHandler(this.fHolyRequestAdd_Load);
this.grpUser.ResumeLayout(false);

View File

@@ -201,13 +201,13 @@ namespace FPJ0000.OtConfirm
FCOMMON.Util.MsgE("시작일~종료일 범위를 확인하세요");
return;
}
var vDay = 0;
var vDay = 0f;
var vTime = 0f;
if (tbDays.Enabled == false) tbDays.Text = string.Empty;
if (tbTimes.Enabled == false) tbTimes.Text = string.Empty;
if (double.TryParse(tbDays.Text, out double val_days)) vDay = int.Parse(tbDays.Text.Trim());
if (double.TryParse(tbDays.Text, out double val_days)) vDay = float.Parse(tbDays.Text.Trim());
if (double.TryParse(tbTimes.Text, out double val_times)) vTime = float.Parse(tbTimes.Text.Trim());
//라디오버튼에 따른 시간 값 할당
@@ -223,7 +223,7 @@ namespace FPJ0000.OtConfirm
return;
}
if (vDay < 1 && vTime < 0.1 && curLevel < 5)
if (vDay < 0.1 && vTime < 0.1 && curLevel < 5)
{
var dlg = FCOMMON.Util.MsgQ("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요\n값을 입력하지 않고 계속할까요?");
if (dlg != DialogResult.Yes) return;
@@ -577,5 +577,10 @@ namespace FPJ0000.OtConfirm
{
}
private void tbTimes_TextChanged(object sender, EventArgs e)
{
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,6 @@
using System;
using FarPoint.Win.Spread;
using FPJ0000.OtConfirm;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -411,6 +413,12 @@ namespace FPJ0000
private void toolStripButton1_Click(object sender, EventArgs e)
{
//전체승인
using(var f = new fOTConfirmValue())
{
if (f.ShowDialog() != DialogResult.OK) return;
}
var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다");
if (dlg != DialogResult.Yes) return;
@@ -446,11 +454,6 @@ namespace FPJ0000
private void toolStripButton3_Click(object sender, EventArgs e)
{
//var drv = this.bs.Current as DataRowView;
//if (drv == null) return;
//var dr = drv.Row as dsPRJ.JobReportRow;
List<dsPRJ.JobReportRow> rows = new List<dsPRJ.JobReportRow>();
List<int> rowindex = new List<int>();
foreach (DataGridViewCell cell in dv1.SelectedCells)
@@ -461,7 +464,7 @@ namespace FPJ0000
if (rowindex.Contains(cell.RowIndex) == false) rowindex.Add(cell.RowIndex);
}
//데이터를 외부 폼에 전송하여 값을 셋팅해온다
using (var f = new OtConfirm.fOTConfirmOK(rows.ToArray()))
{
if (f.ShowDialog() == DialogResult.OK)
@@ -506,5 +509,10 @@ namespace FPJ0000
dtSD.Text = sd.ToShortDateString();
dtED.Text = ed.ToShortDateString();
}
}
private void btConfAll_CheckStateChanged(object sender, EventArgs e)
{
}
}
}

View File

@@ -118,13 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value>
<value>17, 17</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
<value>188, 17</value>
</metadata>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
<value>83, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -181,20 +181,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZJZTxNRGIZ7pT/BoBdekhiFCEaNXigIWMAE
NwSCyFYKAQEJ1GAi1hSMyGJAAiRqCETjhRpwgQKWrZRCK8WIlJal7EvCUoEuM9CZ8npmWgETEr/kybk4
8z6Z750RcBP4UBl3pVijCCvR/A6Saihy0jyl3Kmlw4r76JBnav15iar8WPj7A3xo7wQ/6VEtW+hVvd7I
mm2bMFt3WbVw0DAuWpD3ZRZRJSN2Ybr8oDvqmtBC9bJ+eJTtm3ZAO8NAO8tAM81APbUF5fgmWgw2bDJA
4wiFvE8zSHyhp/6RBElbqA37FgbmWPyYY8jJoJ+XbKHbtIlvBjsRODGwyEK74ECBfBb+Dzre8eHIUr/J
W9LwbXHVDSRW3kRlax3y60vhL/WCH0FYcA6BstMoayzjV7HSDJbW7AiM7WZ4QUSx/8eOoSY0jb1GpSaH
l8RWhCDnbQwy6qIgqr6KhOoENA4uoUlvxddfG1gnPQXJemheICwXHvSRZrKa0S68GZKhSJnOS+KqQkn4
GlJeJkNlsvGrtI9RUJAe1mwOBOX3ugTcBBd201k18dCZ1KjW3sfTtmxEll5CXEU4dNN26EixXMGqCVcn
ZiIIlO0RXHgkdZzJPYqYciEGJvpQ0JUKmTwLUc8DUKf8jJ/zDHSk2L4pB3oJyxYH/B+7BT4SD7Gv5Agy
aqNxuyoY0WWXeUmWPAaS+mTyJgHg7gdmWfRzn5hgIUV6Z6pdAl/JoXlfyWHykAd8czxwvSgAaa/ioTIo
UKDIReqHeIiqIqAjAi35NzREQDucRKDcXeFiZg+9uE5jcJ7l6R5dwL2aFCSRoLg6Ctm1d3fuOOxbLBE0
7Ao425x5V/A/bNwKyXsEZ7M67R3f9dv7PbwfxjGT80Rso9UdJ0WmtE3ObNgtnf0G5+QKhcllCiY3K1YH
D9e8lWYxZBx3UhS17nmnedgdFwhOpbSmeYta2k6KFWZvcQO9Q5ILr7+IGmhPUfPa8YTmdq94eaJAIBD8
Aekrn18k0ej1AAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UohUyqioF6WpTQ3s
ZjrMvM0pmprowiBbTCNTF5qoUCFK0YsK7aJTm7dtzm24Veq85v0GXpa6yzm6s/ntOWdLDYR+8OF58Tzf
D+f5nofHTvBDZfyVEp0iolT3O0Sio8hKc8jYVU9HlGjpsGca03mxuvxY5PsDXGjvhD7pVi9b6FWTyeQ0
2zZhtu6yamGhMbxoQf6XWQhKR+z8DPlBT9Q94UWaZTasnXZAP8NAP8tAN81AM7UF5a9NtAzZsMkAjSMU
8j/NIOmFifpHEiJpoTbsWzDOOfF9jiErg15OsgXV+Ca+DdmJwAXjohP6BQcK5bMIfNDxjgtHywImb0ki
t0VVN5BUeROVrXUoqJchUOKLAAK/8ByCpadR1ljGXcVKM1hasyM4TsVwgqiSwI8dA01oGnuNSl0uJ4mr
CEPu21hk1gkgrL6KxOpENPYtoclkxdf+DayTnkKk3TQn4JfzD/pIspy60S68GZCiWJnBSeKrwkn4GlJf
pkA9buOu0j5GQUF6WLM5EFLQ4xawE1qkorNrEmAY16Bafx9P23IQLbuE+IpIGKbtMJBi2YLVE+5OzEQQ
LN0juPBI4jiTdxSx5XwYJ7Qo7EqDVJ4NwfMg1Ck/4+c8AwMpVjvlQA9h2eJA4GOP4KTYS+QvPoLM2hjc
rgpFTNllTpItj4W4PoV8SRDYfeOsE73sLyZYSJF+WRq3wF98aN5ffJgc8oJ/rheuFwch/VUC1EMKFCry
kPYhAcKqKBiIQE/eho4IaIeLCJS7V7iY1U0vrtPom3dyqEYXcK8mFckkKKoWIKf27s4ei33LSQQNuwLW
NmfeFfwPG3uFlD2Cs9md9lbNj+39Du9H/+Cwyyeu0eqJkyJT2yZnNuyWzp4+1+QKhcllCuMeVqwODrZ5
K02eev+Qi6Kode87zYOeOI93KrU13U/Y0nZCpDD7iRroHZLd+P5F2EB7C5vXjic2t/smyJN4PB7vD5/y
nxrD4VALAAAAAElFTkSuQmCC
</value>
</data>
<data name="btConf.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -227,50 +227,47 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>393, 17</value>
<value>325, 17</value>
</metadata>
<data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANQSURBVFhH7dhZTxNRHAVwPoRx3xHZlB1aNkXcwDUaExPj
F/BF1BgjglBE2VooLTsIKotK4hoRSncKrVCgPqEmoEaCUSNG2WSV4510mlAf6L1Dgi89yX2+v8zMuf/J
9XDHHXcE5OHx1xceHLOO3z9qQ8MRsg73ov5QL+oSe1Cb0IN7B7tx90A37uwna58VNXutqI7vwu09XaiK
60Tl7k5U7HqF8liyYiwoi7agNMqCkkgzisVmFIk6oIwgK7wdirB2FIaaxgtCjEn89q6zzDjIQ0zICzaN
8du7znLjCoJNyA9qA7+96/wPnCyQBbgEXFmMGcpIA/JFahSK9CgSd1DhZAFGeuBSnpwiSgfb44+YmZxD
d+MHyMK0VDjpTgagUBz35Nor32FhihN0VLi8HQZ6oBBccZQJjy5ZMf9nnqcBP4cmII1QUeFy/RmArLjS
6A5UnTJiamyGpwGz03OoOdsGeWgbFS7HT08PZMORUsTp8P39KE+z54XEhvxQPTUu25cBSIvjjhK5WIu3
2s88y56uhgFy8GqYcFk+LEBKnEJsgKnCuRSDtmHy3bUy47K8dfRAGlxRJCnFRedSjHz5DUW8hnx3Rmbc
re0MQFe4kii+FOOzPM1eiuozbSBDXxDuppeWHrgYjhtf8gg9Bjq+8jR7nqX2QhaiE4zL3MYAXAzHzdaC
cD36252BT1N6IA3WCcbd8NTQAxfDcYNfKTKh/ITB+RVPzaHyNAEFGgThMrYyABfDOQa/PMyAxqQup5L8
IiWRxbZCGqBnxkm2qOmBrnCO2SoN0cJQ+obn2fOpdxhZgc3MuPTNLEAKnOOcyw5UoU89xPPssdT2I9Ov
hQmXvqmVHkiL4wohCzIiV6TCt4ERnmfPk+RuZPq0UuPSNjIAaXGOtnLfnDJRi8nRBT8LpDSlJwnKW0OF
u76BAciCc7Q121+D+nNmp9L8GByDxLeJCpe6XkUPZMU5CpHpq4JW2cfz7MmJbKHCpaxjAArBOQoh8XmJ
TvI3Mz0xC0tdP9I8m6hw19a20AOF4hyFkHi1INXzOcE1I8NTTYVLXsMCXAKOthD/4pJXN9MD/wfu6ioG
IMGNLzfu8som+qsP7iKHuytZTtyVFU3n+e3dcccd+nh4/AXhRz35FoyUPQAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANPSURBVFhH7dhZTxNRHAVwPoRx3yuyKWUvqyJu4BqNiYnx
C/giaowRQSiibC0Uyg6CyqKSuEaEQvdCK7tPqAmokWDUiFGgyCrHO+k0oT609w4JvvQk9/n+MjPn/ifX
wx133BGQh8dfX3hwzGy9f7QfDUfIOtyH+kN9qEvoRW18L+4d7MHdAz24s5+sfd2o2duN6rgu3N7TharY
TlTu7kTFrlcojyEr2oKyKAtKIy0oiTCjONyMIkkHlGFkhbajMKQdBcEma36QIZHf3nWWGQdFkAm5gaYJ
fnvXWW5cfqAJeQFG8Nu7zv/AycUswCXgyqLNUEbokSdpQ4FEh6LwDiqc3N9AD1zKkyuM1KL/8UfMTs2j
p/ED5CEaKpxsJwNQKI57cu2V77A4xfFaKlzuDj09UAiuONKER5e6sfBngacBP0cmIQtTUeFy/BiArLjS
qA5UnTJgemKWpwFzM/OoOWuEIthIhcv21dED2XCkFLFafH8/ztNseSHtR16wjhqX5cMApMVxR4kiXIO3
ms88y5auhiFy8KqZcJneLEBKXGG4HqYKx1IM94+S766VGZfppaUH0uCKIkgpLjqWYuzLbxTGqcl3Z2DG
3drOAHSFK4nkS2Gd42m2UlSfMYIMfUG4m54aeqAzHDe+FGE6DHV85Wm2PEvpgzxIKxiXsY0B6AzHzdb8
UB0G2x2BT5N7IQvUCsbdEKnpgc5w3OBXSkwoP6F3fMXT86g8TUBivSBc+lYGoDOcffArQvRoTOxyKMkv
UhJ5TCtk/jpmnHRLGz3QFc4+W2VBGuhL3/A8Wz71jSJT3MyMS9vMAqTA2c+5LLEKA20jPM8WS+0gMnxb
mHBpm1rpgbQ4rhDyAANyJCp8GxrjebY8SepBhncrNS51IwOQFmdvK/fNKRM0mBpf9LNASlN6kqC81FS4
6xsYgCw4e1uz/NSoP2d2KM2P4QlIfZqocCnrVfRAVpy9EBk+KmiUAzzPluyIFipc8joGoBCcvRBS75fo
JH8zM5NzsNQNIlXURIW7traFHigUZy+E1LMFKaLnBNeMdFEbFS5pDQtwCTjaQvyLS1rdTA/8H7irqxiA
BGddbtzllU30Vx/cRQ53V7KcuCsrms7z27vjjjv08fD4CwlIPe+HvHrCAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq8UWVrAolAQ3AW3xGji
g+++uCVGBUW2UqCApYCgiAuColExUcRuQ6dFSmkBnySQIJAokoiRREpkUY4zzjRKTNp7xwRfepL7fH+Z
O2e+mwkKJJBAJOThwTdn6g+4PQ/2d+H+Pm6ldKIuuRO1eztwb08Hana7cXeXG3d2cmuHC7e3u3BrWzuq
k9pxM9GJqq1O3Ehow/V4bqkcqIxzoCLWgWtbWlG+uRVlMa9RquTWphboo1tQEmX3XI1kT4vb+88c46CL
tEOrsI+J2/vPXOOuKuwoltsgbu8//wNXFEEDJMTdTHKiIsEGvcqMchWLyniHZFxROEsOJH1y5fEsup4M
YOrbd7xpGERpHCMZVxhGASQ+1kMs/kxLVQ/0m62ScNpQKzmQ9J0rS2QwOjQu8oCZHzN4fNYFfYyNGlew
kQJIWogKVStqjrf8OmJvJj3TqDrCQq+0U+HyQ5rJgSQ4b1vLYm14nt4l8oR8HhyDLsGEkmg7MS5PRgEk
xXkLoVM2w1X/TuQJ6WWHoY00EuM0wTRACpy3EEUxRgy4RkSeEGtFNwrkFiKcZgNDDqTF8YXQK7l3LdGE
0Q9/lGYGeHTGifxwi19c7noKIC3O21ZdlA3Vx1hMT/wuzcTYFMpSLNCGNfvEqddZyIFScN62FioYPEvr
EHlCem3DUIcYfOJy1lIApeL4QmjlDBpSZwN7rB85oNEnLnuNmRwoFVckZ3HjqPWvI9bvNSMvhPGJy1pN
AZSCK1bYUKgy4Mt7j0gTSlJ/sg1qmdEvLnOViRxIi+O/cxp5E/pdn0SaEKb0LXJkBiJcxkoaICUuL9yE
tro+kSWkmxlCdshLYlzGCiM5kAZXEGHB0wtukSVkpP8rNNFN0MgYYtyV5RRAUlxhhBWVh62zLgsT3GWh
NNlMjUtfRgEkwfHjK0/xanYpuOtW7YlWqINN1LjLSw3kQBIcP1t1SSaRJoQvRXawQRLu0hIKIAmOn625
Gw1of9CHyfFpOO/3IUv2UjIubfErciAJjh/8BaHNvyZEZvCLf3pyPC51EQ2QAOdv8NPiUhc2kQP/B+7i
Agogh/PMNe7c/EbyXx/8jxz+X8lc4s7Pazwlbh9IIIGQJyjoJ38CPp5C2VW3AAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
/dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
CiBpIWzqIK7vCgwfcSzfo4Oo3s7CnOWnwp1ReMiBJLhYW61LfHh0vFXkCfn8phemPCcqMv3EOK2cAkiK
ixXClOVBpPaVyBPSwX6EPt1BjNPIaIAUuFghjNkOdEW6RZ4Qr60dOqWbCKeZx5ADaXF8IcxZ3LuW70TP
uz9KMwTcLQzjTKo7Ia5sLgWQFhdrqynDh0s7WQz2/y5Nf+8ArBvc0C/0xMWVznGTA6XgYm01qBg8PNIi
8oR0+D6iVGGPizs9mwIoFccXQq9kUFc0EvjS+4EDOuLiSma5yIFScUYliws7vH8dsXmdC1oFExd3aiYF
UAquXOWDQW3Hl7dRkSaUpHZPI0rljoS4kzOc5EBaHP+d0ygb8DrySaQJYSwvcFpuJ8IVT6cBUuK0qU40
3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -313,22 +310,16 @@
<metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="WeekName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="otPMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>186, 17</value>
<value>252, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>499, 17</value>
<value>431, 17</value>
</metadata>
</root>

View File

@@ -30,7 +30,7 @@ namespace FPJ0000.OtConfirm
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -40,11 +40,16 @@ namespace FPJ0000.OtConfirm
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
this.button1 = new System.Windows.Forms.Button();
this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter();
this.dsMSSQL = new FPJ0000.dsPRJ();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dv1 = new arCtl.arDatagridView();
this.label1 = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.label2 = new System.Windows.Forms.Label();
this.btInputAll = new System.Windows.Forms.Button();
this.wwDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.WeekName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -56,14 +61,12 @@ namespace FPJ0000.OtConfirm
this.svalueDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ot2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otPMS = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otReasonDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.projectNameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.label1 = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit();
@@ -87,6 +90,7 @@ namespace FPJ0000.OtConfirm
// dsMSSQL
//
this.dsMSSQL.DataSetName = "dsMSSQL";
this.dsMSSQL.Namespace = "http://tempuri.org/dsPRJ.xsd";
this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// bs
@@ -122,21 +126,22 @@ namespace FPJ0000.OtConfirm
this.svalueDataGridViewTextBoxColumn,
this.otDataGridViewTextBoxColumn,
this.ot2DataGridViewTextBoxColumn,
this.otPMS,
this.otReasonDataGridViewTextBoxColumn,
this.otStartDataGridViewTextBoxColumn,
this.otEnd,
this.projectNameDataGridViewTextBoxColumn,
this.descriptionDataGridViewTextBoxColumn});
this.dv1.DataSource = this.bs;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(5);
dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dv1.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(5);
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dv1.DefaultCellStyle = dataGridViewCellStyle11;
this.dv1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv1.Location = new System.Drawing.Point(3, 41);
this.dv1.Name = "dv1";
@@ -144,6 +149,53 @@ namespace FPJ0000.OtConfirm
this.dv1.Size = new System.Drawing.Size(1505, 419);
this.dv1.TabIndex = 4;
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Top;
this.label1.Location = new System.Drawing.Point(3, 3);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1505, 38);
this.label1.TabIndex = 5;
this.label1.Text = "승인시간 및 사유를 입력하세요.";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.WhiteSmoke;
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.richTextBox1.Location = new System.Drawing.Point(3, 495);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(1505, 100);
this.richTextBox1.TabIndex = 6;
this.richTextBox1.Text = "";
//
// label2
//
this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(3, 460);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1505, 35);
this.label2.TabIndex = 7;
this.label2.Text = "담당자 비고";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// btInputAll
//
this.btInputAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btInputAll.Location = new System.Drawing.Point(1362, 3);
this.btInputAll.Name = "btInputAll";
this.btInputAll.Size = new System.Drawing.Size(146, 35);
this.btInputAll.TabIndex = 8;
this.btInputAll.Text = "값 일괄 입력";
this.btInputAll.UseVisualStyleBackColor = true;
this.btInputAll.Click += new System.EventHandler(this.btInputAll_Click);
//
// wwDataGridViewTextBoxColumn
//
this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww";
@@ -245,15 +297,26 @@ namespace FPJ0000.OtConfirm
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle6.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
this.ot2DataGridViewTextBoxColumn.HeaderText = "승인";
this.ot2DataGridViewTextBoxColumn.HeaderText = "승인(대체)";
this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn";
this.ot2DataGridViewTextBoxColumn.Width = 75;
this.ot2DataGridViewTextBoxColumn.Width = 119;
//
// otPMS
//
this.otPMS.DataPropertyName = "otPMS";
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle7.Format = "N1";
this.otPMS.DefaultCellStyle = dataGridViewCellStyle7;
this.otPMS.HeaderText = "승인(PMS)";
this.otPMS.Name = "otPMS";
this.otPMS.Width = 120;
//
// otReasonDataGridViewTextBoxColumn
//
this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason";
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8;
this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유";
this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn";
this.otReasonDataGridViewTextBoxColumn.Width = 75;
@@ -261,28 +324,28 @@ namespace FPJ0000.OtConfirm
// otStartDataGridViewTextBoxColumn
//
this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart";
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle8.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle9.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9;
this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
this.otStartDataGridViewTextBoxColumn.Visible = false;
this.otStartDataGridViewTextBoxColumn.Width = 65;
this.otStartDataGridViewTextBoxColumn.Width = 75;
//
// otEnd
//
this.otEnd.DataPropertyName = "otEnd";
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle9.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle10.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle10;
this.otEnd.HeaderText = "종료";
this.otEnd.Name = "otEnd";
this.otEnd.ReadOnly = true;
this.otEnd.Visible = false;
this.otEnd.Width = 65;
this.otEnd.Width = 75;
//
// projectNameDataGridViewTextBoxColumn
//
@@ -300,46 +363,11 @@ namespace FPJ0000.OtConfirm
this.descriptionDataGridViewTextBoxColumn.Name = "descriptionDataGridViewTextBoxColumn";
this.descriptionDataGridViewTextBoxColumn.ReadOnly = true;
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Top;
this.label1.Location = new System.Drawing.Point(3, 3);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1505, 38);
this.label1.TabIndex = 5;
this.label1.Text = "승인시간 및 사유를 입력하세요.";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.WhiteSmoke;
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "description", true));
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.richTextBox1.Location = new System.Drawing.Point(3, 495);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(1505, 100);
this.richTextBox1.TabIndex = 6;
this.richTextBox1.Text = "";
//
// label2
//
this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(3, 460);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1505, 35);
this.label2.TabIndex = 7;
this.label2.Text = "담당자 비고";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// fOTConfirmOK
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1511, 648);
this.Controls.Add(this.btInputAll);
this.Controls.Add(this.dv1);
this.Controls.Add(this.label2);
this.Controls.Add(this.richTextBox1);
@@ -350,7 +378,6 @@ namespace FPJ0000.OtConfirm
this.MinimizeBox = false;
this.Name = "fOTConfirmOK";
this.Padding = new System.Windows.Forms.Padding(3);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "OT 승인/취소 작업";
this.Load += new System.EventHandler(this.fHolyRequestAdd_Load);
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
@@ -366,6 +393,10 @@ namespace FPJ0000.OtConfirm
private dsPRJ dsMSSQL;
private System.Windows.Forms.BindingSource bs;
private arCtl.arDatagridView dv1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button btInputAll;
private System.Windows.Forms.DataGridViewTextBoxColumn wwDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn pdateDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn WeekName;
@@ -377,13 +408,11 @@ namespace FPJ0000.OtConfirm
private System.Windows.Forms.DataGridViewTextBoxColumn svalueDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn otDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn ot2DataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn otPMS;
private System.Windows.Forms.DataGridViewTextBoxColumn otReasonDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn otEnd;
private System.Windows.Forms.DataGridViewTextBoxColumn projectNameDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.Label label2;
}
}

View File

@@ -13,14 +13,14 @@ namespace FPJ0000.OtConfirm
{
public partial class fOTConfirmOK : fBase
{
dsPRJ.JobReportRow[] dr;
dsPRJ.JobReportRow[] drows;
//Boolean binit = false;
public fOTConfirmOK(dsPRJ.JobReportRow[] dr_)
{
InitializeComponent();
dr = dr_;
this.bs.DataSource = dr_;
drows = dr_;
this.bs.DataSource = drows;
//this.dv1.DataSource = dr_;
}
@@ -36,14 +36,14 @@ namespace FPJ0000.OtConfirm
private void button1_Click(object sender, EventArgs e)
{
//초과시간이 입력된 데이터만 확인한다.
var cnt = dr.Where(t => t.RowState == DataRowState.Modified).Count();
var cnt = drows.Where(t => t.RowState == DataRowState.Modified).Count();
var dlg = FCOMMON.Util.MsgQ($"{cnt}건의 자료를 저장할까요?\n" +
"승인시간이 입력된 자료는 근태현황에 자동 입력됩니다\n" +
"승인시간이 0으로 초기화된 자료는 근태현황이 자동 삭제됩니다");
if (dlg != DialogResult.Yes) return;
this.Validate();
foreach (var row in this.dr)
foreach (var row in this.drows)
{
row.otwuid = FCOMMON.info.Login.no; //220501
row.ottime = DateTime.Now;
@@ -53,6 +53,43 @@ namespace FPJ0000.OtConfirm
DialogResult = DialogResult.OK;
}
private void btInputAll_Click(object sender, EventArgs e)
{
using (var f = new fOTConfirmValue())
{
if (f.ShowDialog() != DialogResult.OK) return;
foreach (var dr in drows)
{
if (f.radAll.Checked)
{
dr.ot2 = dr.ot;
dr.otPMS = 0;
}
else if (f.radAllPMS.Checked)
{
dr.ot2 = 0;
dr.otPMS = dr.ot;
}
else if (f.radInput.Checked)
{
var ot = (float)f.nudValue.Value;
var otPMS = (float)f.nudValuePMS.Value;
var multi = f.checkBox1.Checked;
var multiPMS = f.checkBox2.Checked;
if (multi) dr.ot2 = Math.Round( dr.ot * ot,1); //입력값 배수 ㅊㅓ리
else dr.ot2 = ot;
if (multiPMS) dr.otPMS = Math.Round( dr.ot * otPMS,1); //입력값 배수 ㅊㅓ리
else dr.otPMS = otPMS;
}
dr.otReason = f.tbRemark.Text.Trim();
dr.EndEdit();
}
this.bs.DataSource = drows;
this.Invalidate();
this.dv1.Refresh();
}
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -132,6 +132,9 @@
<metadata name="FreeDay.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otPMS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>

View File

@@ -29,33 +29,73 @@ namespace FPJ0000.OtConfirm
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.Label label1;
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label3;
this.radAll = new System.Windows.Forms.RadioButton();
this.radInput = new System.Windows.Forms.RadioButton();
this.tbRemark = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.nudValue = new System.Windows.Forms.NumericUpDown();
this.btOK = new System.Windows.Forms.Button();
this.nudValuePMS = new System.Windows.Forms.NumericUpDown();
this.radAllPMS = new System.Windows.Forms.RadioButton();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.checkBox2 = new System.Windows.Forms.CheckBox();
label1 = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.nudValue)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.nudValuePMS)).BeginInit();
this.SuspendLayout();
//
// label1
//
label1.AutoSize = true;
label1.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
label1.Location = new System.Drawing.Point(21, 143);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(44, 18);
label1.TabIndex = 2;
label1.Text = "비고";
//
// label2
//
label2.AutoSize = true;
label2.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
label2.Location = new System.Drawing.Point(163, 103);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(44, 18);
label2.TabIndex = 7;
label2.Text = "대체";
//
// label3
//
label3.AutoSize = true;
label3.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
label3.Location = new System.Drawing.Point(321, 103);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(45, 18);
label3.TabIndex = 7;
label3.Text = "PMS";
//
// radAll
//
this.radAll.AutoSize = true;
this.radAll.Checked = true;
this.radAll.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.radAll.Location = new System.Drawing.Point(21, 21);
this.radAll.Location = new System.Drawing.Point(20, 21);
this.radAll.Name = "radAll";
this.radAll.Size = new System.Drawing.Size(164, 22);
this.radAll.Size = new System.Drawing.Size(212, 22);
this.radAll.TabIndex = 0;
this.radAll.TabStop = true;
this.radAll.Text = "입력값 전체 승인";
this.radAll.Text = "입력값 전체 승인(대체)";
this.radAll.UseVisualStyleBackColor = true;
//
// radInput
//
this.radInput.AutoSize = true;
this.radInput.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.radInput.Location = new System.Drawing.Point(21, 58);
this.radInput.Location = new System.Drawing.Point(20, 101);
this.radInput.Name = "radInput";
this.radInput.Size = new System.Drawing.Size(128, 22);
this.radInput.TabIndex = 0;
@@ -66,68 +106,117 @@ namespace FPJ0000.OtConfirm
// tbRemark
//
this.tbRemark.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.tbRemark.Location = new System.Drawing.Point(22, 96);
this.tbRemark.Location = new System.Drawing.Point(20, 176);
this.tbRemark.Name = "tbRemark";
this.tbRemark.Size = new System.Drawing.Size(498, 27);
this.tbRemark.TabIndex = 1;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(474, 72);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(44, 18);
this.label1.TabIndex = 2;
this.label1.Text = "비고";
//
// nudValue
//
this.nudValue.DecimalPlaces = 1;
this.nudValue.Enabled = false;
this.nudValue.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.nudValue.Location = new System.Drawing.Point(155, 54);
this.nudValue.Location = new System.Drawing.Point(213, 97);
this.nudValue.Name = "nudValue";
this.nudValue.Size = new System.Drawing.Size(140, 30);
this.nudValue.Size = new System.Drawing.Size(95, 30);
this.nudValue.TabIndex = 3;
this.nudValue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// btOK
//
this.btOK.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btOK.Location = new System.Drawing.Point(21, 139);
this.btOK.Location = new System.Drawing.Point(19, 219);
this.btOK.Name = "btOK";
this.btOK.Size = new System.Drawing.Size(499, 49);
this.btOK.Size = new System.Drawing.Size(499, 61);
this.btOK.TabIndex = 4;
this.btOK.Text = "확인";
this.btOK.UseVisualStyleBackColor = true;
this.btOK.Click += new System.EventHandler(this.btOK_Click);
//
// nudValuePMS
//
this.nudValuePMS.DecimalPlaces = 1;
this.nudValuePMS.Enabled = false;
this.nudValuePMS.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.nudValuePMS.Location = new System.Drawing.Point(372, 97);
this.nudValuePMS.Name = "nudValuePMS";
this.nudValuePMS.Size = new System.Drawing.Size(95, 30);
this.nudValuePMS.TabIndex = 5;
this.nudValuePMS.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// radAllPMS
//
this.radAllPMS.AutoSize = true;
this.radAllPMS.Font = new System.Drawing.Font("굴림", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.radAllPMS.Location = new System.Drawing.Point(20, 59);
this.radAllPMS.Name = "radAllPMS";
this.radAllPMS.Size = new System.Drawing.Size(213, 22);
this.radAllPMS.TabIndex = 6;
this.radAllPMS.Text = "입력값 전체 승인(PMS)";
this.radAllPMS.UseVisualStyleBackColor = true;
//
// checkBox1
//
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(213, 133);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(72, 16);
this.checkBox1.TabIndex = 8;
this.checkBox1.Text = "배수입력";
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// checkBox2
//
this.checkBox2.AutoSize = true;
this.checkBox2.Location = new System.Drawing.Point(372, 133);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(72, 16);
this.checkBox2.TabIndex = 9;
this.checkBox2.Text = "배수입력";
this.checkBox2.UseVisualStyleBackColor = true;
this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
//
// fOTConfirmValue
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(540, 201);
this.ClientSize = new System.Drawing.Size(540, 293);
this.Controls.Add(this.checkBox2);
this.Controls.Add(this.checkBox1);
this.Controls.Add(label3);
this.Controls.Add(label2);
this.Controls.Add(this.radAllPMS);
this.Controls.Add(this.nudValuePMS);
this.Controls.Add(this.btOK);
this.Controls.Add(this.nudValue);
this.Controls.Add(this.label1);
this.Controls.Add(label1);
this.Controls.Add(this.tbRemark);
this.Controls.Add(this.radInput);
this.Controls.Add(this.radAll);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fOTConfirmValue";
this.Text = "fOTConfirmValue";
this.Load += new System.EventHandler(this.fOTConfirmValue_Load);
((System.ComponentModel.ISupportInitialize)(this.nudValue)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.nudValuePMS)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.RadioButton radAll;
private System.Windows.Forms.RadioButton radInput;
private System.Windows.Forms.TextBox tbRemark;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown nudValue;
private System.Windows.Forms.Button btOK;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
public System.Windows.Forms.NumericUpDown nudValuePMS;
public System.Windows.Forms.RadioButton radAllPMS;
public System.Windows.Forms.RadioButton radAll;
public System.Windows.Forms.RadioButton radInput;
public System.Windows.Forms.TextBox tbRemark;
public System.Windows.Forms.NumericUpDown nudValue;
public System.Windows.Forms.CheckBox checkBox1;
public System.Windows.Forms.CheckBox checkBox2;
}
}

View File

@@ -1,4 +1,5 @@
using FCOMMON;
using AR;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -25,12 +26,66 @@ namespace FPJ0000.OtConfirm
private void btOK_Click(object sender, EventArgs e)
{
if (radInput.Checked)
{
if (checkBox1.Checked)
{
var mv = (float)nudValue.Value;
if (mv == 0)
{
nudValue.Focus();
UTIL.MsgE("배수입력 상태입니다 0은 허용되지 않습니다");
return;
}
}
if (checkBox2.Checked)
{
var mv = (float)nudValuePMS.Value;
if (mv == 0)
{
nudValuePMS.Focus();
UTIL.MsgE("배수입력 상태입니다 0은 허용되지 않습니다");
return;
}
}
}
this.DialogResult = DialogResult.OK;
}
private void radInput_CheckedChanged(object sender, EventArgs e)
{
nudValue.Enabled = radInput.Checked;
nudValuePMS.Enabled = nudValue.Enabled;
}
bool warnmulti = false;
private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
if (checkBox1.Checked)
{
if (warnmulti == false)
{
AR.UTIL.MsgI("요청시간에 입려한 값이 곱셈 처리 됩니다\n1.5를 입력하면 요청값*1.5가 됩니다");
warnmulti = true;
}
}
}
private void checkBox2_CheckedChanged(object sender, EventArgs e)
{
if (checkBox2.Checked)
{
if (warnmulti == false)
{
AR.UTIL.MsgI("요청시간에 입려한 값이 곱셈 처리 됩니다\n1.5를 입력하면 요청값*1.5가 됩니다");
warnmulti = true;
}
}
}
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -117,4 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>

View File

@@ -58,9 +58,10 @@
System.Windows.Forms.Label label18;
System.Windows.Forms.Label label19;
System.Windows.Forms.Label label20;
System.Windows.Forms.Label label7;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.tbIdx = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsPRJ = new FPJ0000.dsPRJ();
@@ -114,6 +115,7 @@
this.cmbReqTeam = new System.Windows.Forms.ComboBox();
this.arLabel1 = new arCtl.arLabel();
this.panel1 = new System.Windows.Forms.Panel();
this.textBox7 = new System.Windows.Forms.TextBox();
this.chkMajor = new System.Windows.Forms.CheckBox();
this.textBox13 = new System.Windows.Forms.TextBox();
this.tbPno = new System.Windows.Forms.TextBox();
@@ -224,6 +226,7 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton9 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton10 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton11 = new System.Windows.Forms.ToolStripButton();
this.panel11 = new System.Windows.Forms.Panel();
this.nudCRAmount = new System.Windows.Forms.NumericUpDown();
this.arLabel14 = new arCtl.arLabel();
@@ -235,7 +238,6 @@
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter();
this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter();
this.toolStripButton11 = new System.Windows.Forms.ToolStripButton();
nameLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
usermainLabel = new System.Windows.Forms.Label();
@@ -265,6 +267,7 @@
label18 = new System.Windows.Forms.Label();
label19 = new System.Windows.Forms.Label();
label20 = new System.Windows.Forms.Label();
label7 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -597,6 +600,16 @@
label20.TabIndex = 94;
label20.Text = "\\";
//
// label7
//
label7.AutoSize = true;
label7.Location = new System.Drawing.Point(455, 102);
label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label7.Name = "label7";
label7.Size = new System.Drawing.Size(44, 12);
label7.TabIndex = 104;
label7.Text = "Priority";
//
// tbIdx
//
this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true));
@@ -616,7 +629,6 @@
// dsPRJ
//
this.dsPRJ.DataSetName = "dsPRJ";
this.dsPRJ.Namespace = "http://tempuri.org/dsPRJ.xsd";
this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// nameTextBox
@@ -730,7 +742,7 @@
this.remark_reqTextBox.Multiline = true;
this.remark_reqTextBox.Name = "remark_reqTextBox";
this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.remark_reqTextBox.Size = new System.Drawing.Size(562, 230);
this.remark_reqTextBox.Size = new System.Drawing.Size(352, 230);
this.remark_reqTextBox.TabIndex = 49;
//
// tbDDate
@@ -780,7 +792,7 @@
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(1238, 25);
this.bn.Size = new System.Drawing.Size(1028, 25);
this.bn.TabIndex = 65;
this.bn.Text = "bindingNavigator1";
//
@@ -942,7 +954,7 @@
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(548, 309);
this.dataGridView1.Size = new System.Drawing.Size(338, 309);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView1_DataError);
this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick);
@@ -968,8 +980,8 @@
//
this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dataGridViewTextBoxColumn10.DataPropertyName = "remark";
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn10.HeaderText = "비고";
this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
this.dataGridViewTextBoxColumn10.ReadOnly = true;
@@ -1134,6 +1146,7 @@
this.arLabel1.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel1.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel1.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel1.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel1.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -1171,6 +1184,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Gainsboro;
this.panel1.Controls.Add(label7);
this.panel1.Controls.Add(this.textBox7);
this.panel1.Controls.Add(this.chkMajor);
this.panel1.Controls.Add(label18);
this.panel1.Controls.Add(this.textBox13);
@@ -1204,6 +1219,15 @@
this.panel1.TabIndex = 86;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
// textBox7
//
this.textBox7.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Priority", true));
this.textBox7.Location = new System.Drawing.Point(506, 98);
this.textBox7.Name = "textBox7";
this.textBox7.Size = new System.Drawing.Size(127, 21);
this.textBox7.TabIndex = 105;
this.textBox7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// chkMajor
//
this.chkMajor.AutoSize = true;
@@ -1329,6 +1353,7 @@
this.arLabel2.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel2.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel2.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel2.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel2.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -1428,7 +1453,6 @@
// dSComm
//
this.dSComm.DataSetName = "DSComm";
this.dSComm.Namespace = "http://tempuri.org/DSComm.xsd";
this.dSComm.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
//
// cmbEpanel
@@ -1519,6 +1543,7 @@
this.arLabel3.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel3.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel3.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel3.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel3.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -1713,6 +1738,7 @@
this.arLabel4.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel4.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel4.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel4.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel4.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel4.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -1794,6 +1820,7 @@
this.arLabel5.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel5.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel5.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel5.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel5.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel5.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -1837,6 +1864,7 @@
this.arLabel6.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel6.BorderSize = new System.Windows.Forms.Padding(0, 0, 0, 1);
this.arLabel6.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel6.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel6.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel6.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -1864,7 +1892,7 @@
this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel6.SignColor = System.Drawing.Color.Yellow;
this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel6.Size = new System.Drawing.Size(562, 23);
this.arLabel6.Size = new System.Drawing.Size(352, 23);
this.arLabel6.TabIndex = 86;
this.arLabel6.Text = "개선 방향";
this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1897,7 +1925,7 @@
this.arPanel1.ProgressValue = 0F;
this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel1.ShowBorder = true;
this.arPanel1.Size = new System.Drawing.Size(564, 255);
this.arPanel1.Size = new System.Drawing.Size(354, 255);
this.arPanel1.TabIndex = 88;
this.arPanel1.Text = "arPanel1";
this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1928,7 +1956,7 @@
this.arPanel2.ProgressValue = 0F;
this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel2.ShowBorder = true;
this.arPanel2.Size = new System.Drawing.Size(550, 336);
this.arPanel2.Size = new System.Drawing.Size(340, 336);
this.arPanel2.TabIndex = 89;
this.arPanel2.Text = "arPanel2";
this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1962,7 +1990,7 @@
this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1;
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1;
this.bindingNavigator1.Size = new System.Drawing.Size(548, 25);
this.bindingNavigator1.Size = new System.Drawing.Size(338, 25);
this.bindingNavigator1.TabIndex = 87;
this.bindingNavigator1.Text = "bindingNavigator1";
//
@@ -2056,7 +2084,7 @@
this.btwDel.Image = ((System.Drawing.Image)(resources.GetObject("btwDel.Image")));
this.btwDel.Name = "btwDel";
this.btwDel.RightToLeftAutoMirrorImage = true;
this.btwDel.Size = new System.Drawing.Size(51, 22);
this.btwDel.Size = new System.Drawing.Size(51, 20);
this.btwDel.Text = "삭제";
this.btwDel.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click);
//
@@ -2068,7 +2096,7 @@
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(3, 133);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(606, 338);
this.panel4.Size = new System.Drawing.Size(501, 338);
this.panel4.TabIndex = 90;
//
// rtBef
@@ -2078,7 +2106,7 @@
this.rtBef.Location = new System.Drawing.Point(0, 23);
this.rtBef.Name = "rtBef";
this.rtBef.ReadOnly = true;
this.rtBef.Size = new System.Drawing.Size(606, 315);
this.rtBef.Size = new System.Drawing.Size(501, 315);
this.rtBef.TabIndex = 87;
this.rtBef.Text = "";
this.rtBef.Click += new System.EventHandler(this.rtBack_Click);
@@ -2093,6 +2121,7 @@
this.arLabel8.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel8.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel8.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel8.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel8.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel8.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2120,7 +2149,7 @@
this.arLabel8.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel8.SignColor = System.Drawing.Color.Yellow;
this.arLabel8.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel8.Size = new System.Drawing.Size(606, 23);
this.arLabel8.Size = new System.Drawing.Size(501, 23);
this.arLabel8.TabIndex = 86;
this.arLabel8.Text = "개선 전";
this.arLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2145,7 +2174,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 130F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 130F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(1224, 604);
this.tableLayoutPanel1.Size = new System.Drawing.Size(1014, 604);
this.tableLayoutPanel1.TabIndex = 91;
//
// panel10
@@ -2156,7 +2185,7 @@
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel10.Location = new System.Drawing.Point(3, 477);
this.panel10.Name = "panel10";
this.panel10.Size = new System.Drawing.Size(606, 124);
this.panel10.Size = new System.Drawing.Size(501, 124);
this.panel10.TabIndex = 96;
//
// rtTangil
@@ -2166,7 +2195,7 @@
this.rtTangil.Location = new System.Drawing.Point(0, 23);
this.rtTangil.Name = "rtTangil";
this.rtTangil.ReadOnly = true;
this.rtTangil.Size = new System.Drawing.Size(606, 101);
this.rtTangil.Size = new System.Drawing.Size(501, 101);
this.rtTangil.TabIndex = 87;
this.rtTangil.Text = "";
this.rtTangil.DoubleClick += new System.EventHandler(this.richTextBox2_DoubleClick);
@@ -2180,6 +2209,7 @@
this.arLabel13.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel13.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel13.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel13.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel13.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel13.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2207,7 +2237,7 @@
this.arLabel13.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel13.SignColor = System.Drawing.Color.Yellow;
this.arLabel13.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel13.Size = new System.Drawing.Size(606, 23);
this.arLabel13.Size = new System.Drawing.Size(501, 23);
this.arLabel13.TabIndex = 86;
this.arLabel13.Text = "유형 효과";
this.arLabel13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2220,9 +2250,9 @@
this.panel9.Controls.Add(this.rtIntangle);
this.panel9.Controls.Add(this.arLabel7);
this.panel9.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel9.Location = new System.Drawing.Point(615, 477);
this.panel9.Location = new System.Drawing.Point(510, 477);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(606, 124);
this.panel9.Size = new System.Drawing.Size(501, 124);
this.panel9.TabIndex = 95;
//
// rtIntangle
@@ -2232,7 +2262,7 @@
this.rtIntangle.Location = new System.Drawing.Point(0, 23);
this.rtIntangle.Name = "rtIntangle";
this.rtIntangle.ReadOnly = true;
this.rtIntangle.Size = new System.Drawing.Size(606, 101);
this.rtIntangle.Size = new System.Drawing.Size(501, 101);
this.rtIntangle.TabIndex = 87;
this.rtIntangle.Text = "";
this.rtIntangle.DoubleClick += new System.EventHandler(this.richTextBox1_DoubleClick);
@@ -2246,6 +2276,7 @@
this.arLabel7.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel7.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel7.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel7.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel7.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel7.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2273,7 +2304,7 @@
this.arLabel7.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel7.SignColor = System.Drawing.Color.Yellow;
this.arLabel7.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel7.Size = new System.Drawing.Size(606, 23);
this.arLabel7.Size = new System.Drawing.Size(501, 23);
this.arLabel7.TabIndex = 86;
this.arLabel7.Text = "무형 효과";
this.arLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2286,9 +2317,9 @@
this.panel8.Controls.Add(this.rtDesc);
this.panel8.Controls.Add(this.arLabel11);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel8.Location = new System.Drawing.Point(615, 3);
this.panel8.Location = new System.Drawing.Point(510, 3);
this.panel8.Name = "panel8";
this.panel8.Size = new System.Drawing.Size(606, 124);
this.panel8.Size = new System.Drawing.Size(501, 124);
this.panel8.TabIndex = 94;
//
// rtDesc
@@ -2298,7 +2329,7 @@
this.rtDesc.Location = new System.Drawing.Point(0, 23);
this.rtDesc.Name = "rtDesc";
this.rtDesc.ReadOnly = true;
this.rtDesc.Size = new System.Drawing.Size(606, 101);
this.rtDesc.Size = new System.Drawing.Size(501, 101);
this.rtDesc.TabIndex = 87;
this.rtDesc.Text = "";
this.rtDesc.Click += new System.EventHandler(this.rtBack_Click);
@@ -2313,6 +2344,7 @@
this.arLabel11.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel11.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel11.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel11.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel11.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel11.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2340,7 +2372,7 @@
this.arLabel11.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel11.SignColor = System.Drawing.Color.Yellow;
this.arLabel11.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel11.Size = new System.Drawing.Size(606, 23);
this.arLabel11.Size = new System.Drawing.Size(501, 23);
this.arLabel11.TabIndex = 86;
this.arLabel11.Text = "개선 후(Method)";
this.arLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2371,7 +2403,7 @@
this.arPanel3.ProgressValue = 0F;
this.arPanel3.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel3.ShowBorder = true;
this.arPanel3.Size = new System.Drawing.Size(606, 124);
this.arPanel3.Size = new System.Drawing.Size(501, 124);
this.arPanel3.TabIndex = 92;
this.arPanel3.Text = "arPanel3";
this.arPanel3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -2385,7 +2417,7 @@
this.rtBack.Location = new System.Drawing.Point(1, 24);
this.rtBack.Name = "rtBack";
this.rtBack.ReadOnly = true;
this.rtBack.Size = new System.Drawing.Size(604, 99);
this.rtBack.Size = new System.Drawing.Size(499, 99);
this.rtBack.TabIndex = 87;
this.rtBack.Text = "";
this.rtBack.Click += new System.EventHandler(this.rtBack_Click);
@@ -2400,6 +2432,7 @@
this.arLabel10.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel10.BorderSize = new System.Windows.Forms.Padding(0, 0, 0, 1);
this.arLabel10.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel10.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel10.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel10.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2427,7 +2460,7 @@
this.arLabel10.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel10.SignColor = System.Drawing.Color.Yellow;
this.arLabel10.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel10.Size = new System.Drawing.Size(604, 23);
this.arLabel10.Size = new System.Drawing.Size(499, 23);
this.arLabel10.TabIndex = 86;
this.arLabel10.Text = "개선 전 (Method)";
this.arLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2440,9 +2473,9 @@
this.panel6.Controls.Add(this.rtAft);
this.panel6.Controls.Add(this.arLabel9);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(615, 133);
this.panel6.Location = new System.Drawing.Point(510, 133);
this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(606, 338);
this.panel6.Size = new System.Drawing.Size(501, 338);
this.panel6.TabIndex = 90;
//
// rtAft
@@ -2452,7 +2485,7 @@
this.rtAft.Location = new System.Drawing.Point(0, 23);
this.rtAft.Name = "rtAft";
this.rtAft.ReadOnly = true;
this.rtAft.Size = new System.Drawing.Size(606, 315);
this.rtAft.Size = new System.Drawing.Size(501, 315);
this.rtAft.TabIndex = 87;
this.rtAft.Text = "";
this.rtAft.Click += new System.EventHandler(this.rtBack_Click);
@@ -2467,6 +2500,7 @@
this.arLabel9.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel9.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel9.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel9.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel9.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel9.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2494,7 +2528,7 @@
this.arLabel9.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel9.SignColor = System.Drawing.Color.Yellow;
this.arLabel9.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel9.Size = new System.Drawing.Size(606, 23);
this.arLabel9.Size = new System.Drawing.Size(501, 23);
this.arLabel9.TabIndex = 86;
this.arLabel9.Text = "개선 후";
this.arLabel9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2510,7 +2544,7 @@
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1238, 668);
this.tabControl1.Size = new System.Drawing.Size(1028, 668);
this.tabControl1.TabIndex = 93;
//
// tabPage1
@@ -2526,7 +2560,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1230, 642);
this.tabPage1.Size = new System.Drawing.Size(1020, 642);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "일반사항";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -2541,7 +2575,7 @@
this.tabControl2.Location = new System.Drawing.Point(662, 267);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(564, 368);
this.tabControl2.Size = new System.Drawing.Size(354, 368);
this.tabControl2.TabIndex = 90;
//
// tabPage3
@@ -2550,7 +2584,7 @@
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(556, 342);
this.tabPage3.Size = new System.Drawing.Size(346, 342);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "업무 현황";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -2561,7 +2595,7 @@
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(556, 342);
this.tabPage4.Size = new System.Drawing.Size(346, 342);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "메모";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -2590,7 +2624,7 @@
this.arPanel4.ProgressValue = 0F;
this.arPanel4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel4.ShowBorder = true;
this.arPanel4.Size = new System.Drawing.Size(550, 336);
this.arPanel4.Size = new System.Drawing.Size(340, 336);
this.arPanel4.TabIndex = 90;
this.arPanel4.Text = "arPanel4";
this.arPanel4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -2619,7 +2653,7 @@
this.dataGridView2.RowHeadersVisible = false;
this.dataGridView2.RowTemplate.Height = 23;
this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView2.Size = new System.Drawing.Size(548, 309);
this.dataGridView2.Size = new System.Drawing.Size(338, 309);
this.dataGridView2.TabIndex = 0;
this.dataGridView2.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView2_DataError);
//
@@ -2644,8 +2678,8 @@
//
this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dataGridViewTextBoxColumn5.DataPropertyName = "remark";
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2;
this.dataGridViewTextBoxColumn5.HeaderText = "비고";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.ReadOnly = true;
@@ -2682,7 +2716,7 @@
this.bindingNavigator2.MovePreviousItem = this.toolStripButton2;
this.bindingNavigator2.Name = "bindingNavigator2";
this.bindingNavigator2.PositionItem = this.toolStripTextBox1;
this.bindingNavigator2.Size = new System.Drawing.Size(548, 25);
this.bindingNavigator2.Size = new System.Drawing.Size(338, 25);
this.bindingNavigator2.TabIndex = 87;
this.bindingNavigator2.Text = "bindingNavigator2";
//
@@ -2786,7 +2820,7 @@
this.tabPage5.Controls.Add(this.toolStrip1);
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(556, 342);
this.tabPage5.Size = new System.Drawing.Size(346, 342);
this.tabPage5.TabIndex = 2;
this.tabPage5.Text = "명판";
this.tabPage5.UseVisualStyleBackColor = true;
@@ -2797,7 +2831,7 @@
this.rtPanelImage.ImeMode = System.Windows.Forms.ImeMode.Hangul;
this.rtPanelImage.Location = new System.Drawing.Point(0, 25);
this.rtPanelImage.Name = "rtPanelImage";
this.rtPanelImage.Size = new System.Drawing.Size(556, 317);
this.rtPanelImage.Size = new System.Drawing.Size(346, 317);
this.rtPanelImage.TabIndex = 50;
this.rtPanelImage.TabStop = false;
//
@@ -2809,7 +2843,7 @@
this.toolStripButton11});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(556, 25);
this.toolStrip1.Size = new System.Drawing.Size(346, 25);
this.toolStrip1.TabIndex = 51;
this.toolStrip1.Text = "toolStrip1";
//
@@ -2831,6 +2865,15 @@
this.toolStripButton10.Text = "Clear";
this.toolStripButton10.Click += new System.EventHandler(this.toolStripButton10_Click);
//
// toolStripButton11
//
this.toolStripButton11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton11.Image")));
this.toolStripButton11.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton11.Name = "toolStripButton11";
this.toolStripButton11.Size = new System.Drawing.Size(55, 22);
this.toolStripButton11.Text = "Paste";
this.toolStripButton11.Click += new System.EventHandler(this.toolStripButton11_Click);
//
// panel11
//
this.panel11.BackColor = System.Drawing.Color.Gainsboro;
@@ -2870,6 +2913,7 @@
this.arLabel14.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel14.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel14.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel14.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel14.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel14.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85)))));
@@ -2911,7 +2955,7 @@
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(1230, 642);
this.tabPage2.Size = new System.Drawing.Size(1020, 642);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "완료내역";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -2925,6 +2969,7 @@
this.arLabel12.BorderColorOver = System.Drawing.Color.FromArgb(((int)(((byte)(194)))), ((int)(((byte)(192)))), ((int)(((byte)(194)))));
this.arLabel12.BorderSize = new System.Windows.Forms.Padding(1);
this.arLabel12.ColorTheme = arCtl.arLabel.eColorTheme.Custom;
this.arLabel12.Cursor = System.Windows.Forms.Cursors.Arrow;
this.arLabel12.Dock = System.Windows.Forms.DockStyle.Top;
this.arLabel12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.arLabel12.ForeColor = System.Drawing.Color.Blue;
@@ -2952,7 +2997,7 @@
this.arLabel12.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel12.SignColor = System.Drawing.Color.Yellow;
this.arLabel12.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel12.Size = new System.Drawing.Size(1224, 32);
this.arLabel12.Size = new System.Drawing.Size(1014, 32);
this.arLabel12.TabIndex = 92;
this.arLabel12.Text = "내역을 편집하려면 각 창을 \"더블클릭\" 하세요.";
this.arLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -3006,20 +3051,11 @@
//
this.taToDo.ClearBeforeFill = true;
//
// toolStripButton11
//
this.toolStripButton11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton11.Image")));
this.toolStripButton11.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton11.Name = "toolStripButton11";
this.toolStripButton11.Size = new System.Drawing.Size(55, 22);
this.toolStripButton11.Text = "Paste";
this.toolStripButton11.Click += new System.EventHandler(this.toolStripButton11_Click);
//
// fProjectData
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1238, 693);
this.ClientSize = new System.Drawing.Size(1028, 693);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.bn);
this.MinimizeBox = false;
@@ -3267,5 +3303,6 @@
private System.Windows.Forms.ToolStripButton toolStripButton9;
private System.Windows.Forms.ToolStripButton toolStripButton10;
private System.Windows.Forms.ToolStripButton toolStripButton11;
private System.Windows.Forms.TextBox textBox7;
}
}

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -204,16 +204,16 @@
<metadata name="label20.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
<metadata name="label7.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
<value>478, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
<value>395, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -363,43 +363,28 @@
</value>
</data>
<metadata name="bsHistWeek.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>449, 17</value>
</metadata>
<metadata name="bsHistWeek.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>449, 17</value>
</metadata>
<metadata name="bsSW.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>676, 56</value>
</metadata>
<metadata name="bsSW.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>676, 56</value>
</metadata>
<metadata name="dSComm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>
<metadata name="bsSW.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>350, 95</value>
</metadata>
<metadata name="dSComm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
<value>519, 56</value>
</metadata>
<metadata name="bsEPanel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>537, 56</value>
</metadata>
<metadata name="bsEPanel.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>537, 56</value>
<value>249, 95</value>
</metadata>
<metadata name="bsDesignID.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 56</value>
</metadata>
<metadata name="bsDesignID.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 56</value>
<value>17, 95</value>
</metadata>
<metadata name="bsChampionID.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>120, 56</value>
</metadata>
<metadata name="bsChampionID.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>120, 56</value>
<value>622, 56</value>
</metadata>
<metadata name="bsAssembly.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>398, 56</value>
<value>132, 95</value>
</metadata>
<metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>239, 17</value>
</metadata>
<data name="bindingNavigatorMoveFirstItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -478,61 +463,13 @@
86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>760, 56</value>
</metadata>
<data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="bsHistDay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>722, 17</value>
<value>134, 56</value>
</metadata>
<metadata name="bsHistDay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>722, 17</value>
<metadata name="bindingNavigator2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>83, 17</value>
</metadata>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -611,25 +548,73 @@
86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>433, 95</value>
</metadata>
<data name="toolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton10.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton11.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="bsTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1078, 17</value>
<value>334, 56</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>164, 17</value>
<value>542, 17</value>
</metadata>
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>226, 17</value>
<value>604, 17</value>
</metadata>
<metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>365, 17</value>
<value>677, 17</value>
</metadata>
<metadata name="taHistD.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>829, 17</value>
<value>241, 56</value>
</metadata>
<metadata name="taToDo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1171, 17</value>
<value>427, 56</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>77</value>

Some files were not shown because too many files have changed in this diff Show More