업무일지 삭제 화면만 불러도 데이터가 삭제되는 현상 수정
사용자 목록이 실 데이터 입력자로 변경 함 업무일지 : 개인별/일자별 집계 추가
This commit is contained in:
chikyun.kim
163
SubProject/FPJ0000/JobReport/fJobReport.Designer.cs
generated
163
SubProject/FPJ0000/JobReport/fJobReport.Designer.cs
generated
@@ -30,18 +30,18 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport));
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
|
||||
FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
|
||||
FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
|
||||
FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
|
||||
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
|
||||
FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
|
||||
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
|
||||
this.bs = new System.Windows.Forms.BindingSource(this.components);
|
||||
this.dsMSSQL = new FPJ0000.dsPRJ();
|
||||
@@ -75,6 +75,10 @@
|
||||
this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.partListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
|
||||
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
|
||||
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
|
||||
@@ -86,16 +90,10 @@
|
||||
this.dtED = new System.Windows.Forms.ToolStripTextBox();
|
||||
this.lbTime = new System.Windows.Forms.ToolStripLabel();
|
||||
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
|
||||
this.cmbState = new System.Windows.Forms.ToolStripComboBox();
|
||||
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
|
||||
this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
|
||||
this.btSearch = new System.Windows.Forms.ToolStripButton();
|
||||
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.btReportDay = new System.Windows.Forms.ToolStripButton();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
|
||||
this.bn.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
|
||||
@@ -132,7 +130,8 @@
|
||||
this.toolStripLabel2,
|
||||
this.tbFind,
|
||||
this.btFind,
|
||||
this.btReport});
|
||||
this.btReport,
|
||||
this.btReportDay});
|
||||
this.bn.Location = new System.Drawing.Point(0, 564);
|
||||
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
|
||||
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
|
||||
@@ -319,7 +318,7 @@
|
||||
this.편집ToolStripMenuItem,
|
||||
this.삭제ToolStripMenuItem});
|
||||
this.cm.Name = "contextMenuStrip1";
|
||||
this.cm.Size = new System.Drawing.Size(226, 296);
|
||||
this.cm.Size = new System.Drawing.Size(226, 274);
|
||||
//
|
||||
// columnSizeToolStripMenuItem
|
||||
//
|
||||
@@ -395,6 +394,32 @@
|
||||
this.partListToolStripMenuItem.Text = "PartList";
|
||||
this.partListToolStripMenuItem.Click += new System.EventHandler(this.partListToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripMenuItem3
|
||||
//
|
||||
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
|
||||
this.toolStripMenuItem3.Size = new System.Drawing.Size(222, 6);
|
||||
//
|
||||
// 복사ToolStripMenuItem
|
||||
//
|
||||
this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem";
|
||||
this.복사ToolStripMenuItem.Size = new System.Drawing.Size(225, 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(225, 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(225, 36);
|
||||
this.삭제ToolStripMenuItem.Text = "삭제";
|
||||
this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
|
||||
//
|
||||
// tam
|
||||
//
|
||||
this.tam.BackupDataSetBeforeUpdate = false;
|
||||
@@ -449,68 +474,68 @@
|
||||
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "초과";
|
||||
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고";
|
||||
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType28;
|
||||
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType10;
|
||||
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
|
||||
this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜";
|
||||
this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
|
||||
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29;
|
||||
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType11;
|
||||
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
|
||||
this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW";
|
||||
this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
|
||||
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType30;
|
||||
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType12;
|
||||
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "requestpart";
|
||||
this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청부서";
|
||||
this.fpSpread1_Sheet1.Columns.Get(2).Width = 78F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
|
||||
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType31;
|
||||
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType13;
|
||||
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "package";
|
||||
this.fpSpread1_Sheet1.Columns.Get(3).Label = "패키지";
|
||||
this.fpSpread1_Sheet1.Columns.Get(3).Width = 86F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType32;
|
||||
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType14;
|
||||
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "status";
|
||||
this.fpSpread1_Sheet1.Columns.Get(4).Label = "상태";
|
||||
this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
|
||||
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType33;
|
||||
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType15;
|
||||
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "type";
|
||||
this.fpSpread1_Sheet1.Columns.Get(5).Label = "업무형태";
|
||||
this.fpSpread1_Sheet1.Columns.Get(5).Width = 84F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType34;
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType16;
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process";
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무분류";
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
|
||||
this.fpSpread1_Sheet1.Columns.Get(6).Width = 80F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
|
||||
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType35;
|
||||
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17;
|
||||
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "projectName";
|
||||
this.fpSpread1_Sheet1.Columns.Get(7).Label = "프로젝트(아이템)";
|
||||
this.fpSpread1_Sheet1.Columns.Get(7).Width = 158F;
|
||||
this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
|
||||
numberCellType10.DecimalPlaces = 0;
|
||||
numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
|
||||
numberCellType10.MaximumValue = 2147483647D;
|
||||
numberCellType10.MinimumValue = -2147483648D;
|
||||
this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType10;
|
||||
numberCellType4.DecimalPlaces = 0;
|
||||
numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
|
||||
numberCellType4.MaximumValue = 2147483647D;
|
||||
numberCellType4.MinimumValue = -2147483648D;
|
||||
this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4;
|
||||
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pidx";
|
||||
this.fpSpread1_Sheet1.Columns.Get(8).Label = "*";
|
||||
this.fpSpread1_Sheet1.Columns.Get(8).Width = 39F;
|
||||
numberCellType11.MaximumValue = 999999999999999D;
|
||||
numberCellType11.MinimumValue = -999999999999999D;
|
||||
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType11;
|
||||
numberCellType5.MaximumValue = 999999999999999D;
|
||||
numberCellType5.MinimumValue = -999999999999999D;
|
||||
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5;
|
||||
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "hrs";
|
||||
this.fpSpread1_Sheet1.Columns.Get(9).Label = "시간";
|
||||
this.fpSpread1_Sheet1.Columns.Get(9).Width = 52F;
|
||||
numberCellType12.MaximumValue = 999999999999999D;
|
||||
numberCellType12.MinimumValue = -999999999999999D;
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType12;
|
||||
numberCellType6.MaximumValue = 999999999999999D;
|
||||
numberCellType6.MinimumValue = -999999999999999D;
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType6;
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ot";
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).ForeColor = System.Drawing.Color.Red;
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).Label = "초과";
|
||||
this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
|
||||
this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType36;
|
||||
this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType18;
|
||||
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "description";
|
||||
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
|
||||
this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고";
|
||||
@@ -530,9 +555,6 @@
|
||||
this.dtED,
|
||||
this.lbTime,
|
||||
this.toolStripSeparator2,
|
||||
this.toolStripLabel1,
|
||||
this.cmbState,
|
||||
this.toolStripSeparator3,
|
||||
this.toolStripLabel3,
|
||||
this.cmbUser,
|
||||
this.btSearch});
|
||||
@@ -586,23 +608,6 @@
|
||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// toolStripLabel1
|
||||
//
|
||||
this.toolStripLabel1.Name = "toolStripLabel1";
|
||||
this.toolStripLabel1.Size = new System.Drawing.Size(31, 22);
|
||||
this.toolStripLabel1.Text = "상태";
|
||||
//
|
||||
// cmbState
|
||||
//
|
||||
this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cmbState.Name = "cmbState";
|
||||
this.cmbState.Size = new System.Drawing.Size(100, 25);
|
||||
//
|
||||
// toolStripSeparator3
|
||||
//
|
||||
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
||||
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
|
||||
//
|
||||
// toolStripLabel3
|
||||
//
|
||||
this.toolStripLabel3.Name = "toolStripLabel3";
|
||||
@@ -627,31 +632,15 @@
|
||||
this.btSearch.Text = "조회(&R)";
|
||||
this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
|
||||
//
|
||||
// toolStripMenuItem3
|
||||
// btReportDay
|
||||
//
|
||||
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
|
||||
this.toolStripMenuItem3.Size = new System.Drawing.Size(222, 6);
|
||||
//
|
||||
// 복사ToolStripMenuItem
|
||||
//
|
||||
this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem";
|
||||
this.복사ToolStripMenuItem.Size = new System.Drawing.Size(225, 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(225, 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(225, 36);
|
||||
this.삭제ToolStripMenuItem.Text = "삭제";
|
||||
this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
|
||||
this.btReportDay.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
|
||||
this.btReportDay.Image = ((System.Drawing.Image)(resources.GetObject("btReportDay.Image")));
|
||||
this.btReportDay.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
this.btReportDay.Name = "btReportDay";
|
||||
this.btReportDay.Size = new System.Drawing.Size(108, 22);
|
||||
this.btReportDay.Text = "일/개인별 요약";
|
||||
this.btReportDay.Click += new System.EventHandler(this.btReportDay_Click);
|
||||
//
|
||||
// fJobReport
|
||||
//
|
||||
@@ -716,9 +705,6 @@
|
||||
private System.Windows.Forms.ToolStripLabel lbEnd;
|
||||
private System.Windows.Forms.ToolStripTextBox dtED;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
|
||||
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
|
||||
private System.Windows.Forms.ToolStripComboBox cmbState;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
|
||||
private System.Windows.Forms.ToolStripLabel toolStripLabel3;
|
||||
private System.Windows.Forms.ToolStripButton btSearch;
|
||||
private dsPRJTableAdapters.JobReportTableAdapter ta;
|
||||
@@ -736,5 +722,6 @@
|
||||
private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripButton btReportDay;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user