Auftraggeber kann nun pro liner Separiert werden
This commit is contained in:
@@ -20,6 +20,13 @@ namespace SanSystem
|
|||||||
public partial class frmAuftraggeberEdit : Form
|
public partial class frmAuftraggeberEdit : Form
|
||||||
{
|
{
|
||||||
IAuftraggeber auftraggeber;
|
IAuftraggeber auftraggeber;
|
||||||
|
public IAuftraggeber Auftraggeber
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return auftraggeber;
|
||||||
|
}
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
33
SanSystem/frmObjektEdit.Designer.cs
generated
33
SanSystem/frmObjektEdit.Designer.cs
generated
@@ -68,6 +68,8 @@
|
|||||||
this.label2 = new System.Windows.Forms.Label();
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
this.label1 = new System.Windows.Forms.Label();
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
this.tabControl1 = new System.Windows.Forms.TabControl();
|
this.tabControl1 = new System.Windows.Forms.TabControl();
|
||||||
|
this.cb_overrideAuftraggeber = new System.Windows.Forms.CheckBox();
|
||||||
|
this.btn_auftraggeber = new System.Windows.Forms.Button();
|
||||||
this.tabPage2.SuspendLayout();
|
this.tabPage2.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.dgv_sanierungen)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.dgv_sanierungen)).BeginInit();
|
||||||
this.Kanalinformationen.SuspendLayout();
|
this.Kanalinformationen.SuspendLayout();
|
||||||
@@ -150,6 +152,8 @@
|
|||||||
//
|
//
|
||||||
// tabPage1
|
// tabPage1
|
||||||
//
|
//
|
||||||
|
this.tabPage1.Controls.Add(this.btn_auftraggeber);
|
||||||
|
this.tabPage1.Controls.Add(this.cb_overrideAuftraggeber);
|
||||||
this.tabPage1.Controls.Add(this.txt_san_nr);
|
this.tabPage1.Controls.Add(this.txt_san_nr);
|
||||||
this.tabPage1.Controls.Add(this.txt_ort);
|
this.tabPage1.Controls.Add(this.txt_ort);
|
||||||
this.tabPage1.Controls.Add(this.txt_bemerkung);
|
this.tabPage1.Controls.Add(this.txt_bemerkung);
|
||||||
@@ -205,7 +209,7 @@
|
|||||||
//
|
//
|
||||||
// txt_bemerkung
|
// txt_bemerkung
|
||||||
//
|
//
|
||||||
this.txt_bemerkung.Location = new System.Drawing.Point(729, 318);
|
this.txt_bemerkung.Location = new System.Drawing.Point(605, 382);
|
||||||
this.txt_bemerkung.Multiline = true;
|
this.txt_bemerkung.Multiline = true;
|
||||||
this.txt_bemerkung.Name = "txt_bemerkung";
|
this.txt_bemerkung.Name = "txt_bemerkung";
|
||||||
this.txt_bemerkung.Size = new System.Drawing.Size(333, 253);
|
this.txt_bemerkung.Size = new System.Drawing.Size(333, 253);
|
||||||
@@ -314,7 +318,7 @@
|
|||||||
//
|
//
|
||||||
this.label8.AutoSize = true;
|
this.label8.AutoSize = true;
|
||||||
this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.label8.Location = new System.Drawing.Point(725, 276);
|
this.label8.Location = new System.Drawing.Point(601, 340);
|
||||||
this.label8.Name = "label8";
|
this.label8.Name = "label8";
|
||||||
this.label8.Size = new System.Drawing.Size(112, 25);
|
this.label8.Size = new System.Drawing.Size(112, 25);
|
||||||
this.label8.TabIndex = 28;
|
this.label8.TabIndex = 28;
|
||||||
@@ -562,6 +566,29 @@
|
|||||||
this.tabControl1.TabIndex = 0;
|
this.tabControl1.TabIndex = 0;
|
||||||
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
|
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
|
||||||
//
|
//
|
||||||
|
// cb_overrideAuftraggeber
|
||||||
|
//
|
||||||
|
this.cb_overrideAuftraggeber.AutoSize = true;
|
||||||
|
this.cb_overrideAuftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.cb_overrideAuftraggeber.Location = new System.Drawing.Point(590, 191);
|
||||||
|
this.cb_overrideAuftraggeber.Name = "cb_overrideAuftraggeber";
|
||||||
|
this.cb_overrideAuftraggeber.Size = new System.Drawing.Size(232, 29);
|
||||||
|
this.cb_overrideAuftraggeber.TabIndex = 33;
|
||||||
|
this.cb_overrideAuftraggeber.Text = "Spezielle Auftraggeber";
|
||||||
|
this.cb_overrideAuftraggeber.UseVisualStyleBackColor = true;
|
||||||
|
this.cb_overrideAuftraggeber.CheckedChanged += new System.EventHandler(this.Cb_overrideAuftraggeber_CheckedChanged);
|
||||||
|
//
|
||||||
|
// btn_auftraggeber
|
||||||
|
//
|
||||||
|
this.btn_auftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.btn_auftraggeber.Location = new System.Drawing.Point(670, 226);
|
||||||
|
this.btn_auftraggeber.Name = "btn_auftraggeber";
|
||||||
|
this.btn_auftraggeber.Size = new System.Drawing.Size(268, 103);
|
||||||
|
this.btn_auftraggeber.TabIndex = 34;
|
||||||
|
this.btn_auftraggeber.Text = "Auftraggeber";
|
||||||
|
this.btn_auftraggeber.UseVisualStyleBackColor = true;
|
||||||
|
this.btn_auftraggeber.Click += new System.EventHandler(this.Btn_auftraggeber_Click);
|
||||||
|
//
|
||||||
// frmObjektEdit
|
// frmObjektEdit
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
|
||||||
@@ -632,5 +659,7 @@
|
|||||||
private System.Windows.Forms.Label label2;
|
private System.Windows.Forms.Label label2;
|
||||||
private System.Windows.Forms.Label label1;
|
private System.Windows.Forms.Label label1;
|
||||||
private System.Windows.Forms.TabControl tabControl1;
|
private System.Windows.Forms.TabControl tabControl1;
|
||||||
|
private System.Windows.Forms.CheckBox cb_overrideAuftraggeber;
|
||||||
|
private System.Windows.Forms.Button btn_auftraggeber;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -73,6 +73,9 @@ namespace SanSystem
|
|||||||
private void frmObjektEdit_Load(object sender, EventArgs e)
|
private void frmObjektEdit_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
txt_objekt_name.Enabled = false;
|
txt_objekt_name.Enabled = false;
|
||||||
|
btn_auftraggeber.Enabled = (inspektionsobjekt.OverrideAuftraggeber != null);
|
||||||
|
cb_overrideAuftraggeber.Checked = btn_auftraggeber.Enabled;
|
||||||
|
|
||||||
|
|
||||||
txt_laenge_schacht.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Schachtlaenge"));
|
txt_laenge_schacht.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Schachtlaenge"));
|
||||||
txt_objekt_name.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Objektbezeichnung"));
|
txt_objekt_name.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Objektbezeichnung"));
|
||||||
@@ -120,6 +123,8 @@ namespace SanSystem
|
|||||||
txt_san_nr.DataBindings.Clear();
|
txt_san_nr.DataBindings.Clear();
|
||||||
|
|
||||||
cb_geschlossenesEnde.DataBindings.Clear();
|
cb_geschlossenesEnde.DataBindings.Clear();
|
||||||
|
if (!cb_overrideAuftraggeber.Checked)
|
||||||
|
inspektionsobjekt.OverrideAuftraggeber = null;
|
||||||
//MessageBox.Show(string.Format("width: {0} height: {1}", width, height));
|
//MessageBox.Show(string.Format("width: {0} height: {1}", width, height));
|
||||||
Global.Instance.BuildNewLinerReste(EventArgs.Empty);
|
Global.Instance.BuildNewLinerReste(EventArgs.Empty);
|
||||||
this.Close();
|
this.Close();
|
||||||
@@ -259,5 +264,25 @@ namespace SanSystem
|
|||||||
txt_punkt_bis.BackColor = Color.Red;
|
txt_punkt_bis.BackColor = Color.Red;
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Cb_overrideAuftraggeber_CheckedChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
btn_auftraggeber.Enabled = cb_overrideAuftraggeber.Checked;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Btn_auftraggeber_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (inspektionsobjekt.OverrideAuftraggeber == null)
|
||||||
|
inspektionsobjekt.OverrideAuftraggeber = new Auftraggeber();
|
||||||
|
frmAuftraggeberEdit frmAuftraggeberEdit = new frmAuftraggeberEdit(inspektionsobjekt.OverrideAuftraggeber);
|
||||||
|
frmAuftraggeberEdit.FormClosed += FrmAuftraggeberEdit_FormClosed;
|
||||||
|
frmAuftraggeberEdit.ShowDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void FrmAuftraggeberEdit_FormClosed(object sender, FormClosedEventArgs e)
|
||||||
|
{
|
||||||
|
inspektionsobjekt.OverrideAuftraggeber = (sender as frmAuftraggeberEdit).Auftraggeber;
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -203,6 +203,7 @@ namespace SanSystem
|
|||||||
{
|
{
|
||||||
CheckEntries();
|
CheckEntries();
|
||||||
dGObjekte.Columns["StrasseName"].Visible = false;
|
dGObjekte.Columns["StrasseName"].Visible = false;
|
||||||
|
dGObjekte.Columns["OverrideAuftraggeber"].Visible = false;
|
||||||
dGObjekte.Columns["OrtName"].Visible = false;
|
dGObjekte.Columns["OrtName"].Visible = false;
|
||||||
dGObjekte.Columns["Projektnummer"].Visible = false;
|
dGObjekte.Columns["Projektnummer"].Visible = false;
|
||||||
dGObjekte.Columns["Rohrmaterial"].Visible = false;
|
dGObjekte.Columns["Rohrmaterial"].Visible = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user