NR파트 검색 기능 추가

This commit is contained in:
chi
2020-04-13 10:03:27 +09:00
parent 694993c54c
commit 0d4413db95
50 changed files with 13779 additions and 1366 deletions

View File

@@ -137,6 +137,7 @@ namespace FBS0000
{
var f = new fHolyday_Add();
f.TopMost = true;
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
RefreshData();

View File

@@ -54,32 +54,43 @@
// sdateLabel
//
sdateLabel.AutoSize = true;
sdateLabel.Location = new System.Drawing.Point(38, 50);
sdateLabel.Location = new System.Drawing.Point(30, 49);
sdateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
sdateLabel.Name = "sdateLabel";
sdateLabel.Size = new System.Drawing.Size(42, 19);
sdateLabel.Size = new System.Drawing.Size(51, 19);
sdateLabel.TabIndex = 2;
sdateLabel.Text = "Start";
sdateLabel.Text = "등록일";
//
// contentsLabel
//
contentsLabel.AutoSize = true;
contentsLabel.Location = new System.Drawing.Point(17, 83);
contentsLabel.Location = new System.Drawing.Point(44, 82);
contentsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
contentsLabel.Name = "contentsLabel";
contentsLabel.Size = new System.Drawing.Size(63, 19);
contentsLabel.Size = new System.Drawing.Size(37, 19);
contentsLabel.TabIndex = 4;
contentsLabel.Text = "Remark";
contentsLabel.Text = "내용";
//
// uidLabel
//
uidLabel.AutoSize = true;
uidLabel.Location = new System.Drawing.Point(39, 16);
uidLabel.Location = new System.Drawing.Point(30, 15);
uidLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
uidLabel.Name = "uidLabel";
uidLabel.Size = new System.Drawing.Size(41, 19);
uidLabel.Size = new System.Drawing.Size(51, 19);
uidLabel.TabIndex = 0;
uidLabel.Text = "User";
uidLabel.Text = "담당자";
//
// label1
//
label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(44, 258);
label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(37, 19);
label1.TabIndex = 6;
label1.Text = "일수";
//
// dsMSSQL
//
@@ -105,60 +116,61 @@
//
// contentsTextBox
//
this.contentsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.contentsTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "contents", true));
this.contentsTextBox.Location = new System.Drawing.Point(87, 80);
this.contentsTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.contentsTextBox.Multiline = true;
this.contentsTextBox.Name = "contentsTextBox";
this.contentsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.contentsTextBox.Size = new System.Drawing.Size(301, 110);
this.contentsTextBox.Size = new System.Drawing.Size(422, 168);
this.contentsTextBox.TabIndex = 5;
//
// dateTimePicker1
//
this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.dateTimePicker1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "sdate", true));
this.dateTimePicker1.Location = new System.Drawing.Point(87, 45);
this.dateTimePicker1.Name = "dateTimePicker1";
this.dateTimePicker1.Size = new System.Drawing.Size(301, 27);
this.dateTimePicker1.Size = new System.Drawing.Size(422, 27);
this.dateTimePicker1.TabIndex = 3;
this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
//
// cmbUser
//
this.cmbUser.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cmbUser.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.bs, "uid", true));
this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbUser.FormattingEnabled = true;
this.cmbUser.Location = new System.Drawing.Point(87, 12);
this.cmbUser.Name = "cmbUser";
this.cmbUser.Size = new System.Drawing.Size(301, 27);
this.cmbUser.Size = new System.Drawing.Size(422, 27);
this.cmbUser.TabIndex = 1;
//
// btOK
//
this.btOK.Location = new System.Drawing.Point(87, 233);
this.btOK.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.btOK.Location = new System.Drawing.Point(87, 291);
this.btOK.Name = "btOK";
this.btOK.Size = new System.Drawing.Size(301, 38);
this.btOK.Size = new System.Drawing.Size(422, 38);
this.btOK.TabIndex = 8;
this.btOK.Text = "OK";
this.btOK.UseVisualStyleBackColor = true;
this.btOK.Click += new System.EventHandler(this.btOK_Click);
//
// label1
//
label1.AutoSize = true;
label1.Location = new System.Drawing.Point(38, 200);
label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(34, 19);
label1.TabIndex = 6;
label1.Text = "day";
//
// numericUpDown1
//
this.numericUpDown1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.numericUpDown1.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.bs, "termDr", true));
this.numericUpDown1.Location = new System.Drawing.Point(87, 198);
this.numericUpDown1.Location = new System.Drawing.Point(87, 256);
this.numericUpDown1.Name = "numericUpDown1";
this.numericUpDown1.Size = new System.Drawing.Size(301, 27);
this.numericUpDown1.Size = new System.Drawing.Size(422, 27);
this.numericUpDown1.TabIndex = 7;
this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
@@ -166,7 +178,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(398, 280);
this.ClientSize = new System.Drawing.Size(523, 340);
this.Controls.Add(this.numericUpDown1);
this.Controls.Add(label1);
this.Controls.Add(this.btOK);
@@ -177,12 +189,11 @@
this.Controls.Add(this.contentsTextBox);
this.Controls.Add(uidLabel);
this.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fHolyday_Add";
this.Text = "휴가 발생 등록";
this.Text = "휴가 등록";
this.TopMost = true;
this.Load += new System.EventHandler(this.@__Load);
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();

View File

@@ -36,7 +36,7 @@ namespace FBS0000
this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow;
}
this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); ;
this.cmbUser.DataSource = FCOMMON.DBM.getUserTable();
this.cmbUser.DisplayMember = "dispName";
this.cmbUser.ValueMember = "id";
this.bs.DataSource = dr;
@@ -47,6 +47,8 @@ namespace FBS0000
private void __Load(object sender, EventArgs e)
{
bInit = true;
this.Show();
Application.DoEvents();
}
private void btOK_Click(object sender, EventArgs e)

View File

@@ -126,6 +126,9 @@
<metadata name="uidLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</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>
</metadata>
@@ -138,7 +141,4 @@
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>248, 17</value>
</metadata>
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>