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

Favoriten bei Eigenen + geteilen

Browse Source
This commit is contained in:
Rene Evertz
2026-01-27 16:58:04 +01:00
parent 7b88b2b59a
commit b45b51bff4
8 changed files with 246 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/ViewModel/AbstractDCMapperVM.cs
View File

@@ -6,7 +6,7 @@ namespace BeWo.ViewModel
{
public abstract class AbstractDCMapperVM<DCType> : AbstractBaseVM where DCType : new()
{
private readonly List<string> _DirtyProps = new List<string>();
protected readonly List<string> _DirtyProps = new List<string>();
private bool? _IsNew;

19
BeWo/ViewModel/AiPromptbausteinFolderVM.cs
View File

@@ -152,15 +152,30 @@ namespace BeWo.ViewModel
{
get
{
if (SubPrompts?.VMList != null && SubPrompts.VMList.Count > 0)
if (TotalPromptCount > 0)
{
return $"{Title} ({SubPrompts.Count})";
return $"{Title} ({TotalPromptCount})";
}
return Title;
}
}
public int TotalPromptCount
{
get
{
var total = SubPrompts.Count;
foreach ( var folder in SubFolders.VMList)
{
total += folder.TotalPromptCount;
}
return total;
}
}
protected override void InitByDataContract(AiPromptbausteinFolderDC pDataContract)
{
_Title = pDataContract.Title;

16
BeWo/ViewModel/AiPromptbausteinPromptVM.cs
View File

@@ -134,6 +134,11 @@ namespace BeWo.ViewModel
protected override AiPromptbausteinPromptDC MapToDataContract(AiPromptbausteinPromptDC pDataContract, bool doCommit)
{
pDataContract.IsFavorite = _IsFavorite;
if (!CanEdit)
return pDataContract;
pDataContract.Title = _Title;
pDataContract.Description = _Description;
pDataContract.ParentFolderOid = _ParentFolderOid;
@@ -145,7 +150,6 @@ namespace BeWo.ViewModel
pDataContract.ShowPromptByTenant = _ShowPromptByTenant;
pDataContract.IsOwnsoftPrompt = _IsOwnsoftPrompt;
pDataContract.OwnsoftRefLink = _OwnsoftRefLink;
pDataContract.IsFavorite = _IsFavorite;
return pDataContract;
}
@@ -165,5 +169,15 @@ namespace BeWo.ViewModel
OwnsoftRefLink = pDataContract.OwnsoftRefLink;
IsFavorite = pDataContract.IsFavorite;
}
public override bool IsDirty
{
get
{
if (!CanEdit)
return _DirtyProps.Contains(nameof(IsFavorite));
return _DirtyProps.Count > 0;
}
}
}
}

87
BeWo/ViewModel/ListViewModel/AiPromptbausteinFolderListVM.cs
View File

@@ -1,9 +1,12 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BS.Shared.DataContracts.Feature.AI;
using DevExpress.CodeParser;
using DevExpress.Xpf.Scheduling.Editors;
namespace BeWo.ViewModel.ListViewModel
{
@@ -30,7 +33,7 @@ namespace BeWo.ViewModel.ListViewModel
foreach (var vm in VMList)
{
if (vm.DataContract.Oid < -1)
return false;
continue;
if (vm.SubFolders is object && vm.SubFolders.ContainsDirtyObject())
return true;
@@ -41,5 +44,87 @@ namespace BeWo.ViewModel.ListViewModel
return false;
}
//public IEnumerable<AiPromptbausteinFolderVM> GetNewFolders()
//{
// foreach(var folder in VMList)
// {
// if (folder.IsNew)
// {
// yield return folder;
// continue;
// }
// var new_sub_folders = folder.SubFolders.GetNewFolders();
// foreach (var new_sub_folder in new_sub_folders)
// {
// yield return new_sub_folder;
// }
// }
//}
//public IEnumerable<AiPromptbausteinPromptDC> GetNewPrompts()
//{
// foreach (var folder in VMList)
// {
// if (folder.IsNew)
// continue;
// var new_prompts = folder.SubPrompts.CommitAdded();
// foreach (var new_prompt in new_prompts)
// {
// yield return new_prompt;
// }
// var new_sub_prompts = folder.SubFolders.GetNewPrompts();
// foreach (var new_sub_prompt in new_sub_prompts)
// {
// yield return new_sub_prompt;
// }
// }
//}
//public IEnumerable<AiPromptbausteinFolderVM> GetUpdatedFolder()
//{
// foreach (var folder in VMList)
// {
// if (folder.IsNew)
// continue;
// var new_prompts = folder.SubPrompts.CommitAdded();
// foreach (var new_prompt in new_prompts)
// {
// yield return new_prompt;
// }
// var new_sub_prompts = folder.SubFolders.GetNewPrompts();
// foreach (var new_sub_prompt in new_sub_prompts)
// {
// yield return new_sub_prompt;
// }
// }
//}
//public IEnumerable<AiPromptbausteinFolderVM> GetUpdatedPrompt()
//{
// foreach (var folder in VMList)
// {
// if (folder.IsNew)
// continue;
// var new_prompts = folder.SubPrompts.CommitAdded();
// foreach (var new_prompt in new_prompts)
// {
// yield return new_prompt;
// }
// var new_sub_prompts = folder.SubFolders.GetNewPrompts();
// foreach (var new_sub_prompt in new_sub_prompts)
// {
// yield return new_sub_prompt;
// }
// }
//}
}
}

94
BeWo/ViewModel/VMFactory.cs
View File

@@ -11,6 +11,7 @@ using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
using DevExpress.XtraEditors.Filtering.Templates;
@@ -701,29 +702,29 @@ namespace BeWo.ViewModel
ServiceFacade.DoEmployeeServiceAsync(s => s.GetAllEmploymentTypes(), r => pCallBack(new EmploymentTypeListVM(r)));
}
private static void InternalCreateCustomerVM(CustomerDC pCustomerDC, Action<CustomerVM> pCallBack)
{
var list = new List<ValueListEntryType>
{
ValueListEntryType.DisabilityType,
ValueListEntryType.CustomerCareType,
ValueListEntryType.PlacementObjectiveType,
ValueListEntryType.TerminationReasonType,
ValueListEntryType.Nationality,
ValueListEntryType.Aufenthaltsstatus,
ValueListEntryType.RoleInFamily,
ValueListEntryType.NotizenKategorieCustomer,
ValueListEntryType.Auftragsherkunft,
ValueListEntryType.Vermittlungsgrundlage,
ValueListEntryType.EinkommenBeginnType,
ValueListEntryType.EinkommenEndeType,
ValueListEntryType.FremdHilfeType,
ValueListEntryType.SozSchwierigkeitenType,
ValueListEntryType.SozBeziehungenType,
ValueListEntryType.ErstaufnahmeType,
ValueListEntryType.RegionType,
ValueListEntryType.VgAVerlauf
};
private static void InternalCreateCustomerVM(CustomerDC pCustomerDC, Action<CustomerVM> pCallBack)
{
var list = new List<ValueListEntryType>
{
ValueListEntryType.DisabilityType,
ValueListEntryType.CustomerCareType,
ValueListEntryType.PlacementObjectiveType,
ValueListEntryType.TerminationReasonType,
ValueListEntryType.Nationality,
ValueListEntryType.Aufenthaltsstatus,
ValueListEntryType.RoleInFamily,
ValueListEntryType.NotizenKategorieCustomer,
ValueListEntryType.Auftragsherkunft,
ValueListEntryType.Vermittlungsgrundlage,
ValueListEntryType.EinkommenBeginnType,
ValueListEntryType.EinkommenEndeType,
ValueListEntryType.FremdHilfeType,
ValueListEntryType.SozSchwierigkeitenType,
ValueListEntryType.SozBeziehungenType,
ValueListEntryType.ErstaufnahmeType,
ValueListEntryType.RegionType,
ValueListEntryType.VgAVerlauf
};
ServiceFacade.DoValueListServiceAsync(
s => s.GetAllValueListEntrysByTypes(list),
@@ -925,7 +926,7 @@ namespace BeWo.ViewModel
public static void CreateAiConversationListVM(AiContextType uIContext, long? reference_oid, Action<AiConversationListVM> callback)
{
ServiceFacade.DoAiEnhancedServiceAsnyc(
s => s.GetAiConversations(uIContext, reference_oid),
s => s.GetAiConversations(uIContext, reference_oid),
cb =>
{
cb.Reverse();
@@ -937,7 +938,50 @@ namespace BeWo.ViewModel
{
ServiceFacade.DoAiEnhancedServiceAsnyc(
req => req.GetAiPromptbausteinFolder(aiActionType),
res => get_viewmodel(new AiPromptbausteinFolderListVM(res)));
res =>
{
var listvm = new AiPromptbausteinFolderListVM(res);
reloadFavoriten(listvm);
get_viewmodel(listvm);
});
}
static void reloadFavoriten(AiPromptbausteinFolderListVM folders)
{
var favoriten = new AiPromptbausteinFolderDC()
{
Oid = -5,
Title = "Favoriten",
Description = "Eigene Favoriten",
SubPrompts = new List<AiPromptbausteinPromptDC>()
};
var fav_vm = new AiPromptbausteinFolderVM(favoriten);
fav_vm.SubPrompts.VMList.Clear();
folders.VMList.Insert(0, fav_vm);
findFavoriten(folders, fav_vm);
}
static void findFavoriten(AiPromptbausteinFolderListVM folders, AiPromptbausteinFolderVM favoriten)
{
foreach (var folder in folders.VMList)
{
if (folder == favoriten)
continue;
if (folder.SubFolders?.VMList.Any() ?? false)
findFavoriten(folder.SubFolders, favoriten);
foreach (var prompt in folder.SubPrompts.VMList)
{
if (prompt.IsFavorite)
favoriten.SubPrompts.VMList.Add(prompt);
}
}
}
}
}

42
BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
View File

@@ -26,6 +26,8 @@ namespace BeWo.ViewModel.View.Administration
private AiActionType AiActionType { get; set; }
public AiPromptbausteinFolderListVM Folders { get; set; }
public AiPromptbausteinFolderVM Favoriten { get; set; }
public AiPromptbausteinPromptVM SelectedPrompt { get; set; }
public AiPromptbausteinFolderVM CopiedFolder { get; set; }
public AiPromptbausteinPromptVM CopiedPrompt { get; set; }
@@ -170,6 +172,10 @@ namespace BeWo.ViewModel.View.Administration
listvm =>
{
Folders = listvm;
if (Folders.VMList.Count > 0 && Folders.VMList[0].DataContract.Oid == -5)
{
Favoriten = Folders.VMList[0];
}
FirePropertyChanged(nameof(Folders));
});
}
@@ -179,7 +185,7 @@ namespace BeWo.ViewModel.View.Administration
foreach (var node in folders.VMList)
{
if (node.DataContract.Oid is long oid && oid < -1)
continue;
continue;
if (node.IsNew)
{
@@ -201,6 +207,26 @@ namespace BeWo.ViewModel.View.Administration
}
}
}
void DFS_Search_UpdatePromptFavorite(AiPromptbausteinFolderListVM folders, ref List<AiPromptbausteinFolderVM> toadd_Folder, ref List<AiPromptbausteinPromptDC> toadd_Prompts, ref List<AiPromptbausteinFolderVM> toupdate_Folder, ref List<AiPromptbausteinPromptDC> toupdate_Prompt)
{
foreach (var node in folders.VMList)
{
if (node == Favoriten)
continue;
if (node.DataContract?.Oid >= -1)
continue;
if (node.IsNew)
continue;
if (node.HasSubFolders)
DFS_Search_UpdatePromptFavorite(node.SubFolders, ref toadd_Folder, ref toadd_Prompts, ref toupdate_Folder, ref toupdate_Prompt);
if (node.SubPrompts.AddedCount > 0)
toadd_Prompts.AddRange(node.SubPrompts.CommitAdded());
}
}
void DFS_Search_Delete(AiPromptbausteinFolderListVM folders, ref List<AiPromptbausteinFolderDC> todelete_Folder, ref List<AiPromptbausteinPromptDC> todelete_Prompt)
{
foreach (var node_dc in folders.DCBackup)
@@ -340,6 +366,20 @@ namespace BeWo.ViewModel.View.Administration
{
var edit_dc = edit_vm.CommitToDataContract();
sel_prompt.UpdateByDataContract(edit_dc);
if (sel_prompt.IsFavorite && !Favoriten.SubPrompts.VMList.Contains(sel_prompt))
Favoriten.SubPrompts.VMList.Add(sel_prompt);
else if (!sel_prompt.IsFavorite && Favoriten.SubPrompts.VMList.Contains(sel_prompt))
{
Favoriten.SubPrompts.VMList.Remove(sel_prompt);
if(Favoriten.SubPrompts.Count == 0)
{
var selected_folder = SelectedFolder;
SelectedFolder = null;
SelectedFolder = selected_folder;
}
}
};
WindowService.Show(vm);

16
Shared/DataContracts/Feature/AI/AiPromptbausteinFolderStructureDC.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Management.Instrumentation;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.DataContracts.Feature.AI
{
//[DataContract]
//public class AiPromptbausteinFolderStructureDC : IDataContract
//{
// public AiPromptbausteinFolderDC MyProperty { get; set; }
//}
}

1
Shared/Shared.csproj
View File

@@ -188,6 +188,7 @@
<Compile Include="DataContracts\AdminService\IAdminServiceDC.cs" />
<Compile Include="DataContracts\AdminService\AdminServiceSumReqDC.cs" />
<Compile Include="DataContracts\Feature\AI\AiPromptbausteinFolderDC.cs" />
<Compile Include="DataContracts\Feature\AI\AiPromptbausteinFolderStructureDC.cs" />
<Compile Include="DataContracts\Feature\AI\AiPromptbausteinPromptDC.cs" />
<Compile Include="DataContracts\Invoicing\GkvAbrechnung\GkvServerGetNumberRequestDC.cs" />
<Compile Include="DataContracts\Invoicing\GkvAbrechnung\GkvServerGetNumberResponseDC.cs" />