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

Format

Browse Source 
DataContract -> BeWoDataContract.cs
(fix quick action menu)
This commit is contained in:
Rene Evertz
2024-08-20 13:31:42 +02:00
parent a2aa0869cc
commit bd99904316
7 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Service/Plugins/TranslationDictionary.cs
View File

@@ -72,8 +72,6 @@ namespace BeWo.Service.Plugins
AddOrReplaceTranslation(dict, "CustomerNotizen", "Notizen");
AddOrReplaceTranslation(dict, "EmployeeNotizen", "Notizen");
AddOrReplaceTranslation(dict, "OrganisationStundenplan", "Betreuungszeiten");
AddOrReplaceTranslation(dict, "CustomerStundenplan", "Betreuungszeiten");
@@ -137,6 +135,8 @@ namespace BeWo.Service.Plugins
AddOrReplaceTranslation(dict, "ContextMenu_Items_Appointment_Actions_Open", "Belegung bearbeiten");
AddOrReplaceTranslation(dict, "ContextMenu_Items_Appointment_Actions_Delete", "Belegung löschen");
AddOrReplaceTranslation(dict, "Module_DisplayName_Wohnhilfe", "Wohnhilfe");
return dict;
}

40
Shared/Core/AbstractIDSpecificDefaultClass.cs
View File

@@ -6,25 +6,15 @@ namespace BS.Shared.Core
{
public class AbstractIDSpecificDefaultClass<T> where T : AbstractIDSpecificDefaultClass<T>, new()
{
#region Constants and Fields
protected string _SpecificID = string.Empty;
private static readonly Dictionary<string, T> _InstanceCache = new Dictionary<string, T>();
#endregion
#region Constructors and Destructors
protected AbstractIDSpecificDefaultClass() {}
#endregion
#region Public Methods
protected AbstractIDSpecificDefaultClass() { }
public static T GetInstance(string specificId, string tenant = null)
{
if (specificId == null)
if (specificId == null)
{
specificId = tenant;
}
@@ -40,14 +30,14 @@ namespace BS.Shared.Core
var assignableForms = allemblyTypes.Where(i => typeof(T).IsAssignableFrom(i));
var x = assignableForms.FirstOrDefault(t => t.GetCustomAttributes(typeof(IDSpecificClassAttribute), true).ToList().Exists(i =>
{
if(i is IDSpecificClassAttribute attribute)
if (i is IDSpecificClassAttribute attribute)
{
if(attribute.Identifiers != null)
if (attribute.Identifiers != null)
{
return attribute.Identifiers.Contains(specificId);
}
if(!string.IsNullOrEmpty(attribute.Identifier))
if (!string.IsNullOrEmpty(attribute.Identifier))
{
return attribute.Identifier.Equals(specificId);
}
@@ -61,15 +51,15 @@ namespace BS.Shared.Core
.FirstOrDefault(t => t.GetCustomAttributes(typeof(IDSpecificClassAttribute), true)
.ToList()
.Exists(i =>
{
var attr = (IDSpecificClassAttribute)i;
if (attr.Identifiers != null)
return attr.Identifiers.Contains(specificId);
if (!String.IsNullOrEmpty(attr.Identifier))
return attr.Identifier.Equals(specificId);
return false;
{
var attr = (IDSpecificClassAttribute)i;
if (attr.Identifiers != null)
return attr.Identifiers.Contains(specificId);
if (!String.IsNullOrEmpty(attr.Identifier))
return attr.Identifier.Equals(specificId);
return false;
}));
}));
if (cbSpecific != null)
{
var instance = Activator.CreateInstance(cbSpecific) as T;
@@ -81,7 +71,7 @@ namespace BS.Shared.Core
if (!_InstanceCache.ContainsKey(string.Empty))
{
_InstanceCache.Add(string.Empty,
_InstanceCache.Add(string.Empty,
new T
{
_SpecificID = specificId
@@ -90,7 +80,5 @@ namespace BS.Shared.Core
return _InstanceCache[string.Empty];
}
#endregion
}
}

0
Shared/DataContracts/DataContract.cs → Shared/DataContracts/BeWoDataContract.cs
View File

2
Shared/DataContracts/WohneinheitBelegungDC.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace BS.Shared.DataContracts
{
public class WohneinheitBelegungDC : DataContract
public class WohneinheitBelegungDC : BeWoDataContract
{
[DataMember] public CompactCustomerDC Customer { get; set; }
[DataMember] public DateTime StartDate { get; set; }

2
Shared/DataContracts/WohneinheitDC.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace BS.Shared.DataContracts
{
public class WohneinheitDC : DataContract
public class WohneinheitDC : BeWoDataContract
{
[DataMember] public string Wohnname { get; set; }
[DataMember] public string Zimmername { get; set; }

14
Shared/DataContracts/Wohnhilfe/BereichEinkommenUndArbeitDC.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.DataContracts.Wohnhilfe
{
[DataContract]
public class BereichEinkommenUndArbeitDC : IDataContract
{
}
}

1
Shared/Shared.csproj
View File

@@ -171,6 +171,7 @@
<Compile Include="DataContracts\AdditionalServiceRegionDC.cs" />
<Compile Include="DataContracts\AddressRouteDC.cs" />
<Compile Include="DataContracts\Wohnhilfe\BereichBundDC.cs" />
<Compile Include="DataContracts\Wohnhilfe\BereichEinkommenUndArbeitDC.cs" />
<Compile Include="DataContracts\Wohnhilfe\BereichSozialDC.cs" />
<Compile Include="DataContracts\Wohnhilfe\FalldatenDC.cs" />
<Compile Include="DataContracts\DataContract.cs" />