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

Objekte können hinzugefügt werdne

Browse Source
This commit is contained in:
Husky
2020-03-17 20:50:44 +01:00
parent 8b1336a014
commit ed2eb35be4
6 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
KanSan.Base/BaseRepository.cs
View File

@@ -1,4 +1,5 @@
using KanSan.Base.Interfaces;
using KanSan.Base.Models;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
@@ -19,6 +20,7 @@ namespace KanSan.Base
this.context = context;
if (context == null) throw new ArgumentNullException("context");
this.dbSet = context.Set<TEntity>();
}
public virtual void Delete(TEntity entityToDelete)
{
@@ -33,10 +35,16 @@ namespace KanSan.Base
Delete(entityToDelete);
}
public IEnumerable<TEntity> GetAll(string include)
{
return dbSet.Include(include);
}
public IEnumerable<TEntity> Get(Expression<Func<TEntity, bool>> filter = null, Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = null, string includeProperties = "")
{
IQueryable<TEntity> query = dbSet;
if (filter != null)
{
query = query.Where(filter);
@@ -72,9 +80,30 @@ namespace KanSan.Base
dbSet.Add(entity);
}
public void Update(TEntity entityToUpdate)
public IQueryable<TEntity> Include(params Expression<Func<TEntity,object>>[] includeExpressions)
{
IQueryable<TEntity> query = null;
foreach(var include in includeExpressions)
{
query = dbSet.Include(include);
}
return query ?? dbSet;
}
public void Update(TEntity entityToUpdate, bool attach = true)
{
if (!attach)
{
var d = context.Entry(entityToUpdate);
if (d != null)
{
d.State = EntityState.Detached;
}
}
else
{
dbSet.Attach(entityToUpdate);
}
IDatabaseEntry x = (entityToUpdate as IDatabaseEntry);
if(x == null)
return;

6
KanSan.Base/Interfaces/IRepository.cs
View File

@@ -6,16 +6,18 @@ using System.Text;
namespace KanSan.Base.Interfaces
{
public interface IRepository<TEntity> where TEntity: class
public interface IRepository<TEntity> where TEntity : class
{
void Delete(TEntity entityToDelete);
void Delete(object id);
IEnumerable<TEntity> GetAll(string include);
IEnumerable<TEntity> Get(
Expression<Func<TEntity, bool>> filter = null,
Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>> orderBy = null,
string includeProperties = "");
TEntity GetByID(object id);
void Insert(TEntity entity);
void Update(TEntity entityToUpdate);
void Update(TEntity entityToUpdate, bool attach = true);
IQueryable<TEntity> Include(params Expression<Func<TEntity, object>>[] includes);
}
}

1
KanSan.Base/UnitOfWork.cs
View File

@@ -25,6 +25,7 @@ namespace KanSan.Base
public UnitOfWork(KanSanContext dbContext)
{
_dbContext = dbContext;
//_dbContext.ChangeTracker.QueryTrackingBehavior = Microsoft.EntityFrameworkCore.QueryTrackingBehavior.NoTracking;
}
public IRepository<Projekt> ProjekteRepository => _projekte ?? (_projekte = new BaseRepository<Projekt>(_dbContext));

2
KanSan.ViewModel/Objekte/ObjekteAddViewModel.cs
View File

@@ -42,7 +42,7 @@ namespace KanSan.ViewModel.Objekte
newSewer.StrasseName = Strasse;
newSewer.ObjektNummer = PunktOben;
unitOfWork.KanaeleRepository.Update(newSewer);
unitOfWork.KanaeleRepository.Update(newSewer,false);
unitOfWork.Commit();
}

2
KanSan.ViewModel/Objekte/ObjekteListViewModel.cs
View File

@@ -28,6 +28,8 @@ namespace KanSan.ViewModel
this.selectedBaustelle = selectedBaustelle;
//
List<Sewer> list = unitOfWork.KanaeleRepository.Get(x => x.Baustelle.Equals(selectedBaustelle)).ToList();
var my = unitOfWork.KanaeleRepository.Include(c => c.PunktOben);
var x = list.GroupBy(x => x.StrasseName).Select(x => new ObjekteTransfer
{
Strassename = x.Key,

37
KanSan/UI/Objekte/UCObjekteList.xaml
View File

@@ -3,6 +3,8 @@
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:self="clr-namespace:KanSan.ViewModel;assembly=KanSan.ViewModel"
xmlns:model="clr-namespace:KanSan.Base.Models;assembly=KanSan.Base"
xmlns:local="clr-namespace:KanSan.UI"
xmlns:sd ="clr-namespace:KanSan.SampleData"
mc:Ignorable="d"
@@ -17,18 +19,31 @@
<RowDefinition Height="50" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<TreeView ItemsSource="{Binding KanalObjekte}">
<TreeView Name="trvStreets" ItemsSource="{Binding KanalObjekte}">
<TreeView.Resources>
<HierarchicalDataTemplate DataType="{x:Type self:ObjekteTransfer}" ItemsSource="{Binding Objekte}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Strassename}"/>
<TextBlock Text=" [" Foreground="Blue" />
<TextBlock Text="{Binding Objekte.Count}" Foreground="Blue" />
<TextBlock Text="]" Foreground="Blue" />
</StackPanel>
</HierarchicalDataTemplate>
<DataTemplate DataType="{x:Type model:Sewer}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="Von [" />
<TextBlock Text="{Binding PunktOben.Objektnummer}"/>
<TextBlock Text="] Nach [" />
<TextBlock Text="{Binding PunktUnten.Objektnummer}" />
<TextBlock Text="] DN [" />
<TextBlock Text="{Binding DN}"/>
<TextBlock Text="] Material ["/>
<TextBlock Text="{Binding Material}" />
<TextBlock Text="]" />
</StackPanel>
</DataTemplate>
</TreeView.Resources>
</TreeView>
<!--<DataGrid ItemsSource="{Binding KanalObjekte}" Name="dgObjekte" AutoGenerateColumns="False">
<DataGrid.Columns>
<DataGridTextColumn Header="Strasse" Binding="{Binding StrasseName}" />
<DataGridTextColumn Header="Objektnummer" Binding="{Binding ObjektNummer}" />
<DataGridTextColumn Header="Durchmesser" Binding="{Binding DN}" />
<DataGridTextColumn Header="Material" Binding="{Binding Material}" />
</DataGrid.Columns>
</DataGrid>-->
<Button Grid.Row="1" x:Name="ProjektSelect" Content="Objekt Auswählen" />
<Button Grid.Row="2" Name="ProjektEdit" Content="Objekt Editieren" />
<Button Grid.Row="3" Name="ObjektNew" Content="Neue Objekt Hinzufügen" Click="ObjektNew_Click" />