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

Model geupdated

Browse Source
This commit is contained in:
HuskyTeufel
2021-10-06 19:52:32 +02:00
parent b48c012c18
commit cae9f38227
21 changed files with 1104 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
View File

@@ -36,11 +36,14 @@ namespace DaSaSo.ViewModel.Commands
_sewerObjectService = sewerObjectService;
_renavigator = renavigator;
_navigator = navigator;
}
public override async Task ExecuteAsync(object? parameter)
{
Trace.WriteLine(_actualProject.AktuellSewerObject.IsChanged);
_navigator.CurrentViewModel = null;
_renavigator.Renavigate();
}

22
DaSaSo.ViewModel/SewerDamageEditViewModel.cs
View File

@@ -16,7 +16,7 @@ namespace DaSaSo.ViewModel
private SewerDamage? _damage;
public SewerDamageControllViewModel damageControllViewModel { get; set; }
public SewerPreperationControllViewModel preperationControllViewModel { get; set; }
//public SewerPreperationControllViewModel preperationControllViewModel { get; set; }
public IRelayCommand Berechne { get; set; }
private string? _entfernung;
@@ -26,6 +26,7 @@ namespace DaSaSo.ViewModel
set
{
_entfernung = value;
_damage.SewerObject.IsChanged = true;
OnPropertyChanged();
}
}
@@ -46,7 +47,7 @@ namespace DaSaSo.ViewModel
Damage = actualProject.AktuellSewerDamage;
damageControllViewModel = new SewerDamageControllViewModel(Damage.DamageType);
preperationControllViewModel = new SewerPreperationControllViewModel(Damage.PreparationType);
//preperationControllViewModel = new SewerPreperationControllViewModel(Damage.PreparationType);
Entfernung = Damage.Distance.ToString();
@@ -67,10 +68,21 @@ namespace DaSaSo.ViewModel
public override void Dispose()
{
// Alle Werte Speichern, form wurde geändert (Noch nicht in DB!)
Damage.DamageType = damageControllViewModel.CalculateDamageFlags();
Damage.PreparationType = preperationControllViewModel.CalculatePreparationFlags();
EDamageType newDamage = damageControllViewModel.CalculateDamageFlags();
//EPreparationType newPrepartion = preperationControllViewModel.CalculatePreparationFlags();
if(Damage.DamageType != newDamage)
{
Damage.DamageType = newDamage;
Damage.SewerObject.IsChanged = true;
}
/* if(Damage.PreparationType != newPrepartion)
{
Damage.PreparationType = newPrepartion;
Damage.SewerObject.IsChanged = true;
}
*/
damageControllViewModel.Dispose();
preperationControllViewModel.Dispose();
//preperationControllViewModel.Dispose();
base.Dispose();
}

30
DaSaSo.ViewModel/SewerStammdatenViewModel.cs
View File

@@ -36,6 +36,30 @@ namespace DaSaSo.ViewModel
}
}
}
public string Hausnummer
{
get => Model.Hausnummer;
set
{
if(Model.Hausnummer != value)
{
Model.Hausnummer = value;
OnPropertyChanged();
}
}
}
public string Sanierungsid
{
get => Model.SanNummer;
set
{
if(Model.SanNummer != value)
{
Model.SanNummer = value;
OnPropertyChanged();
}
}
}
public string Oberepunkt
{
@@ -155,6 +179,12 @@ namespace DaSaSo.ViewModel
Model = _actualProject.AktuellSewerObject;
SaveCommand = new SaveSewerStammdatenCommand(this, dataService, sewerpointService);
this.PropertyChanged += SewerStammdatenViewModel_PropertyChanged;
}
private void SewerStammdatenViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
{
Model.IsChanged = true;
}
~SewerStammdatenViewModel()