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

그룹권한에 업무일지편집제한 추가, 해당 기능이 on 되면 업무일지 7일 이전 데이터 수정 못하게 됨

Browse Source
This commit is contained in:
chi
2023-05-15 11:33:54 +09:00
parent 98a3617a61
commit ba717f542a
8 changed files with 925 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Project/Properties/AssemblyInfo.cs
View File

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

56
SubProject/FCM0000/User/fUserGroupDev.Designer.cs generated
View File

@@ -30,10 +30,14 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserGroupDev));
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
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();
@@ -113,14 +117,14 @@
this.toolStripLabel2,
this.tbFind,
this.btFind});
this.bn.Location = new System.Drawing.Point(0, 623);
this.bn.Location = new System.Drawing.Point(0, 570);
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(652, 25);
this.bn.Size = new System.Drawing.Size(910, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -166,6 +170,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";
@@ -230,6 +235,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, 25);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -252,7 +258,7 @@
this.toolStripMenuItem1,
this.권한설정ToolStripMenuItem});
this.cm1.Name = "cm1";
this.cm1.Size = new System.Drawing.Size(203, 116);
this.cm1.Size = new System.Drawing.Size(203, 94);
//
// columnSizeToolStripMenuItem
//
@@ -299,7 +305,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(652, 623);
this.fpSpread1.Size = new System.Drawing.Size(910, 570);
this.fpSpread1.TabIndex = 2;
//
// fpSpread1_Sheet1
@@ -308,42 +314,50 @@
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 = 4;
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 = textCellType1;
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 = textCellType2;
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 = textCellType3;
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)))));
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType1;
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;
@@ -353,18 +367,16 @@
//
this.ta.ClearBeforeFill = true;
//
// fUserGroup
// fUserGroupDev
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(652, 648);
this.ClientSize = new System.Drawing.Size(910, 595);
this.ContextMenuStrip = this.cm1;
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.bn);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fUserGroup";
this.Name = "fUserGroupDev";
this.Text = "사용자 그룹";
this.Load += new System.EventHandler(this.@__Load);
((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();

3
SubProject/FCM0000/User/fUserGroupDev.resx
View File

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

28
SubProject/FCM0000/User/fUserGroupPermission.Designer.cs generated
View File

@@ -39,6 +39,7 @@
this.checkBox4 = new System.Windows.Forms.CheckBox();
this.checkBox5 = new System.Windows.Forms.CheckBox();
this.checkBox6 = new System.Windows.Forms.CheckBox();
this.checkBox7 = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// c0
@@ -87,9 +88,9 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(14, 247);
this.button1.Location = new System.Drawing.Point(15, 244);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(136, 44);
this.button1.Size = new System.Drawing.Size(465, 44);
this.button1.TabIndex = 1;
this.button1.Text = "확인";
this.button1.UseVisualStyleBackColor = true;
@@ -120,7 +121,7 @@
// checkBox3
//
this.checkBox3.AutoSize = true;
this.checkBox3.Location = new System.Drawing.Point(142, 14);
this.checkBox3.Location = new System.Drawing.Point(153, 14);
this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(170, 34);
this.checkBox3.TabIndex = 4;
@@ -131,7 +132,7 @@
// checkBox4
//
this.checkBox4.AutoSize = true;
this.checkBox4.Location = new System.Drawing.Point(142, 54);
this.checkBox4.Location = new System.Drawing.Point(153, 54);
this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(74, 34);
this.checkBox4.TabIndex = 5;
@@ -142,7 +143,7 @@
// checkBox5
//
this.checkBox5.AutoSize = true;
this.checkBox5.Location = new System.Drawing.Point(142, 88);
this.checkBox5.Location = new System.Drawing.Point(153, 88);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(116, 34);
this.checkBox5.TabIndex = 6;
@@ -153,7 +154,7 @@
// checkBox6
//
this.checkBox6.AutoSize = true;
this.checkBox6.Location = new System.Drawing.Point(142, 128);
this.checkBox6.Location = new System.Drawing.Point(153, 128);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(188, 34);
this.checkBox6.TabIndex = 7;
@@ -161,11 +162,23 @@
this.checkBox6.Text = "업무일지-기술료";
this.checkBox6.UseVisualStyleBackColor = true;
//
// checkBox7
//
this.checkBox7.AutoSize = true;
this.checkBox7.Location = new System.Drawing.Point(153, 165);
this.checkBox7.Name = "checkBox7";
this.checkBox7.Size = new System.Drawing.Size(209, 34);
this.checkBox7.TabIndex = 8;
this.checkBox7.Tag = "10";
this.checkBox7.Text = "업무일지-편집제한";
this.checkBox7.UseVisualStyleBackColor = true;
//
// fUserGroupPermission
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(344, 297);
this.ClientSize = new System.Drawing.Size(491, 297);
this.Controls.Add(this.checkBox7);
this.Controls.Add(this.checkBox6);
this.Controls.Add(this.checkBox5);
this.Controls.Add(this.checkBox4);
@@ -202,5 +215,6 @@
private System.Windows.Forms.CheckBox checkBox4;
private System.Windows.Forms.CheckBox checkBox5;
private System.Windows.Forms.CheckBox checkBox6;
private System.Windows.Forms.CheckBox checkBox7;
}
}

1
SubProject/FCOMMON/Info.cs
View File

@@ -29,6 +29,7 @@ namespace FCOMMON
menu_docu,
menu_logdata,
jobreport_kisul,
jobreport_editblock,
}
public static class info

27
SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs generated
View File

@@ -68,6 +68,7 @@
this.tbProject = new System.Windows.Forms.ComboBox();
this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
this.panel1 = new System.Windows.Forms.Panel();
this.chkManagerAlert = new System.Windows.Forms.CheckBox();
this.tbProjectIndex = new System.Windows.Forms.Button();
this.grpkisul = new System.Windows.Forms.GroupBox();
this.cmb_kisuldiv = new System.Windows.Forms.ComboBox();
@@ -79,7 +80,6 @@
this.tbTag = new System.Windows.Forms.TextBox();
this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.chkManagerAlert = new System.Windows.Forms.CheckBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
hrsLabel = new System.Windows.Forms.Label();
typeLabel = new System.Windows.Forms.Label();
@@ -322,9 +322,10 @@
// btSave
//
this.btSave.BackColor = System.Drawing.Color.SkyBlue;
this.btSave.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.btSave.Location = new System.Drawing.Point(829, 6);
this.btSave.Name = "btSave";
this.btSave.Size = new System.Drawing.Size(133, 163);
this.btSave.Size = new System.Drawing.Size(151, 163);
this.btSave.TabIndex = 28;
this.btSave.Text = "확인";
this.btSave.UseVisualStyleBackColor = false;
@@ -496,6 +497,17 @@
this.panel1.Size = new System.Drawing.Size(984, 205);
this.panel1.TabIndex = 0;
//
// chkManagerAlert
//
this.chkManagerAlert.AutoSize = true;
this.chkManagerAlert.Location = new System.Drawing.Point(265, 181);
this.chkManagerAlert.Name = "chkManagerAlert";
this.chkManagerAlert.Size = new System.Drawing.Size(116, 16);
this.chkManagerAlert.TabIndex = 30;
this.chkManagerAlert.Text = "관리자 메일 알림";
this.toolTip1.SetToolTip(this.chkManagerAlert, "체크시 업무일지 내용을 관리자에게 메일로 전송합니다.\r\n메일양식에 MA 항목이 등록되어있어야 합니다");
this.chkManagerAlert.UseVisualStyleBackColor = true;
//
// tbProjectIndex
//
this.tbProjectIndex.Location = new System.Drawing.Point(754, 58);
@@ -615,17 +627,6 @@
this.tam.SPMasterTableAdapter = null;
this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
// chkManagerAlert
//
this.chkManagerAlert.AutoSize = true;
this.chkManagerAlert.Location = new System.Drawing.Point(265, 181);
this.chkManagerAlert.Name = "chkManagerAlert";
this.chkManagerAlert.Size = new System.Drawing.Size(116, 16);
this.chkManagerAlert.TabIndex = 30;
this.chkManagerAlert.Text = "관리자 메일 알림";
this.toolTip1.SetToolTip(this.chkManagerAlert, "체크시 업무일지 내용을 관리자에게 메일로 전송합니다.\r\n메일양식에 MA 항목이 등록되어있어야 합니다");
this.chkManagerAlert.UseVisualStyleBackColor = true;
//
// fJobReport_Add
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

35
SubProject/FPJ0000/JobReport_/fJobReport_Add.cs
View File

@@ -103,7 +103,7 @@ namespace FPJ0000.JobReport_
this.cmbPackage.DataSource = dt_package;
//업무형태
var dt_type = FCOMMON.DBM.getCodeTable("15","code,memo,svalue");
var dt_type = FCOMMON.DBM.getCodeTable("15", "code,memo,svalue");
this.cmbType.DisplayMember = "Value";
this.cmbType.ValueMember = "Value";
this.cmbType.DataSource = dt_type;
@@ -147,10 +147,10 @@ namespace FPJ0000.JobReport_
cmbProcess.SelectedValue = dr.process;
tbTag.Text = dr.tag;
if(dr.process.isEmpty() && cmbProcess.SelectedIndex < 0) //기본값을 찾는다
if (dr.process.isEmpty() && cmbProcess.SelectedIndex < 0) //기본값을 찾는다
{
var dts = dt_process.AsEnumerable().Where(t => t.IsNull("SValue") == false).ToList();
foreach(var dr in dts)
foreach (var dr in dts)
{
if (dr["Svalue"].ToString().Equals("O"))
{
@@ -293,7 +293,20 @@ namespace FPJ0000.JobReport_
{
panel1.Enabled = false;
this.Text += "(읽기전용)";
}
else if (dr.RowState != DataRowState.Detached && FCOMMON.info.Login.level < 5)
{
//신규자료가 아니라면 7일간만 편집을 허용한다
var enableBlock = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.jobreport_editblock);
if(enableBlock)
{
var writedate = DateTime.Now - DateTime.Parse(dr.pdate);
if (writedate.TotalDays > 7)
{
panel1.Enabled = false;
this.Text += "(7일초과)";
}
}
}
//신규데이터라면 양식을 처리한다.
@@ -440,9 +453,9 @@ namespace FPJ0000.JobReport_
return;
}
if(dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached )
if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached)
{
if(FCOMMON.info.Disable_8hourover)
if (FCOMMON.info.Disable_8hourover)
{
var h = Single.Parse(tbHrs.Text);
if (h > 8)
@@ -605,10 +618,10 @@ namespace FPJ0000.JobReport_
this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf;
this.bs.EndEdit();
if(chkManagerAlert.Checked)
if (chkManagerAlert.Checked)
{
var dlg = FCOMMON.Util.MsgQ("관리자 메일을 전송할까요?\n업무일지 작성 내용이 전달 됩니다");
if(dlg == DialogResult.Yes)
if (dlg == DialogResult.Yes)
{
var db = new EEEntities();
var mf = db.MailForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "MA").FirstOrDefault();
@@ -659,7 +672,7 @@ namespace FPJ0000.JobReport_
org = org.Replace("{OT}", tbOt.Text);
org = org.Replace("{PROJECT}", tbProject.Text);
org = org.Replace("{REMARK}", richTextBoxEx1.Text);
org = org.Replace("{SENDER}",FCOMMON.info.Login.email);
org = org.Replace("{SENDER}", FCOMMON.info.Login.email);
return org;
@@ -841,13 +854,13 @@ namespace FPJ0000.JobReport_
private void tbProjectIndex_Click(object sender, EventArgs e)
{
if(int.TryParse(tbProjectIndex.Text, out int pidx))
if (int.TryParse(tbProjectIndex.Text, out int pidx))
{
if (pidx < 1) return;
var ta = new dsPRJTableAdapters.ProjectsTableAdapter();
var dr = ta.GetbyIDX(pidx).First();
var f = new fProjectData(dr,false);
var f = new fProjectData(dr, false);
f.Show();
//if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
//{

9
SubProject/FPJ0000/JobReport_/fJobReport_Add.resx
View File

@@ -162,6 +162,12 @@
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</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>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 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>
</metadata>
@@ -184,4 +190,7 @@
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>226, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>416, 17</value>
</metadata>
</root>