This commit is contained in:
chi
2022-12-16 15:06:45 +09:00
parent 146f32c64e
commit 6ea52f61be
12 changed files with 1776 additions and 1540 deletions

View File

@@ -132,8 +132,8 @@
this.btViewDel = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.label1 = new System.Windows.Forms.Label();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -242,6 +242,7 @@
//
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";
@@ -350,6 +351,7 @@
// 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, 26);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -606,6 +608,7 @@
// 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";
@@ -622,6 +625,7 @@
// 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";
@@ -677,6 +681,7 @@
// tbRequest
//
this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbRequest.Name = "tbRequest";
this.tbRequest.Size = new System.Drawing.Size(70, 37);
this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -780,18 +785,6 @@
this.fpSpread1.TabIndex = 4;
this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff);
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 629);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1226, 23);
this.label1.TabIndex = 6;
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -1066,6 +1059,18 @@
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 629);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1226, 23);
this.label1.TabIndex = 6;
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fPurchase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

View File

@@ -953,7 +953,10 @@ namespace FEQ0000
return;
}
var dr = drv.Row as dsPurchase.PurchaseRow;
this.label1.Text = string.Format("{0}", dr.bigo.Replace("\r", "").Replace("\n", ""));
if (dr.project.isEmpty())
this.label1.Text = $"비고:{dr.bigo.Replace("\r", "").Replace("\n", "")}";
else
this.label1.Text = $"프로젝트:{dr.project},비고:{dr.bigo.Replace("\r", "").Replace("\n", "")}";
}
private void toolStripButton4_Click(object sender, EventArgs e)

View File

@@ -410,13 +410,13 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGSSURBVFhH7ZDdSgJBGIa9kY67hK6gdFX8g27Cm4gIYjVN
6KyMrM6qw6DooOjXGbeO6kACQ/IwDJSCLKPJd9gVk8l1ncWNmAdeZme+l/FxfIp/j18nTCbBNH2LZ4wj
f+pyEvfNLBgTiZxxiHNR30m6gjLUX95ZoVhtR/RSc3qeTIUzF40CqbZxLoNrghZccok+YTWPpHBdEC8W
WqJ8dQPXBYHbdylBGTwT3DitsWi2xApnNfNEjGeCsWWD97AOwjNBvBzkNv/qCw6LEhSBeW8GgfnYBYEl
Z9fFXAmKsOTsupgrQRGWnF0XcyUowpKz62KuBPuxxHrzG5iNXdAJSlAWJSiLEpTlh6BsZldu2OrJI//G
in1/Z5R0BQ8qX1LZvWux5FaZX5rcLrO9zl7Uc5KuYGix9LxOm8KSk+zctvilkBXNnSTf8dEy53UuGEiR
ICRx+ajp/4P4AVFv2EBO04nGBWUJpIvxWO7qNU8bbP/+k62RBot29lqKxsyK9wR1koikrx8Cc8cf4Syt
QNocKTzG5/sG83SklgnLtDwAAAAASUVORK5CYII=
6KyMrM6qw6AIIvp1xq2jOpDAkDwMA6Ugy2jyHXbFZHJdZ3Ej5oGX2ZnvZXwcn+Lf49cJk0kwTd/iGePI
n7qcxH0zC8ZEImcc4lzUd5KuoAz1l3dWKFbbEb3UnJ4nU+HMRaNAqm2cy+CaoAWXXKJPWM0jKVwXxIuF
lihf3cB1QeD2XUpQBs8EN05rLJotscJZzTwR45lgbNngPayD8EwQLwe5zb/6gsOiBEVg3ptBYD52QWDJ
2XUxV4IiLDm7LuZKUIQlZ9fFXAmKsOTsupgrwX4ssd78BmZjF3SCEpRFCcqiBGX5ISib2ZUbtnryyL+x
Yt/fGSVdwYPKl1R271osuVXmlya3y2yvsxf1nKQrGFosPa/TprDkJDu3LX4pZEVzJ8l3fLTMeZ0LBlIk
CElcPmr6/yB+QNQbNpDTdKJxQVkC6WI8lrt6zdMG27//ZGukwaKdvZaiMbPiPUGdJCLp64fA3PFHOEsr
kDZHCo/x+b4B8eCklafTY54AAAAASUVORK5CYII=
</value>
</data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -56,6 +56,9 @@
this.label1 = new System.Windows.Forms.Label();
this.btRefresh = new System.Windows.Forms.Button();
this.dv1 = new arCtl.arDatagridView();
this.button1 = new System.Windows.Forms.Button();
this.linkLabel13 = new System.Windows.Forms.LinkLabel();
this.linkLabel14 = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.panel1.SuspendLayout();
@@ -79,6 +82,9 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.panel1.Controls.Add(this.linkLabel13);
this.panel1.Controls.Add(this.linkLabel14);
this.panel1.Controls.Add(this.button1);
this.panel1.Controls.Add(this.linkLabel9);
this.panel1.Controls.Add(this.linkLabel10);
this.panel1.Controls.Add(this.linkLabel11);
@@ -118,6 +124,7 @@
this.linkLabel9.TabIndex = 24;
this.linkLabel9.TabStop = true;
this.linkLabel9.Text = "12월";
this.linkLabel9.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel10
//
@@ -129,6 +136,7 @@
this.linkLabel10.TabIndex = 23;
this.linkLabel10.TabStop = true;
this.linkLabel10.Text = "11월";
this.linkLabel10.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel11
//
@@ -140,6 +148,7 @@
this.linkLabel11.TabIndex = 22;
this.linkLabel11.TabStop = true;
this.linkLabel11.Text = "10월";
this.linkLabel11.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel12
//
@@ -151,6 +160,7 @@
this.linkLabel12.TabIndex = 21;
this.linkLabel12.TabStop = true;
this.linkLabel12.Text = "09월";
this.linkLabel12.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel5
//
@@ -162,6 +172,7 @@
this.linkLabel5.TabIndex = 20;
this.linkLabel5.TabStop = true;
this.linkLabel5.Text = "08월";
this.linkLabel5.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel6
//
@@ -173,6 +184,7 @@
this.linkLabel6.TabIndex = 19;
this.linkLabel6.TabStop = true;
this.linkLabel6.Text = "07월";
this.linkLabel6.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel7
//
@@ -184,6 +196,8 @@
this.linkLabel7.TabIndex = 18;
this.linkLabel7.TabStop = true;
this.linkLabel7.Text = "06월";
this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked);
this.linkLabel7.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel8
//
@@ -195,6 +209,7 @@
this.linkLabel8.TabIndex = 17;
this.linkLabel8.TabStop = true;
this.linkLabel8.Text = "05월";
this.linkLabel8.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel3
//
@@ -206,6 +221,7 @@
this.linkLabel3.TabIndex = 16;
this.linkLabel3.TabStop = true;
this.linkLabel3.Text = "04월";
this.linkLabel3.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel4
//
@@ -217,6 +233,7 @@
this.linkLabel4.TabIndex = 15;
this.linkLabel4.TabStop = true;
this.linkLabel4.Text = "03월";
this.linkLabel4.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel2
//
@@ -228,6 +245,7 @@
this.linkLabel2.TabIndex = 14;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "02월";
this.linkLabel2.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel1
//
@@ -239,6 +257,7 @@
this.linkLabel1.TabIndex = 13;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "01월";
this.linkLabel1.Click += new System.EventHandler(this.linkLabel13_Click);
//
// btSave
//
@@ -349,6 +368,42 @@
this.dv1.Size = new System.Drawing.Size(1114, 641);
this.dv1.TabIndex = 1;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Right;
this.button1.Location = new System.Drawing.Point(884, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 48);
this.button1.TabIndex = 25;
this.button1.Text = "WW축소";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// linkLabel13
//
this.linkLabel13.AutoSize = true;
this.linkLabel13.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel13.Location = new System.Drawing.Point(717, 31);
this.linkLabel13.Name = "linkLabel13";
this.linkLabel13.Size = new System.Drawing.Size(51, 19);
this.linkLabel13.TabIndex = 27;
this.linkLabel13.TabStop = true;
this.linkLabel13.Text = "하반기";
this.linkLabel13.Click += new System.EventHandler(this.linkLabel13_Click);
//
// linkLabel14
//
this.linkLabel14.AutoSize = true;
this.linkLabel14.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.linkLabel14.Location = new System.Drawing.Point(717, 7);
this.linkLabel14.Name = "linkLabel14";
this.linkLabel14.Size = new System.Drawing.Size(51, 19);
this.linkLabel14.TabIndex = 26;
this.linkLabel14.TabStop = true;
this.linkLabel14.Text = "상반기";
this.linkLabel14.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel14_LinkClicked);
this.linkLabel14.Click += new System.EventHandler(this.linkLabel13_Click);
//
// rJobReportPrj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -396,5 +451,8 @@
private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btRefresh;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.LinkLabel linkLabel13;
private System.Windows.Forms.LinkLabel linkLabel14;
}
}

View File

@@ -104,6 +104,7 @@ namespace FPJ0000.JobReport_
//날짜에 해당하는 열을 먼저 생성한다
dv1.Columns.Add("dvcu_pidx", "*");
dv1.Columns.Add("dvcu_state", "상태");
dv1.Columns.Add("dvcu_title", "프로젝트");
//dv1.Columns.Add("dvcu_hrs", "시간");
@@ -131,15 +132,31 @@ namespace FPJ0000.JobReport_
var TotHrs = dsReport.JobProjectTimes.Sum(t => t.hrs);
//데이터를 추가한다.
foreach (var dr in dsReport.JobProjectTimes.GroupBy(t => t.pidx))
foreach (var dr in dsReport.JobProjectTimes.OrderByDescending(t => t.PrjStatus + t.PrjName).GroupBy(t => t.pidx))
{
var pidx = dr.Key;
var fdr = dr.First();
List<object> row = new List<object>();
row.Add(dr.Key);
if (dr.Key == -1) row.Add("Other");
else row.Add(fdr.title);
if (dr.Key == -1)
{
row.Add("--");
row.Add("비 프로젝트 업무");
}
else
{
row.Add(fdr.PrjStatus);
if (fdr.PrjName.isEmpty())
{
row.Add($"{fdr.title}");
}
else
{
row.Add($"{fdr.PrjName}");
}
}
//row.Add("--");
foreach (var item in wwlist)
@@ -174,7 +191,7 @@ namespace FPJ0000.JobReport_
dv1.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
dv1.Columns[0].DefaultCellStyle.BackColor = Color.LightGray;
dv1.Columns[1].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft;
dv1.Columns[2].DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleLeft;
for (int i = 0; i < this.dv1.ColumnCount; i++)
@@ -208,7 +225,7 @@ namespace FPJ0000.JobReport_
for (int i = 0; i < this.dv1.ColumnCount; i++)
{
var c = dvrow.Cells[i];
c.Style.BackColor = Color.Gray;
c.Style.BackColor = Color.LightGray;
}
}
@@ -234,5 +251,47 @@ namespace FPJ0000.JobReport_
if (binit == false) return;
UpdateUserList();
}
private void button1_Click(object sender, EventArgs e)
{
var newsize = dv1.Columns[2].Width < 10 ? 100 : 5;
this.dv1.SuspendLayout();
for (int i = 3; i < this.dv1.ColumnCount - 2; i++)
{
this.dv1.Columns[i].Width = newsize;
}
this.dv1.ResumeLayout();
}
private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
}
private void linkLabel13_Click(object sender, EventArgs e)
{
var lnk = sender as LinkLabel;
if (lnk.Text.Equals("상반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-01-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-05-31");
}
else if (lnk.Text.Equals("하반기"))
{
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-06-01");
dte.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-12-31");
}
else
{
if (int.TryParse(lnk.Text.Substring(0, 2), out int mon) == false) return;
dts.Value = DateTime.Parse(DateTime.Now.Year.ToString("0000") + "-" + mon.ToString("00" + "-01"));
dte.Value = dts.Value.AddMonths(1).AddDays(-1);
}
}
private void linkLabel14_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
}
}
}

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="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>245, 17</value>
</metadata>

View File

@@ -331,20 +331,20 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY
zXSY6XRO0dREFwbZahqZl9BEBxWiFL2o0C46tXmbc7rhFpnL1Ob9Al6Wuss5bmf67TlnSw2EfvDhefGc
74fz+57DYyf0njrxYqlOFVWm+x0m01HkpDnK2VNPR5X20xFPtKYzUk2lf/TbfVxo94Q/6tUsWekVk8nk
ttg3YLHtsGJlofFzwYqCTzMQlo04BJlKH2/UM5HF2iU23D/lgn6agX6GgW6KgXbSCfWvDbQO27HBAE0j
FAo+TCP5mYn6RxIma6XWHU4YZ934OsuQk8EAJ3Gix7yBL8MOItiEccEN/bwLRcoZ8O92vuHCseXBE9dl
0VuSmqtIrr6G6rZ6FDaUgy8LQDBBUHQaofITqGiq4Fax0QwWVx0ITehhOEFMKf9951AzmsdeolqXx0kS
qiKQ9zoeWfVCiBWXkKRIQtPgIppNNnz+vo410lOYvJfmBIJKgY+/LNutG+3GqyE5StSZnCSxJpKELyPt
eSo0Zju3SscYBRXpYdXuQlhhn0fATnhxD51TK4LBrIVCfweP23MRW34eiVXRMEw5YCDFsgVrxj2dWIgg
VL5LcPa+zHUy/xDiKwUwjvejqDsdcmUOhE9DUK/+iG9zDAyk2P5JF/oIS1YX+A+8gmNSX0mQ9CCy6uJw
oyYccRUXOEmOMh7ShlTyJiFg740zbgywn5hgJUUGZms9giDp/rkg6QHykC+C8nxxpSQEGS9E0AyrUKTK
R/o7EcQ1MTAQgZ78GzoioF2bRKDeWeFcdi+9sEZjcM7N0TM6j9u1aUghQYlCiNy6W9t3LA6nmwgadwSs
bdayI/gfdnaF1F2CUzldDtnD0q29Ht6Lrq6uzSMJTTZvnBSZ1j4xve6wshcTyxQmliiYvSzbXBxs8zba
E6Yoas3vZssPb5zHO57WlhEobm0/KlFZAiWN9DYpHgL+Im6k/cQtq4eTWjoCRMpkHo/H+wPLWp3CEq51
jAAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALpSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s
Zipm3uYUTU10YZAtppHX0ESFClGKXlRoF53a1Dnn3IZbZC5Tm/MueFnqLudsO9NvzzlbaiD0gw/Pi+d8
P5zf9xweO2EPFMmXKzWy6CrN73CxhiInzVHNnlo6ulJNR5arDOdEylr/mLcHuNDeiXg8qFyx0GsGg8Ft
tjlgtu6yZmGh8XPJguJPc4ivGrfzc6Q+3qhnospUK2xYPeOCdpaBdo6BZoaBatoJxS8HusZscDBA+ziF
4g+zSHtmoP6RhIu7qE27E/p5N77OM+RkMMxJnBgwOvBlzE4EW9AvuaFddKFUOoeQ+31vuHBcdbDppjhm
W9hwHWn1N1Df3YKS1mqEiAMQTOCXnkWY5BRq2mu4Vaw0g+V1O8KSBhhOEFsZ8r5vtAMdky9RrynkJEl1
kSh8nYjclngIGq8gtTEV7SPL6DBY8fn7JjZIT+GSQZoT8Gv5Pv7iPLdmoh+vRiWoUORwkuSGKBK+iszn
GVAabdwqvZMUZKSHdZsL4SVDHgE7EWUDdH5TCnRGFRq19/CkpwBx1ReRXBcD3YwdOlIsW7ByytOJmQjC
JHsE5x+KXaeLjiCxlg/9lBql/VmQSPMR/zQULYqP+LbAQEeKVU+7MERYsbgQ8sgrOCHyFQaJDiO3OQG3
GiKQUHOJk+RLEyFqzSBvEgr2Xj/nxjD7iQkWUmRgnsojCBIdXAgSHSIP+SKo0BfXKkKR/SIFyjEZSmVF
yHqXAkFDLHREoCX/hoYIaNcWESh2V7iQN0gvbdAYWXBzDEws4m5TJtJJUNgYj4LmOzt3LHanmwjadgWs
bd68K/gfNnaFjD2CM/lyu1hcvr3fw/shl8u3jiW1W71xUmRmj2l2025hL0yrFEwrFIxeVq0uDrZ5K+0J
UxS14Xe784c3zuOdzOzODhR09RwXysyBwjZ6h3QPAX8RtNF+gs71o6mdvQEp0jQej8f7A8h4nb60ARZQ
AAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -6,8 +6,8 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:JobReportItemList" ZOrder="2" X="70" Y="70" Height="134" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="392" Y="70" Height="48" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="16" />
<Shape ID="DesignTable:JobReportItemList" ZOrder="2" X="40" Y="54" Height="305" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="1" X="392" Y="70" Height="220" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
</Shapes>
<Connectors />
</DiagramLayout>

View File

@@ -2800,6 +2800,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnidx;
private global::System.Data.DataColumn columnPrjStatus;
private global::System.Data.DataColumn columnPrjName;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobProjectTimesDataTable() {
@@ -2873,6 +2877,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn PrjStatusColumn {
get {
return this.columnPrjStatus;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn PrjNameColumn {
get {
return this.columnPrjName;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2910,14 +2930,16 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx) {
public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx, string PrjStatus, string PrjName) {
JobProjectTimesRow rowJobProjectTimesRow = ((JobProjectTimesRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
ww,
pidx,
title,
hrs,
idx};
idx,
PrjStatus,
PrjName};
rowJobProjectTimesRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobProjectTimesRow);
return rowJobProjectTimesRow;
@@ -2952,6 +2974,8 @@ namespace FPJ0000 {
this.columntitle = base.Columns["title"];
this.columnhrs = base.Columns["hrs"];
this.columnidx = base.Columns["idx"];
this.columnPrjStatus = base.Columns["PrjStatus"];
this.columnPrjName = base.Columns["PrjName"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2967,6 +2991,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnhrs);
this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnidx);
this.columnPrjStatus = new global::System.Data.DataColumn("PrjStatus", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPrjStatus);
this.columnPrjName = new global::System.Data.DataColumn("PrjName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPrjName);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnww.ReadOnly = true;
@@ -2978,6 +3006,8 @@ namespace FPJ0000 {
this.columnidx.AllowDBNull = false;
this.columnidx.ReadOnly = true;
this.columnidx.Unique = true;
this.columnPrjStatus.MaxLength = 50;
this.columnPrjName.MaxLength = 255;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5181,6 +5211,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string PrjStatus {
get {
if (this.IsPrjStatusNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobProjectTimes.PrjStatusColumn]));
}
}
set {
this[this.tableJobProjectTimes.PrjStatusColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string PrjName {
get {
if (this.IsPrjNameNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobProjectTimes.PrjNameColumn]));
}
}
set {
this[this.tableJobProjectTimes.PrjNameColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswwNull() {
@@ -5228,6 +5290,30 @@ namespace FPJ0000 {
public void SethrsNull() {
this[this.tableJobProjectTimes.hrsColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPrjStatusNull() {
return this.IsNull(this.tableJobProjectTimes.PrjStatusColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPrjStatusNull() {
this[this.tableJobProjectTimes.PrjStatusColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPrjNameNull() {
return this.IsNull(this.tableJobProjectTimes.PrjNameColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPrjNameNull() {
this[this.tableJobProjectTimes.PrjNameColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -7761,6 +7847,8 @@ ORDER BY pdate";
tableMapping.ColumnMappings.Add("title", "title");
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("idx", "idx");
tableMapping.ColumnMappings.Add("PrjStatus", "PrjStatus");
tableMapping.ColumnMappings.Add("PrjName", "PrjName");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -7777,10 +7865,12 @@ ORDER BY pdate";
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 MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs
FROM JobReport
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) > 0)
GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0)
this._commandCollection[0].CommandText = @"SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
Projects.status AS PrjStatus, Projects.name AS PrjName
FROM JobReport LEFT OUTER JOIN
Projects ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
ORDER BY title, ww";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));

View File

@@ -295,13 +295,15 @@ ORDER BY pdate</CommandText>
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="JobProjectTimesTableAdapter" GeneratorDataComponentClassName="JobProjectTimesTableAdapter" Name="JobProjectTimes" UserDataComponentName="JobProjectTimesTableAdapter">
<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">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" 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 MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs
FROM JobReport
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) &gt; 0)
GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0)
<CommandText>SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
Projects.status AS PrjStatus, Projects.name AS PrjName
FROM JobReport LEFT OUTER JOIN
Projects ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) &gt; 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
ORDER BY title, ww</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -319,6 +321,8 @@ ORDER BY title, ww</CommandText>
<Mapping SourceColumn="title" DataSetColumn="title" />
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="idx" DataSetColumn="idx" />
<Mapping SourceColumn="PrjStatus" DataSetColumn="PrjStatus" />
<Mapping SourceColumn="PrjName" DataSetColumn="PrjName" />
</Mappings>
<Sources />
</TableAdapter>
@@ -660,6 +664,20 @@ ORDER BY title, ww</CommandText>
</xs:element>
<xs:element name="hrs" msdata:ReadOnly="true" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
<xs:element name="idx" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
<xs:element name="PrjStatus" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrjStatus" msprop:Generator_ColumnVarNameInTable="columnPrjStatus" msprop:Generator_ColumnPropNameInTable="PrjStatusColumn" msprop:Generator_UserColumnName="PrjStatus" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="PrjName" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="PrjName" msprop:Generator_ColumnVarNameInTable="columnPrjName" msprop:Generator_ColumnPropNameInTable="PrjNameColumn" msprop:Generator_UserColumnName="PrjName" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="255" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>

View File

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