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

Textbausteine sind jetzt in einer Baumstruktur

Browse Source
This commit is contained in:
staccatomamba
2017-09-26 12:48:29 +02:00
parent ac9b62450d
commit b79a36a2f6
53 changed files with 2857 additions and 4483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
BeWo/BeWo.csproj
View File

@@ -272,6 +272,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Controls\TextModuleTreeViewControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\ServiceRecordRTFWindowView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -428,7 +432,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\TextbausteinView.xaml">
<Page Include="View\Detail\TextModuleView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -557,6 +561,7 @@
<Compile Include="Core\DocumentWatcher.cs" />
<Compile Include="Core\ReportPreviewModelLandscapeBugWorkaround.cs" />
<Compile Include="Core\SupportConceptGoalTreeItem.cs" />
<Compile Include="Core\TextModuleTreeItem.cs" />
<Compile Include="EnterTenantDialog.xaml.cs">
<DependentUpon>EnterTenantDialog.xaml</DependentUpon>
</Compile>
@@ -698,7 +703,7 @@
<Compile Include="ViewModel\ListViewModel\BargeldtransaktionsListVM.cs" />
<Compile Include="ViewModel\ListViewModel\GenericValueListEntryListVM.cs" />
<Compile Include="ViewModel\ListViewModel\MedikamentenverordnungslisteListVM.cs" />
<Compile Include="ViewModel\ListViewModel\TextbausteinListVM.cs" />
<Compile Include="ViewModel\ListViewModel\TextModuleListVM.cs" />
<Compile Include="ViewModel\TeamNewsItemVM.cs" />
<Compile Include="ViewModel\ListViewModel\AdditionalServiceBookingListVM.cs" />
<Compile Include="ViewModel\ListViewModel\AdditionalServiceGroupOfPeopleListVM.cs" />
@@ -723,7 +728,7 @@
<Compile Include="ViewModel\ListViewModel\ServiceAccountingListVM.cs" />
<Compile Include="ViewModel\ListViewModel\OrganisationPersonRelationListVM.cs" />
<Compile Include="ViewModel\OrganisationPersonRelationVM.cs" />
<Compile Include="ViewModel\TextbausteinVM.cs" />
<Compile Include="ViewModel\TextModuleVM.cs" />
<Compile Include="ViewModel\VerordnungslistenVM.cs" />
<Compile Include="View\BargeldkassenView.xaml.cs">
<DependentUpon>BargeldkassenView.xaml</DependentUpon>
@@ -734,6 +739,9 @@
<Compile Include="View\ChatProgressBarView.xaml.cs">
<DependentUpon>ChatProgressBarView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Controls\TextModuleTreeViewControl.xaml.cs">
<DependentUpon>TextModuleTreeViewControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
<DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>
</Compile>
@@ -857,8 +865,8 @@
<Compile Include="View\Detail\MedikamentenverordnungslistenEditView.xaml.cs">
<DependentUpon>MedikamentenverordnungslistenEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\TextbausteinView.xaml.cs">
<DependentUpon>TextbausteinView.xaml</DependentUpon>
<Compile Include="View\Detail\TextModuleView.xaml.cs">
<DependentUpon>TextModuleView.xaml</DependentUpon>
</Compile>
<Compile Include="View\ChatView.xaml.cs">
<DependentUpon>ChatView.xaml</DependentUpon>
@@ -920,7 +928,7 @@
<DependentUpon>ResourcesTreeSearchView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Search\SupportConceptGroupSearchView.cs" />
<Compile Include="View\Search\TextbausteineSearchView.cs" />
<Compile Include="View\Search\TextModuleSearchView.cs" />
<Compile Include="View\SupportEMailControl.xaml.cs">
<DependentUpon>SupportEMailControl.xaml</DependentUpon>
</Compile>
@@ -933,6 +941,7 @@
<Compile Include="View\Master\ReportView.xaml.cs">
<DependentUpon>ReportView.xaml</DependentUpon>
</Compile>
<Reference Include="WindowsFormsIntegration" />
<Resource Include="Ressources\Icons\Search.png" />
<Reference Include="System.Xaml" />
</ItemGroup>

2
BeWo/Converter/BoolReverseConverter.cs
View File

@@ -10,7 +10,7 @@ namespace BeWo.Converter
{
if (value is bool)
{
return !((bool) value);
return !(bool) value;
}
return false;

11
BeWo/Converter/BoolVisibilityConverter.cs
View File

@@ -14,18 +14,19 @@ namespace BeWo.Converter
return Visibility.Visible;
}
bool lMode = true;
if (parameter is string)
var lMode = true;
var s = parameter as string;
if (s != null)
{
bool.TryParse((string) parameter, out lMode);
bool.TryParse(s, out lMode);
}
if (lMode)
{
return (!(bool)value) ? Visibility.Collapsed : Visibility.Visible;
return !(bool)value ? Visibility.Collapsed : Visibility.Visible;
}
return ((bool)value) ? Visibility.Collapsed : Visibility.Visible;
return (bool)value ? Visibility.Collapsed : Visibility.Visible;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

9
BeWo/Core/Service/GoalService.cs
View File

@@ -14,7 +14,7 @@ namespace BeWo.Core.Service
{
public static List<SupportConceptGoalDC> GetGoalTree(IEnumerable<ValueListEntryDC> goalCategories, List<ValueListEntryDC> indGoalCategories, List<ValueListEntryDC> pAllGoals, bool removeEmptyGoalCategories)
{
List<ValueListEntryDC> allCategories = new List<ValueListEntryDC>();
var allCategories = new List<ValueListEntryDC>();
if (goalCategories != null && pAllGoals != null && pAllGoals.Count > 0)
{
foreach (var goalCat in goalCategories)
@@ -41,8 +41,6 @@ namespace BeWo.Core.Service
}
}
var sortedCategories = allCategories.OrderBy(s => s.TypeDescription).ToList();
var sortedGoals = pAllGoals.OrderBy(s => s.TypeDescription).ToList();
@@ -122,12 +120,15 @@ namespace BeWo.Core.Service
private static void RemoveCategoriesWithoutSelectedGoals(ICollection<SupportConceptGoalDC> goalList, List<ValueListEntryDC> sortedGoals)
{
var cats2Remove = new List<SupportConceptGoalDC>();
foreach (var cat in goalList)
{
RemoveCategoriesWithoutSelectedGoals(cat.Children, sortedGoals);
if (!ContainsAnyGoal(cat, sortedGoals))
{
cats2Remove.Add(cat);
}
}
foreach (var cat in cats2Remove)
@@ -136,7 +137,6 @@ namespace BeWo.Core.Service
}
}
private static bool ContainsAnyGoal(SupportConceptGoalDC cat, IEnumerable<ValueListEntryDC> goals)
{
foreach (var goal in goals)
@@ -271,6 +271,7 @@ namespace BeWo.Core.Service
}
private static List<ValueListEntryDC> InsertedGoals;
public static IEnumerable<ValueListEntryDC> SaveIndividualGoalsAndMassnahmenRecursively(SupportConceptGoalTreeItem treeItem)
{
InsertedGoals = new List<ValueListEntryDC>();

145
BeWo/Core/Service/SupportConceptService.cs
View File

@@ -174,89 +174,92 @@ namespace BeWo.Core.Service
}
}
public static List<ServiceCategoryTreeItem> CreateServiceTree(IList<ServiceCategoryDC> serviceCategories, IList<ServiceDescriptionDC> serviceDescriptions, IList<ServiceAccountingDC> serviceAccountings)
{
List<ServiceCategoryTreeItem> treeList = new List<ServiceCategoryTreeItem>();
public static List<ServiceCategoryTreeItem> CreateServiceTree(IList<ServiceCategoryDC> serviceCategories, IList<ServiceDescriptionDC> serviceDescriptions, IList<ServiceAccountingDC> serviceAccountings)
{
var treeList = new List<ServiceCategoryTreeItem>();
if (serviceCategories != null && serviceDescriptions != null)
{
List<ServiceCategoryDC> sortedCategories = serviceCategories.Where(sd => !sd.OhneHilfeplan.HasValue ||sd.OhneHilfeplan.Value == AccountingvisibilityType.Beides || sd.OhneHilfeplan.Value == AccountingvisibilityType.NurKlientenbezogen).OrderBy(s => s.Name).ToList();
List<ServiceAccountingDC> serviceAccountingsCopy = new List<ServiceAccountingDC>();
List<ServiceDescriptionDC> descriptions = serviceDescriptions.OrderBy(s => s.Name).ToList();
if(serviceCategories != null && serviceDescriptions != null)
{
var sortedCategories = serviceCategories.Where(sd => !sd.OhneHilfeplan.HasValue || sd.OhneHilfeplan.Value == AccountingvisibilityType.Beides || sd.OhneHilfeplan.Value == AccountingvisibilityType.NurKlientenbezogen).OrderBy(s => s.Name).ToList();
var serviceAccountingsCopy = new List<ServiceAccountingDC>();
var descriptions = serviceDescriptions.OrderBy(s => s.Name).ToList();
if (serviceAccountings != null)
{
foreach (var serviceAccountingDc in serviceAccountings)
{
descriptions.Remove(serviceAccountingDc.ServiceDescription);
serviceAccountingsCopy.Add(serviceAccountingDc);
}
}
if(serviceAccountings != null)
{
foreach(var serviceAccountingDc in serviceAccountings)
{
descriptions.Remove(serviceAccountingDc.ServiceDescription);
serviceAccountingsCopy.Add(serviceAccountingDc);
}
}
foreach (var serviceDescriptionDc in descriptions)
{
ServiceAccountingDC accountingDc = new ServiceAccountingDC();
accountingDc.ServiceDescription = serviceDescriptionDc;
foreach(var serviceDescriptionDc in descriptions)
{
var accountingDc = new ServiceAccountingDC();
accountingDc.ServiceDescription = serviceDescriptionDc;
serviceAccountingsCopy.Add(accountingDc);
}
List<ServiceAccountingDC> sortedAccountings = serviceAccountingsCopy.OrderBy(acc => acc.ServiceDescription.Name).ToList();
serviceAccountingsCopy.Add(accountingDc);
}
Dictionary<long, ServiceCategoryTreeItem> categoryDict = new Dictionary<long, ServiceCategoryTreeItem>();
var sortedAccountings = serviceAccountingsCopy.OrderBy(acc => acc.ServiceDescription.Name).ToList();
foreach (ServiceCategoryDC category in sortedCategories)
{
ServiceCategoryTreeItem treeItem = new ServiceCategoryTreeItem();
treeItem.ServiceCategory = category;
treeItem.IsExpanded = true;
categoryDict.Add(category.ServiceCategoryOid.Value, treeItem);
treeList.Add(treeItem);
}
var categoryDict = new Dictionary<long, ServiceCategoryTreeItem>();
foreach (ServiceAccountingDC sa in sortedAccountings)
{
ServiceCategoryTreeItem childItem = new ServiceCategoryTreeItem();
childItem.ServiceAccounting = sa;
foreach(var category in sortedCategories)
{
var treeItem = new ServiceCategoryTreeItem
{
ServiceCategory = category,
IsExpanded = true
};
if (sa.ServiceDescription.Category != null && categoryDict.ContainsKey(sa.ServiceDescription.Category.ServiceCategoryOid.Value))
{
ServiceCategoryTreeItem parentItem = categoryDict[sa.ServiceDescription.Category.ServiceCategoryOid.Value];
childItem.Parent = parentItem;
categoryDict.Add(category.ServiceCategoryOid.Value, treeItem);
treeList.Add(treeItem);
}
//if (selectedDescriptions != null)
//{
// foreach (var existingSd in selectedDescriptions)
// {
// if (existingSd.Equals(sd))
// {
// childItem.IsChecked = true;
// }
// }
foreach(var sa in sortedAccountings)
{
var childItem = new ServiceCategoryTreeItem {ServiceAccounting = sa};
// childItem.PropertyChanged += (s, e) =>
// {
// ServiceCategoryTreeItem selectedSd = s as ServiceCategoryTreeItem;
// if (selectedSd != null && selectedSd.ServiceDescription != null)
// {
// if (selectedSd.IsChecked)
// {
// selectedDescriptions.Add(selectedSd.ServiceDescription);
// }
// else
// {
// selectedDescriptions.Remove(selectedSd.ServiceDescription);
// }
// }
// };
//}
if(sa.ServiceDescription.Category != null && categoryDict.ContainsKey(sa.ServiceDescription.Category.ServiceCategoryOid.Value))
{
var parentItem = categoryDict[sa.ServiceDescription.Category.ServiceCategoryOid.Value];
childItem.Parent = parentItem;
parentItem.Children.Add(childItem);
}
}
}
//if (selectedDescriptions != null)
//{
// foreach (var existingSd in selectedDescriptions)
// {
// if (existingSd.Equals(sd))
// {
// childItem.IsChecked = true;
// }
// }
return treeList;
}
// childItem.PropertyChanged += (s, e) =>
// {
// ServiceCategoryTreeItem selectedSd = s as ServiceCategoryTreeItem;
// if (selectedSd != null && selectedSd.ServiceDescription != null)
// {
// if (selectedSd.IsChecked)
// {
// selectedDescriptions.Add(selectedSd.ServiceDescription);
// }
// else
// {
// selectedDescriptions.Remove(selectedSd.ServiceDescription);
// }
// }
// };
//}
parentItem.Children.Add(childItem);
}
}
}
return treeList;
}
public static FlatSupportConceptTreeNodeDC CreateFlatSupportConceptItem(CompactSupportConceptDC dc, CompactOrganisationDC orga)
{

2
BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
View File

@@ -139,7 +139,7 @@ namespace BeWo.Scheduler.ViewModel
{
SchedulerAppointmentVM found = null;
foreach (var vm in Appointments.OfType<SchedulerAppointmentVM>().Where(vm => vm.DataContract.Equals(dc)))
foreach (var vm in Appointments.OfType<SchedulerAppointmentVM>().Where(vm => vm.DataContract != null && vm.DataContract.Equals(dc)))
{
found = vm;
}

4
BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstBearbeitungsView.xaml.cs
View File

@@ -272,7 +272,7 @@ namespace BeWo.SchulbegleitenderDienst
public void GetAllTokensAndSetAll()
{
// var x =
ServiceFacade.DoOperationsServiceAsync(r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Klient, _klientOid), x => this.Dispatch(
ServiceFacade.DoOperationsServiceAsync(r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Klient, _klientOid), x => this.Dispatch(
delegate
{
List<string> wunschliste = new List<string>();
@@ -312,7 +312,7 @@ namespace BeWo.SchulbegleitenderDienst
//var x =
ServiceFacade.DoOperationsServiceAsync(
r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter, 0), x =>this.Dispatch(delegate
r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter, 0), x =>this.Dispatch(delegate
{
List<string> wunschliste = new List<string>();
List<string> ausschlussliste = new List<string>();

4
BeWo/SchulbegleitenderDienst/SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml.cs
View File

@@ -126,7 +126,7 @@ namespace BeWo.SchulbegleitenderDienst
private void SetMitarbeiterKriteria()
{
var tokenlist = ServiceFacade.DoOperationsServiceSync(r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter, _employeeOid));
var tokenlist = ServiceFacade.DoOperationsServiceSync(r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter, _employeeOid));
foreach (var tkList in tokenlist)
{
@@ -151,7 +151,7 @@ namespace BeWo.SchulbegleitenderDienst
ServiceFacade.DoOperationsServiceAsync(
r => r.GetAllTokens(SchulbegleitenderZugehörigkeitsTyp.Klient, 0), x => this.Dispatch(delegate
r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Klient, 0), x => this.Dispatch(delegate
{
List<string> wunschliste = new List<string>();
List<string> ausschlussliste = new List<string>();

121
BeWo/ServiceProxy/Generated.cs
View File

@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -2888,24 +2888,24 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateBeWoFoldersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void UpdateBeWoFolders(System.Collections.Generic.List<BS.Shared.DataContracts.BeWoFolderDC> dcs);
// CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadDocument) übereinstimmt.
// CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadDocument)
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadDocument", ReplyAction="http://tempuri.org/IStreamingService/UploadDocumentResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BeWo.ServiceProxy.UploadResult UploadDocument(BeWo.ServiceProxy.UploadPackage request);
// CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UpdatePackage) von Nachricht "UpdatePackage" nicht mit dem Standardwert (UpdateDocument) übereinstimmt.
// CODEGEN: Generating message contract since the wrapper name (UpdatePackage) of message UpdatePackage does not match the default value (UpdateDocument)
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request);
// CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt.
// CODEGEN: Generating message contract since the wrapper name (UploadChatPackage) of message UploadChatPackage does not match the default value (CreateNewSpeziallStreamChatMessagesDC)
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" +
"e")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" +
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request);
// CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadImportFile) übereinstimmt.
// CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadImportFile)
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadImportFile", ReplyAction="http://tempuri.org/IStreamingService/UploadImportFileResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadImportFileBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BeWo.ServiceProxy.UploadImportFileResult UploadImportFile(BeWo.ServiceProxy.UploadPackage request);
@@ -4000,6 +4000,11 @@ namespace BeWo.ServiceProxy
public interface IOperationsService
{
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipient", ReplyAction="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientBeWoFault" +
"Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindUnreadChatMessagesForRecipient(long personOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateNewEmployeeAPPCodeDCBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid);
@@ -4100,7 +4105,7 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllTokens", ReplyAction="http://tempuri.org/IOperationsService/GetAllTokensResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllTokensBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC> GetAllTokens(BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid);
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC> GetAllTokens(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteToken", ReplyAction="http://tempuri.org/IOperationsService/DeleteTokenResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -4108,15 +4113,15 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeletTokenRelation", ReplyAction="http://tempuri.org/IOperationsService/DeletTokenRelationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeletTokenRelationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable<long> oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp typ);
void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable<long> oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp typ);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewToken", ReplyAction="http://tempuri.org/IOperationsService/InsertNewTokenResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid);
void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewRelationToken", ReplyAction="http://tempuri.org/IOperationsService/InsertNewRelationTokenResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewRelationTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid);
void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateToken", ReplyAction="http://tempuri.org/IOperationsService/UpdateTokenResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateTokenBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -4142,11 +4147,11 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenWunschOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenWunschOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenWunschOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token);
void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token);
void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptions", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -4397,26 +4402,30 @@ namespace BeWo.ServiceProxy
"", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> FindServiceRecordsForLastDays(System.Nullable<long> costbearer2SupportConceptOid, int days, System.Nullable<long> employeeOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/GetAllTextbausteineResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> GetAllTextbausteine();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllTextModules", ReplyAction="http://tempuri.org/IOperationsService/GetAllTextModulesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> GetAllTextModules();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/InsertNewTextbausteineResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> InsertNewTextbausteine(System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> pTextbausteine);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTextModules", ReplyAction="http://tempuri.org/IOperationsService/GetTextModulesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> GetTextModules(bool pShouldShowAllTextModules, long pEmployeeOid, bool pHasRightToSeeAllTextModules, bool pIsInAdministrationView);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/UpdateTextbausteineResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void UpdateTextbausteine(System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> pTextbausteine);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewTextModules", ReplyAction="http://tempuri.org/IOperationsService/InsertNewTextModulesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> InsertNewTextModules(System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> pTextbausteine);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteTextbausteine", ReplyAction="http://tempuri.org/IOperationsService/DeleteTextbausteineResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTextbausteineBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeleteTextbausteine(System.Collections.Generic.Dictionary<long, long> pOid2Version);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateTextModules", ReplyAction="http://tempuri.org/IOperationsService/UpdateTextModulesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void UpdateTextModules(System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> pTextbausteine);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTextbausteineByServiceCategory", ReplyAction="http://tempuri.org/IOperationsService/GetTextbausteineByServiceCategoryResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTextbausteineByServiceCategoryBeWoFaultF" +
"ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> GetTextbausteineByServiceCategory(long pServiceCategoryOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeleteTextModules", ReplyAction="http://tempuri.org/IOperationsService/DeleteTextModulesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteTextModulesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeleteTextModules(System.Collections.Generic.Dictionary<long, long> pOid2Version);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetTextModulesByServiceCategory", ReplyAction="http://tempuri.org/IOperationsService/GetTextModulesByServiceCategoryResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetTextModulesByServiceCategoryBeWoFaultFau" +
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> GetTextModulesByServiceCategory(long pServiceCategoryOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/FindServiceRecordsInSpan", ReplyAction="http://tempuri.org/IOperationsService/FindServiceRecordsInSpanResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/FindServiceRecordsInSpanBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
@@ -4450,11 +4459,6 @@ namespace BeWo.ServiceProxy
"ult", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.CustomerAPPCodeDC> GetIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipient", ReplyAction="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/FindUnreadChatMessagesForRecipientBeWoFault" +
"Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindUnreadChatMessagesForRecipient(long personOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -4770,6 +4774,11 @@ namespace BeWo.ServiceProxy
{
}
public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindUnreadChatMessagesForRecipient(long personOid)
{
return base.Channel.FindUnreadChatMessagesForRecipient(personOid);
}
public BS.Shared.DataContracts.EmployeeAPPCodeDC CreateNewEmployeeAPPCodeDC(long employeeOid)
{
return base.Channel.CreateNewEmployeeAPPCodeDC(employeeOid);
@@ -4875,7 +4884,7 @@ namespace BeWo.ServiceProxy
base.Channel.UpdateAbsenceTime(abs);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC> GetAllTokens(BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid)
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC> GetAllTokens(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid)
{
return base.Channel.GetAllTokens(zugehoerigkeitsTyp, oid);
}
@@ -4885,17 +4894,17 @@ namespace BeWo.ServiceProxy
base.Channel.DeleteToken(token);
}
public void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable<long> oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp typ)
public void DeletTokenRelation(BS.Shared.DataContracts.Compact.CompactTokenDC token, System.Nullable<long> oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp typ)
{
base.Channel.DeletTokenRelation(token, oid, typ);
}
public void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid)
public void InsertNewToken(string beschreibung, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid)
{
base.Channel.InsertNewToken(beschreibung, typ, zugehoerigkeitsTyp, oid);
}
public void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid)
public void InsertNewRelationToken(BS.Shared.DataContracts.Compact.CompactTokenDC token, BS.Shared.TokenTyp typ, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Nullable<long> oid)
{
base.Channel.InsertNewRelationToken(token, typ, zugehoerigkeitsTyp, oid);
}
@@ -4925,12 +4934,12 @@ namespace BeWo.ServiceProxy
return base.Channel.KlientenAbschlagsInfoListe(start, end);
}
public void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token)
public void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token)
{
base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token);
}
public void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token)
public void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token)
{
base.Channel.DoTokenAusschlussOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerAusschlussToken, token);
}
@@ -5190,29 +5199,34 @@ namespace BeWo.ServiceProxy
return base.Channel.FindServiceRecordsForLastDays(costbearer2SupportConceptOid, days, employeeOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> GetAllTextbausteine()
public System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> GetAllTextModules()
{
return base.Channel.GetAllTextbausteine();
return base.Channel.GetAllTextModules();
}
public System.Collections.Generic.List<long> InsertNewTextbausteine(System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> pTextbausteine)
public System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> GetTextModules(bool pShouldShowAllTextModules, long pEmployeeOid, bool pHasRightToSeeAllTextModules, bool pIsInAdministrationView)
{
return base.Channel.InsertNewTextbausteine(pTextbausteine);
return base.Channel.GetTextModules(pShouldShowAllTextModules, pEmployeeOid, pHasRightToSeeAllTextModules, pIsInAdministrationView);
}
public void UpdateTextbausteine(System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> pTextbausteine)
public System.Collections.Generic.List<long> InsertNewTextModules(System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> pTextbausteine)
{
base.Channel.UpdateTextbausteine(pTextbausteine);
return base.Channel.InsertNewTextModules(pTextbausteine);
}
public void DeleteTextbausteine(System.Collections.Generic.Dictionary<long, long> pOid2Version)
public void UpdateTextModules(System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> pTextbausteine)
{
base.Channel.DeleteTextbausteine(pOid2Version);
base.Channel.UpdateTextModules(pTextbausteine);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC> GetTextbausteineByServiceCategory(long pServiceCategoryOid)
public void DeleteTextModules(System.Collections.Generic.Dictionary<long, long> pOid2Version)
{
return base.Channel.GetTextbausteineByServiceCategory(pServiceCategoryOid);
base.Channel.DeleteTextModules(pOid2Version);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.TextModuleDC> GetTextModulesByServiceCategory(long pServiceCategoryOid)
{
return base.Channel.GetTextModulesByServiceCategory(pServiceCategoryOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.ServiceRecordDC> FindServiceRecordsInSpan(long pCostBearer2SupportConceptOid, BS.Shared.Core.DateTimeSpan period)
@@ -5250,11 +5264,6 @@ namespace BeWo.ServiceProxy
return base.Channel.GetIsChatActiveCustomerAPPCodeDC(customerOid, activeType);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.ChatMessageDC> FindUnreadChatMessagesForRecipient(long personOid)
{
return base.Channel.FindUnreadChatMessagesForRecipient(personOid);
}
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
{
base.Channel.DeactivateInvoices(invoices);

18
BeWo/ServiceProxy/ServiceFacade.cs
View File

@@ -510,7 +510,7 @@ namespace BeWo.ServiceProxy
public static void GetAll<T>(Action<List<T>> pCallBack)
{
if (typeof(T).Equals(typeof(CompactCustomerDC)))
if (typeof(T) == typeof(CompactCustomerDC))
{
long? oid = null;
@@ -534,27 +534,27 @@ namespace BeWo.ServiceProxy
pCallBack(list.Cast<T>().ToList());
});
}
else if (typeof(T).Equals(typeof(CompactEmployeeDC)))
else if (typeof(T) == typeof(CompactEmployeeDC))
{
DoEmployeeServiceAsync(s => s.GetAllActiveEmployeesCompact().Cast<T>().ToList(), r => pCallBack(r));
}
else if (typeof(T).Equals(typeof(CompactTeamDC)))
else if (typeof(T) == typeof(CompactTeamDC))
{
DoEmployeeServiceAsync(s => s.GetAllTeamsCompact().Cast<T>().ToList(), r => pCallBack(r));
}
else if (typeof(T).Equals(typeof(CompactOrganisationDC)))
else if (typeof(T) == typeof(CompactOrganisationDC))
{
DoCustomerServiceAsync(s => s.GetAllActiveOrganisationsCompact().Cast<T>().ToList(), r => pCallBack(r));
}
else if (typeof(T).Equals(typeof(CompactPersonDC)))
else if (typeof(T) == typeof(CompactPersonDC))
{
DoCustomerServiceAsync(s => s.GetAllActivePersonsCompact().Cast<T>().ToList(), r => pCallBack(r));
}
else if (typeof(T).Equals(typeof(CompactSupportConceptDC)))
else if (typeof(T) == typeof(CompactSupportConceptDC))
{
DoCustomerServiceAsync(s => s.GetAllActiveSupportConceptsCompact().Cast<T>().ToList(), r => pCallBack(r));
}
else if (typeof(T).Equals(typeof(CompactUserDC)))
else if (typeof(T) == typeof(CompactUserDC))
{
DoUserServiceAsync(s => s.GetAllUsersCompact().Cast<T>().ToList(), r => pCallBack(r), true);
}
@@ -562,9 +562,9 @@ namespace BeWo.ServiceProxy
{
DoResourceServiceAsync(s => s.GetAllResources().Cast<T>().ToList(), pCallBack, true);
}
else if (typeof (T) == typeof (TextbausteinDC))
else if (typeof (T) == typeof (TextModuleDC))
{
DoOperationsServiceAsync(s => s.GetAllTextbausteine().Cast<T>().ToList(), pCallBack);
DoOperationsServiceAsync(s => s.GetAllTextModules().Cast<T>().ToList(), pCallBack);
}
else
{

11
BeWo/Styles/OrangeBlack.xaml
View File

@@ -14,7 +14,7 @@
xmlns:Blacklight_Wpf_Controls="clr-namespace:Blacklight.Wpf.Controls;assembly=Blacklight.Wpf.Controls">
<!-- Region Brushes-->
<SolidColorBrush x:Key="TextbausteinBrush" Color="#FFA9B8C2" />
<SolidColorBrush x:Key="TextModuleBrush" Color="#FFA9B8C2" />
<SolidColorBrush x:Key="ZusageMitVorbehaltBrush" Color="#FFB927D9" />
<SolidColorBrush x:Key="ZusageZugesagtBrush" Color="#FF48D44E" />
<SolidColorBrush x:Key="ZusageAbgesagtBrush" Color="#FFAB0030" />
@@ -1786,8 +1786,6 @@
<!-- EndRegion -->
<!-- Region Navigation Styles and Templates -->
<Style x:Key="SearchDetailStyle" TargetType="{x:Type ListBoxItem}">
<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
<Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -2245,7 +2243,7 @@
</Setter>
</Style>
<!-- Region Employee Styles-->
<!-- Region Employee Styles-->
<SolidColorBrush x:Key="EmployeeContentBrush" Color="#FF45993B" />
<LinearGradientBrush x:Key="EmployeeListBrush" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FF45993B" Offset="0" />
@@ -2262,10 +2260,8 @@
<Setter Property="Template" Value="{StaticResource NavigationGroupTemplate}" />
</Style>
<!-- EndRegion -->
<!-- EndRegion -->
<!-- ######## Wohnheim Style ##################################################################################################### -->
<!-- Region Wohnheim Styles-->
<SolidColorBrush x:Key="WohnheimContentBrush" Color="#FF325CED" />
@@ -2285,7 +2281,6 @@
<Setter Property="Template" Value="{StaticResource NavigationGroupTemplate}" />
</Style>
<!-- EndRegion -->
<!-- ############################################################################################################# -->
<!-- Region Organisation Styles-->
<LinearGradientBrush x:Key="OrganisationGradientBrush" EndPoint="0.5,1" StartPoint="0.5,0">

167
BeWo/View/Controls/ComboBoxTreeViewControl.xaml
View File

@@ -1,92 +1,89 @@
<UserControl x:Class="BeWo.View.Controls.ComboBoxTreeViewControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:clientPartials="clr-namespace:BS.Shared.DataContracts.ClientPartials;assembly=BS.Shared"
mc:Ignorable="d"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<StackPanel x:Name="ComboBox_TreeView_Imitation" Orientation="Horizontal" Margin="3,0,3,3"
Visibility="{Binding Path=PrototypeVM.IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}">
<TextBox x:Name="Imitationheader" Width="182" HorizontalAlignment="Left"
Cursor="Arrow" VerticalContentAlignment="Center" Height="23" IsReadOnly="True"
Visibility="{Binding Path=PrototypeVM.IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
<Button Content="6" Click="OpenPopUpBtnClick" FontFamily="Webdings" FontSize="8" Height="19" Name="OpenPopUpBtn" Width="17" Margin="-22,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
</StackPanel>
<Popup Grid.Row="1" x:Name="TreeViewPopup" AllowsTransparency="True"
IsOpen="False" StaysOpen="False"
Closed="PopUpClosedEvent" PopupAnimation="Slide">
<Border BorderBrush="Black" BorderThickness="2" Background="#788991">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Label x:Name="SearchFieldLabel" Grid.Column="0" Content="Suche" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox x:Name="cbtv_search" Grid.Column="1" Margin="3" Height="23" Template="{StaticResource SearchTextBoxTemplate}" HorizontalAlignment="Stretch"/>
</Grid>
<TreeView x:Name="Tree1" Margin="0" Grid.Row="1"
ItemTemplate="{DynamicResource treeitemtemplate}"
ItemContainerStyle="{DynamicResource servicecat_treeitemstyle}"
BorderThickness="0" Background="White"
Loaded="Tree1_OnLoaded"
dx:ThemeManager.ThemeName="None">
<TreeView.ItemsSource>
<MultiBinding Converter="{StaticResource FilterDCConverter}">
<MultiBinding.Bindings>
<Binding Path="TreeViewSourceList" />
<Binding ElementName="cbtv_search" Path="Text" />
</MultiBinding.Bindings>
</MultiBinding>
</TreeView.ItemsSource>
<TreeView.Resources>
<Style x:Key="servicecat_treeitemstyle" TargetType="TreeViewItem">
<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
</Style>
<HierarchicalDataTemplate x:Key="treeitemtemplate"
DataType="{x:Type clientPartials:SupportConceptGoalDC}"
ItemsSource="{Binding Path=Children}">
<Grid HorizontalAlignment="Left">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<CheckBox x:Name="Bd" Tag="{Binding}"
IsChecked="{Binding Path=IsChecked}"
Visibility="{Binding Path=HasParent, Converter={StaticResource BoolVisibilityConverter}}"
Grid.Column="0" Margin="3 2"
VerticalAlignment="Center"
Click="Bd_OnClick" />
<TextBlock x:Name="BdText" Tag="{Binding}"
Grid.Column="1" Margin="3 2"
Text="{Binding Path=Name}"
VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black" MouseDown="BdText_OnMouseDown" TextAlignment="Left"/>
</Grid>
</HierarchicalDataTemplate>
</TreeView.Resources>
</TreeView>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<CheckBox x:Name="DeSelectAllCheckBox" Click="DeSelectAllOnClick" IsChecked="False" Content="Alle Ziele" Margin="3" VerticalAlignment="Center" />
<Button Grid.Column="1" x:Name="ApplyBtn" Margin="3" Height="23"
Content="Übernehmen" Click="ApplyBtnClose" HorizontalAlignment="Right"/>
</Grid>
</Grid>
</Border>
</Popup>
</Grid>
</UserControl>
<Grid>
<StackPanel x:Name="ComboBox_TreeView_Imitation" Orientation="Horizontal" Margin="3,0,3,3" Visibility="{Binding Path=PrototypeVM.IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}">
<TextBox x:Name="Imitationheader" Width="182" HorizontalAlignment="Left" Cursor="Arrow" VerticalContentAlignment="Center" Height="23" IsReadOnly="True" Visibility="{Binding Path=PrototypeVM.IsGoalTreeVisible, Converter={StaticResource BoolVisibilityConverter}}" />
<Button Content="6" Click="OpenPopUpBtnClick" FontFamily="Webdings" FontSize="8" Height="19" Name="OpenPopUpBtn" Width="17" Margin="-22,0,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
</StackPanel>
<Popup Grid.Row="1" x:Name="TreeViewPopup" AllowsTransparency="True"
IsOpen="False" StaysOpen="False"
Closed="PopUpClosedEvent" PopupAnimation="Slide">
<Border BorderBrush="Black" BorderThickness="2" Background="#788991">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label x:Name="SearchFieldLabel" Grid.Column="0" Content="Suche" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Left" />
<TextBox x:Name="cbtv_search" Grid.Column="1" Margin="3" Height="23" Template="{StaticResource SearchTextBoxTemplate}" HorizontalAlignment="Stretch" />
</Grid>
<TreeView x:Name="Tree1" Margin="0" Grid.Row="1"
ItemTemplate="{DynamicResource treeitemtemplate}"
ItemContainerStyle="{DynamicResource servicecat_treeitemstyle}"
BorderThickness="0" Background="White"
Loaded="Tree1_OnLoaded"
dx:ThemeManager.ThemeName="None">
<TreeView.ItemsSource>
<MultiBinding Converter="{StaticResource FilterDCConverter}">
<MultiBinding.Bindings>
<Binding Path="TreeViewSourceList" />
<Binding ElementName="cbtv_search" Path="Text" />
</MultiBinding.Bindings>
</MultiBinding>
</TreeView.ItemsSource>
<TreeView.Resources>
<Style x:Key="servicecat_treeitemstyle" TargetType="TreeViewItem">
<Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
</Style>
<HierarchicalDataTemplate x:Key="treeitemtemplate"
DataType="{x:Type clientPartials:SupportConceptGoalDC}"
ItemsSource="{Binding Path=Children}">
<Grid HorizontalAlignment="Left">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<CheckBox x:Name="Bd" Tag="{Binding}"
IsChecked="{Binding Path=IsChecked}"
Visibility="{Binding Path=HasParent, Converter={StaticResource BoolVisibilityConverter}}"
Grid.Column="0" Margin="3 2"
VerticalAlignment="Center"
Click="Bd_OnClick" />
<TextBlock x:Name="BdText" Tag="{Binding}"
Grid.Column="1" Margin="3 2"
Text="{Binding Path=Name}"
VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="Black"
MouseDown="BdText_OnMouseDown" TextAlignment="Left" />
</Grid>
</HierarchicalDataTemplate>
</TreeView.Resources>
</TreeView>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<CheckBox x:Name="DeSelectAllCheckBox" Click="DeSelectAllOnClick" IsChecked="False" Content="Alle Ziele" Margin="3" VerticalAlignment="Center" />
<Button Grid.Column="1" x:Name="ApplyBtn" Margin="3" Height="23" Content="Übernehmen" Click="ApplyBtnClose" HorizontalAlignment="Right" />
</Grid>
</Grid>
</Border>
</Popup>
</Grid>
</UserControl>

83
BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
View File

@@ -5,15 +5,12 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.ClientPartials;
namespace BeWo.View.Controls
{
/// <summary>
/// Interaktionslogik für ComboBoxTreeViewControl.xaml
/// </summary>
public partial class ComboBoxTreeViewControl
{
public double ParentWindowHeight
@@ -22,11 +19,7 @@ namespace BeWo.View.Controls
set { SetValue(ParentWindowHeightProperty, value); }
}
public static readonly DependencyProperty ParentWindowHeightProperty =
DependencyProperty.Register("ParentWindowHeight",
typeof (double),
typeof (ComboBoxTreeViewControl),
new FrameworkPropertyMetadata(500.0));
public static readonly DependencyProperty ParentWindowHeightProperty = DependencyProperty.Register("ParentWindowHeight", typeof (double), typeof (ComboBoxTreeViewControl), new FrameworkPropertyMetadata(500.0));
public List<SupportConceptGoalDC> TreeViewSourceList
@@ -39,11 +32,7 @@ namespace BeWo.View.Controls
}
}
public static readonly DependencyProperty ListProperty =
DependencyProperty.Register("TreeViewSourceList",
typeof (List<SupportConceptGoalDC>),
typeof (ComboBoxTreeViewControl),
new FrameworkPropertyMetadata(new List<SupportConceptGoalDC>()));
public static readonly DependencyProperty ListProperty = DependencyProperty.Register("TreeViewSourceList", typeof (List<SupportConceptGoalDC>), typeof (ComboBoxTreeViewControl), new FrameworkPropertyMetadata(new List<SupportConceptGoalDC>()));
public ComboBoxTreeViewControl()
{
@@ -53,14 +42,12 @@ namespace BeWo.View.Controls
private void ShowCheckedValues()
{
string ToolTipString;
GoalCount = 0;
var selectedGoals = GetSelectedGoals();
bool allSelected = selectedGoals.Count == GoalCount && GoalCount > 0;
var allSelected = selectedGoals.Count == GoalCount && GoalCount > 0;
ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.TypeDescription + "; "));
var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.TypeDescription + "; "));
DeSelectAllCheckBox.IsChecked = allSelected;
@@ -72,15 +59,17 @@ namespace BeWo.View.Controls
return;
}
string[] splittedToolTip = ToolTipString.Split(';');
var splittedToolTip = ToolTipString.Split(';');
ToolTipString = string.Empty;
foreach (var item in splittedToolTip.Where(x => x != " "))
{
ToolTipString += item.Trim(' ');
if (splittedToolTip.Where(x => x != " ").ToList().IndexOf(item) <
(splittedToolTip.Count(x => x != " ") - 1))
ToolTipString += "\n";
if (splittedToolTip.Where(x => x != " ").ToList().IndexOf(item) < splittedToolTip.Count(x => x != " ") - 1)
{
ToolTipString += "\n";
}
}
Imitationheader.ToolTip = ToolTipString;
@@ -96,9 +85,9 @@ namespace BeWo.View.Controls
}
private int GoalCount;
private void AddCheckedGoals(List<SupportConceptGoalDC> goals, List<ValueListEntryDC> selectedGoals)
private void AddCheckedGoals(IEnumerable<SupportConceptGoalDC> goals, ICollection<ValueListEntryDC> selectedGoals)
{
foreach (SupportConceptGoalDC item in goals)
foreach (var item in goals)
{
if (item.Children == null || item.Children.Count == 0)
{
@@ -125,21 +114,26 @@ namespace BeWo.View.Controls
private void openPopup()
{
TreeViewPopup.Placement = PlacementMode.RelativePoint;
TreeViewPopup.PlacementTarget = Imitationheader;
TreeViewPopup.VerticalOffset = Imitationheader.Height;
TreeViewPopup.Placement = PlacementMode.RelativePoint;
TreeViewPopup.PlacementTarget = Imitationheader;
TreeViewPopup.VerticalOffset = Imitationheader.Height;
TreeViewPopup.HorizontalOffset = 0;
TreeViewPopup.MinWidth = Imitationheader.Width;
TreeViewPopup.IsOpen = true;
TreeViewPopup.MinWidth = Imitationheader.Width;
TreeViewPopup.IsOpen = true;
if (ParentWindowHeight == 0)
{
ParentWindowHeight = 500;
}
OpenPopUpBtn.IsEnabled = false;
}
private void PopUpClosedEvent(object sender, EventArgs eventArgs)
{
ShowCheckedValues();
cbtv_search.Text = string.Empty;
cbtv_search.Text = string.Empty;
OpenPopUpBtn.IsEnabled = true;
}
@@ -150,16 +144,18 @@ namespace BeWo.View.Controls
public void ResetControl()
{
TreeViewSourceList = new List<SupportConceptGoalDC>();
Imitationheader.Text = string.Empty;
Imitationheader.ToolTip = null;
TreeViewSourceList = new List<SupportConceptGoalDC>();
Imitationheader.Text = string.Empty;
Imitationheader.ToolTip = null;
DeSelectAllCheckBox.IsChecked = false;
}
private void Tree1_OnLoaded(object sender, RoutedEventArgs e)
{
if (ParentWindowHeight >= TreeViewPopup.VerticalOffset)
TreeViewPopup.MaxHeight = ParentWindowHeight - TreeViewPopup.VerticalOffset - ParentWindowHeight/4;
{
TreeViewPopup.MaxHeight = ParentWindowHeight - TreeViewPopup.VerticalOffset - ParentWindowHeight/4;
}
}
private void Bd_OnClick(object sender, RoutedEventArgs e)
@@ -172,13 +168,18 @@ namespace BeWo.View.Controls
var cb = (CheckBox)sender;
if (!cb.IsChecked.HasValue)
return;
{
return;
}
foreach (var item in TreeViewSourceList)
{
item.IsChecked = cb.IsChecked.Value;
foreach (var item2 in item.Children)
item2.IsChecked = cb.IsChecked.Value;
{
item2.IsChecked = cb.IsChecked.Value;
}
}
ShowCheckedValues();
@@ -187,9 +188,13 @@ namespace BeWo.View.Controls
private void BdText_OnMouseDown(object sender, MouseButtonEventArgs e)
{
var SupportConceptGoal = ((TextBlock)sender).Tag as SupportConceptGoalDC;
SupportConceptGoal.IsChecked = !SupportConceptGoal.IsChecked;
ShowCheckedValues();
if(SupportConceptGoal != null)
{
SupportConceptGoal.IsChecked = !SupportConceptGoal.IsChecked;
}
ShowCheckedValues();
}
}
}

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

File diff suppressed because it is too large Load Diff

36
BeWo/View/Detail/CustomerView.xaml.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Globalization;
using System.Linq;
using System.ServiceModel;
@@ -29,23 +28,19 @@ using DevExpress.Utils;
using DevExpress.Xpf.Editors.Settings;
using DevExpress.Xpf.Grid;
using System.IO;
using System.Windows.Forms;
using System.Windows.Media.Imaging;
using System.Windows.Media;
using DevExpress.XtraGrid;
using Binding = System.Windows.Data.Binding;
using Button = System.Windows.Controls.Button;
using CheckBox = System.Windows.Controls.CheckBox;
using ComboBox = System.Windows.Controls.ComboBox;
using Control = System.Windows.Controls.Control;
using GridControl = DevExpress.Xpf.Grid.GridControl;
using GroupBox = System.Windows.Controls.GroupBox;
using Binding = System.Windows.Data.Binding;
using Button = System.Windows.Controls.Button;
using CheckBox = System.Windows.Controls.CheckBox;
using ComboBox = System.Windows.Controls.ComboBox;
using Control = System.Windows.Controls.Control;
using GridControl = DevExpress.Xpf.Grid.GridControl;
using GroupBox = System.Windows.Controls.GroupBox;
using HorizontalAlignment = System.Windows.HorizontalAlignment;
using Hyperlink = System.Windows.Documents.Hyperlink;
using Image = System.Windows.Controls.Image;
using MessageBox = System.Windows.MessageBox;
using VerticalAlignment = System.Windows.VerticalAlignment;
using Hyperlink = System.Windows.Documents.Hyperlink;
using MessageBox = System.Windows.MessageBox;
using VerticalAlignment = System.Windows.VerticalAlignment;
namespace BeWo.View.Detail
@@ -87,7 +82,6 @@ namespace BeWo.View.Detail
public static readonly string[] GradDerBehinderungComboBoxQuelle = { "20", "30", "40", "50", "60", "70", "80", "90", "100" };
//Konstruktor
public CustomerView(CustomerVM pCustomerVM)
{
InitializeComponent();
@@ -392,12 +386,10 @@ namespace BeWo.View.Detail
Cache.GetInstance().ClearSupportConceptTree();
Cache.GetInstance().ClearCustomers();
BeWoApp.MainControl.ResetView(UIContext.Customer);
}
catch (FaultException<BeWoFault>)
{
MessageBox.Show(
"Dieser Datensatz wurde in der Zwischenzeit von einem anderen Benutzer geändert. Klicken Sie Ok um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
MessageBox.Show("Dieser Datensatz wurde in der Zwischenzeit von einem anderen Benutzer geändert. Klicken Sie Ok, um den Datansatz erneut zu laden. Ihre Änderungen gehen dabei leider verloren.");
ReloadViewModel(lDataContract.CustomerOid.Value);
}
}
@@ -1018,7 +1010,7 @@ namespace BeWo.View.Detail
{
if (tabitem_schuldienst.Content == null)
{
//tabitem_schuldienst.Content = new SchulbegleitenderDienst.SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.CustomerOid.Value,SchulbegleitenderZugehörigkeitsTyp.Klient);
//tabitem_schuldienst.Content = new SchulbegleitenderDienst.SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.CustomerOid.Value,SchulbegleitenderZugehoerigkeitsTyp.Klient);
}
}
@@ -1619,8 +1611,8 @@ namespace BeWo.View.Detail
{
var v1String = e.Value1.ToString();
var v2String = e.Value2.ToString();
var dt1 = Convert.ToDateTime(v1String.Substring(v1String.Length - 10, 10));
var dt2 = Convert.ToDateTime(v2String.Substring(v2String.Length - 10, 10));
var dt1 = Convert.ToDateTime(v1String.Substring(v1String.Length - 10, 10), new CultureInfo("de-DE"));
var dt2 = Convert.ToDateTime(v2String.Substring(v2String.Length - 10, 10), new CultureInfo("de-DE"));
e.Result = Comparer<DateTime>.Default.Compare(dt1, dt2) * -1;
e.Handled = true;

12
BeWo/View/Detail/CustomerView2.xaml
View File

@@ -15,7 +15,7 @@
</localView:BeWoView.Triggers>
<Grid x:Name="root">
<Grid.Resources>
<dxg:GridControl x:Key="grid_costBearer" VerticalAlignment="Stretch" DataSource="{Binding Path=CostBearers.VMList}" HorizontalAlignment="Stretch">
<dxg:GridControl x:Key="grid_costBearer" VerticalAlignment="Stretch" ItemsSource="{Binding Path=CostBearers.VMList}" HorizontalAlignment="Stretch">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
@@ -33,7 +33,7 @@
</dxg:GridControl.View>
</dxg:GridControl>
<dxg:GridControl VerticalAlignment="Stretch" DataSource="{Binding Path=EmployeeRelations.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_EmployeeRelation">
<dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EmployeeRelations.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_EmployeeRelation">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
@@ -51,7 +51,7 @@
</dxg:GridControl.View>
</dxg:GridControl>
<dxg:GridControl VerticalAlignment="Stretch" DataSource="{Binding Path=TeamRelations.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_TeamRelation" >
<dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=TeamRelations.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_TeamRelation" >
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True" >
<dxg:GridColumn.CellTemplate>
@@ -67,7 +67,7 @@
</dxg:GridControl.View>
</dxg:GridControl>
<dxg:GridControl VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" DataSource="{Binding Path=AbsenceTimes.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_absences">
<dxg:GridControl VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" ItemsSource="{Binding Path=AbsenceTimes.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_absences">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
@@ -92,7 +92,7 @@
</dxg:GridControl.View>
</dxg:GridControl>
<dxg:GridControl VerticalAlignment="Stretch" DataSource="{Binding Path=EnvironmentPersons.VMList}" HorizontalAlignment="Stretch" x:Key="grid_PersonRelations">
<dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EnvironmentPersons.VMList}" HorizontalAlignment="Stretch" x:Key="grid_PersonRelations">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
@@ -113,7 +113,7 @@
</dxg:GridControl.View>
</dxg:GridControl>
<dxg:GridControl VerticalAlignment="Stretch" DataSource="{Binding Path=EnvironmentOrganisations.VMList}" HorizontalAlignment="Stretch" x:Key="grid_OrganisationRelations">
<dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EnvironmentOrganisations.VMList}" HorizontalAlignment="Stretch" x:Key="grid_OrganisationRelations">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">

2
BeWo/View/Detail/EmployeeView.xaml.cs
View File

@@ -468,7 +468,7 @@ namespace BeWo.View.Detail
{
if (tabitem_schuldienst.Content == null)
{
tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.EmployeeOid.Value, SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter);
tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.EmployeeOid.Value, SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter);
}
}

2
BeWo/View/Detail/ServiceCategoryView.xaml
View File

@@ -112,7 +112,7 @@
<dxg:GridColumn FieldName="Percentage" Header="max. Anteil (%)" Width="100" />
<dxg:GridColumn FieldName="IsBillable" Header="Abrechenbar" Width="100" />
<dxg:GridColumn x:Name="column_visibility" FieldName="OhneHilfeplan" Header="Sichtbarkeit" Width="150" />
<dxg:GridColumn x:Name="column_costrateperiods" FieldName="CurrentAmount.CostRateValue" Header="Betrag" Width="60" EditSettings="{dxe:TextSettings DisplayFormat=c, EditFormat=c}">
<dxg:GridColumn x:Name="column_costrateperiods" FieldName="CurrentAmount.CostRateValue" Header="Betrag" Width="60" EditSettings="{dxe:TextSettings DisplayFormat=c, EditFormat=c, MaskCulture=de}">
<dxg:GridColumn.EditTemplate>
<ControlTemplate>
<Button x:Name="PART_Editor" BorderThickness="0" Style="{x:Null}" Height="20" HorizontalAlignment="Stretch" Click="PART_Editor_Click">

2
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml
View File

@@ -59,7 +59,7 @@
<Popup Margin="10" x:Name="popup_textbausteine" StaysOpen="False" Placement="MousePoint" Width="400" Height="400">
<search:TextbausteineSearchView x:Name="textbausteineSearchView" ItemSelected="TextbausteineSearchView_OnItemSelected" />
<search:TextModuleSearchView x:Name="textbausteineSearchView" ItemSelected="TextbausteineSearchView_OnItemSelected" />
</Popup>
</Grid>
</GroupBox>

136
BeWo/View/Detail/ServiceRecordRTFWindowView.xaml.cs
View File

@@ -1,34 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using BeWo.ViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace BeWo.View.Detail
{
/// <summary>
/// Interaktionslogik für ServiceRecordRTFWindowView.xaml
/// </summary>
public partial class ServiceRecordRTFWindowView : Window
public partial class ServiceRecordRTFWindowView
{
public event EventHandler<CustomRTFWindowArgs> RaiseCustomEvent;
public ServiceRecordRTFWindowView(string titel,string text, string rtfText)
{
InitializeComponent();
@@ -38,7 +24,6 @@ namespace BeWo.View.Detail
richEditControl.Text = text;
richEditControl.RtfText = rtfText;
// höhe und breite vom Screen nehmen und durch 2 teilen
Width = SystemParameters.PrimaryScreenWidth / 2;
Height = SystemParameters.PrimaryScreenWidth / 2;
@@ -52,18 +37,16 @@ namespace BeWo.View.Detail
private void RtfRueckgabe()
{
RaiseCustomEvent(this, new CustomRTFWindowArgs(richEditControl.Text,richEditControl.RtfText));
Close();
RaiseCustomEvent?.Invoke(this, new CustomRTFWindowArgs(richEditControl.Text,richEditControl.RtfText));
Close();
}
//TextBausteine Bereich
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{
popup_textbausteine.IsOpen = true;
}
private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs<TextbausteinDC> e)
private void TextbausteineSearchView_OnItemSelected(object sender, EventArgs<TextModuleDC> e)
{
if (string.IsNullOrEmpty(richEditControl.Text))
{
@@ -104,105 +87,36 @@ namespace BeWo.View.Detail
private void EditTextbausteineClick(object sender, RoutedEventArgs e)
{
VMFactory.CreateTextbausteinListVMAsync(
x => this.Dispatch(delegate
{
var tbv = new TextbausteinView(x) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
VMFactory.CreateTextModuleListVMAsync(
textModules => this.Dispatch(delegate
{
var tbv = new TextModuleView(textModules) { Background = FindResource("ApplicationBackground") as LinearGradientBrush };
var rootGrid2 = (Grid)tbv.root.Content;
var zielGrid = (Grid)rootGrid2.Children[0];
var cb = new CheckBox
{
Content = "Nur für mich sichtbar",
Margin = new Thickness(3),
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center
};
var window = new BeWoWindow(tbv) { rootGroupBox = { Header = "Textbausteine" }, Width = 850, MinWidth = 850 };
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
{
cb.IsEnabled = false;
}
var IsOnlyForEmployeeBinding = new Binding("NewVM.IsOnlyForEmployee") { Source = tbv.ViewModel, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged };
BindingOperations.SetBinding(cb, ToggleButton.IsCheckedProperty, IsOnlyForEmployeeBinding);
Grid.SetColumn(cb, 0);
Grid.SetRow(cb, 2);
Grid.SetColumnSpan(cb, 4);
zielGrid.Children.Add(cb);
var stackPanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right };
var speichernBtn = new Button
{
Content = "Speichern und schließen",
HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(3),
VerticalAlignment = VerticalAlignment.Center
};
var abbrechenBtn = new Button
{
Content = "Abbrechen",
HorizontalAlignment = HorizontalAlignment.Right,
Margin = new Thickness(3),
VerticalAlignment = VerticalAlignment.Center
};
stackPanel.Children.Add(speichernBtn);
stackPanel.Children.Add(abbrechenBtn);
Grid.SetRow(stackPanel, 2);
rootGrid2.Children.Add(stackPanel);
tbv.root.Header = string.Empty;
var window = new BeWoWindow(tbv) { Width = 514, Height = 400, rootGroupBox = { Header = "Textbausteine" } };
speichernBtn.Click += (o, args) =>
{
tbv.Focus();
if (x.IsDirty || x.VMList.Any(vm => vm.IsDirty))
tbv.Save(() => { textbausteineSearchView.ServiceCategoryOid = textbausteineSearchView.ServiceCategoryOid; });
window.Close();
};
abbrechenBtn.Click += (o, args) =>
{
tbv.Focus();
tbv.DoSaveCheck();
window.Close();
};
window.Show();
}));
}
tbv.CancelButton.Click += (o, args) =>
{
tbv.Focus();
tbv.DoSaveCheck();
window.Close();
};
window.Show();
}), false, true);
}
}
public class CustomRTFWindowArgs : EventArgs
{
private string _text;
private string _rtfText;
public CustomRTFWindowArgs(string txt, string rtfTxt)
public CustomRTFWindowArgs(string txt, string rtfTxt)
{
_text = txt;
_rtfText = rtfTxt;
Text = txt;
RtfText = rtfTxt;
}
public string Text
{
get { return _text; }
}
public string Text { get; }
public string RtfText
{
get { return _rtfText;}
}
public string RtfText { get; }
}
}

845
BeWo/View/Detail/ServiceRecordView2.xaml
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

123
BeWo/View/Detail/TextbausteinView.xaml
View File

@@ -1,123 +0,0 @@
<view:BeWoView x:Class="BeWo.View.Detail.TextbausteinView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" Focusable="True">
<view:BeWoView.Resources>
<detail:IsOnlyForEmployeeRightsConverter x:Key="IsOnlyForEmployeeRightsConverter" />
</view:BeWoView.Resources>
<GroupBox Name="root" Header="Aktuell definierte Textbausteine" Style="{StaticResource ObjectEditGroupBox}">
<Grid VerticalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0">Name</Label>
<TextBox Grid.Column="1" Grid.Row="0" Width="100" Text="{validation:ValidationBinding Path=NewVM.Name}"></TextBox>
<Label Grid.Column="2" Grid.Row="0">Position</Label>
<dxe:SpinEdit Grid.Column="3" Grid.Row="0" Width="100" Height="23" MinValue="0" IsFloatValue="False" Value="{Binding Path=NewVM.Position, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"></dxe:SpinEdit>
<Label Grid.Column="4" Grid.Row="0">Kategorie</Label>
<controls:NullItemComboBox Grid.Column="5" Grid.Row="0" Width="150" Height="23" ItemsSource="{Binding Path=PossibleCategories, Mode=OneWay}" SelectedItem="{Binding Path=NewVM.ServiceCategory}" />
<Label Grid.Column="0" Grid.Row="1">Text</Label>
<TextBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="5" AcceptsReturn="True" MaxWidth="469" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" TextWrapping="Wrap" Height="100" Margin="0,3,0,0" Text="{Binding Path=NewVM.Text, UpdateSourceTrigger=PropertyChanged}"></TextBox>
<Button Grid.Column="4" Grid.Row="2" x:Name="AddTextbausteinButton" Margin="3" HorizontalAlignment="Right" Grid.ColumnSpan="2" Click="ButtonAddTextbaustein_Click">Hinzufügen</Button>
</Grid>
<dxg:GridControl Grid.Column="0" Grid.Row="1" x:Name="datagrid_textbausteine" Margin="0,10,0,0" DataSource="{Binding VMList}">
<dxg:GridControl.Columns>
<dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<Button Content="r" Click="DeleteButton_Click" IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Name" Header="Name">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<dxe:TextEdit EditMode="InplaceInactive" Text="{Binding Path=DataContext.RowData.Row.Name, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}"></dxe:TextEdit>
</ControlTemplate>
</dxg:GridColumn.DisplayTemplate>
<dxg:GridColumn.EditTemplate>
<ControlTemplate>
<dxe:TextEdit x:Name="PART_Editor" EditMode="InplaceActive" Text="{Binding Path=DataContext.RowData.Row.Name, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}"></dxe:TextEdit>
</ControlTemplate>
</dxg:GridColumn.EditTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Position" Header="Position">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<dxe:SpinEdit EditMode="InplaceInactive" MinValue="0" IsFloatValue="False"
Value="{Binding Path=DataContext.RowData.Row.Position, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}"></dxe:SpinEdit>
</ControlTemplate>
</dxg:GridColumn.DisplayTemplate>
<dxg:GridColumn.EditTemplate>
<ControlTemplate>
<dxe:SpinEdit x:Name="PART_Editor" EditMode="InplaceActive" MinValue="0" IsFloatValue="False"
Value="{Binding Path=DataContext.RowData.Row.Position, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}"></dxe:SpinEdit>
</ControlTemplate>
</dxg:GridColumn.EditTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="Text" Header="Text">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<dxe:TextEdit EditMode="InplaceInactive" Text="{Binding Path=DataContext.RowData.Row.Text, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
></dxe:TextEdit>
</ControlTemplate>
</dxg:GridColumn.DisplayTemplate>
<dxg:GridColumn.EditTemplate>
<ControlTemplate>
<dxe:TextEdit x:Name="PART_Editor" EditMode="InplaceActive" Text="{Binding Path=DataContext.RowData.Row.Text, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}"></dxe:TextEdit>
</ControlTemplate>
</dxg:GridColumn.EditTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="Nur für Ersteller sichtbar" x:Name="EigenerTextbausteinSpalte">
<dxg:GridColumn.CellTemplate>
<DataTemplate>
<dxe:CheckEdit HorizontalAlignment="Center"
IsChecked="{Binding Path=DataContext.RowData.Row.IsOnlyForEmployee, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
IsEnabled="{Binding Path=DataContext.RowData.Row, ConverterParameter=IsOnlyForEmployeeCheckBox, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}"/>
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn FieldName="ServiceCategory" Header="Kategorie">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings ItemsSource="{Binding Path=PossibleCategories}"></dxe:ComboBoxEditSettings>
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" ShowingEditor="GridViewBase_OnShowingEditor" />
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</GroupBox>
</view:BeWoView>

172
BeWo/View/Detail/TextbausteinView.xaml.cs
View File

@@ -1,172 +0,0 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Data;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.Extensions;
using DevExpress.Xpf.Grid;
namespace BeWo.View.Detail
{
public partial class TextbausteinView
{
private TextbausteinListVM _ViewModel;
public TextbausteinListVM ViewModel
{
get { return _ViewModel; }
set
{
_ViewModel = value;
root.DataContext = value;
}
}
public override bool IsDirty
{
get { return ViewModel != null && ViewModel.IsDirty; }
}
internal override DependencyObject ValidationOnSaveRootElement
{
get { return AddTextbausteinButton; }
}
private bool isInAdministrationView;
public TextbausteinView(TextbausteinListVM pViewModel, bool pIsInAdministrationView = false)
{
InitializeComponent();
isInAdministrationView = pIsInAdministrationView;
EigenerTextbausteinSpalte.Visible = !isInAdministrationView;
ViewModel = pViewModel;
}
protected override void Save()
{
var lToDos = new List<Action<IOperationsService>>();
if (ViewModel.AddedCount > 0)
{
lToDos.Add(s => s.InsertNewTextbausteine(ViewModel.CommitAdded()));
}
if (ViewModel.RemovedCount > 0)
{
lToDos.Add(s => s.DeleteTextbausteine(ViewModel.GetRemoved().ToDictionary(dc => dc.TextbausteinOid.Value, dc => dc.TextbausteinVersion.Value)));
}
if (ViewModel.ChangedCount > 0)
{
lToDos.Add(s => s.UpdateTextbausteine(ViewModel.CommitChanged()));
}
ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, ReloadViewModel);
}
public void Save(Action pCallBack)
{
var lToDos = new List<Action<IOperationsService>>();
if (ViewModel.AddedCount > 0)
{
lToDos.Add(s => s.InsertNewTextbausteine(ViewModel.CommitAdded()));
}
if (ViewModel.RemovedCount > 0)
{
lToDos.Add(s => s.DeleteTextbausteine(ViewModel.GetRemoved().ToDictionary(dc => dc.TextbausteinOid.Value, dc => dc.TextbausteinVersion.Value)));
}
if (ViewModel.ChangedCount > 0)
{
lToDos.Add(s => s.UpdateTextbausteine(ViewModel.CommitChanged()));
}
ServiceFacade.DoMultipleOperationsServicesAsync(lToDos, pCallBack);
}
private void ReloadViewModel()
{
Cache.GetInstance().ClearServiceCategoryDescriptions();
VMFactory.CreateTextbausteinListVMAsync(r => this.Dispatch(delegate
{
ViewModel = r;
}), isInAdministrationView);
}
private void DeleteButton_Click(object sender, RoutedEventArgs e)
{
ViewModel.VMList.Remove(datagrid_textbausteine.GetCurrentValue<TextbausteinVM>());
BeWoWpfUtils.RefreshDXGrid(datagrid_textbausteine);
}
private void ButtonAddTextbaustein_Click(object sender, RoutedEventArgs e)
{
if (ValidationTrigger.Validate(this))
{
ViewModel.AddNewVMToList();
}
}
private void GridViewBase_OnShowingEditor(object sender, ShowingEditorEventArgs e)
{
if (e.Column.Header.Equals("Kategorie"))
{
var textbausteinVM = (TextbausteinVM) e.Row;
e.Cancel = !CheckEditorRights(textbausteinVM, null);
}
}
public static bool CheckEditorRights(TextbausteinVM textbausteinVM, object parameter)
{
if (textbausteinVM != null)
{
var isOwn = textbausteinVM.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid);
var hasRight2EditAll = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten);
var hasRight2EditOwn = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten);
var hasRight2Create4All = BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten);
if (parameter != null && parameter.ToString().Equals("IsOnlyForEmployeeCheckBox"))
{
return isOwn && hasRight2EditOwn && hasRight2Create4All || hasRight2EditAll;
}
return isOwn && hasRight2EditOwn || hasRight2EditAll;
}
return false;
}
}
public class IsOnlyForEmployeeRightsConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var textbausteinVM = (TextbausteinVM) value;
return TextbausteinView.CheckEditorRights(textbausteinVM, parameter);
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

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

@@ -35,73 +35,40 @@
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource AdministrationContentBrush}" Height="6" />
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
<TabControl x:Name="root" Style="{StaticResource ObjectEditTabControl}"
PreviewMouseLeftButtonDown="root_PreviewMouseLeftButtonDown" BorderThickness="0,0,0,0">
<TabItem Header="Einstellungen" IsSelected="True" Name="tabitem_mandator"
Selector.Selected="tabitem_mandator_Selected" />
<!--### CB<TabItem Header="Einstellungen für Kalender" Name="tabitem_schedulerSettings"
Selector.Selected="tabitem_schedulerSettings_Selected" />-->
<TabItem Header="Abschlüsse der Mitarbeiter" Name="tabitem_qualificationTypes"
Selector.Selected="tabitem_qualificationTypes_Selected" />
<TabItem Header="Abwesenheitskategorien" Name="tabitem_absenceCategories"
Selector.Selected="tabitem_absenceCategories_Selected" />
<TabItem Header="Behinderungskategorien" Name="tabitem_disablityTypes"
Selector.Selected="tabitem_disablityTypes_Selected" />
<TabItem Header="Beschäftigungsarten" Name="tabitem_employmentTypes"
Selector.Selected="tabitem_employmentTypes_Selected" />
<TabItem Header="Betreuungsarten" Name="tabitem_customerCareTypes"
Selector.Selected="tabitem_customerCareTypes_Selected" />
<TabItem Header="Gründe für Beendigung der Betreuung" Name="tabitem_terminationReasons"
Selector.Selected="tabitem_terminationReasons_Selected" />
<TabItem Header="Vermittlung" Name="tabitem_placementObjectives"
Selector.Selected="tabitem_placementObjectives_Selected" />
<TabControl x:Name="root" Style="{StaticResource ObjectEditTabControl}" PreviewMouseLeftButtonDown="root_PreviewMouseLeftButtonDown" BorderThickness="0,0,0,0">
<TabItem Header="Einstellungen" IsSelected="True" Name="tabitem_mandator" Selector.Selected="tabitem_mandator_Selected" />
<!--### CB<TabItem Header="Einstellungen für Kalender" Name="tabitem_schedulerSettings" Selector.Selected="tabitem_schedulerSettings_Selected" />-->
<TabItem Header="Abschlüsse der Mitarbeiter" Name="tabitem_qualificationTypes" Selector.Selected="tabitem_qualificationTypes_Selected" />
<TabItem Header="Abwesenheitskategorien" Name="tabitem_absenceCategories" Selector.Selected="tabitem_absenceCategories_Selected" />
<TabItem Header="Behinderungskategorien" Name="tabitem_disablityTypes" Selector.Selected="tabitem_disablityTypes_Selected" />
<TabItem Header="Beschäftigungsarten" Name="tabitem_employmentTypes" Selector.Selected="tabitem_employmentTypes_Selected" />
<TabItem Header="Betreuungsarten" Name="tabitem_customerCareTypes" Selector.Selected="tabitem_customerCareTypes_Selected" />
<TabItem Header="Gründe für Beendigung der Betreuung" Name="tabitem_terminationReasons" Selector.Selected="tabitem_terminationReasons_Selected" />
<TabItem Header="Vermittlung" Name="tabitem_placementObjectives" Selector.Selected="tabitem_placementObjectives_Selected" />
<TabItem Header="Titel" Name="tabitem_titles" Selector.Selected="tabitem_titles_Selected" />
<TabItem Header="Funktionen" Name="tabitem_functions"
Selector.Selected="tabitem_functions_Selected" />
<TabItem Header="Nationalitäten" Name="tabitem_Nationality"
Selector.Selected="tabitem_Nationality_Selected" />
<TabItem Header="Aufenthaltsstatus" Name="tabitem_Aufenthaltsstatus"
Selector.Selected="tabitem_Aufenthaltsstatus_Selected" />
<TabItem Header="Finanzkategorien" Name="tabitem_finazCategories"
Selector.Selected="tabitem_finazCategories_Selected" />
<TabItem Header="Leistungskategorien" Name="tabitem_serviceCategories"
Selector.Selected="tabitem_serviceCategories_Selected" />
<TabItem Header="Leistungen" Name="tabitem_serviceDescriptions"
Selector.Selected="tabitem_serviceDescriptions_Selected" />
<TabItem Header="Textbausteine" Name="tabitem_textbausteine"
Selector.Selected="tabitem_textbausteine_Selected" />
<TabItem Header="Medikamentenarten" Name="tabitem_medikamentenarten"
Selector.Selected="tabitem_medikamentenarten_Selected"/>
<TabItem Header="Rollen des Personals" Name="tabitem_roles"
Selector.Selected="tabitem_roles_Selected" />
<TabItem Header="Rollen des Umfeldes" Name="tabitem_environmentRoles"
Selector.Selected="tabitem_environmentRoles_Selected" />
<TabItem Header="Schwerpunkte des Personals" Name="tabitem_activityFocus"
Selector.Selected="tabitem_activityFocus_Selected" />
<TabItem Header="Ressourcenkategorien" Name="tabitem_resourceCategories"
Selector.Selected="tabitem_resourceCategories_Selected" />
<TabItem Header="Ressourcen" Name="tabitem_resources"
Selector.Selected="tabitem_resources_Selected" />
<TabItem Header="Ziele und Maßnahmen" Name="tabitem_goalcategories"
Selector.Selected="tabitem_goalcategories_Selected" />
<TabItem Header="Funktionen" Name="tabitem_functions" Selector.Selected="tabitem_functions_Selected" />
<TabItem Header="Nationalitäten" Name="tabitem_Nationality" Selector.Selected="tabitem_Nationality_Selected" />
<TabItem Header="Aufenthaltsstatus" Name="tabitem_Aufenthaltsstatus" Selector.Selected="tabitem_Aufenthaltsstatus_Selected" />
<TabItem Header="Finanzkategorien" Name="tabitem_finazCategories" Selector.Selected="tabitem_finazCategories_Selected" />
<TabItem Header="Leistungskategorien" Name="tabitem_serviceCategories" Selector.Selected="tabitem_serviceCategories_Selected" />
<TabItem Header="Leistungen" Name="tabitem_serviceDescriptions" Selector.Selected="tabitem_serviceDescriptions_Selected" />
<TabItem Header="Textbausteine" Name="tabitem_textbausteine" Selector.Selected="Tabitem_TextModules_Selected" />
<TabItem Header="Medikamentenarten" Name="tabitem_medikamentenarten" Selector.Selected="tabitem_medikamentenarten_Selected"/>
<TabItem Header="Rollen des Personals" Name="tabitem_roles" Selector.Selected="tabitem_roles_Selected" />
<TabItem Header="Rollen des Umfeldes" Name="tabitem_environmentRoles" Selector.Selected="tabitem_environmentRoles_Selected" />
<TabItem Header="Schwerpunkte des Personals" Name="tabitem_activityFocus" Selector.Selected="tabitem_activityFocus_Selected" />
<TabItem Header="Ressourcenkategorien" Name="tabitem_resourceCategories" Selector.Selected="tabitem_resourceCategories_Selected" />
<TabItem Header="Ressourcen" Name="tabitem_resources" Selector.Selected="tabitem_resources_Selected" />
<TabItem Header="Ziele und Maßnahmen" Name="tabitem_goalcategories" Selector.Selected="tabitem_goalcategories_Selected" />
<!--<TabItem Header="Ergebnisziele" Name="tabitem_goals" Selector.Selected="tabitem_goals_Selected" />-->
<TabItem Header="Ankündigungen" Name="tabitem_news" Selector.Selected="tabitem_news_Selected" />
<TabItem Header="Punktebogen Werte" Name="tabitem_assessmentSheetValues"
Selector.Selected="tabitem_assessmentSheetValues_Selected" />
<TabItem Header="Punktebogen Kategorien" Name="tabitem_assessmentSheetCategories"
Selector.Selected="tabitem_assessmentSheetCategories_Selected" />
<!--<TabItem Header="Rechnungsnummer" Name="tabitem_InvoiceNumber"
Selector.Selected="tabitem_InvoiceNumber_Selected" />-->
<TabItem Header="Bereiche" Name="tabitem_additionalServices"
Selector.Selected="Tabitem_additionalAdditionalServices_OnSelected"/>
<TabItem Header="Angebote" Name="tabitem_additionalServiceRegions"
Selector.Selected="Tabitem_additionalServiceRegions_OnSelected"/>
<TabItem Header="Überstunden Auszahlungsarten" Name="tabitem_auszahlungsarten"
Selector.Selected="Tabitem_auszahlungsarten_OnSelected"/>
<!--Dokumentationstyp auswahl-->
<TabItem Header="Dokumentationstypen" Name="tabitem_dokumenttype" Selector.Selected="tabitem_dokumenttype_Selected" />
<TabItem Header="Punktebogen Werte" Name="tabitem_assessmentSheetValues" Selector.Selected="tabitem_assessmentSheetValues_Selected" />
<TabItem Header="Punktebogen Kategorien" Name="tabitem_assessmentSheetCategories" Selector.Selected="tabitem_assessmentSheetCategories_Selected" />
<!--<TabItem Header="Rechnungsnummer" Name="tabitem_InvoiceNumber" Selector.Selected="tabitem_InvoiceNumber_Selected" />-->
<TabItem Header="Bereiche" Name="tabitem_additionalServices" Selector.Selected="Tabitem_additionalAdditionalServices_OnSelected"/>
<TabItem Header="Angebote" Name="tabitem_additionalServiceRegions" Selector.Selected="Tabitem_additionalServiceRegions_OnSelected"/>
<TabItem Header="Überstunden Auszahlungsarten" Name="tabitem_auszahlungsarten" Selector.Selected="Tabitem_auszahlungsarten_OnSelected"/>
<TabItem Header="Dokumentationstypen" Name="tabitem_dokumenttype" Selector.Selected="tabitem_dokumenttype_Selected" />
</TabControl>
</ScrollViewer>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,0,0,0" VerticalAlignment="Stretch"

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

@@ -53,6 +53,11 @@ namespace BeWo.View.Master
{
tabitem_medikamentenarten.Visibility = Visibility.Collapsed;
}
if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleBearbeiten))
{
tabitem_textbausteine.Visibility = Visibility.Collapsed;
}
}
public override bool IsDirty
@@ -230,8 +235,6 @@ namespace BeWo.View.Master
}
}
//neues Tabitem Nationalität
private void tabitem_Nationality_Selected(object sender, RoutedEventArgs e)
{
if (!_OpenViews.ContainsKey(tabitem_Nationality) || _SavePerformed)
@@ -243,7 +246,6 @@ namespace BeWo.View.Master
}
}
//Neues TabItem Aufenthaltsstatus
private void tabitem_Aufenthaltsstatus_Selected(object sender, RoutedEventArgs e)
{
if (!_OpenViews.ContainsKey(tabitem_Aufenthaltsstatus) || _SavePerformed)
@@ -255,8 +257,6 @@ namespace BeWo.View.Master
}
}
private void tabitem_goalcategories_Selected(object sender, RoutedEventArgs e) // Ziele und Maßnahmen
{
if (!_OpenViews.ContainsKey(tabitem_goalcategories) || _SavePerformed)
@@ -288,8 +288,6 @@ namespace BeWo.View.Master
}
}
//SCHEDULER
private void tabitem_schedulerSettings_Selected(object sender, RoutedEventArgs e)
{
//### CB
@@ -299,7 +297,6 @@ namespace BeWo.View.Master
//}
}
private void tabitem_news_Selected(object sender, RoutedEventArgs e)
{
if (!_OpenViews.ContainsKey(tabitem_news) || _SavePerformed)
@@ -410,11 +407,11 @@ namespace BeWo.View.Master
VMFactory.CreateMedArtListVMAsync(r => this.Dispatch(() => AddView(tabitem_medikamentenarten, new MedikamentenartenView(r))));
}
private void tabitem_textbausteine_Selected(object sender, RoutedEventArgs e)
private void Tabitem_TextModules_Selected(object sender, RoutedEventArgs e)
{
if (!_OpenViews.ContainsKey(tabitem_textbausteine) || _SavePerformed)
{
VMFactory.CreateTextbausteinListVMAsync(r => this.Dispatch(() => AddView(tabitem_textbausteine, new TextbausteinView(r, true))), true);
VMFactory.CreateTextModuleListVMAsync(r => this.Dispatch(() => AddView(tabitem_textbausteine, new TextModuleView(r, true))), true, true);
}
}

4
BeWo/View/SchulbegleitenderDienst.xaml.cs
View File

@@ -37,13 +37,13 @@ namespace BeWo.View
private List<CompactTokenDC> tokenlist = new List<CompactTokenDC>();
long? Oid = 0;
private SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp;
private SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp;
Dictionary<string, CompactTokenDC> verfuegbarerWunschToken = new Dictionary<string, CompactTokenDC>();
Dictionary<string, CompactTokenDC> verfuegbarerAusschlussToken = new Dictionary<string, CompactTokenDC>();
public SchulbegleitenderDienst(TableID pObjectTid, long? oid,SchulbegleitenderZugehörigkeitsTyp typ)
public SchulbegleitenderDienst(TableID pObjectTid, long? oid,SchulbegleitenderZugehoerigkeitsTyp typ)
{
InitializeComponent();

9
BeWo/View/Search/GenericSearchView.cs
View File

@@ -15,8 +15,7 @@ using BS.Shared.Extensions;
namespace BeWo.View.Search
{
public class GenericSearchView<T> : UserControl
where T : class, IFilterableDC
public class GenericSearchView<T> : UserControl where T : class, IFilterableDC
{
private readonly ListBox _ResultListBox;
@@ -148,8 +147,10 @@ namespace BeWo.View.Search
{
ListItemStyle = FindResource("SearchSimpleStyle") as Style;
if (typeof(T) == typeof(TextbausteinDC))
ListItemStyle = FindResource("NavigationListStyleWithSampleDescAsToolTip") as Style;
if (typeof(T) == typeof(TextModuleDC))
{
ListItemStyle = FindResource("NavigationListStyleWithSampleDescAsToolTip") as Style;
}
}
}

56
BeWo/View/Search/TextbausteineSearchView.cs
View File

@@ -1,56 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Windows.Media;
using BeWo.ServiceProxy;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace BeWo.View.Search
{
public class TextbausteineSearchView : GenericSearchView<TextbausteinDC>
{
private long serviceCategoryOid;
public long ServiceCategoryOid
{
get { return serviceCategoryOid; }
set
{
serviceCategoryOid = value;
ServiceFacade.DoOperationsServiceAsync(s => s.GetTextbausteineByServiceCategory(ServiceCategoryOid), r =>
{
r = r.OrderBy(tb => tb.ServiceCategory != null).ThenBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
this.Dispatch(() => UpdateObjectList(r));
});
}
}
public TextbausteineSearchView()
{
if (!DesignerProperties.GetIsInDesignMode(this))
{
ThemeColor = FindResource("TextbausteinBrush") as Brush;
}
}
protected override void GetAll(Action<List<TextbausteinDC>> pCallBack)
{
ServiceFacade.DoOperationsServiceAsync(s => s.GetTextbausteineByServiceCategory(ServiceCategoryOid), r =>
{
r = r.OrderBy(tb => tb.ServiceCategory == null).ThenBy(tb => tb.Position).ThenBy(tb => tb.Name).ToList();
r = !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen) ?
r.Where(w => w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)).ToList() :
r.Where(w => !(w.IsOnlyForEmployee && !w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid))).ToList();
pCallBack(r);
});
}
}
}

2
BeWo/ViewModel/CustomerVM.cs
View File

@@ -168,7 +168,6 @@ namespace BeWo.ViewModel
private VarFieldListVM _VarFields;
private int? _DistanceInMeter;
private string _Vormund;
private bool employeeRelationsSet;
private DateTime? _AssistanceBegin;
private string _AusstVersAmt;
private DateTime? _AusweisGueltigVon;
@@ -443,7 +442,6 @@ namespace BeWo.ViewModel
set
{
employeeRelationsSet = true;
_EmployeeRelations = value;
FirePropertyChanged(PropertyName_EmployeeRelations);
}

14
BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
View File

@@ -69,13 +69,13 @@ namespace BeWo.ViewModel.ListViewModel
{
get
{
return this._EditVM;
return _EditVM;
}
set
{
this._EditVM = value;
this.FirePropertyChanged(PropertyName_EditVM);
_EditVM = value;
FirePropertyChanged(PropertyName_EditVM);
}
}
@@ -91,13 +91,13 @@ namespace BeWo.ViewModel.ListViewModel
{
get
{
return this._NewVM ?? (this.NewVM = this.CreateVM(new DCType()));
return _NewVM ?? (NewVM = CreateVM(new DCType()));
}
set
{
this._NewVM = value;
this.FirePropertyChanged(PropertyName_NewVM);
_NewVM = value;
FirePropertyChanged(PropertyName_NewVM);
}
}
@@ -105,7 +105,7 @@ namespace BeWo.ViewModel.ListViewModel
{
get
{
return this.GetRemoved().Count;
return GetRemoved().Count;
}
}

38
BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
View File

@@ -21,33 +21,21 @@ namespace BeWo.ViewModel.ListViewModel
{
public class ServiceRecordListVM : AbstractDCListMapperVM<ServiceRecordDC, ServiceRecordVM>
{
public static string PropertyName_CustomerNodes = "CustomerNodes";
public static string PropertyName_Information = "Information";
public static string PropertyName_PrototypeVM = "PrototypeVM";
public static string PropertyName_RecordCountInformationString = "RecordCountInformationString";
public static string PropertyName_RecordingDays = "RecordingDays";
public static string PropertyName_CustomerNodes = "CustomerNodes";
public static string PropertyName_Information = "Information";
public static string PropertyName_PrototypeVM = "PrototypeVM";
public static string PropertyName_RecordCountInformationString = "RecordCountInformationString";
public static string PropertyName_RecordingDays = "RecordingDays";
public static string PropertyName_ServiceRecordsForSelectedCustomer = "ServiceRecordsForSelectedCustomer";
public static string PropertyName_IsCustomerWarningActive = "IsCustomerWarningActive";
public static string PropertyName_CustomerWarning = "CustomerWarning";
public static string PropertyName_Statistics = "Statistics";
public static string PropertyName_ServiceRecordTimeInterval = "ServiceRecordTimeInterval";
public static string PropertyName_Wohnheimbuchungen = "Wohnheimbuchungen";
public static string PropertyName_SelectedWohnheimbuchung = "SelectedWohnheimbuchung";
public static string PropertyName_BedarfsMedViewModel = "BedarfsMedViewModel";
public static string PropertyName_MedRecordCreationEnabled = "MedRecordCreationEnabled";
public static string PropertyName_IsCustomerWarningActive = "IsCustomerWarningActive";
public static string PropertyName_CustomerWarning = "CustomerWarning";
public static string PropertyName_Statistics = "Statistics";
public static string PropertyName_ServiceRecordTimeInterval = "ServiceRecordTimeInterval";
public static string PropertyName_Wohnheimbuchungen = "Wohnheimbuchungen";
public static string PropertyName_SelectedWohnheimbuchung = "SelectedWohnheimbuchung";
public static string PropertyName_BedarfsMedViewModel = "BedarfsMedViewModel";
public static string PropertyName_MedRecordCreationEnabled = "MedRecordCreationEnabled";
public event EventHandler StatisticInfosLoaded;

23
BeWo/ViewModel/ListViewModel/TextbausteinListVM.cs
View File

@@ -1,23 +0,0 @@
using System.Collections.Generic;
using BS.Shared.DataContracts;
namespace BeWo.ViewModel.ListViewModel
{
public class TextbausteinListVM : AbstractDCListMapperVM<TextbausteinDC, TextbausteinVM>
{
public static string PropertyName_PossibleCategories = "PossibleCategories";
private readonly List<ServiceCategoryDC> _PossibleCategories;
public TextbausteinListVM(IEnumerable<TextbausteinDC> pDataContracts, List<ServiceCategoryDC> pPossibleCategories) : base(pDataContracts)
{
_PossibleCategories = pPossibleCategories;
}
public IEnumerable<ServiceCategoryDC> PossibleCategories
{
get { return _PossibleCategories; }
}
}
}

173
BeWo/ViewModel/TextbausteinVM.cs
View File

@@ -1,173 +0,0 @@
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.ViewModel
{
public class TextbausteinVM : AbstractDCMapperVM<TextbausteinDC>
{
public static string PropertyName_Text = "Text";
public static string PropertyName_Name = "Name";
public static string PropertyName_ServiceCategory = "ServiceCategory";
public static string PropertyName_Position = "Position";
public static string PropertyName_Employee = "Employee";
public static string PropertyName_IsOnlyForEmployee = "IsOnlyForEmployee";
private int _Position;
private string _Text;
private string _Name;
private CompactEmployeeDC _Employee;
private ServiceCategoryDC _ServiceCategory;
private bool _IsOnlyForEmployee;
public TextbausteinVM(TextbausteinDC pDataContract) : base(pDataContract, pDataContract.TextbausteinOid == null)
{
}
public ServiceCategoryDC ServiceCategory
{
get { return _ServiceCategory; }
set
{
if (AreDifferent(_ServiceCategory, value))
{
_ServiceCategory = value;
StoreDirtyInformation(AreDifferent(DataContract.ServiceCategory, value), PropertyName_ServiceCategory);
FirePropertyChanged(PropertyName_ServiceCategory);
}
}
}
public CompactEmployeeDC Employee
{
get { return _Employee; }
set
{
if (AreDifferent(_Employee, value))
{
_Employee = value;
StoreDirtyInformation(AreDifferent(DataContract.Employee, value), PropertyName_Employee);
FirePropertyChanged(PropertyName_Employee);
}
}
}
public int Position
{
get { return _Position; }
set
{
if (AreDifferent(_Position, value))
{
_Position = value;
StoreDirtyInformation(AreDifferent(DataContract.Position, value), PropertyName_Position);
FirePropertyChanged(PropertyName_Position);
}
}
}
public string Text
{
get { return _Text; }
set
{
if (AreDifferent(_Text, value))
{
_Text = value;
StoreDirtyInformation(AreDifferent(DataContract.Text, value), PropertyName_Text);
FirePropertyChanged(PropertyName_Text);
}
}
}
public bool IsOnlyForEmployee
{
get { return _IsOnlyForEmployee; }
set
{
if (AreDifferent(_IsOnlyForEmployee, value))
{
_IsOnlyForEmployee = value;
StoreDirtyInformation(AreDifferent(DataContract.IsOnlyForEmployee, value), PropertyName_IsOnlyForEmployee);
FirePropertyChanged(PropertyName_IsOnlyForEmployee);
}
}
}
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public string Name
{
get { return _Name; }
set
{
if (AreDifferent(_Name, value))
{
_Name = value;
StoreDirtyInformation(AreDifferent(DataContract.Name, value), PropertyName_Name);
FirePropertyChanged(PropertyName_Name);
}
}
}
protected override void InitByDataContract(TextbausteinDC pDataContract)
{
if (!IsNew)
{
_ServiceCategory = pDataContract.ServiceCategory;
_Text = pDataContract.Text;
_Position = pDataContract.Position;
_Name = pDataContract.Name;
_Employee = pDataContract.Employee;
_IsOnlyForEmployee = pDataContract.IsOnlyForEmployee;
}
else
{
ServiceFacade.DoEmployeeServiceSync(s => _Employee = s.LoadCompactEmployee(BeWoApp.LoggedOnEmployee.EmployeeOid.Value));
if (BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineNurEigeneBearbeiten) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleBearbeiten))
{
_IsOnlyForEmployee = true;
}
}
}
protected override TextbausteinDC MapToDataContract(TextbausteinDC pDataContract, bool doCommit)
{
pDataContract.Text = _Text;
pDataContract.Position = _Position;
pDataContract.Name = _Name;
pDataContract.IsOnlyForEmployee = _IsOnlyForEmployee;
if(_Employee != null)
{
pDataContract.Employee = _Employee;
}
if (_ServiceCategory != null)
{
pDataContract.ServiceCategory = _ServiceCategory;
}
return pDataContract;
}
}
}

16
BeWo/ViewModel/VMFactory.cs
View File

@@ -435,23 +435,13 @@ namespace BeWo.ViewModel
r => pCallBack(new AuszahlungsartListVM(r.ToList())));
}
public static void CreateTextbausteinListVMAsync(Action<TextbausteinListVM> pCallBack, bool pIsInAdministrationView = false)
public static void CreateTextModuleListVMAsync(Action<TextModuleListVM> pCallBack, bool pIsInAdministrationView = false, bool pIsInTextModuleEditor = false)
{
ServiceFacade.DoOperationsServiceAsync(s1 => s1.GetAllTextbausteine(), r1 => ServiceFacade.DoOperationsServiceAsync(
ServiceFacade.DoOperationsServiceAsync(s1 => s1.GetTextModules(pIsInTextModuleEditor, BeWoApp.LoggedOnEmployee.EmployeeOid.Value, BeWoApp.LoggedOnUser.HasRight(UserRightType.TextModulesAlleAnsehen), pIsInAdministrationView), r1 => ServiceFacade.DoOperationsServiceAsync(
s2 => s2.GetAllServiceCategories(),
s3 =>
{
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.TextbausteineAlleAnsehen))
{
r1 = r1.Where(w => w.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)).ToList();
}
if (pIsInAdministrationView)
{
r1 = r1.Where(w => !w.IsOnlyForEmployee).ToList();
}
pCallBack(new TextbausteinListVM(r1, s3));
pCallBack(new TextModuleListVM(r1.OrderBy(o => o.Name), s3));
}));
}

10
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -514,26 +514,26 @@ namespace BeWoPlanerMobil.Controllers
public string LoadTextbausteineForServiceCategory(long pServiceCategoryOid)
{
if (!MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen) && !MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen))
if (!MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesNurEigeneAnsehen) && !MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesAlleAnsehen))
{
return null;
}
var textbausteine = OperationsService.GetTextbausteineByServiceCategory(pServiceCategoryOid);
var textbausteine = OperationsService.GetTextModulesByServiceCategory(pServiceCategoryOid);
if(MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen))
if(MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesNurEigeneAnsehen))
{
textbausteine = textbausteine.Where(w => w.Employee.EmployeeOid == Model.Employee.EmployeeOid).ToList();
}
Model.Textbausteine = textbausteine.ToList();
return SerializeObject(textbausteine.Select(s => new TextbausteinDisplayItem(s.TextbausteinOid.Value, s.Name)));
return SerializeObject(textbausteine.Select(s => new TextbausteinDisplayItem(s.TextModuleOid.Value, s.Name)));
}
public string LoadCompleteTextbausteinByOid(long pTextbausteinOid)
{
var abc = Model.Textbausteine.FirstOrDefault(f => f.TextbausteinOid.Value == pTextbausteinOid);
var abc = Model.Textbausteine.FirstOrDefault(f => f.TextModuleOid.Value == pTextbausteinOid);
return abc.Text;
}

8
BeWoPlanerMobil/Models/MainModel.cs
View File

@@ -43,7 +43,7 @@ namespace BeWoPlanerMobil.Models
public List<SupportConceptDC> SupportConcepts { get; set; }
public List<ServiceCategoryModel> ServiceCategories { get; set; }
public List<TextbausteinDC> Textbausteine { get; set; }
public List<TextModuleDC> Textbausteine { get; set; }
private List<ServiceRecordDC> serviceRecords;
@@ -113,8 +113,8 @@ namespace BeWoPlanerMobil.Models
{
get
{
return MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineAlleAnsehen) ||
MobileSessionFacade.CheckForUserRight(UserRightType.TextbausteineNurEigeneAnsehen);
return MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesAlleAnsehen) ||
MobileSessionFacade.CheckForUserRight(UserRightType.TextModulesNurEigeneAnsehen);
}
}
@@ -165,7 +165,7 @@ namespace BeWoPlanerMobil.Models
if (Textbausteine != null)
{
result.AddRange(Textbausteine.Select(item => new SelectListItem { Value = item.TextbausteinOid.Value.ToString(), Text = item.Name }).ToList());
result.AddRange(Textbausteine.Select(item => new SelectListItem { Value = item.TextModuleOid.Value.ToString(), Text = item.Name }).ToList());
}
return result;

39
Data/Access/SearchDAO.cs
View File

@@ -1442,13 +1442,13 @@ namespace BeWo.Data.Access
return c.List<SchedulerAppointment>();
}
public IEnumerable<Textbaustein> GetActiveTextbausteineByServiceCategory(long pServiceCategoryOid)
public IEnumerable<TextModule> GetActiveTextbausteineByServiceCategory(long pServiceCategoryOid)
{
var c = CreateCriteriaIsActive<Textbaustein>();
var c = CreateCriteriaIsActive<TextModule>();
c.Add(Restrictions.Or(Restrictions.Eq(Textbaustein.PropertyName_ServiceCategory + ".Oid", pServiceCategoryOid), Restrictions.IsNull(Textbaustein.PropertyName_ServiceCategory)));
c.Add(Restrictions.Or(Restrictions.Eq(TextModule.PropertyName_ServiceCategory + ".Oid", pServiceCategoryOid), Restrictions.IsNull(TextModule.PropertyName_ServiceCategory)));
return c.List<Textbaustein>();
return c.List<TextModule>();
}
public IEnumerable<SchedulerAppointment> GetAllActiveAppointmentsForEmployeeInInterval2(DateTime start, DateTime end, List<long> pEmployeeOids)
@@ -2140,5 +2140,36 @@ namespace BeWo.Data.Access
return criteria.List<AbsenceTime>();
}
public IEnumerable<TextModule> GetActiveTextModules(bool pShouldOnlyLoadOwnTextModules, bool pHasRightToSeeAll, bool pIsInAdministrationView, long pEmployeeOid)
{
var criteria = CreateCriteriaIsActive<TextModule>();
if(pIsInAdministrationView && pHasRightToSeeAll) // Der Mitarbeiter hat das Recht, alle zu sehen
{
criteria.Add(Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), false));
}
else if(pIsInAdministrationView && !pHasRightToSeeAll) // In der Verwaltung. Der Mitarbeiter kann aber nur die eigenen sehen
{
criteria.Add(Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), false))
.Add(Restrictions.Eq(nameof(TextModule.Employee) + "." + nameof(BeWoEntityBase.Oid), pEmployeeOid));
}
else if(!pHasRightToSeeAll || pShouldOnlyLoadOwnTextModules) // Der Mitarbeiter darf nur die eigenen sehen oder befindet sich im Editor
{
criteria.Add(Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), true))
.Add(Restrictions.Eq(nameof(TextModule.Employee) + "." + nameof(BeWoEntityBase.Oid), pEmployeeOid));
}
else if(!pIsInAdministrationView)
{
criteria.Add(
Restrictions.Or(
Restrictions.And(
Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), true),
Restrictions.Eq(nameof(TextModule.Employee) + "." + nameof(BeWoEntityBase.Oid), pEmployeeOid)),
Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), false)));
}
return criteria.List<TextModule>();
}
}
}

8
Data/Data.csproj
View File

@@ -196,7 +196,7 @@
<Compile Include="Entities\Signature.cs" />
<Compile Include="Entities\Wohnheimbuchung2Costbearer2SupportConcept.cs" />
<Compile Include="Entities\Wohnheim.cs" />
<Compile Include="Entities\Textbaustein.cs" />
<Compile Include="Entities\TextModule.cs" />
<Compile Include="Entities\UiElement.cs" />
<Compile Include="Entities\ListedSupportConcept.cs" />
<Compile Include="Entities\MedArt.cs" />
@@ -567,8 +567,8 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
<Content Include="Mappings\CustomerTeam.hbm.xml" />
<EmbeddedResource Include="Mappings\QuittierungsCheck.hbm.xml">
<Content Include="Mappings\CustomerTeam.hbm.xml" />
<EmbeddedResource Include="Mappings\QuittierungsCheck.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Employee2Token.hbm.xml" />
@@ -630,7 +630,7 @@
<EmbeddedResource Include="Mappings\Bargeldtransaktion.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\Textbaustein.hbm.xml">
<EmbeddedResource Include="Mappings\TextModule.hbm.xml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Mappings\DepotRhythmus.hbm.xml" />

113
Data/Entities/Textbaustein.cs
View File

@@ -1,113 +0,0 @@
using BS.Shared;
namespace BeWo.Data.Entities
{
public class Textbaustein : BeWoEntityBase
{
public static string PropertyName_Text = "Text";
public static string PropertyName_Position = "Position";
public static string PropertyName_ServiceCategory = "ServiceCategory";
public static string PropertyName_Name = "Name";
public static string PropertyName_Employee = "Employee";
public static string PropertyName_IsOnlyForEmployee = "IsOnlyForEmployee";
private string _Text;
private string _Name;
private int _Position;
private ServiceCategory _ServiceCategory;
private Employee _Employee;
private bool _IsOnlyForEmployee;
public Textbaustein()
{
_Tid = TableID.Textbaustein;
}
public virtual ServiceCategory ServiceCategory
{
get { return _ServiceCategory; }
set
{
if (AreDifferent(_ServiceCategory, value))
{
_ServiceCategory = value;
}
}
}
public virtual Employee Employee
{
get { return _Employee; }
set
{
if (AreDifferent(_Employee, value))
{
_Employee = value;
}
}
}
public virtual bool IsOnlyForEmployee
{
get { return _IsOnlyForEmployee; }
set
{
if (AreDifferent(_IsOnlyForEmployee, value))
{
_IsOnlyForEmployee = value;
}
}
}
public virtual string Text
{
get
{
return _Text;
}
set
{
if (AreDifferent(_Text, value))
{
_Text = value;
}
}
}
public virtual string Name
{
get
{
return _Name;
}
set
{
if (AreDifferent(_Name, value))
{
_Name = value;
}
}
}
public virtual int Position
{
get
{
return _Position;
}
set
{
if (AreDifferent(_Position, value))
{
_Position = value;
}
}
}
}
}

24
Data/Mappings/Textbaustein.hbm.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="BeWo.Data.Entities.Textbaustein,BeWo.Data" table="Textbaustein">
<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
<generator class="identity" />
</id>
<version type="Int64" column="Version" name="Version" />
<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
<property column="InsTs" type="DateTime" name="InsTs" />
<property column="InsUser" type="String" name="InsUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="Notice" type="String" name="Notice" length="1024" />
<property column="Text" type="String" name="Text" length="1024" />
<property column="Position" name="Position" type="Int32" />
<property column="Name" type="String" name="Name" length="1024" />
<property column="IsOnlyForEmployee" type="Boolean" name="IsOnlyForEmployee" />
<many-to-one name="ServiceCategory" column="ServiceCategoryOid" class="BeWo.Data.Entities.ServiceCategory, BeWo.Data" cascade="none" fetch="join"/>
<many-to-one name="Employee" column="EmployeeOid" class="BeWo.Data.Entities.Employee, BeWo.Data" cascade="none" fetch="join"/>
</class>
</hibernate-mapping>

6
Service/DCEntityMapper/MapperFactory.cs
View File

@@ -265,7 +265,7 @@ namespace BeWo.Service.DCEntityMapper
private static DepotRhythmusDC_DepotRhythmus _DepotRhythmusDC_DepotRhythmus;
private static TextbausteinDC_Textbaustein _TextbausteinDC_Textbaustein;
private static TextModuleDC_TextModule _TextModuleDC_TextModule;
private static BargeldtransaktionDC_Bargeldtransaktion _BargeldtransaktionDC_Bargeldtransaktion;
@@ -284,11 +284,11 @@ namespace BeWo.Service.DCEntityMapper
get { return _BargeldtransaktionDC_Bargeldtransaktion ?? (_BargeldtransaktionDC_Bargeldtransaktion = new BargeldtransaktionDC_Bargeldtransaktion()); }
}
public static TextbausteinDC_Textbaustein TextbausteinDC_Textbaustein
public static TextModuleDC_TextModule TextModuleDC_TextModule
{
get
{
return _TextbausteinDC_Textbaustein ?? (_TextbausteinDC_Textbaustein = new TextbausteinDC_Textbaustein());
return _TextModuleDC_TextModule ?? (_TextModuleDC_TextModule = new TextModuleDC_TextModule());
}
}

58
Service/DCEntityMapper/TextbausteinDC_Textbaustein.cs
View File

@@ -1,58 +0,0 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared.DataContracts;
namespace BeWo.Service.DCEntityMapper
{
public class TextbausteinDC_Textbaustein : AbstractIDCEntityMapper<Textbaustein, TextbausteinDC>
{
public override TextbausteinDC MergeWithDC(Textbaustein pEntity, TextbausteinDC pDataContract)
{
pDataContract.Position = pEntity.Position;
pDataContract.TextbausteinVersion = pEntity.Version.Value;
pDataContract.TextbausteinOid = pEntity.Oid.Value;
pDataContract.Text = pEntity.Text;
pDataContract.Name = pEntity.Name;
pDataContract.IsOnlyForEmployee = pEntity.IsOnlyForEmployee;
if(pEntity.ServiceCategory != null)
pDataContract.ServiceCategory = MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewDC(pEntity.ServiceCategory);
if (pEntity.Employee != null)
pDataContract.Employee = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.Employee);
return pDataContract;
}
public override Textbaustein MergeWithEntity(TextbausteinDC pDataContract, Textbaustein pEntity)
{
ConcurrencyCheck(pDataContract.TextbausteinVersion, pEntity);
pEntity.Position = pDataContract.Position;
pEntity.Oid = pDataContract.TextbausteinOid;
pEntity.Text = pDataContract.Text;
pEntity.Name = pDataContract.Name;
pEntity.IsOnlyForEmployee = pDataContract.IsOnlyForEmployee;
if (pDataContract.ServiceCategory != null)
{
pEntity.ServiceCategory = pDataContract.ServiceCategory.ServiceCategoryOid.HasValue ?
DAOFactory.GenericDAO.LoadByID<ServiceCategory>(pDataContract.ServiceCategory.ServiceCategoryOid.Value) :
MapperFactory.ServiceCategoryDC_ServiceCategory.MapToNewEntity(pDataContract.ServiceCategory);
}
if (pDataContract.Employee != null)
{
pEntity.Employee = DAOFactory.GenericDAO.LoadByID<Employee>(pDataContract.Employee.EmployeeOid);
}
return pEntity;
}
protected override bool AreDCAndEntityEqual(TextbausteinDC pDC, Textbaustein pEntity)
{
return pDC.TextbausteinOid == pEntity.Oid;
}
}
}

2
Service/Service.csproj
View File

@@ -243,7 +243,7 @@
<Compile Include="DCEntityMapper\WohnheimCustomerRelDC_Customer2WohnheimMapper.cs" />
<Compile Include="DCEntityMapper\WohnheimEmployeeRelDC_Employee2WohnheimMapper.cs" />
<Compile Include="DCEntityMapper\WohnheimDC_Wohnheim.cs" />
<Compile Include="DCEntityMapper\TextbausteinDC_Textbaustein.cs" />
<Compile Include="DCEntityMapper\TextModuleDC_TextModule.cs" />
<Compile Include="DCEntityMapper\UiElementDC_UIElement.cs" />
<Compile Include="DCEntityMapper\MedArtDC_MedArt.cs" />
<Compile Include="DCEntityMapper\MedikamentenverordnungDC_Medikamentenverordnung.cs" />

32
Service/ServiceContracts/IOperationsService.cs
View File

@@ -488,23 +488,27 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<TextbausteinDC> GetAllTextbausteine();
IList<TextModuleDC> GetAllTextModules();
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<TextModuleDC> GetTextModules(bool pShouldShowAllTextModules, long pEmployeeOid, bool pHasRightToSeeAllTextModules, bool pIsInAdministrationView);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<long> InsertNewTextModules(IEnumerable<TextModuleDC> pTextbausteine);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
IList<long> InsertNewTextbausteine(IEnumerable<TextbausteinDC> pTextbausteine);
void UpdateTextModules(List<TextModuleDC> pTextbausteine);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void UpdateTextbausteine(List<TextbausteinDC> pTextbausteine);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeleteTextbausteine(Dictionary<long, long> pOid2Version);
void DeleteTextModules(Dictionary<long, long> pOid2Version);
[FaultContract(typeof (BeWoFault))]
[OperationContract]
IList<TextbausteinDC> GetTextbausteineByServiceCategory(long pServiceCategoryOid);
IList<TextModuleDC> GetTextModulesByServiceCategory(long pServiceCategoryOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -640,7 +644,7 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<CompactTokenDC> GetAllTokens(SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, long? oid);
List<CompactTokenDC> GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, long? oid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -648,15 +652,15 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DeletTokenRelation(CompactTokenDC token, long? oid, SchulbegleitenderZugehörigkeitsTyp typ);
void DeletTokenRelation(CompactTokenDC token, long? oid, SchulbegleitenderZugehoerigkeitsTyp typ);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewToken(string beschreibung, TokenTyp typ, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, long? oid);
void InsertNewToken(string beschreibung, TokenTyp typ, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, long? oid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void InsertNewRelationToken(CompactTokenDC token, TokenTyp typ, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, long? oid);
void InsertNewRelationToken(CompactTokenDC token, TokenTyp typ, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, long? oid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
@@ -680,12 +684,12 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DoTokenWunschOperation(int art, long? Oid, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp,
void DoTokenWunschOperation(int art, long? Oid, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp,
Dictionary<string, CompactTokenDC> verfuegbarerWunschToken, string token);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
void DoTokenAusschlussOperation(int art, long? Oid, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp,
void DoTokenAusschlussOperation(int art, long? Oid, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp,
Dictionary<string, CompactTokenDC> verfuegbarerAusschlussToken, string token);
}
}

1
Service/ServiceContracts/IResourceService.cs
View File

@@ -172,6 +172,5 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<AbsenceTimeDC> GetAllActiveAbsenceTimesInInterval(DateTime pStart, DateTime pEnd, long pEmployeeOid, bool pHasRightToSeeAllEmployeeAppointments);
}
}

140
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -2304,21 +2304,15 @@ namespace BeWo.Service.ServiceImplementations
}
public List<ServiceRecordValidationResultDC> ValidateServiceRecordEntry(ServiceRecordDC newServiceRecord,
SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed, bool isGroupRecord,
IList<long> employeeOids)
public List<ServiceRecordValidationResultDC> ValidateServiceRecordEntry(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed, bool isGroupRecord, IList<long> employeeOids)
{
return ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids,
null);
return ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, null);
}
public List<ServiceRecordValidationResultDC> ValidateServiceRecord(ServiceRecordDC newServiceRecord,
SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed,
IList<long> employeeOids, IList<long> cb2scOids)
public List<ServiceRecordValidationResultDC> ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics, int maxDaysEditServiceRecordsAllowed, IList<long> employeeOids, IList<long> cb2scOids)
{
var validator = PluginLoader.FindClass<ServiceRecordValidator>();
return validator.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids);
}
public List<ServiceRecordValidationResultDC> ValidateServiceRecordDeletion(ServiceRecordDC serviceRecord, long employeeOid)
@@ -2327,7 +2321,6 @@ namespace BeWo.Service.ServiceImplementations
return validator.ValidateServiceRecordDeletion(serviceRecord, employeeOid);
}
public List<ServiceRecordValidationResult> CheckExistingSettlementInvoices(ServiceRecordDC pServiceRecord)
{
@@ -2457,7 +2450,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
private ServiceRecordDC CreateServiceRecordDCCompact(ServiceRecord sr)
private static ServiceRecordDC CreateServiceRecordDCCompact(ServiceRecord sr)
{
var dc = new ServiceRecordDC();
@@ -2521,7 +2514,7 @@ namespace BeWo.Service.ServiceImplementations
return dc;
}
private ServiceRecordDC CreateServiceRecordDCIfSupportConceptIsActive(ServiceRecord sr, Customer cust, bool checkArchivedSupportConcepts)
private static ServiceRecordDC CreateServiceRecordDCIfSupportConceptIsActive(ServiceRecord sr, Customer cust, bool checkArchivedSupportConcepts)
{
ServiceRecordDC dc = null;
if (!checkArchivedSupportConcepts || (sr.SupportConcept != null && sr.SupportConcept.IsActive == ActivationTypeId.Active))
@@ -2689,7 +2682,7 @@ namespace BeWo.Service.ServiceImplementations
return dc;
}
private List<BeWoFolderDC> CreateFolderTree(List<BeWoFolderDC> folderDCList, List<FileAttachmentDC> fileDCList, TableID pObjectTid, long pObjectOid, bool templateFolder = false)
private static List<BeWoFolderDC> CreateFolderTree(List<BeWoFolderDC> folderDCList, List<FileAttachmentDC> fileDCList, TableID pObjectTid, long pObjectOid, bool templateFolder = false)
{
Dictionary<long, BeWoFolderDC> folderDict = folderDCList.ToDictionary(fo => fo.BeWoFolderOid.Value);
Dictionary<long, FileAttachmentDC> fileDict = fileDCList.ToDictionary(fi => fi.FileAttachmentOid.Value);
@@ -2755,7 +2748,7 @@ namespace BeWo.Service.ServiceImplementations
return resultList;
}
public static Dictionary<String, String> GetSettingsValueDict(string settings)
public static Dictionary<string, string> GetSettingsValueDict(string settings)
{
var dict = new Dictionary<String, String>();
if (!String.IsNullOrEmpty(settings))
@@ -2775,7 +2768,7 @@ namespace BeWo.Service.ServiceImplementations
return dict;
}
private static String GetContractState()
private static string GetContractState()
{
//#if DEBUG
@@ -3028,11 +3021,11 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Insert(hServiceRecords);
}
public IList<TextbausteinDC> GetAllTextbausteine()
public IList<TextModuleDC> GetAllTextModules()
{
try
{
return MapperFactory.TextbausteinDC_Textbaustein.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<Textbaustein>());
return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<TextModule>());
}
catch (Exception e)
{
@@ -3040,11 +3033,23 @@ namespace BeWo.Service.ServiceImplementations
}
}
public IList<TextbausteinDC> GetTextbausteineByServiceCategory(long pServiceCategoryOid)
public IList<TextModuleDC> GetTextModules(bool pShouldShowAllTextModules, long pEmployeeOid, bool pHasRightToSeeAllTextModules, bool pIsInAdministrationView)
{
try
{
return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextModules(pShouldShowAllTextModules, pHasRightToSeeAllTextModules, pIsInAdministrationView, pEmployeeOid));
}
catch(Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}
public IList<TextModuleDC> GetTextModulesByServiceCategory(long pServiceCategoryOid)
{
try
{
return MapperFactory.TextbausteinDC_Textbaustein.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextbausteineByServiceCategory(pServiceCategoryOid));
return MapperFactory.TextModuleDC_TextModule.MapToNewDCs(DAOFactory.SearchDAO.GetActiveTextbausteineByServiceCategory(pServiceCategoryOid));
}
catch (Exception e)
{
@@ -3052,11 +3057,11 @@ namespace BeWo.Service.ServiceImplementations
}
}
public IList<long> InsertNewTextbausteine(IEnumerable<TextbausteinDC> pTextbausteine)
public IList<long> InsertNewTextModules(IEnumerable<TextModuleDC> pTextbausteine)
{
try
{
var lTextbausteine = MapperFactory.TextbausteinDC_Textbaustein.MapToNewEntities(pTextbausteine);
var lTextbausteine = MapperFactory.TextModuleDC_TextModule.MapToNewEntities(pTextbausteine);
DAOFactory.GenericDAO.Insert(lTextbausteine);
return lTextbausteine.Select(asb => asb.Oid.Value).ToList();
@@ -3067,13 +3072,13 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void UpdateTextbausteine(List<TextbausteinDC> pTextbausteine)
public void UpdateTextModules(List<TextModuleDC> pTextbausteine)
{
try
{
var lOriginals = DAOFactory.GenericDAO.LoadByIDs<Textbaustein>(pTextbausteine.Select(sc => sc.TextbausteinOid.Value));
var lOriginals = DAOFactory.GenericDAO.LoadByIDs<TextModule>(pTextbausteine.Select(sc => sc.TextModuleOid.Value));
MapperFactory.TextbausteinDC_Textbaustein.MergeWithEntitys(pTextbausteine, lOriginals);
MapperFactory.TextModuleDC_TextModule.MergeWithEntitys(pTextbausteine, lOriginals);
DAOFactory.GenericDAO.Update(lOriginals);
}
@@ -3083,14 +3088,14 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void DeleteTextbausteine(Dictionary<long, long> pOid2Version)
public void DeleteTextModules(Dictionary<long, long> pOid2Version)
{
try
{
List<Textbaustein> lOriginals = DAOFactory.GenericDAO.LoadByIDs<Textbaustein>(pOid2Version.Select(e => e.Key));
lOriginals.DoForEach(or => MapperFactory.TextbausteinDC_Textbaustein.ConcurrencyCheck(pOid2Version[or.Oid.Value], or));
var lOriginals = DAOFactory.GenericDAO.LoadByIDs<TextModule>(pOid2Version.Select(e => e.Key));
lOriginals.DoForEach(or => MapperFactory.TextModuleDC_TextModule.ConcurrencyCheck(pOid2Version[or.Oid.Value], or));
DAOFactory.GenericDAO.Delete(lOriginals);
DAOFactory.GenericDAO.Delete(lOriginals);
}
catch (Exception e)
{
@@ -3175,7 +3180,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void UpdateIsChatActiveEmployeeAPPCodeDC(long employeeOid, int activeType)
{
try
@@ -3218,8 +3222,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
public CustomerAPPCodeDC CreateNewCustomerAPPCodeDC(long customerOid)
{
try
@@ -3499,23 +3501,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
//####################### Schulbegleitender Dienst ##############################################
//public void DeletAbsenceTime(long absenceoid)
//{
// try
// {
// var x = DAOFactory.GenericDAO.GetByID<AbsenceTime>(absenceoid);
// DAOFactory.GenericDAO.Delete(x);
// }
// catch (Exception e)
// {
// throw Utils.CreateBeWoFaultException(e);
// }
//}
public void DeactivateAbsenceTime( Dictionary<long,long> pOid2Version)
{
try
@@ -3528,20 +3513,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
//public List<VertretungDC>GetAllVertretungen()
//{
// try
// {
// var x = DAOFactory.GenericDAO.GetAllActive<Vertretung>();
// return MapperFactory.VertretungDC_Vertretung.MapToNewDCs(x);
// }
// catch (Exception e)
// {
// throw Utils.CreateBeWoFaultException(e);
// }
//}
public void InsertNewEmployeeAbsenceTime(long employeeOid, AbsenceTimeDC at)
{
try
@@ -3628,7 +3599,6 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public void CreateVertretung(VertretungDC vertretung)
{
@@ -3661,7 +3631,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<VertretungsListeItemsDC> VertretungsListe(DateTime datum)
{
try
@@ -3728,7 +3697,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
//hole die Range an vertretungen raus raus
public List<VertretungsListeItemsDC> VertretungsListeWoechentlich(DateTime start, DateTime ende)
{
try
@@ -3762,8 +3730,7 @@ namespace BeWo.Service.ServiceImplementations
}
//Token Bereich für Token
public List<CompactTokenDC> GetAllTokens(SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, long? oid)
public List<CompactTokenDC> GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, long? oid)
{
try
{
@@ -3771,7 +3738,7 @@ namespace BeWo.Service.ServiceImplementations
IList<Token> fToken = new List<Token>();
if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Klient)
if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient)
{
var x = GetCustomer2TokenList();
@@ -3791,7 +3758,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
}
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter)
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter)
{
var x = GetEmployee2TokenList();
@@ -3819,7 +3786,6 @@ namespace BeWo.Service.ServiceImplementations
throw Utils.CreateBeWoFaultException(e);
}
}
public void UpdateToken(TokenDC token)
{
@@ -3835,7 +3801,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void InsertNewToken(string beschreibung, TokenTyp typ, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, long? oid)
public void InsertNewToken(string beschreibung, TokenTyp typ, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, long? oid)
{
try
{
@@ -3845,7 +3811,7 @@ namespace BeWo.Service.ServiceImplementations
TokenTyp = typ
};
if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Klient)
if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient)
{
var x = DAOFactory.GenericDAO.GetByID<Customer>(oid.Value);
@@ -3862,7 +3828,7 @@ namespace BeWo.Service.ServiceImplementations
token.RelatedCustomers = c2tList;
}
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter)
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter)
{
var x = DAOFactory.GenericDAO.GetByID<Employee>(oid.Value);
@@ -3889,7 +3855,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void DoTokenAusschlussOperation(int art, long? Oid, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, Dictionary<string, CompactTokenDC> verfuegbarerAusschlussToken, string token)
public void DoTokenAusschlussOperation(int art, long? Oid, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, Dictionary<string, CompactTokenDC> verfuegbarerAusschlussToken, string token)
{
try
{
@@ -3938,7 +3904,7 @@ namespace BeWo.Service.ServiceImplementations
}
else
{
if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Klient)
if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient)
{
var c2tList = GetCustomer2TokenList();
@@ -3958,7 +3924,7 @@ namespace BeWo.Service.ServiceImplementations
DeletTokenRelation(ken, Oid, zugehoerigkeitsTyp);
}
}
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter)
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter)
{
var e2tList = GetEmployee2TokenList();
@@ -3986,7 +3952,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void DoTokenWunschOperation( int art,long? Oid, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp,Dictionary<string,CompactTokenDC> verfuegbarerWunschToken, string token)
public void DoTokenWunschOperation( int art,long? Oid, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, Dictionary<string,CompactTokenDC> verfuegbarerWunschToken, string token)
{
try
{
@@ -4037,7 +4003,7 @@ namespace BeWo.Service.ServiceImplementations
}
else
{
if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Klient)
if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient)
{
var c2tList = GetCustomer2TokenList();
@@ -4056,7 +4022,7 @@ namespace BeWo.Service.ServiceImplementations
DeletTokenRelation(ken, Oid, zugehoerigkeitsTyp);
}
}
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter)
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter)
{
var e2tList = GetEmployee2TokenList();
@@ -4084,8 +4050,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void InsertNewRelationToken(CompactTokenDC ctoken, TokenTyp typ, SchulbegleitenderZugehörigkeitsTyp zugehoerigkeitsTyp, long? oid)
public void InsertNewRelationToken(CompactTokenDC ctoken, TokenTyp typ, SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, long? oid)
{
try
{
@@ -4093,7 +4058,7 @@ namespace BeWo.Service.ServiceImplementations
var token = MapperFactory.TokenDC_Token.MapToNewDC(tk);
if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Klient)
if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Klient)
{
var x = DAOFactory.GenericDAO.GetByID<Customer>(oid.Value);
@@ -4110,7 +4075,7 @@ namespace BeWo.Service.ServiceImplementations
token.RelatedCustomers = c2tList;
}
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter)
else if (zugehoerigkeitsTyp == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter)
{
var x = DAOFactory.GenericDAO.GetByID<Employee>(oid.Value);
@@ -4153,11 +4118,11 @@ namespace BeWo.Service.ServiceImplementations
}
}
public void DeletTokenRelation(CompactTokenDC token,long? oid, SchulbegleitenderZugehörigkeitsTyp typ)
public void DeletTokenRelation(CompactTokenDC token,long? oid, SchulbegleitenderZugehoerigkeitsTyp typ)
{
try
{
if(typ == SchulbegleitenderZugehörigkeitsTyp.Klient)
if(typ == SchulbegleitenderZugehoerigkeitsTyp.Klient)
{
var tokenEntity = DAOFactory.GenericDAO.LoadByID<Token>(token.TokenOid.Value);
@@ -4177,7 +4142,7 @@ namespace BeWo.Service.ServiceImplementations
DAOFactory.GenericDAO.Update(tokenEntity);
}
}
else if (typ == SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter)
else if (typ == SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter)
{
var tokenEntity = DAOFactory.GenericDAO.LoadByID<Token>(token.TokenOid.Value);
@@ -4235,9 +4200,6 @@ namespace BeWo.Service.ServiceImplementations
}
}
//#################################################################
#endregion
#endregion

10
Shared/BeWoEntityEnums.cs
View File

@@ -416,10 +416,10 @@ namespace BS.Shared
AllowChangeOwnPassword = 20800,
TextbausteineAlleAnsehen = 20900,
TextbausteineNurEigeneAnsehen = 20901,
TextbausteineAlleBearbeiten = 20902,
TextbausteineNurEigeneBearbeiten = 20903,
TextModulesAlleAnsehen = 20900,
TextModulesNurEigeneAnsehen = 20901,
TextModulesAlleBearbeiten = 20902,
TextModulesNurEigeneBearbeiten = 20903,
//TextbausteineAlleAnlegen = 20904,
//TextbausteineNurEigeneAnlegen = 20905,
@@ -933,7 +933,7 @@ namespace BS.Shared
WunschKriterium
}
public enum SchulbegleitenderZugehörigkeitsTyp
public enum SchulbegleitenderZugehoerigkeitsTyp
{
Mitarbeiter,
Klient

12
Shared/Core/EnumTranslations.cs
View File

@@ -452,16 +452,16 @@ namespace BS.Shared.Core
UserRightType.KalenderInZeiterfassungUebernehmen, "Termine in Zeiterfassung übernehmen"
},
{
UserRightType.TextbausteineAlleAnsehen, "Textbausteine ansehen (allgemeine)"
UserRightType.TextModulesAlleAnsehen, "Textbausteine ansehen (allgemeine)"
},
{
UserRightType.TextbausteineNurEigeneAnsehen, "Textbausteine ansehen (eigene)"
UserRightType.TextModulesNurEigeneAnsehen, "Textbausteine ansehen (eigene)"
},
{
UserRightType.TextbausteineAlleBearbeiten, "Textbausteine bearbeiten (allgemeine)"
UserRightType.TextModulesAlleBearbeiten, "Textbausteine bearbeiten (allgemeine)"
},
{
UserRightType.TextbausteineNurEigeneBearbeiten, "Textbausteine bearbeiten (eigene)"
UserRightType.TextModulesNurEigeneBearbeiten, "Textbausteine bearbeiten (eigene)"
},
//{
// UserRightType.TextbausteineAlleAnlegen, "Textbausteine für alle Mitarbeiter anlegen"
@@ -709,10 +709,10 @@ namespace BS.Shared.Core
SchulbegleitenderZugehörigkeitsTypTranslations = new Dictionary<object, string>
{
{
SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter,"Mitarbeiter"
SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter,"Mitarbeiter"
},
{
SchulbegleitenderZugehörigkeitsTyp.Klient,"Klienten"
SchulbegleitenderZugehoerigkeitsTyp.Klient,"Klienten"
}
};
#endregion

6
Shared/DataContracts/ClientPartials/SupportConceptGoalDC.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Windows.Media;
@@ -76,8 +75,11 @@ namespace BS.Shared.DataContracts.ClientPartials
}
public SupportConceptGoalDC ParentGoal { get; set; }
public event PropertyChangedEventHandler PropertyChanged;
public SolidColorBrush FilterableBrush { get { return new SolidColorBrush(Colors.Transparent); } }
protected void RaisePropertyChanged(string propertyName)
{
PropertyChangedEventHandler propertyChanged = PropertyChanged;

51
Shared/DataContracts/ClientPartials/TextbausteinDC.cs
View File

@@ -1,51 +0,0 @@
using System.Windows.Media;
namespace BS.Shared.DataContracts
{
public partial class TextbausteinDC : IFilterableDC
{
public override bool Equals(object obj)
{
if (obj is TextbausteinDC)
{
var y = (TextbausteinDC) obj;
if (TextbausteinOid == null && y.TextbausteinOid == null)
{
return GetHashCode() == y.GetHashCode();
}
if (TextbausteinOid != null && y.TextbausteinOid != null)
{
return TextbausteinOid == y.TextbausteinOid;
}
}
return false;
}
public override int GetHashCode()
{
return GetType().Name.GetHashCode() ^ TextbausteinOid.GetHashCode();
}
public override string ToString()
{
return Name;
}
public ActivationTypeId ActivationType { get; set; }
public string DetailDescription { get { return Text; } }
public string FilterRelevants { get { return Name + Text; } }
public string IconPath { get; private set; }
public string SimpleDescription { get { return Name; } }
public bool SupportsActivationType { get; private set; }
public long Version
{
get { return TextbausteinVersion == null ? 0 : TextbausteinVersion.Value; }
set { TextbausteinVersion = value; }
}
public SolidColorBrush FilterableBrush { get { return new SolidColorBrush(Colors.Transparent); } }
}
}

34
Shared/DataContracts/TextbausteinDC.cs
View File

@@ -1,34 +0,0 @@
using System.Runtime.Serialization;
using BS.Shared.DataContracts.Compact;
namespace BS.Shared.DataContracts
{
[DataContract]
public partial class TextbausteinDC : IDataContract
{
[DataMember]
public long? TextbausteinOid { get; set; }
[DataMember]
public long? TextbausteinVersion { get; set; }
[DataMember]
public string Text { get; set; }
[DataMember]
public ServiceCategoryDC ServiceCategory { get; set; }
[DataMember]
public int Position { get; set; }
[DataMember]
public string Name { get; set; }
[DataMember]
public CompactEmployeeDC Employee { get; set; }
[DataMember]
public bool IsOnlyForEmployee { get; set; }
}
}

4
Shared/Shared.csproj
View File

@@ -162,7 +162,7 @@
<Compile Include="DataContracts\ClientPartials\WohnheimEmployeeRelationDC.cs" />
<Compile Include="DataContracts\ClientPartials\OrganisationPersonRelationDC.cs" />
<Compile Include="DataContracts\ClientPartials\ServiceRecordHistoryDC.cs" />
<Compile Include="DataContracts\ClientPartials\TextbausteinDC.cs" />
<Compile Include="DataContracts\ClientPartials\TextModuleDC.cs" />
<Compile Include="DataContracts\Compact\ClientPartials\CompactCustomerTeamDC.cs" />
<Compile Include="DataContracts\Compact\ClientPartials\CompactGroupOfPeopleDC.cs" />
<Compile Include="DataContracts\Compact\ClientPartials\CompactWohnheimDC.cs" />
@@ -215,7 +215,7 @@
<Compile Include="DataContracts\WohnheimDC.cs" />
<Compile Include="DataContracts\ServiceRecordPeriodStatisticsInfoDC.cs" />
<Compile Include="DataContracts\ServiceRecordStatisticsInfoDC.cs" />
<Compile Include="DataContracts\TextbausteinDC.cs" />
<Compile Include="DataContracts\TextModuleDC.cs" />
<Compile Include="DataContracts\UiElementDC.cs" />
<Compile Include="DataContracts\ListedServiceRecordDC.cs" />
<Compile Include="DataContracts\MedArtDC.cs" />