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

Release Version

Browse Source
This commit is contained in:
Christian
2017-02-22 17:59:08 +01:00
parent edbbe30b3e
commit 960aaacde3
14 changed files with 1245 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
BeWo/Core/BeWoUtils.cs
View File

@@ -1677,9 +1677,21 @@ namespace BeWo.Core
}
break;
case ServiceRecordValidationResult.Custom:
MessageBox.Show(result.Message, "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
lValid = false;
exitLoop = true;
if (result.Allow)
{
if (MessageBox.Show(result.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
{
lValid = false;
exitLoop = true;
}
}
else
{
MessageBox.Show(result.Message, "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
lValid = false;
exitLoop = true;
}
break;
}
@@ -1690,14 +1702,64 @@ namespace BeWo.Core
return lValid;
}
/// <summary>
/// Erzeugt einen Report mit Hilfe des ReportServices und zeigt ihn in einem BeWoWindow
/// </summary>
/// <param name="title">Titel des Fensters</param>
/// <param name="documentPreview">Documentpreview für den Report</param>
/// <param name="variablen">Dictionary mit Variablen für das ReportObject</param>
/// <param name="reportType">Der Typ des Reports (z.B. KalenderMonatsformatReport)</param>
public static void ShowReport(string title, DocumentPreview documentPreview, Dictionary<String, Object> variablen, ReportEnum reportType)
public static bool ValidateServiceRecordDeletion(ServiceRecordVM vm)
{
var lValid = true;
var dc = vm.CommitToDataContract();
var emp = BeWoApp.LoggedOnUser.Employee;
var r = new List<ServiceRecordValidationResultDC>();
//ServiceFacade.DoOperationsServiceSync(o => r = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));
if (r.Count > 0)
{
var exitLoop = false;
foreach (var result in r)
{
switch (result.ResultType)
{
case ServiceRecordValidationResult.Custom:
if (result.Allow)
{
if (MessageBox.Show(result.Message, "Löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
{
lValid = false;
exitLoop = true;
}
}
else
{
MessageBox.Show(result.Message, "Löschen nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
lValid = false;
exitLoop = true;
}
break;
}
if (exitLoop) break;
}
}
return lValid;
}
/// <summary>
/// Erzeugt einen Report mit Hilfe des ReportServices und zeigt ihn in einem BeWoWindow
/// </summary>
/// <param name="title">Titel des Fensters</param>
/// <param name="documentPreview">Documentpreview für den Report</param>
/// <param name="variablen">Dictionary mit Variablen für das ReportObject</param>
/// <param name="reportType">Der Typ des Reports (z.B. KalenderMonatsformatReport)</param>
public static void ShowReport(string title, DocumentPreview documentPreview, Dictionary<String, Object> variablen, ReportEnum reportType)
{
switch (reportType)
{

40
BeWo/View/Detail/CustomerView.xaml
View File

@@ -438,25 +438,23 @@
<!-- ########## Nationalität ############### -->
<Grid Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2">
<Grid Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="Blubb"/>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="Staatsangehörigkeit"/>
<Label Grid.Column="0" Content="Staatsangehörigkeit"/>
<ComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />
<ComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Left"/>
</Grid>
<!-- ####################################### -->
<!-- ###### MigrationsHintergrund ########## -->
<Label Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Migrationshintergrund"/>
<CheckBox Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" Margin="3" x:Name="chkMigration" HorizontalAlignment="Left"
IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}"/>
<Label Grid.Column="0" Grid.Row="5" Content="Migrationshintergrund"/>
<CheckBox Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" Margin="3,5,3,1" Height="23" x:Name="chkMigration" HorizontalAlignment="Left"
IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}" />
<!-- ####################################### -->
@@ -466,13 +464,11 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="Blubb"/>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Aufenthalststatus"/>
<Label Grid.Column="0" HorizontalAlignment="Left" Content="Aufenthaltsstatus"/>
<ComboBox x:Name="comboBox_Aufenthalt" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" />
<ComboBox x:Name="comboBox_Aufenthalt" Grid.Column="1" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="120" HorizontalAlignment="Left"/>
</Grid>
@@ -487,7 +483,7 @@
<!--<uc:MaskedTextBox Grid.Column="1" Grid.Row="3" Mask="00/00/0000" Margin="3" Height="23" Text="{Binding Path=DateOfBirth, Converter={StaticResource DateConverter}, UpdateSourceTrigger=PropertyChanged}" />-->
<dxe:DateEdit AllowNullInput="True" Grid.Column="1" Grid.Row="2" Height="23" Margin="3"
EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}" Width="100"
EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}" Width="120"
HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
<!-- <Grid Grid.Column="1" Grid.Row="3" Height="23" Margin="0,3,0,3">
<Grid.ColumnDefinitions>
@@ -524,7 +520,7 @@
Text="{Binding Path=Childs, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Grid.Column="3" Grid.Row="3" Margin="3" Height="23"
Text="{Binding Path=EquityContribution, UpdateSourceTrigger=PropertyChanged}" />
<CheckBox x:Name="chkArchiviert" Grid.Column="3" Grid.Row="4" Margin="3" Height="23"
<CheckBox x:Name="chkArchiviert" Grid.Column="3" Grid.Row="4" Margin="3,5,3,1" Height="23"
IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" />
<TextBox Margin="3" Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="8"
Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Height="100"
@@ -887,7 +883,7 @@
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Width="100" Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
<Label Grid.Column="0" Grid.Row="1" Content="Ausweis unbefristet gültig" VerticalAlignment="Center" />
<CheckBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" x:Name="AusweisUnbefristetCheckBox"
<CheckBox Grid.Column="1" Grid.Row="1" Margin="3,5,3,1" Height="23" x:Name="AusweisUnbefristetCheckBox"
VerticalAlignment="Center" VerticalContentAlignment="Center"
IsChecked="{Binding Path=AusweisUnbefristetGueltig, UpdateSourceTrigger=PropertyChanged}"/>
@@ -1255,8 +1251,6 @@
<Grid x:Name="grid_environment">
<Grid MinHeight="100">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@@ -1273,7 +1267,7 @@
<TextBox Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Text="{Binding Path=Environment, UpdateSourceTrigger=PropertyChanged}" />
</Grid>
</GroupBox>
<GroupBox x:Name="GroupBoxPersons" Grid.Row="5" Margin="0,20,0,0" Header="Diesem Klienten zugeordnete Personen" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
<GroupBox x:Name="GroupBoxPersons" Grid.Row="2" Margin="0,20,0,0" Header="Diesem Klienten zugeordnete Personen" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
<Grid x:Name="environmentPersonGrid">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -1322,7 +1316,7 @@
DeleteButtonVisibility="Collapsed"
PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick"
Text="{val:ValidationBinding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" />
Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" />
<!--popupedit_environmentOrganisationSearch danach suchen für organisationsbereich -->
@@ -1353,7 +1347,7 @@
<GroupBox x:Name="GroupBoxOrganisations" Grid.Row="4" Margin="0,20,0,0"
<GroupBox x:Name="GroupBoxOrganisations" Grid.Row="3" Margin="0,20,0,0"
Header="Diesem Klienten zugeordnete Organisationen" Style="{DynamicResource ObjectEditGroupBox}" VerticalAlignment="Top"
MinHeight="150" MaxHeight="400">
<Grid x:Name="environmentOrganisationGrid">
@@ -1443,18 +1437,18 @@
</GroupBox>
<!-- ######################## Rolle des Umfelds Familie / ganz nach oben und so wie andere nur statt rolle, status ################### -->
<GroupBox x:Name="GroupBoxFamily" Grid.Row="2" Margin="0,20,0,0" Header="Diesem Klienten zugeordnete Familien Mitglieder" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
<GroupBox x:Name="GroupBoxFamily" Grid.Row="1" Margin="0,20,0,0" Header="Diesem Klienten zugeordnete Angehörige" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
<Grid x:Name="environmentFamilyGrid">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Button Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
Margin="3" Content="Neues Mitglied hinzufügen" x:Name="button_openAddEnvironmentFamily"
Margin="3" Content="Neue Person hinzufügen" x:Name="button_openAddEnvironmentFamily"
Click="button_openAddEnvironmentFamily_Click" />
<controls:PopupNonTopmost Topmost="False" x:Name="popup_newEnvironmentFamily" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=button_openAddEnvironmentFamily}">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_newEnvironmentFamily" Header="Neues Mitglied hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<GroupBox x:Name="groupbox_newEnvironmentFamily" Header="Neue Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />

44
BeWo/View/Detail/EnvironmentRoleView.xaml.cs
View File

@@ -32,50 +32,50 @@ namespace BeWo.View.Detail
public EnvironmentRoleView(ValueListEntryListVM pViewModelPerson, ValueListEntryListVM pViewModelOrganisation, ValueListEntryListVM pViewModelRoleInOrganisation, ValueListEntryListVM pViewModelRoleInFamily)
{
this.InitializeComponent();
roleInFamily = new ValueListView(pViewModelRoleInFamily);
personView = new ValueListView(pViewModelPerson);
organisationView = new ValueListView(pViewModelOrganisation);
roleInOrganisation = new ValueListView(pViewModelRoleInOrganisation);
roleInFamily = new ValueListView(pViewModelRoleInFamily);
roleInFamily.SetValue(Grid.RowProperty, 0);
personView.SetValue(Grid.RowProperty, 1);
organisationView.SetValue(Grid.RowProperty, 2);
roleInOrganisation.SetValue(Grid.RowProperty, 3);
personView.SetValue(Grid.RowProperty, 0);
organisationView.SetValue(Grid.RowProperty, 1);
roleInOrganisation.SetValue(Grid.RowProperty, 2);
roleInFamily.SetValue(Grid.RowProperty, 3);
personView.Margin = new Thickness(0, 10, 0, 0);
organisationView.Margin = new Thickness(0, 10, 0, 0);
roleInOrganisation.Margin = new Thickness(0, 10, 0, 0);
roleInFamily.Margin = new Thickness(0, 10, 0, 0);
rootGrid.Children.Add(roleInFamily);
rootGrid.Children.Add(personView);
rootGrid.Children.Add(organisationView);
rootGrid.Children.Add(roleInOrganisation);
rootGrid.Children.Add(roleInFamily);
}
//Für Funktionen
public EnvironmentRoleView(ValueListEntryListVM pViewModelOrganisation, ValueListEntryListVM pViewModelOrganisationFunktion)
public EnvironmentRoleView(ValueListEntryListVM personFunktionList, ValueListEntryListVM orgFunktionList)
{
this.InitializeComponent();
organisationView = new ValueListView(pViewModelOrganisation);
roleInOrganisation = new ValueListView(pViewModelOrganisationFunktion);
personView = new ValueListView(personFunktionList);
organisationView = new ValueListView(orgFunktionList);
organisationView.SetValue(Grid.RowProperty, 0);
roleInOrganisation.SetValue(Grid.RowProperty, 1);
roleInOrganisation.Margin = new Thickness(0, 10, 0, 0);
personView.SetValue(Grid.RowProperty, 0);
organisationView.SetValue(Grid.RowProperty, 1);
organisationView.Margin = new Thickness(0, 10, 0, 0);
rootGrid.Children.Add(personView);
rootGrid.Children.Add(organisationView);
rootGrid.Children.Add(roleInOrganisation);
}
public override bool IsDirty

6
BeWo/View/Detail/PersonView.xaml
View File

@@ -125,11 +125,11 @@
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" AllowNullInput="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3" EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}" Width="100" HorizontalAlignment="Left" />
<ComboBox x:Name="comboBox_Function" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" SelectedValue="{Binding Path=Function, Mode=TwoWay}" />
<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="8" Margin="3,6,3,0" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
<CheckBox x:Name="chkArchiviert" Grid.Column="1" Grid.Row="8" Margin="3,5,3,1" Height="23" IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" />
<TextBox Grid.Row="9" Grid.RowSpan="3" Grid.Column="1" Margin="3" VerticalAlignment="Stretch" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AutoWordSelection="True" />
<CheckBox Grid.Column="1" VerticalAlignment="Center" Margin="3" x:Name="chkMigration" Grid.Row="7"
IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}"/>
<CheckBox Grid.Column="1" VerticalAlignment="Center" Margin="3,5,3,1" x:Name="chkMigration" Grid.Row="7"
IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}" Height="23"/>
<ComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Grid.Row="6" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />

10
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -249,17 +249,14 @@ namespace BeWo.View.Detail
ConfigureDocTypes();
ConfigureEndDate();
UnterschriftenHeader.Visible = BeWoApp.AppSettings.ShowSignatures;
}
private void ConfigureEndDate() {
var Settings = BeWoApp.AppSettings;
if (!BeWoApp.AppSettings.ShowSignatures)
{
UnterschriftenHeader.Visible = true;
}
if (Settings.IsOnlyYearMonthVisible)
{
GridMitJahrMonat.Visibility = Visibility.Visible;
@@ -649,6 +646,9 @@ namespace BeWo.View.Detail
return;
}
var result = BeWoUtils.ValidateServiceRecordDeletion(vm);
var msg = vm.GroupOid != null
? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne Klienten aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie dem gesamten Gruppeneintrag löschen möchten?"
: "Sind Sie sicher, dass Sie den gewählten Eintrag löschen möchten?";

2
BeWo/View/Master/AdministrationView.xaml
View File

@@ -59,7 +59,7 @@
<TabItem Header="Funktionen" Name="tabitem_functions"
Selector.Selected="tabitem_functions_Selected" />
<TabItem Header="Nationalität" Name="tabitem_Nationality"
<TabItem Header="Nationalitäten" Name="tabitem_Nationality"
Selector.Selected="tabitem_Nationality_Selected" />
<TabItem Header="Aufenthaltsstatus" Name="tabitem_Aufenthaltsstatus"
Selector.Selected="tabitem_Aufenthaltsstatus_Selected" />

6
BeWo/View/Master/AdministrationView.xaml.cs
View File

@@ -224,9 +224,9 @@ namespace BeWo.View.Master
VMFactory.CreateValueListVMAsync(ValueListEntryType.FunctionType,
//personList => VMFactory.CreateValueListVMAsync(ValueListEntryType.RoleInOrganisationType,
roleInOrgList => VMFactory.CreateValueListVMAsync(ValueListEntryType.OrganisationFunctionType,
orgList =>
this.Dispatch(() => AddView(tabitem_functions, new EnvironmentRoleView(/*personList,*/ orgList, roleInOrgList)))));
personFunctionList => VMFactory.CreateValueListVMAsync(ValueListEntryType.OrganisationFunctionType,
orgFunctionList =>
this.Dispatch(() => AddView(tabitem_functions, new EnvironmentRoleView(/*personList,*/ personFunctionList, orgFunctionList)))));
}
}

5
Model/Changes_15_02_2017.txt
View File

@@ -1,3 +1,2 @@
ALTER TABLE `1234567890`.`customer2person`
ADD COLUMN `IstFamilie`
TINYINT(4) NULL DEFAULT NULL COMMENT '' AFTER `OrganisationOid`;
ALTER TABLE `customer2person`
ADD COLUMN `IstFamilie` TINYINT(4) NULL DEFAULT NULL COMMENT '';

2129
Report/ReportObjects/MitarbeiterstundenkontoBerechnung.cs
View File

File diff suppressed because it is too large Load Diff

23
Service/Plugins/ServiceRecordValidator.cs
View File

@@ -503,7 +503,9 @@ namespace BeWo.Service.Plugins
{
result.Add(new ServiceRecordValidationResultDC { ResultType = ServiceRecordValidationResult.Error });
}
}
}
return result;
}
@@ -601,5 +603,22 @@ namespace BeWo.Service.Plugins
return false;
}
}
public List<ServiceRecordValidationResultDC> ValidateServiceRecordDeletion(ServiceRecordDC serviceRecord, long employeeOid)
{
var result = new List<ServiceRecordValidationResultDC>();
// 1. Prüfe Unterschrift vorhanden
if (serviceRecord.SignatureOid.HasValue)
{
result.Add(new ServiceRecordValidationResultDC
{
ResultType = ServiceRecordValidationResult.Custom,
Message = "Dieser Eintrag wurde bereits unterschrieben."
});
}
return result;
}
}
}

8
Service/ServiceContracts/IOperationsService.cs
View File

@@ -385,8 +385,12 @@ namespace BeWo.Service.ServiceContracts
List<ServiceRecordValidationResultDC> ValidateServiceRecord(ServiceRecordDC newServiceRecord,
SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed,
IList<long> employeeOids, IList<long> cb2scOids);
[FaultContract(typeof (BeWoFault))]
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<ServiceRecordValidationResultDC> ValidateServiceRecordDeletion(ServiceRecordDC serviceRecord, long employeeOid);
[FaultContract(typeof (BeWoFault))]
[OperationContract]
List<long> InsertNewAdditionalServices(IEnumerable<AdditionalServiceDC> pAdditionalServiceDcs);

8
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -2237,6 +2237,14 @@ namespace BeWo.Service.ServiceImplementations
}
public List<ServiceRecordValidationResultDC> ValidateServiceRecordDeletion(ServiceRecordDC serviceRecord, long employeeOid)
{
var validator = PluginLoader.FindClass<ServiceRecordValidator>();
return validator.ValidateServiceRecordDeletion(serviceRecord, employeeOid);
}
public List<ServiceRecordValidationResult> CheckExistingSettlementInvoices(ServiceRecordDC pServiceRecord)
{
var result = new List<ServiceRecordValidationResult>();

12
Shared/Core/EnumTranslations.cs
View File

@@ -737,7 +737,7 @@ namespace BS.Shared.Core
ValueListEntryType.TitleType, "Titel"
},
{
ValueListEntryType.FunctionType, "Funktionen"
ValueListEntryType.FunctionType, "Funktionen (Personen)"
},
{
ValueListEntryType.SupportConceptGoalCategoryType, "Grundsatzziele"
@@ -755,13 +755,13 @@ namespace BS.Shared.Core
ValueListEntryType.DocumentType, "Dokumentationstypen"
},
{
ValueListEntryType.OrganisationFunctionType,"Funktionen Organisation"
ValueListEntryType.OrganisationFunctionType,"Funktionen (Organisationen)"
},
{
ValueListEntryType.RoleInOrganisationType,"Rolle in der Organisation"
},
{
ValueListEntryType.RoleInFamily,"Rollen des Umfeldes (Familie)"
ValueListEntryType.RoleInFamily,"Rollen des Umfeldes (Angehörige)"
},
{
ValueListEntryType.Nationality,"Nationalität"
@@ -812,7 +812,7 @@ namespace BS.Shared.Core
ValueListEntryType.TitleType, "Titel"
},
{
ValueListEntryType.FunctionType, "Funktionen"
ValueListEntryType.FunctionType, "Funktionen (Personen)"
},
{
ValueListEntryType.SupportConceptGoalCategoryType, "Grundsatzziele"
@@ -833,13 +833,13 @@ namespace BS.Shared.Core
ValueListEntryType.DocumentType, "Dokumentationstypen"
},
{
ValueListEntryType.OrganisationFunctionType,"Funktionen Organisation"
ValueListEntryType.OrganisationFunctionType,"Funktionen (Organisationen)"
},
{
ValueListEntryType.RoleInOrganisationType, "Rolle in der Organisation"
},
{
ValueListEntryType.RoleInFamily, "Rollen des Umfeldes (Familie)"
ValueListEntryType.RoleInFamily, "Rollen des Umfeldes (Angehörige)"
},
{
ValueListEntryType.Nationality,"Nationalität"

5
Shared/DataContracts/ServiceRecordValidationResultDC.cs
View File

@@ -34,5 +34,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public string CustomerName { get; set; }
}
[DataMember]
public bool Allow { get; set; }
}
}