ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Neues Feld Adresszusatz 2 bei Mitarbeiter (war wichtig für Straffälligenhilfe)

Browse Source
This commit is contained in:
Christian
2026-02-26 11:47:55 +01:00
parent d76a978cf0
commit 7d9eba0e0f
10 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
BeWo/View/Detail/EmployeeView.xaml
View File

@@ -623,6 +623,7 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90" />
@@ -639,18 +640,24 @@
Grid.Row="1"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
Content="{t:Translate EmployeeViewAdresszusatz2}" />
<Label
Grid.Row="2"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Strasse
</Label>
<Label
Grid.Row="2"
Grid.Row="3"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Postleitzahl
</Label>
<Label
Grid.Row="3"
Grid.Row="4"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
@@ -668,18 +675,24 @@
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=AddressLine2, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="2"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="3"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
<TextBox
Grid.Row="4"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</GroupBox>

19
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -66,6 +66,7 @@ namespace BeWo.ViewModel
public static string PropertyName_Profession = "Profession";
public static string PropertyName_Qualifications = "Qualifications";
public static string PropertyName_AddressLine1 = "AddressLine1";
public static string PropertyName_AddressLine2 = "AddressLine2";
public static string PropertyName_Street = "Street";
public static string PropertyName_TaxClass = "TaxClass";
public static string PropertyName_TaxNumber = "TaxNumber";
@@ -131,6 +132,7 @@ namespace BeWo.ViewModel
private ObservableSortCollection<ValueListEntryDC> _Qualifications;
private Sex? _Sex;
private string _AddressLine1;
private string _AddressLine2;
private string _Street;
private string _TaxClass;
private string _TaxNumber;
@@ -1062,6 +1064,21 @@ namespace BeWo.ViewModel
}
}
}
public string AddressLine2
{
get { return this._AddressLine2; }
set
{
if (this.AreDifferent(this._AddressLine2, value))
{
this._AddressLine2 = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AddressLine2, value), PropertyName_AddressLine2);
this.FirePropertyChanged(PropertyName_AddressLine2);
}
}
}
public string Street
{
get { return _Street; }
@@ -1403,6 +1420,7 @@ namespace BeWo.ViewModel
_PostalCode = pDataContract.PostalCode;
_Profession = pDataContract.Profession;
_AddressLine1 = pDataContract.AddressLine1;
_AddressLine2 = pDataContract.AddressLine2;
_Street = pDataContract.Street;
_TaxNumber = pDataContract.TaxNumber;
_TaxClass = pDataContract.TaxClass;
@@ -1524,6 +1542,7 @@ namespace BeWo.ViewModel
pDataContract.PostalCode = _PostalCode;
pDataContract.Profession = _Profession;
pDataContract.AddressLine1 = _AddressLine1;
pDataContract.AddressLine2 = _AddressLine2;
pDataContract.Street = _Street;
pDataContract.TaxNumber = _TaxNumber;
pDataContract.TaxClass = _TaxClass;

2
ReportImp/Fortis/CustomerDataReport.cs
View File

@@ -59,7 +59,7 @@ namespace BeWo.Fortis
behindertCB.Checked = (bool) varFieldValue;
break;
case 40:
GDBTableCell.Text = vValue + "%";
GDBTableCell.Text = vValue;
break;
case 41:
behindertenAGueltigBisTableCell.Text = vValue;

2
ReportImp/Fortis/Service/CustomVorlagenManager.cs
View File

@@ -20,6 +20,8 @@ namespace Fortis.Service
var list = base.GetPlatzhalterForCustomer();
ReplacePlatzhalter(list, new PlatzhalterDC() { Bezeichnung = "Jobtitel", Platzhalter = "MaJobtitel", PlatzhalterID = "MaAdresszusatz", IconType = "AB", FieldName = "Person.Address.AddressLine1" });
ReplacePlatzhalter(list, new PlatzhalterDC() { Bezeichnung = "Dienstort", Platzhalter = "MaDienstort", PlatzhalterID = "MaAdresszusatz2", IconType = "AB", FieldName = "Person.Address.AddressLine2" });
return list;
}

1
ReportImp/Fortis/Translation/TranslationDictionary.cs
View File

@@ -21,6 +21,7 @@ namespace Fortis.Translation
AddOrReplaceTranslation(dict, "EmployeeViewAdresse", "Adresse dienstlich");
AddOrReplaceTranslation(dict, "EmployeeViewAdresszusatz", "Jobtitel");
AddOrReplaceTranslation(dict, "EmployeeViewAdresszusatz2", "Dienstort");
AddOrReplaceTranslation(dict, "EmployeeViewKontakt", "Kontakt dienstlich");
return dict;

2
Service/DCEntityMapper/PersonDC_Person.cs
View File

@@ -56,6 +56,7 @@ namespace BeWo.Service.DCEntityMapper
{
pDataContract.AddressOid = pEntity.Address.Oid;
pDataContract.AddressLine1 = pEntity.Address.AddressLine1;
pDataContract.AddressLine2 = pEntity.Address.AddressLine2;
pDataContract.Street = pEntity.Address.Street;
pDataContract.Town = pEntity.Address.Town;
pDataContract.PostalCode = pEntity.Address.PostalCode;
@@ -165,6 +166,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.Address.Oid = pDataContract.AddressOid;
pEntity.Address.AddressLine1 = pDataContract.AddressLine1;
pEntity.Address.AddressLine2 = pDataContract.AddressLine2;
pEntity.Address.Street = pDataContract.Street;
pEntity.Address.Town = pDataContract.Town;
pEntity.Address.PostalCode = pDataContract.PostalCode;

1
Service/Dokumentverwaltung/EmployeePlaceholderManager.cs
View File

@@ -45,6 +45,7 @@ namespace BeWo.Service.Dokumentverwaltung
};
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Adresszusatz", Platzhalter = "MaAdresszusatz", IconType = "AB", FieldName = "Person.Address.AddressLine1" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Adresszusatz 2", Platzhalter = "MaAdresszusatz2", IconType = "AB", FieldName = "Person.Address.AddressLine2" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "MaStrasse", IconType = "AB", FieldName = "Person.Address.Street" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "MaPLZ", IconType = "AB", FieldName = "Person.Address.PostalCode" });
adressdaten.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "MaOrt", IconType = "AB", FieldName = "Person.Address.Town" });

3
Service/Dokumentverwaltung/VgaPlaceholderManager.cs
View File

@@ -37,10 +37,12 @@ namespace BeWo.Service.Dokumentverwaltung
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragseingang", Platzhalter = "Auftragseingang", FieldName = "CustomerVermittlungArbeit.Auftragseingang", IconType = "AB", Format = "dd.MM.yyyy" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Auftragsherkunft", Platzhalter = "Auftragsherkunft", FieldName = "CustomerVermittlungArbeit.Auftragsherkunft.Value", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Vermittlungsgrundlage", Platzhalter = "Vermittlungsgrundlage", FieldName = "CustomerVermittlungArbeit.Vermittlungsgrundlage.Value", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Delikt/Gesetzverstoß", Platzhalter = "Delikt", FieldName = "CustomerVermittlungArbeit.Delikt", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Tagessätze", Platzhalter = "Tagessatze", FieldName = "CustomerVermittlungArbeit.Tagessatze", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Tagessatzhöhe", Platzhalter = "Tagessatzhohe", FieldName = "CustomerVermittlungArbeit.Tagessatzhohe", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Höhe der Geldstrafe", Platzhalter = "HoheDerGeldstrafe", FieldName = "CustomerVermittlungArbeit.HoheDerGeldstrafe", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Zu leistende Arbeitsstunden", Platzhalter = "ZuLeistendeArbeitsstunden", FieldName = "CustomerVermittlungArbeit.ZuLeistendeArbeitsstunden", IconType = "AB", Format = "0.0#" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Frist", Platzhalter = "Frist", FieldName = "CustomerVermittlungArbeit.Frist", IconType = "AB", Format = "dd.MM.yyyy" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Hinweis", Platzhalter = "Hinweis", FieldName = "CustomerVermittlungArbeit.Hinweis", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Termin", Platzhalter = "Termin", FieldName = "CustomerVermittlungArbeit.Termin", IconType = "AB", Format = "dd.MM.yyyy" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Bearbeitungsstatus", Platzhalter = "CustomerVermittlungBearbeitungsstatus", FieldName = "CustomerVermittlungArbeit.CustomerVermittlungBearbeitungsstatus", IconType = "AB" });
@@ -50,6 +52,7 @@ namespace BeWo.Service.Dokumentverwaltung
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ersparte Hafttage", Platzhalter = "ErsparteHafttage", FieldName = "CustomerVermittlungArbeit.ErsparteHafttage", IconType = "AB", Format = "0.##" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Geleistete Ratenzahlung", Platzhalter = "GeleisteteRatenzahlung", FieldName = "CustomerVermittlungArbeit.GeleisteteRatenzahlung", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Geleistete Einmalzahlung", Platzhalter = "GeleisteteEinmalzahlung", FieldName = "CustomerVermittlungArbeit.GeleisteteEinmalzahlung", IconType = "AB", Format = "c" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "BWH", Platzhalter = "BWH", FieldName = "CustomerVermittlungArbeit.Bewaehrungshelfer", IconType = "AB" });
vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Bemerkung", Platzhalter = "Bemerkung", FieldName = "CustomerVermittlungArbeit.Bemerkung", IconType = "AB" });

1
Service/Plugins/TranslationDictionary.cs
View File

@@ -94,6 +94,7 @@ namespace BeWo.Service.Plugins
AddOrReplaceTranslation(dict, "EmployeeViewAdresse", "Adresse");
AddOrReplaceTranslation(dict, "EmployeeViewAdresszusatz", "Adresszusatz");
AddOrReplaceTranslation(dict, "EmployeeViewAdresszusatz2", "Adresszusatz2");
AddOrReplaceTranslation(dict, "EmployeeViewKontakt", "Kontakt");
AddOrReplaceTranslation(dict, "Zwei Faktor Authentifizierung erforderlich", "Zwei-Faktor-Authentifizierung erforderlich.\nEs wurde ein Code an ownChat gesendet.\n\nBitte geben Sie hier den Code ein:");

4
Shared/DataContracts/PersonDC.cs
View File

@@ -45,6 +45,7 @@ namespace BS.Shared.DataContracts
[DataMember] public string Profession { get; set; }
[DataMember] public Sex? Sex { get; set; }
[DataMember] public string AddressLine1 { get; set; }
[DataMember] public string AddressLine2 { get; set; }
[DataMember] public string Street { get; set; }
[DataMember] public ValueListEntryDC Title { get; set; }
[DataMember] public string Town { get; set; }
@@ -76,13 +77,12 @@ namespace BS.Shared.DataContracts
}
}
public string AddressLine2 => null;
public string State => null;
public string Country => null;
public bool ContainsAddressData()
{
return !Utils.AreAllNullOrEmpty(this.AddressLine1, this.Street, this.PostalCode, this.Town);
return !Utils.AreAllNullOrEmpty(this.AddressLine1, this.AddressLine2, this.Street, this.PostalCode, this.Town);
}
public bool ContainsBankAccountData()