Husky/DaSaSo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Schlauchliner form wird vollständig verwaltet

Browse Source
This commit is contained in:
HuskyTeufel
2021-10-13 11:56:02 +02:00
parent 4ed6826f62
commit adbbc0e528
12 changed files with 169 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DaSaSo.Domain/Model/Impregnation.cs
View File

@@ -12,7 +12,7 @@ namespace DaSaSo.Domain.Model
public string Number { get; set; }
public decimal Linerlength { get; set; }
public bool IsAvaible { get; set; }
public DateTime Date { get; set; }
public DateOnly Date { get; set; }
public string LinerNumber { get; set; }
public decimal WallThickness { get; set; }
}

394
DaSaSo.EntityFramework/Migrations/20211009185244_DateOnly.Designer.cs generated
View File

@@ -1,394 +0,0 @@
// <auto-generated />
using System;
using DaSaSo.EntityFramework;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace DaSaSo.EntityFramework.Migrations
{
[DbContext(typeof(DaSaSoDbContext))]
[Migration("20211009185244_DateOnly")]
partial class DateOnly
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.0-rc.1.21452.10")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("BuildingSiteNumber")
.HasColumnType("text");
b.Property<string>("ContactPerson")
.HasColumnType("text");
b.Property<string>("Country")
.HasColumnType("text");
b.Property<int?>("ProjectId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("ProjectId");
b.ToTable("Buildingsites");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Country")
.HasColumnType("text");
b.Property<string>("Firstname")
.HasColumnType("text");
b.Property<string>("LastName")
.HasColumnType("text");
b.Property<string>("Postcode")
.HasColumnType("text");
b.Property<string>("Street")
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("Clients");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Impregnation", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("DN")
.HasColumnType("integer");
b.Property<DateTime>("Date")
.HasColumnType("timestamp with time zone");
b.Property<bool>("IsAvaible")
.HasColumnType("boolean");
b.Property<string>("LinerNumber")
.HasColumnType("text");
b.Property<decimal>("Linerlength")
.HasColumnType("numeric");
b.Property<string>("Number")
.HasColumnType("text");
b.Property<decimal>("WallThickness")
.HasColumnType("numeric");
b.HasKey("Id");
b.ToTable("Impregnations");
});
modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<bool>("ClosedEnd")
.HasColumnType("boolean");
b.Property<DateOnly>("Date")
.HasColumnType("date");
b.Property<int?>("ImpregnationId")
.HasColumnType("integer");
b.Property<decimal>("InversionPressure")
.HasColumnType("numeric");
b.Property<decimal>("LinerLength")
.HasColumnType("numeric");
b.Property<string>("Operator")
.HasColumnType("text");
b.Property<bool>("Preliner")
.HasColumnType("boolean");
b.Property<int>("PreparationType")
.HasColumnType("integer");
b.Property<decimal>("TemperaturAssembly")
.HasColumnType("numeric");
b.Property<decimal>("TemperaturStorage")
.HasColumnType("numeric");
b.Property<decimal>("TemperatureOutdoors")
.HasColumnType("numeric");
b.Property<decimal>("TemperatureSewer")
.HasColumnType("numeric");
b.Property<string>("Weather")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("ImpregnationId");
b.ToTable("PipeLiners");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int?>("ClientId")
.HasColumnType("integer");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("Projektnummer")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("ClientId");
b.ToTable("Projects");
});
modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int>("DamageType")
.HasColumnType("integer");
b.Property<decimal>("Distance")
.HasColumnType("numeric");
b.Property<int?>("SewerObjectId")
.HasColumnType("integer");
b.HasKey("Id");
b.HasIndex("SewerObjectId");
b.ToTable("SewerDamages");
});
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<int?>("BuildingSiteId")
.HasColumnType("integer");
b.Property<bool>("BuildingsiteBarier")
.HasColumnType("boolean");
b.Property<int>("DN")
.HasColumnType("integer");
b.Property<string>("Hausnummer")
.HasColumnType("text");
b.Property<string>("Material")
.HasColumnType("text");
b.Property<string>("ObjektName")
.HasColumnType("text");
b.Property<bool>("PermitNeeded")
.HasColumnType("boolean");
b.Property<int?>("PipeLinerId")
.HasColumnType("integer");
b.Property<int?>("PunktObenId")
.HasColumnType("integer");
b.Property<int>("PunktObenType")
.HasColumnType("integer");
b.Property<int?>("PunktUntenId")
.HasColumnType("integer");
b.Property<int>("PunktUntenType")
.HasColumnType("integer");
b.Property<string>("SanNummer")
.HasColumnType("text");
b.Property<bool>("SewerActivated")
.HasColumnType("boolean");
b.Property<bool>("SewerCleaned")
.HasColumnType("boolean");
b.Property<decimal>("SewerLength")
.HasColumnType("numeric");
b.Property<string>("StreetName")
.HasColumnType("text");
b.Property<bool>("WaterBarrier")
.HasColumnType("boolean");
b.HasKey("Id");
b.HasIndex("BuildingSiteId");
b.HasIndex("PipeLinerId");
b.HasIndex("PunktObenId");
b.HasIndex("PunktUntenId");
b.ToTable("SewerObjects");
});
modelBuilder.Entity("DaSaSo.Domain.Model.SewerPoint", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("Objektnummer")
.HasColumnType("text");
b.HasKey("Id");
b.ToTable("SewerPoints");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
{
b.HasOne("DaSaSo.Domain.Model.Project", "Project")
.WithMany("BuildingSites")
.HasForeignKey("ProjectId");
b.Navigation("Project");
});
modelBuilder.Entity("DaSaSo.Domain.Model.PipeLiner", b =>
{
b.HasOne("DaSaSo.Domain.Model.Impregnation", "Impregnation")
.WithMany()
.HasForeignKey("ImpregnationId");
b.Navigation("Impregnation");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
{
b.HasOne("DaSaSo.Domain.Model.Client", "Client")
.WithMany("Projects")
.HasForeignKey("ClientId");
b.Navigation("Client");
});
modelBuilder.Entity("DaSaSo.Domain.Model.SewerDamage", b =>
{
b.HasOne("DaSaSo.Domain.Model.SewerObject", "SewerObject")
.WithMany("SewerDamages")
.HasForeignKey("SewerObjectId");
b.Navigation("SewerObject");
});
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
{
b.HasOne("DaSaSo.Domain.Model.Buildingsite", "BuildingSite")
.WithMany("SewerObjects")
.HasForeignKey("BuildingSiteId");
b.HasOne("DaSaSo.Domain.Model.PipeLiner", "PipeLiner")
.WithMany()
.HasForeignKey("PipeLinerId");
b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktOben")
.WithMany()
.HasForeignKey("PunktObenId");
b.HasOne("DaSaSo.Domain.Model.SewerPoint", "PunktUnten")
.WithMany()
.HasForeignKey("PunktUntenId");
b.Navigation("BuildingSite");
b.Navigation("PipeLiner");
b.Navigation("PunktOben");
b.Navigation("PunktUnten");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Buildingsite", b =>
{
b.Navigation("SewerObjects");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Client", b =>
{
b.Navigation("Projects");
});
modelBuilder.Entity("DaSaSo.Domain.Model.Project", b =>
{
b.Navigation("BuildingSites");
});
modelBuilder.Entity("DaSaSo.Domain.Model.SewerObject", b =>
{
b.Navigation("SewerDamages");
});
#pragma warning restore 612, 618
}
}
}

32
DaSaSo.EntityFramework/Migrations/20211009185244_DateOnly.cs
View File

@@ -1,32 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DaSaSo.EntityFramework.Migrations
{
public partial class DateOnly : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateOnly>(
name: "Date",
table: "PipeLiners",
type: "date",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "timestamp with time zone");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<DateTime>(
name: "Date",
table: "PipeLiners",
type: "timestamp with time zone",
nullable: false,
oldClrType: typeof(DateOnly),
oldType: "date");
}
}
}

2
DaSaSo.EntityFramework/Services/SewerObjectDataService.cs
View File

@@ -45,6 +45,8 @@ namespace DaSaSo.EntityFramework.Services
.Include("PunktOben")
.Include("PunktUnten")
.Include("SewerDamages")
.Include("PipeLiner")
.Include("PipeLiner.Impregnation")
.FirstOrDefaultAsync((e) => e.Id == id);
return s;
}

87
DaSaSo.ViewModel/Controls/SewerRhebalationControllViewModel.cs Normal file
View File

@@ -0,0 +1,87 @@
using DaSaSo.Domain.Model;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Controls
{
public class SewerRhebalationControllViewModel : BaseViewModel
{
public string Bediener
{
get => model.Operator;
set
{
if(model.Operator != value)
{
model.Operator = value;
OnPropertyChanged();
}
}
}
public decimal TemperaturAussen
{
get => model.TemperatureOutdoors;
set
{
if(model.TemperatureOutdoors != value)
{
model.TemperatureOutdoors = value;
OnPropertyChanged();
}
}
}
public decimal TemperaturSewer
{
get => model.TemperatureSewer;
set
{
if(model.TemperatureSewer != value)
{
model.TemperatureSewer = value;
OnPropertyChanged();
}
}
}
public string Weather
{
get => model.Weather;
set
{
if(model.Weather != value)
{
model.Weather = value;
OnPropertyChanged();
}
}
}
private DateTime _date;
public DateTime Datum
{
get => _date;
set
{
if(_date != value)
{
_date = value;
model.Date = DateOnly.FromDateTime(_date);
OnPropertyChanged();
}
}
}
public SewerPreperationControllViewModel SewerPreperationControllViewModel { get; set; }
private PipeLiner model;
public SewerRhebalationControllViewModel(PipeLiner model)
{
this.model = model;
SewerPreperationControllViewModel = new SewerPreperationControllViewModel(model.PreparationType);
_date = model.Date.ToDateTime(new TimeOnly(0));
}
}
}

35
DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
View File

@@ -3,6 +3,7 @@ using DaSaSo.ViewModel.Controls;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -11,7 +12,7 @@ namespace DaSaSo.ViewModel
{
public class SewerPipeLinerViewModel : BaseViewModel
{
private SewerPreperationControllViewModel _sewerPreperationControllViewModel;
private SewerRhebalationControllViewModel _sewerRhebalationControllViewModel;
private PipeLiner _model;
public PipeLiner Model
@@ -80,21 +81,43 @@ namespace DaSaSo.ViewModel
}
}
}
public SewerPreperationControllViewModel SewerPreperationControllViewModel
public decimal EinbauDruck
{
get => _sewerPreperationControllViewModel;
set => _sewerPreperationControllViewModel = value;
get => Model.InversionPressure;
set
{
if(Model.InversionPressure != value)
{
Model.InversionPressure = value;
OnPropertyChanged();
}
}
}
public SewerRhebalationControllViewModel SewerRhebalationControllViewModel
{
get => _sewerRhebalationControllViewModel;
set => _sewerRhebalationControllViewModel = value;
}
public SewerPipeLinerViewModel(IActualProject actualProject)
{
SewerPreperationControllViewModel = new SewerPreperationControllViewModel(EPreparationType.WaterBaried);
if(actualProject.AktuellSewerObject.PipeLiner == null)
{
actualProject.AktuellSewerObject.PipeLiner = new PipeLiner();
}
Model = actualProject.AktuellSewerObject.PipeLiner;
SewerRhebalationControllViewModel = new SewerRhebalationControllViewModel(Model);
}
public override void Dispose()
{
// Todo Calculate SewerPreperation
//EPreparationType preparationFlags = SewerPreperationControllViewModel.CalculatePreparationFlags();
//Model.PreparationType = preparationFlags;
//SewerPreperationControllViewModel.Dispose();
//Debugger.Break();
base.Dispose();
}
}
}

14
DaSaSo.ViewModel/Window/MainWindowViewModel.cs
View File

@@ -37,6 +37,7 @@ namespace DaSaSo.ViewModel
private string _clientname = "";
private string _projektname = "";
private string _projektnummer = "";
private string _buildingsitename = "";
private RegistryKey? registry;
const string REGISTRYKEY = "HKEY_CURRENT_USER\\Software\\Cosysda\\DaSaSo";
@@ -73,6 +74,18 @@ namespace DaSaSo.ViewModel
}
}
}
public string Projektnummer
{
get => _projektnummer;
set
{
if (_projektnummer != value)
{
_projektnummer = value;
OnPropertyChanged();
}
}
}
public string Buildingsitename
{
get => _buildingsitename;
@@ -203,6 +216,7 @@ namespace DaSaSo.ViewModel
{
SaveInRegistry("lastproject", _actualProject.AktuellProjekt.Id.ToString());
Projektname = _actualProject.AktuellProjekt.Name;
Projektnummer = _actualProject.AktuellProjekt.Projektnummer;
OnPropertyChanged(nameof(CanSelectBuildingSite));
UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.Buildingsites);
}

1
DaSaSo.Wpf/App.xaml.cs
View File

@@ -165,6 +165,7 @@ namespace DaSaSo.Wpf
using (DaSaSoDbContext context = contextFactory.CreateDbContext())
{
context.Database.Migrate();
}
MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService<MainWindowViewModel>() };
window.Show();

2
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
View File

@@ -18,7 +18,7 @@
<StackPanel>
<CheckBox Margin="5" Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" />
<CheckBox Margin="5" Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
<CheckBox Margin="5" Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
<CheckBox Margin="5" Content="Mit Roboter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
<CheckBox Margin="5" Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
<CheckBox Margin="5" Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Genehmigung}" />
<CheckBox Margin="5" Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding WaterBaried}" />

24
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
View File

@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
@@ -12,7 +12,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border>
<local:SewerDamagePreparation />
<local:SewerDamagePreparation DataContext="{Binding SewerPreperationControllViewModel}" />
</Border>
<Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
<Grid Grid.Column="1" Background="LightBlue">
@@ -21,21 +21,23 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Label Margin="20" Grid.Column="0" Grid.Row="0" Content="Operator" />
<Label Margin="20" Grid.Column="0" Grid.Row="1" Content="Datum" />
<Label Margin="20" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
<Label Margin="20" Grid.Column="0" Grid.Row="3" Content="Temperatur Kanal" />
<Label Margin="5" Grid.Column="0" Grid.Row="0" Content="Operator" />
<Label Margin="5" Grid.Column="0" Grid.Row="1" Content="Datum" />
<Label Margin="5" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
<Label Margin="5" Grid.Column="0" Grid.Row="3" Content="Temperatur Kanal" />
<Label Margin="5" Grid.Column="0" Grid.Row="4" Content="Wetter" />
<TextBox Grid.Column="1" Grid.Row="0" Margin="20" Text="{Binding Operator}" />
<!--<TextBox Grid.Column="1" Grid.Row="1" Margin="20" />-->
<DatePicker Grid.Column="1" Grid.Row="1" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="2" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="3" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="0" Margin="5" Text="{Binding Bediener}" />
<DatePicker Grid.Column="1" Grid.Row="1" Margin="5" SelectedDate="{Binding Datum}" />
<TextBox Grid.Column="1" Grid.Row="2" Margin="5" Text="{Binding TemperaturAussen}" />
<TextBox Grid.Column="1" Grid.Row="3" Margin="5" Text="{Binding TemperaturSewer}" />
<TextBox Grid.Column="1" Grid.Row="4" Margin="5" Text="{Binding Weather}" />
</Grid>
</Border>
</Grid>

34
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
View File

@@ -9,10 +9,10 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
</Grid.RowDefinitions>
<Border Grid.Row="0">
<controls:SewerRehabilation DataContext="{Binding SewerPreperationControllViewModel}" />
<controls:SewerRehabilation DataContext="{Binding SewerRhebalationControllViewModel}" />
</Border>
<Border BorderBrush="Black" BorderThickness="2" Grid.Row="1">
<Grid Background="LightBlue">
@@ -24,24 +24,24 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Margin="20" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
<Label Margin="20" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
<Label Margin="20" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
<Label Margin="20" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
<Label Margin="20" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
<Label Margin="20" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
<Label Margin="10" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
<Label Margin="10" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
<Label Margin="10" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
<Label Margin="10" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
<Label Margin="10" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
<Label Margin="10" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="20" Content="Ja" IsChecked="{Binding ClosedEnd}" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="20" Content="Ja" IsChecked="{Binding Preliner}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="20" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="20" Text="{Binding LagerungTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="20" Text="{Binding EinbauTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="20" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="10" Content="Ja" IsChecked="{Binding ClosedEnd}" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="10" Content="Ja" IsChecked="{Binding Preliner}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="10" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="10" Text="{Binding LagerungTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="10" Text="{Binding EinbauTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="10" Text="{Binding EinbauDruck}" />
</Grid>
</Border>
</Grid>

6
DaSaSo.Wpf/Window/MainWindow.xaml
View File

@@ -49,13 +49,15 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="40" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>
<ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding CurrentViewModel}" />
<StatusBar FontSize="20" Grid.Row="1" Grid.ColumnSpan="2">
<StatusBarItem FontSize="20" Content="{Binding ClientName}" />
<StatusBarItem FontSize="20" Content="{Binding Projektname}" />
<Separator />
<StatusBarItem FontSize="20" Content="{Binding Projektnummer}" />
<Separator />
<StatusBarItem FontSize="20" Content="{Binding Buildingsitename}" />
</StatusBar>
</Grid>