Es können jetzt von xml 2006 importiert werden

This commit is contained in:
Husky
2018-07-21 11:57:06 +02:00
parent ea3b8c564a
commit 20388f5603
42 changed files with 815 additions and 42 deletions

View File

@@ -249,6 +249,10 @@
<Project>{c949087e-20e1-4a17-b021-faead363c1d8}</Project>
<Name>SanShared</Name>
</ProjectReference>
<ProjectReference Include="..\SchnittstelleImporter\SchnittstelleImporter.csproj">
<Project>{E1564A4D-39FD-489B-8029-AEEF33033EF2}</Project>
<Name>SchnittstelleImporter</Name>
</ProjectReference>
<ProjectReference Include="..\TempCAN\TempCAN.csproj">
<Project>{e4979419-5eae-4b6d-a6a0-9632c1de87a0}</Project>
<Name>TempCAN</Name>

View File

@@ -33,9 +33,10 @@
this.neuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.öffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel();
this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.stammdatenImportierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.mainmenu.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
@@ -57,7 +58,8 @@
//
this.projektToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.neuToolStripMenuItem,
this.öffnenToolStripMenuItem});
this.öffnenToolStripMenuItem,
this.stammdatenImportierenToolStripMenuItem});
this.projektToolStripMenuItem.Name = "projektToolStripMenuItem";
this.projektToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
this.projektToolStripMenuItem.Text = "Projekt";
@@ -65,14 +67,14 @@
// neuToolStripMenuItem
//
this.neuToolStripMenuItem.Name = "neuToolStripMenuItem";
this.neuToolStripMenuItem.Size = new System.Drawing.Size(111, 22);
this.neuToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
this.neuToolStripMenuItem.Text = "Neu";
this.neuToolStripMenuItem.Click += new System.EventHandler(this.neuToolStripMenuItem_Click);
//
// öffnenToolStripMenuItem
//
this.öffnenToolStripMenuItem.Name = "öffnenToolStripMenuItem";
this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(111, 22);
this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
this.öffnenToolStripMenuItem.Text = "Öffnen";
this.öffnenToolStripMenuItem.Click += new System.EventHandler(this.öffnenToolStripMenuItem_Click);
//
@@ -83,6 +85,13 @@
this.speichernToolStripMenuItem.Text = "Speichern";
this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click);
//
// massenstatistikToolStripMenuItem
//
this.massenstatistikToolStripMenuItem.Name = "massenstatistikToolStripMenuItem";
this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(99, 20);
this.massenstatistikToolStripMenuItem.Text = "Massenstatistik";
this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click);
//
// statusStrip1
//
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -100,12 +109,12 @@
this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(44, 17);
this.toolStripStatus_projekt_Label.Text = "Projekt";
//
// massenstatistikToolStripMenuItem
// stammdatenImportierenToolStripMenuItem
//
this.massenstatistikToolStripMenuItem.Name = "massenstatistikToolStripMenuItem";
this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(99, 20);
this.massenstatistikToolStripMenuItem.Text = "Massenstatistik";
this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click);
this.stammdatenImportierenToolStripMenuItem.Name = "stammdatenImportierenToolStripMenuItem";
this.stammdatenImportierenToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
this.stammdatenImportierenToolStripMenuItem.Text = "Stammdaten importieren";
this.stammdatenImportierenToolStripMenuItem.Click += new System.EventHandler(this.stammdatenImportierenToolStripMenuItem_Click);
//
// frmMain
//
@@ -116,7 +125,7 @@
this.Controls.Add(this.mainmenu);
this.IsMdiContainer = true;
this.MainMenuStrip = this.mainmenu;
this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "frmMain";
this.Text = "Kanalsanierungsverwaltung";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frm_main_FormClosing);
@@ -140,6 +149,7 @@
private System.Windows.Forms.ToolStripStatusLabel toolStripStatus_projekt_Label;
private System.Windows.Forms.ToolStripMenuItem speichernToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem massenstatistikToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem stammdatenImportierenToolStripMenuItem;
}
}

View File

@@ -1,6 +1,7 @@
using Database;
using FluentFTP;
using KlassenBIB;
using SchnittstelleImporter;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -108,5 +109,13 @@ namespace SanSystem
FrmSelectMassenDate frmSelectMassenDate = new FrmSelectMassenDate();
frmSelectMassenDate.ShowDialog();
}
private void stammdatenImportierenToolStripMenuItem_Click(object sender, EventArgs e)
{
IImportedObjekte importedObjekte = new Import();
importedObjekte.XMLFile = @"C:\Users\Damian\Desktop\XML\3_Zustandsdaten\ISYBAU_XML-2006-Zustandsdaten_DIN_EN_13508-2.xml";
importedObjekte.Projektnummer = Global.Instance.ProjektNummer;
Datenbank.Instance.loadedProjekt.Objekte.AddRange(importedObjekte.GetInspektionsobjekte());
}
}
}