Guids werden hinzugefügt
This commit is contained in:
@@ -47,6 +47,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Datenbank.cs" />
|
<Compile Include="Datenbank.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="UpdateDatabase.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\KlassenBIB\KlassenBIB.csproj">
|
<ProjectReference Include="..\KlassenBIB\KlassenBIB.csproj">
|
||||||
|
|||||||
@@ -54,6 +54,8 @@ namespace Database
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
loadedProjekt = new KlassenBIB.Projekt();
|
loadedProjekt = new KlassenBIB.Projekt();
|
||||||
|
|
||||||
|
UpdateDatabase.UpdateNewGuids();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
30
Database/UpdateDatabase.cs
Normal file
30
Database/UpdateDatabase.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Database
|
||||||
|
{
|
||||||
|
class UpdateDatabase
|
||||||
|
{
|
||||||
|
public static void UpdateNewGuids()
|
||||||
|
{
|
||||||
|
if (Datenbank.Instance.loadedProjekt == null) return;
|
||||||
|
foreach(var entries in Datenbank.Instance.loadedProjekt.Objekte)
|
||||||
|
{
|
||||||
|
|
||||||
|
if(entries.Guid.Equals(Guid.Empty))
|
||||||
|
entries.Guid = Guid.NewGuid();
|
||||||
|
|
||||||
|
|
||||||
|
foreach(var sanierungen in entries.Sanierung)
|
||||||
|
{
|
||||||
|
if (sanierungen.Guid.Equals(Guid.Empty))
|
||||||
|
sanierungen.Guid = Guid.NewGuid();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -81,6 +81,10 @@ namespace KlassenBIB
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
public Guid Guid { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
public Inspektionsobjekt()
|
public Inspektionsobjekt()
|
||||||
{
|
{
|
||||||
Schadenskuerzeln = new InspektionskuerzelnCollection();
|
Schadenskuerzeln = new InspektionskuerzelnCollection();
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace KlassenBIB
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class Sanieren : Sanierung
|
public abstract class Sanieren : Sanierung
|
||||||
{
|
{
|
||||||
Guid guid;
|
|
||||||
DateTime datum = new DateTime();
|
DateTime datum = new DateTime();
|
||||||
bool fertig = false;
|
bool fertig = false;
|
||||||
string verzeichnispfad;
|
string verzeichnispfad;
|
||||||
@@ -22,10 +22,6 @@ namespace KlassenBIB
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Guid Guid { get => guid; set => guid = value; }
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
public DateTime Datum { get => datum; set => datum = value; }
|
public DateTime Datum { get => datum; set => datum = value; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace KlassenBIB
|
|||||||
[Browsable(false)]
|
[Browsable(false)]
|
||||||
public abstract class Sanierung : INotifyPropertyChanged
|
public abstract class Sanierung : INotifyPropertyChanged
|
||||||
{
|
{
|
||||||
//Guid guid;
|
Guid guid;
|
||||||
double tempAusen;
|
double tempAusen;
|
||||||
double tempKanal;
|
double tempKanal;
|
||||||
string wetter;
|
string wetter;
|
||||||
@@ -53,7 +53,10 @@ namespace KlassenBIB
|
|||||||
/// <param name="projektpfad"></param>
|
/// <param name="projektpfad"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public abstract string CheckVerzeichnisse(string projektpfad);
|
public abstract string CheckVerzeichnisse(string projektpfad);
|
||||||
//public Guid Guid { get => guid; set => guid = value; }
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
public Guid Guid { get => guid; set => guid = value; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
2
SanSystem/frmObjektEdit.Designer.cs
generated
2
SanSystem/frmObjektEdit.Designer.cs
generated
@@ -373,6 +373,7 @@
|
|||||||
this.txt_punkt_bis.Name = "txt_punkt_bis";
|
this.txt_punkt_bis.Name = "txt_punkt_bis";
|
||||||
this.txt_punkt_bis.Size = new System.Drawing.Size(330, 30);
|
this.txt_punkt_bis.Size = new System.Drawing.Size(330, 30);
|
||||||
this.txt_punkt_bis.TabIndex = 4;
|
this.txt_punkt_bis.TabIndex = 4;
|
||||||
|
this.txt_punkt_bis.Leave += new System.EventHandler(this.Txt_punkt_bis_Leave);
|
||||||
//
|
//
|
||||||
// txt_punkt_von
|
// txt_punkt_von
|
||||||
//
|
//
|
||||||
@@ -466,6 +467,7 @@
|
|||||||
this.dgv_schadenkuerzel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
this.dgv_schadenkuerzel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||||
this.dgv_schadenkuerzel.Location = new System.Drawing.Point(6, 6);
|
this.dgv_schadenkuerzel.Location = new System.Drawing.Point(6, 6);
|
||||||
this.dgv_schadenkuerzel.Name = "dgv_schadenkuerzel";
|
this.dgv_schadenkuerzel.Name = "dgv_schadenkuerzel";
|
||||||
|
this.dgv_schadenkuerzel.RowHeadersWidth = 51;
|
||||||
this.dgv_schadenkuerzel.Size = new System.Drawing.Size(1268, 269);
|
this.dgv_schadenkuerzel.Size = new System.Drawing.Size(1268, 269);
|
||||||
this.dgv_schadenkuerzel.TabIndex = 0;
|
this.dgv_schadenkuerzel.TabIndex = 0;
|
||||||
this.dgv_schadenkuerzel.RowHeaderMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgv_schadenkuerzel_RowHeaderMouseDoubleClick);
|
this.dgv_schadenkuerzel.RowHeaderMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgv_schadenkuerzel_RowHeaderMouseDoubleClick);
|
||||||
|
|||||||
@@ -20,15 +20,16 @@ namespace SanSystem
|
|||||||
public partial class frmObjektEdit : Form
|
public partial class frmObjektEdit : Form
|
||||||
{
|
{
|
||||||
Inspektionsobjekt inspektionsobjekt = null;
|
Inspektionsobjekt inspektionsobjekt = null;
|
||||||
|
private bool neu = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="inspektion"></param>
|
/// <param name="inspektion"></param>
|
||||||
public frmObjektEdit(Inspektionsobjekt inspektion)
|
public frmObjektEdit(Inspektionsobjekt inspektion, bool neu = false)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
this.neu = neu;
|
||||||
|
|
||||||
btn_add_san.Text = Global.Instance.language.Labels["add_san"];
|
btn_add_san.Text = Global.Instance.language.Labels["add_san"];
|
||||||
btn_close.Text = Global.Instance.language.Labels["btn_close"];
|
btn_close.Text = Global.Instance.language.Labels["btn_close"];
|
||||||
@@ -213,5 +214,13 @@ namespace SanSystem
|
|||||||
//frmSanKonzept.MdiParent = this.MdiParent;
|
//frmSanKonzept.MdiParent = this.MdiParent;
|
||||||
frmSanKonzept.ShowDialog();
|
frmSanKonzept.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Txt_punkt_bis_Leave(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (!neu) return;
|
||||||
|
// Prüfen ob dieser Element bereits vorhanden ist
|
||||||
|
if (Datenbank.Instance.loadedProjekt.Objekte.Exists(x => x.BisPunkt.Equals(txt_punkt_bis.Text)))
|
||||||
|
txt_punkt_bis.BackColor = Color.Red;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -182,12 +182,13 @@ namespace SanSystem
|
|||||||
private void btn_add_Click(object sender, EventArgs e)
|
private void btn_add_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt();
|
Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt();
|
||||||
|
inspektionsobjekt.Guid = Guid.NewGuid();
|
||||||
inspektionsobjekt.Projektnummer = inspektionsobjekte.First().Projektnummer;
|
inspektionsobjekt.Projektnummer = inspektionsobjekte.First().Projektnummer;
|
||||||
inspektionsobjekt.OrtName = inspektionsobjekte.First().OrtName;
|
inspektionsobjekt.OrtName = inspektionsobjekte.First().OrtName;
|
||||||
inspektionsobjekt.StrasseName = inspektionsobjekte.First().StrasseName;
|
inspektionsobjekt.StrasseName = inspektionsobjekte.First().StrasseName;
|
||||||
Datenbank.Instance.loadedProjekt.Objekte.Add(inspektionsobjekt);
|
Datenbank.Instance.loadedProjekt.Objekte.Add(inspektionsobjekt);
|
||||||
|
|
||||||
frmObjektEdit frmObjektEdit = new frmObjektEdit(inspektionsobjekt);
|
frmObjektEdit frmObjektEdit = new frmObjektEdit(inspektionsobjekt,true);
|
||||||
frmObjektEdit.FormClosed += FrmObjektEdit_FormClosed;
|
frmObjektEdit.FormClosed += FrmObjektEdit_FormClosed;
|
||||||
frmObjektEdit.ShowDialog();
|
frmObjektEdit.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user