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

Neue Version, Neues Modul ShowWohnhilfe

Browse Source
This commit is contained in:
Christian
2024-10-28 11:50:40 +01:00
parent 29351e5afc
commit 9a9bfb8372
13 changed files with 94 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/BeWo.csproj
View File

@@ -39,16 +39,16 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>true</UpdateRequired>
<MapFileExtensions>false</MapFileExtensions>
<InstallUrl>https://app.ownsoft.de/test/</InstallUrl>
<InstallUrl>https://app.ownsoft.de/</InstallUrl>
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>ownSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.250</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.253</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>251</ApplicationRevision>
<ApplicationRevision>254</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

2
BeWo/BeWo.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
<InstallUrlHistory>https://app.ownsoft.de/test/|https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/</InstallUrlHistory>
<InstallUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
<BootstrapperUrlHistory />

6
BeWo/BeWoApp.xaml.cs
View File

@@ -51,7 +51,7 @@ namespace BeWo
public static MainControl MainControl;
public static string ShortVersion = "3.22";
public static string Version = "Version 3.22 Test";
public static string Version = "Version 3.22";
public static int RenderTier = 0;
@@ -527,6 +527,9 @@ namespace BeWo
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AllowGkvAbrechnung);
AppSettings.AllowGkvAbrechnung = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowWohnhilfe);
AppSettings.ShowWohnhilfe = val != null && val.Equals("1");
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowImportAbschlagszahlungen);
AppSettings.ShowImportAbschlagszahlungen = val != null && val.Equals("1");
@@ -601,6 +604,7 @@ namespace BeWo
AppSettings.ShowAIInternal = true;
AppSettings.ShowWorktime = true;
AppSettings.ShowPersehImport = true;
AppSettings.ShowWohnhilfe = true;
//showInfoButtonInCalender = true;
#endif

2
BeWo/Core/Config/AppSettings.cs
View File

@@ -450,7 +450,7 @@ namespace BeWo.Core.Config
public bool ShowAIInternal { get; set; }
public bool AllowGkvAbrechnung { get; set; }
public bool ShowWohnhilfe { get; set; }
public bool ShowImportAbschlagszahlungen { get; set; }
public bool ShowPersehImport { get; set; }

2
BeWo/DebugConfig.cs
View File

@@ -24,7 +24,7 @@ namespace BeWo
{
#if DEBUG
//return _CurrentConfig ?? (_CurrentConfig = SimpleAutoLogin);
return _CurrentConfig ?? (_CurrentConfig = SimpleAutoLogin);
#endif

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

@@ -57,7 +57,7 @@
<dxa:AccordionItem Header="{markup:Translate Medikamentenarten}" Name="TabitemMedikamentenarten" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Rollen des Umfeldes}" Name="TabitemEnvironmentRoles" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Vermittlung}" Name="TabitemPlacementObjectives" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{t:Translate Falldaten}" Foreground="Black" >
<dxa:AccordionItem Header="{t:Translate Falldaten}" Foreground="Black" Name="TabitemFalldaten">
<dxa:AccordionItem Header="{markup:Translate Auftragsherkunft}" Name="TabitemAuftragsherkunft" Selected="Tabitem_Selected" Foreground="Black"/>
<dxa:AccordionItem Header="{markup:Translate Vermittlungsgrundlage}" Name="TabitemVermittlungsgrundlage" Selected="Tabitem_Selected" Foreground="Black"/>
</dxa:AccordionItem>

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

@@ -100,6 +100,10 @@ namespace BeWo.View.Master
TabitemDienste.Visibility = Visibility.Visible;
#endif
if (!BeWoApp.AppSettings.ShowWohnhilfe)
{
TabitemFalldaten.Visibility = Visibility.Collapsed;
}
#endregion
}

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

@@ -1757,31 +1757,34 @@ namespace BeWo.ViewModel.ListViewModel
private void UpdateGruppenZiele(List<SupportConceptTreeNodeDetailInfoDC> allInfos)
{
var goalCats = new List<ValueListEntryDC>();
var goals = new List<ValueListEntryDC>();
var goalCategoryDict = _AllGoalCategories.ToDictionary(goalCat => goalCat.ValueListEntryOid.Value);
foreach (var info in allInfos)
if (allInfos != null && _AllGoalCategories != null)
{
foreach (var goal in info.SupportConceptGoals)
var goalCats = new List<ValueListEntryDC>();
var goals = new List<ValueListEntryDC>();
var goalCategoryDict = _AllGoalCategories.ToDictionary(goalCat => goalCat.ValueListEntryOid.Value);
foreach (var info in allInfos)
{
if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
foreach (var goal in info.SupportConceptGoals)
{
var path = GetAllParentGoalCategoies(goalCategoryDict, goal);
foreach (var goalCat in path)
if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
{
goalCats.Add(goalCat);
goalCategoryDict.Remove(goalCat.ValueListEntryOid.Value);
var path = GetAllParentGoalCategoies(goalCategoryDict, goal);
foreach (var goalCat in path)
{
goalCats.Add(goalCat);
goalCategoryDict.Remove(goalCat.ValueListEntryOid.Value);
}
}
goals.Add(goal);
}
goals.Add(goal);
}
}
PrototypeVM.ChangeGoalTree(goalCats, goals);
PrototypeVM.ChangeGoalTree(goalCats, goals);
}
}

51
BeWo/ViewModel/UserGroupVM.cs
View File

@@ -98,14 +98,20 @@ namespace BeWo.ViewModel
if (!IsDienstplanungRight(r) || BeWoApp.AppSettings.ShowDienstplanung)
{
if (!IsAbwesenheitsPlanungRight(r) || BeWoApp.AppSettings.ShowUrlaubsplanung)
{
if (!IsUnterschriftRight(r))
{
if (r != UserRightType.SupportConcept_ImportData || BeWoApp.AppSettings.ShowPersehImport)
{
if (r != UserRightType.AiChatInZeiterfassung || BeWoApp.AppSettings.ShowAI)
{
possibleRights.Add(r);
{
if (!IsWohnhilfeRight(r) || BeWoApp.AppSettings.ShowWohnhilfe)
{
if (!IsGkvAbrechnungRight(r) || BeWoApp.AppSettings.AllowGkvAbrechnung)
{
if (!IsUnterschriftRight(r))
{
if (r != UserRightType.SupportConcept_ImportData || BeWoApp.AppSettings.ShowPersehImport)
{
if (r != UserRightType.AiChatInZeiterfassung || BeWoApp.AppSettings.ShowAI)
{
possibleRights.Add(r);
}
}
}
}
}
@@ -150,7 +156,8 @@ namespace BeWo.ViewModel
private static bool IsDienstplanungRight(UserRightType userRightType)
{
if (userRightType == UserRightType.DienstplanungAnsehen)
if (userRightType == UserRightType.DienstplanungAnsehen
|| userRightType == UserRightType.DienstplanungBearbeiten)
return true;
return false;
}
@@ -243,6 +250,32 @@ namespace BeWo.ViewModel
return false;
}
private static bool IsWohnhilfeRight(UserRightType userRightType)
{
if (userRightType == UserRightType.WohnheimView_Wohneinheit_Belegung_View
|| userRightType == UserRightType.WohnheimView_Wohneinheit_Belegung_Manage
|| userRightType == UserRightType.WohnheimView_Wohneinheit_View
|| userRightType == UserRightType.WohnheimView_Wohneinheit_Manage
|| userRightType == UserRightType.WohnheimView_Wohneinheit_Gallery_View
|| userRightType == UserRightType.WohnheimView_Wohneinheit_Gallery_Manage
|| userRightType == UserRightType.Customer_GemeinnutzigeArbeit_View
|| userRightType == UserRightType.Customer_GemeinnutzigeArbeit_Manage
|| userRightType == UserRightType.Customer_Wohnhilfe_View
|| userRightType == UserRightType.Customer_Wohnhilfe_Manage)
return true;
return false;
}
private static bool IsGkvAbrechnungRight(UserRightType userRightType)
{
if (userRightType == UserRightType.Finance_Gkv_View
|| userRightType == UserRightType.Finance_Gkv_Create
|| userRightType == UserRightType.Finance_Gkv_Send
|| userRightType == UserRightType.Finance_Gkv_Delete)
return true;
return false;
}
private static bool IsUnterschriftRight(UserRightType userRightType)
{
if (userRightType == UserRightType.ServiceRecord_AllowCreateAfterEmployeeSignature

1
Data/Security/UserRightHelper.cs
View File

@@ -159,6 +159,7 @@ namespace BeWo.Data.Security
}
var rights_3_22 = new List<UserRightType> {
UserRightType.DienstplanungBearbeiten,
UserRightType.WohnheimView_Wohneinheit_Belegung_View,
UserRightType.WohnheimView_Wohneinheit_Belegung_Manage,
UserRightType.WohnheimView_Wohneinheit_View,

8
Model/Changes_alle_fuer_neue_db.txt
View File

@@ -1367,3 +1367,11 @@ ADD CONSTRAINT `FK_CUSTOMERVERMITTLUNGARBEIT_VERMITTLUNGSGRUNDLAGE`
REFERENCES `valuelistentry` (`Oid`)
ON DELETE SET NULL
ON UPDATE CASCADE;
ALTER TABLE `organisation`
ADD COLUMN `BezDatenannahmestelle` VARCHAR(4096) NULL DEFAULT NULL AFTER `IKDatenannahmestelle`;
ALTER TABLE `organisation`
ADD COLUMN `Verfahrensstufe` INT NULL DEFAULT 0 AFTER `BusinessPartnerId`;

7
ReportImp/HPHBersenbrueck/Abrechnungsbogen.cs
View File

@@ -105,7 +105,12 @@ namespace BeWo.HPHBersenbrueck
foreach (var serviceRecord in serviceRecordList)
{
String key = String.Format("{0:yyyyMM}", serviceRecord.Start);
if (serviceRecord.ServiceDescription.Name.StartsWith("6 ") || serviceRecord.ServiceDescription.Name.StartsWith("10 ") || serviceRecord.ServiceDescription.Name.ToLower().Contains("unrefinanziert") ||
serviceRecord.ServiceDescription.Name.StartsWith("15 "))
{
continue;
}
String key = String.Format("{0:yyyyMM}", serviceRecord.Start);
if (!month2TotalSummary.ContainsKey(key))
{

1
Shared/Core/SettingsKeys.cs
View File

@@ -95,6 +95,7 @@
public static string FilterGroupServiceCategories => "FilterGroupServiceCategories";
public static string AllowGkvAbrechnung => "AllowGkvAbrechnung";
public static string ShowWohnhilfe => "ShowWohnhilfe";
public static string ShowImportAbschlagszahlungen => "ShowImportAbschlagszahlungen";