diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 9767390a5..5c8bb84dc 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -151,11 +151,11 @@ - - + + - - + + diff --git a/BeWo/View/Detail/AI/AiPromptbausteinActionResultView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinActionResultView.xaml index c9735d083..7cb64d9e4 100644 --- a/BeWo/View/Detail/AI/AiPromptbausteinActionResultView.xaml +++ b/BeWo/View/Detail/AI/AiPromptbausteinActionResultView.xaml @@ -9,8 +9,8 @@ d:DataContext="{d:DesignInstance Type=ai:AiPromptbausteinActionResultViewModel}" d:DesignHeight="600" d:DesignWidth="600" - mc:Ignorable="d" - Background="{StaticResource ObjectEditBackgroundBrush}"> + Background="{StaticResource ObjectEditBackgroundBrush}" + mc:Ignorable="d"> diff --git a/BeWo/ViewModel/AiPromptroutineStepVM.cs b/BeWo/ViewModel/AiPromptbausteinRoutineStepVM.cs similarity index 73% rename from BeWo/ViewModel/AiPromptroutineStepVM.cs rename to BeWo/ViewModel/AiPromptbausteinRoutineStepVM.cs index d2e3af7cf..9fb51bcb9 100644 --- a/BeWo/ViewModel/AiPromptroutineStepVM.cs +++ b/BeWo/ViewModel/AiPromptbausteinRoutineStepVM.cs @@ -6,13 +6,13 @@ using BS.Shared.DataContracts.Feature.AI; namespace BeWo.ViewModel { - public class AiPromptroutineStepVM : AbstractDCMapperVM + public class AiPromptbausteinRoutineStepVM : AbstractDCMapperVM { private int _Position; private AiPromptbausteinPromptDC _PromptReference; private long _ReferenceVersion; - public AiPromptroutineStepVM(AiPromptroutineStepDC dc) : base(dc, dc.Oid) + public AiPromptbausteinRoutineStepVM(AiPromptbausteinRoutineStepDC dc) : base(dc, dc.Oid) { } @@ -35,14 +35,14 @@ namespace BeWo.ViewModel set => SetProperty(ref _ReferenceVersion, value, nameof(ReferenceVersion), () => DataContract.ReferenceVersion); } - protected override void InitByDataContract(AiPromptroutineStepDC pDataContract) + protected override void InitByDataContract(AiPromptbausteinRoutineStepDC pDataContract) { _Position = pDataContract.Position; _PromptReference = pDataContract.PromptReference; _ReferenceVersion = pDataContract.ReferenceVersion; } - protected override AiPromptroutineStepDC MapToDataContract(AiPromptroutineStepDC pDataContract, bool doCommit) + protected override AiPromptbausteinRoutineStepDC MapToDataContract(AiPromptbausteinRoutineStepDC pDataContract, bool doCommit) { pDataContract.Position = _Position; pDataContract.PromptReference = _PromptReference; diff --git a/BeWo/ViewModel/AiPromptroutineVM.cs b/BeWo/ViewModel/AiPromptbausteinRoutineVM.cs similarity index 83% rename from BeWo/ViewModel/AiPromptroutineVM.cs rename to BeWo/ViewModel/AiPromptbausteinRoutineVM.cs index 65255a1ea..a80cf0aa0 100644 --- a/BeWo/ViewModel/AiPromptroutineVM.cs +++ b/BeWo/ViewModel/AiPromptbausteinRoutineVM.cs @@ -7,7 +7,7 @@ using BS.Shared.DataContracts.Feature.AI; namespace BeWo.ViewModel { - public class AiPromptroutineVM : AbstractDCMapperVM + public class AiPromptbausteinRoutineVM : AbstractDCMapperVM { private string _Title; private string _Description; @@ -18,9 +18,9 @@ namespace BeWo.ViewModel private bool _IsFavorite; private AiActionType _ActionType; private bool _CanEdit; - private AiPromptroutineStepListVM _Steps; + private AiPromptbausteinRoutineStepListVM _Steps; - public AiPromptroutineVM(AiPromptroutineDC dc) : base(dc, dc.Oid) + public AiPromptbausteinRoutineVM(AiPromptbausteinRoutineDC dc) : base(dc, dc.Oid) { } @@ -79,13 +79,13 @@ namespace BeWo.ViewModel set => SetProperty(ref _CanEdit, value, nameof(CanEdit), () => DataContract.CanEdit); } - public AiPromptroutineStepListVM Steps + public AiPromptbausteinRoutineStepListVM Steps { get => _Steps; set => SetProperty(ref _Steps, value, nameof(Steps)); } - protected override void InitByDataContract(AiPromptroutineDC pDataContract) + protected override void InitByDataContract(AiPromptbausteinRoutineDC pDataContract) { _Title = pDataContract.Title; _Description = pDataContract.Description; @@ -97,10 +97,10 @@ namespace BeWo.ViewModel _ActionType = pDataContract.ActionType; _CanEdit = pDataContract.CanEdit; - _Steps = new AiPromptroutineStepListVM(pDataContract.Steps); + _Steps = new AiPromptbausteinRoutineStepListVM(pDataContract.Steps); } - protected override AiPromptroutineDC MapToDataContract(AiPromptroutineDC pDataContract, bool doCommit) + protected override AiPromptbausteinRoutineDC MapToDataContract(AiPromptbausteinRoutineDC pDataContract, bool doCommit) { pDataContract.Title = _Title; pDataContract.Description = _Description; diff --git a/BeWo/ViewModel/ListViewModel/AiPromptbausteinRoutineListVM.cs b/BeWo/ViewModel/ListViewModel/AiPromptbausteinRoutineListVM.cs new file mode 100644 index 000000000..b01d617e6 --- /dev/null +++ b/BeWo/ViewModel/ListViewModel/AiPromptbausteinRoutineListVM.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BS.Shared.DataContracts.Feature.AI; + +namespace BeWo.ViewModel.ListViewModel +{ + public class AiPromptbausteinRoutineListVM : AbstractDCListMapperVM + { + public AiPromptbausteinRoutineListVM(IEnumerable pDataContracts = null) : base(pDataContracts) + { + + } + } +} \ No newline at end of file diff --git a/BeWo/ViewModel/ListViewModel/AiPromptbausteinRoutineStepListVM.cs b/BeWo/ViewModel/ListViewModel/AiPromptbausteinRoutineStepListVM.cs new file mode 100644 index 000000000..dbb66b835 --- /dev/null +++ b/BeWo/ViewModel/ListViewModel/AiPromptbausteinRoutineStepListVM.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BS.Shared.DataContracts.Feature.AI; + +namespace BeWo.ViewModel.ListViewModel +{ + public class AiPromptbausteinRoutineStepListVM : AbstractDCListMapperVM + { + public AiPromptbausteinRoutineStepListVM(IEnumerable pDataContracts = null) : base(pDataContracts) + { + + } + } +} \ No newline at end of file diff --git a/BeWo/ViewModel/ListViewModel/AiPromptroutineListVM.cs b/BeWo/ViewModel/ListViewModel/AiPromptroutineListVM.cs deleted file mode 100644 index 150a9d7c1..000000000 --- a/BeWo/ViewModel/ListViewModel/AiPromptroutineListVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using BS.Shared.DataContracts.Feature.AI; - -namespace BeWo.ViewModel.ListViewModel -{ - public class AiPromptroutineListVM : AbstractDCListMapperVM - { - public AiPromptroutineListVM(IEnumerable pDataContracts = null) : base(pDataContracts) - { - - } - } -} \ No newline at end of file diff --git a/BeWo/ViewModel/ListViewModel/AiPromptroutineStepListVM.cs b/BeWo/ViewModel/ListViewModel/AiPromptroutineStepListVM.cs deleted file mode 100644 index 20ef5697d..000000000 --- a/BeWo/ViewModel/ListViewModel/AiPromptroutineStepListVM.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using BS.Shared.DataContracts.Feature.AI; - -namespace BeWo.ViewModel.ListViewModel -{ - public class AiPromptroutineStepListVM : AbstractDCListMapperVM - { - public AiPromptroutineStepListVM(IEnumerable pDataContracts = null) : base(pDataContracts) - { - - } - } -} \ No newline at end of file diff --git a/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs b/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs index 42869946b..2bb8b9fcd 100644 --- a/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs +++ b/BeWo/ViewModel/View/AI/AiPromptbausteinComplexSelectionViewModel.cs @@ -27,6 +27,7 @@ namespace BeWo.ViewModel.View.AI private AiPromptbausteinFolderVM _SelectedFolder; private AiPromptbausteinPromptVM _SelectedPrompt; + private AiPromptbausteinRoutineVM _SelectedRoutine; private IBeWoWindowService WindowService { get; set; } @@ -47,6 +48,11 @@ namespace BeWo.ViewModel.View.AI public DelegateCommand DeletePromptCommand { get; private set; } public DelegateCommand ChangeFavoritenStatePromptCommand { get; private set; } + public DelegateCommand OpenAddRoutineDialogCommand { get; private set; } + public DelegateCommand OpenEditRoutineDialogCommand { get; private set; } + public DelegateCommand DeleteRoutineCommand { get; private set; } + public DelegateCommand ChangeFavoritenStateRoutineCommand { get; private set; } + public bool CanEditPromptbausteine { get; set; } public bool HasCopiedFolder => CopiedFolder is object; public bool HasCopiedPrompt => CopiedPrompt is object; @@ -84,6 +90,11 @@ namespace BeWo.ViewModel.View.AI OpenEditPromptDialogCommand = new DelegateCommand(OpenEditPromptDialog, canOpenEditPromptDialog, false); DeletePromptCommand = new DelegateCommand(OpenDeletePromptDialog, canOpenDeletePromptDialog, false); ChangeFavoritenStatePromptCommand = new DelegateCommand(ChangeFavoritenStatePrompt, canChangeFavoritenStatePrompt, false); + + OpenAddRoutineDialogCommand = new DelegateCommand(OpenAddRoutineDialog, canOpenAddRoutineDialog, false); + OpenEditRoutineDialogCommand = new DelegateCommand(OpenEditRoutineDialog, canOpenEditRoutineDialog, false); + DeleteRoutineCommand = new DelegateCommand(OpenDeleteRoutineDialog, canOpenDeleteRoutineDialog, false); + ChangeFavoritenStateRoutineCommand = new DelegateCommand(ChangeFavoritenStateRoutine, canChangeFavoritenStateRoutine, false); CanEditPromptbausteine = BeWoApp.HasLoggedOnUserRight(UserRightType.AiModulePromptbausteineEdit); } @@ -99,12 +110,7 @@ namespace BeWo.ViewModel.View.AI get => _SelectedFolder; set { - if (value == _SelectedFolder) - return; - - _SelectedFolder = value; - FirePropertyChanged(nameof(SelectedFolder)); - + SetProperty(ref _SelectedFolder, value, nameof(SelectedFolder)); if (SelectedPrompt is object) { SelectedPrompt.IsSelected = false; @@ -117,11 +123,18 @@ namespace BeWo.ViewModel.View.AI get => _SelectedPrompt; set { - _SelectedPrompt = value; - FirePropertyChanged(nameof(SelectedPrompt)); + SetProperty(ref _SelectedPrompt, value, nameof(SelectedPrompt)); SendCommand.RaiseCanExecuteChanged(); } } + public AiPromptbausteinRoutineVM SelectedRoutine + { + get => _SelectedRoutine; + set + { + SetProperty(ref _SelectedRoutine, value, nameof(SelectedRoutine)); + } + } public AiPromptbausteinFolderListVM Folders { get; private set; } public AiActionType LoadedActionType { get; set; } @@ -206,6 +219,11 @@ namespace BeWo.ViewModel.View.AI PastePromptCommand?.RaiseCanExecuteChanged(); DeletePromptCommand?.RaiseCanExecuteChanged(); ChangeFavoritenStatePromptCommand?.RaiseCanExecuteChanged(); + + OpenAddRoutineDialogCommand?.RaiseCanExecuteChanged(); + OpenEditRoutineDialogCommand?.RaiseCanExecuteChanged(); + DeleteRoutineCommand?.RaiseCanExecuteChanged(); + ChangeFavoritenStateRoutineCommand?.RaiseCanExecuteChanged(); } // --- Folder Commands --- @@ -364,5 +382,29 @@ namespace BeWo.ViewModel.View.AI bool canOpenEditPromptDialog() => SelectedPrompt is object; bool canOpenDeletePromptDialog() => CanEditPromptbausteine && (SelectedPrompt?.CanEdit ?? false); bool canChangeFavoritenStatePrompt() => SelectedPrompt is object; + + // --- Routine Commands + + void OpenAddRoutineDialog() + { + + } + void OpenEditRoutineDialog() + { + + } + void OpenDeleteRoutineDialog() + { + + } + void ChangeFavoritenStateRoutine() + { + + } + + bool canOpenAddRoutineDialog() => CanEditPromptbausteine && (SelectedFolder?.CanAddPrompt ?? false); + bool canOpenEditRoutineDialog() => SelectedRoutine is object; + bool canOpenDeleteRoutineDialog() => CanEditPromptbausteine && (SelectedRoutine?.CanEdit ?? false); + bool canChangeFavoritenStateRoutine() => SelectedRoutine is object; } } diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs index 0d9026169..6d2dfe728 100644 --- a/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs +++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs @@ -467,5 +467,29 @@ namespace BeWo.ViewModel.View.Administration { return SelectedPrompt is object; } + + // --- Routine Commands + + void OpenAddRoutineDialog() + { + + } + void OpenEditRoutineDialog() + { + + } + void OpenDeleteRoutineDialog() + { + + } + void ChangeFavoritenStateRoutine() + { + + } + + //bool canOpenAddRoutineDialog() => CanEditPromptbausteine && (SelectedFolder?.CanAddPrompt ?? false); + //bool canOpenEditRoutineDialog() => SelectedRoutine is object; + //bool canOpenDeleteRoutineDialog() => CanEditPromptbausteine && (SelectedRoutine?.CanEdit ?? false); + //bool canChangeFavoritenStateRoutine() => SelectedRoutine is object; } } diff --git a/Data/Data.csproj b/Data/Data.csproj index ec854a741..372b360a5 100644 --- a/Data/Data.csproj +++ b/Data/Data.csproj @@ -234,8 +234,8 @@ - - + + diff --git a/Data/Entities/AiPromptroutine.cs b/Data/Entities/AiPromptbausteinRoutine.cs similarity index 76% rename from Data/Entities/AiPromptroutine.cs rename to Data/Entities/AiPromptbausteinRoutine.cs index 422ebfd80..87fa12048 100644 --- a/Data/Entities/AiPromptroutine.cs +++ b/Data/Entities/AiPromptbausteinRoutine.cs @@ -8,11 +8,11 @@ using BS.Shared.DataContracts.Feature.AI; namespace BeWo.Data.Entities { - public class AiPromptroutine : BeWoEntityBase + public class AiPromptbausteinRoutine : BeWoEntityBase { - public AiPromptroutine() + public AiPromptbausteinRoutine() { - _Tid = TableID.AiPromptroutine; + _Tid = TableID.AiPromptbausteinRoutine; } public virtual string Title { get; set; } @@ -33,6 +33,6 @@ namespace BeWo.Data.Entities public virtual bool CanEdit { get; set; } - public virtual List Steps { get; set; } + public virtual List Steps { get; set; } } } diff --git a/Data/Entities/AiPromptroutineStep.cs b/Data/Entities/AiPromptbausteinRoutineStep.cs similarity index 68% rename from Data/Entities/AiPromptroutineStep.cs rename to Data/Entities/AiPromptbausteinRoutineStep.cs index c33c50b40..990289494 100644 --- a/Data/Entities/AiPromptroutineStep.cs +++ b/Data/Entities/AiPromptbausteinRoutineStep.cs @@ -6,11 +6,11 @@ using BS.Shared.Core; namespace BeWo.Data.Entities { - public class AiPromptroutineStep : BeWoEntityBase + public class AiPromptbausteinRoutineStep : BeWoEntityBase { - public AiPromptroutineStep() + public AiPromptbausteinRoutineStep() { - _Tid = TableID.AiPromptroutineStep; + _Tid = TableID.AiPromptbausteinRoutineStep; } public virtual int Position { get; set; } diff --git a/Model/Changes_2026-04-20 AiPromptroutine 2.txt b/Model/Changes_2026-04-20 AiPromptroutine 2.txt new file mode 100644 index 000000000..092085c45 --- /dev/null +++ b/Model/Changes_2026-04-20 AiPromptroutine 2.txt @@ -0,0 +1,8 @@ +INSERT INTO `.executedscripts` +VALUES ('Changes_2026-04-20 AiPromptroutine 2', CURDATE()); + +ALTER TABLE `aipromptroutine` +RENAME TO `aipromptbauteinroutine` ; + +ALTER TABLE `aipromptroutinestep` +RENAME TO `aipromptbausteinroutinestep` ; \ No newline at end of file diff --git a/Service/DCEntityMapper/AiPromptroutineDC_AiPromptroutine.cs b/Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs similarity index 71% rename from Service/DCEntityMapper/AiPromptroutineDC_AiPromptroutine.cs rename to Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs index ee4e97816..e4322760e 100644 --- a/Service/DCEntityMapper/AiPromptroutineDC_AiPromptroutine.cs +++ b/Service/DCEntityMapper/AiPromptbausteinRoutineDC_AiPromptbausteinRoutine.cs @@ -11,9 +11,9 @@ using BS.Shared.DataContracts.Feature.AI; namespace BeWo.Service.DCEntityMapper { - public class AiPromptroutineDC_AiPromptroutine : BeWoDataContract_BeWoEntityBase + public class AiPromptbausteinRoutineDC_AiPromptbausteinRoutine : BeWoDataContract_BeWoEntityBase { - public override AiPromptroutineDC MergeWithDC(AiPromptroutine pEntity, AiPromptroutineDC pDataContract) + public override AiPromptbausteinRoutineDC MergeWithDC(AiPromptbausteinRoutine pEntity, AiPromptbausteinRoutineDC pDataContract) { base.MergeWithDC(pEntity, pDataContract); @@ -26,7 +26,7 @@ namespace BeWo.Service.DCEntityMapper pDataContract.ActionType = pEntity.ActionType; pDataContract.CanEdit = pEntity.CanEdit; - pDataContract.Steps = MapperFactory.AiPromptroutineStep.MapToNewDCs(pEntity.Steps); + pDataContract.Steps = MapperFactory.AiPromptbausteinRoutineStep.MapToNewDCs(pEntity.Steps); if (pEntity.CreatorOid is long oid) pDataContract.Creator = new EmployeeServiceImp().GetActiveCompactEmployeeWithOid(oid); @@ -34,7 +34,7 @@ namespace BeWo.Service.DCEntityMapper return pDataContract; } - public override AiPromptroutine MergeWithEntity(AiPromptroutineDC pDataContract, AiPromptroutine pEntity) + public override AiPromptbausteinRoutine MergeWithEntity(AiPromptbausteinRoutineDC pDataContract, AiPromptbausteinRoutine pEntity) { base.MergeWithEntity(pDataContract, pEntity); @@ -48,7 +48,7 @@ namespace BeWo.Service.DCEntityMapper pEntity.ActionType = pDataContract.ActionType; pEntity.CanEdit = pDataContract.CanEdit; - pEntity.Steps = DAOFactory.GenericDAO.LoadByIDs(pDataContract.Steps.Select(x => x.Oid.Value)); + pEntity.Steps = DAOFactory.GenericDAO.LoadByIDs(pDataContract.Steps.Select(x => x.Oid.Value)); if (pDataContract.ParentFolderOid is long oid && oid >= 0) pEntity.ParentFolderOid = pDataContract.ParentFolderOid; diff --git a/Service/DCEntityMapper/AiPromptroutineStepDC_AiPromptroutineStep.cs b/Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs similarity index 66% rename from Service/DCEntityMapper/AiPromptroutineStepDC_AiPromptroutineStep.cs rename to Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs index affa4a247..f3fec216b 100644 --- a/Service/DCEntityMapper/AiPromptroutineStepDC_AiPromptroutineStep.cs +++ b/Service/DCEntityMapper/AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep.cs @@ -11,9 +11,9 @@ using BS.Shared.DataContracts.Feature.AI; namespace BeWo.Service.DCEntityMapper { - public class AiPromptroutineStepDC_AiPromptroutineStep : BeWoDataContract_BeWoEntityBase + public class AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep : BeWoDataContract_BeWoEntityBase { - public override AiPromptroutineStepDC MergeWithDC(AiPromptroutineStep pEntity, AiPromptroutineStepDC pDataContract) + public override AiPromptbausteinRoutineStepDC MergeWithDC(AiPromptbausteinRoutineStep pEntity, AiPromptbausteinRoutineStepDC pDataContract) { base.MergeWithDC(pEntity, pDataContract); @@ -24,7 +24,7 @@ namespace BeWo.Service.DCEntityMapper return pDataContract; } - public override AiPromptroutineStep MergeWithEntity(AiPromptroutineStepDC pDataContract, AiPromptroutineStep pEntity) + public override AiPromptbausteinRoutineStep MergeWithEntity(AiPromptbausteinRoutineStepDC pDataContract, AiPromptbausteinRoutineStep pEntity) { base.MergeWithEntity(pDataContract, pEntity); diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs index 99d65f3d8..46a5db0ad 100644 --- a/Service/DCEntityMapper/MapperFactory.cs +++ b/Service/DCEntityMapper/MapperFactory.cs @@ -814,8 +814,8 @@ namespace BeWo.Service.DCEntityMapper public static AiConfigDC_AiConfig AiConfig { get; } = new AiConfigDC_AiConfig(); public static AiPromptbausteinFolderDC_AiPromptbausteinFolder AiPromptbausteinFolder { get; } = new AiPromptbausteinFolderDC_AiPromptbausteinFolder(); public static AiPromptbausteinPromptDC_AiPromptbausteinPrompt AiPromptbausteinPrompt { get; } = new AiPromptbausteinPromptDC_AiPromptbausteinPrompt(); - public static AiPromptroutineDC_AiPromptroutine AiPromptroutine { get; } = new AiPromptroutineDC_AiPromptroutine(); - public static AiPromptroutineStepDC_AiPromptroutineStep AiPromptroutineStep { get; } = new AiPromptroutineStepDC_AiPromptroutineStep(); + public static AiPromptbausteinRoutineDC_AiPromptbausteinRoutine AiPromptbausteinRoutine { get; } = new AiPromptbausteinRoutineDC_AiPromptbausteinRoutine(); + public static AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep AiPromptbausteinRoutineStep { get; } = new AiPromptbausteinRoutineStepDC_AiPromptbausteinRoutineStep(); public static AiUserSettingDC_AiUserSetting AiUserSetting { get; } = new AiUserSettingDC_AiUserSetting(); public static AddressDC_Address Address { get; } = new AddressDC_Address(); public static GkvAbrechnungLightDC_GkvAbrechnungLight GkvAbrechnungLight { get; } = new GkvAbrechnungLightDC_GkvAbrechnungLight(); diff --git a/Service/Service.csproj b/Service/Service.csproj index ce97d80bc..2b652bd05 100644 --- a/Service/Service.csproj +++ b/Service/Service.csproj @@ -247,8 +247,8 @@ - - + + diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs index b71bc814b..cb144d919 100644 --- a/Shared/BeWoEntityEnums.cs +++ b/Shared/BeWoEntityEnums.cs @@ -200,8 +200,8 @@ namespace BS.Shared AiPromptbausteinPrompt = 187, AiPromptbausteinFolder = 188, AiUserSetting = 189, - AiPromptroutine = 190, - AiPromptroutineStep = 191, + AiPromptbausteinRoutine = 190, + AiPromptbausteinRoutineStep = 191, } public enum SystemEntryID diff --git a/Shared/DataContracts/Feature/AI/AiPromptroutineDC.cs b/Shared/DataContracts/Feature/AI/AiPromptbausteinRoutineDC.cs similarity index 69% rename from Shared/DataContracts/Feature/AI/AiPromptroutineDC.cs rename to Shared/DataContracts/Feature/AI/AiPromptbausteinRoutineDC.cs index 5167a54f9..62431f7d4 100644 --- a/Shared/DataContracts/Feature/AI/AiPromptroutineDC.cs +++ b/Shared/DataContracts/Feature/AI/AiPromptbausteinRoutineDC.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BS.Shared.DataContracts.Feature.AI { - public class AiPromptroutineDC : BeWoDataContract, IAiPromptroutine + public class AiPromptbausteinRoutineDC : BeWoDataContract, IAiPromptbausteinRoutine { [DataMember] public string Title { get; set; } [DataMember] public string Description { get; set; } @@ -21,8 +21,8 @@ namespace BS.Shared.DataContracts.Feature.AI [DataMember] public AiActionType ActionType { get; set; } [DataMember] public bool CanEdit { get; set; } - [DataMember] public List Steps { get; set; } = new List { }; + [DataMember] public List Steps { get; set; } = new List { }; - List IAiPromptroutine.Steps => this.Steps.Select(x => x as IAiPromptroutineStep).ToList(); + List IAiPromptbausteinRoutine.Steps => this.Steps.Select(x => x as IAiPromptbausteinRoutineStep).ToList(); } } diff --git a/Shared/DataContracts/Feature/AI/AiPromptroutineStepDC.cs b/Shared/DataContracts/Feature/AI/AiPromptbausteinRoutineStepDC.cs similarity index 85% rename from Shared/DataContracts/Feature/AI/AiPromptroutineStepDC.cs rename to Shared/DataContracts/Feature/AI/AiPromptbausteinRoutineStepDC.cs index e29bed16c..29d504bbe 100644 --- a/Shared/DataContracts/Feature/AI/AiPromptroutineStepDC.cs +++ b/Shared/DataContracts/Feature/AI/AiPromptbausteinRoutineStepDC.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace BS.Shared.DataContracts.Feature.AI { - public class AiPromptroutineStepDC : BeWoDataContract, IAiPromptroutineStep + public class AiPromptbausteinRoutineStepDC : BeWoDataContract, IAiPromptbausteinRoutineStep { [DataMember] public int Position { get; set; } [DataMember] public AiPromptbausteinPromptDC PromptReference { get; set; } diff --git a/Shared/Extensions/AiPromptroutineExtensions.cs b/Shared/Extensions/AiPromptbausteinRoutineExtensions.cs similarity index 79% rename from Shared/Extensions/AiPromptroutineExtensions.cs rename to Shared/Extensions/AiPromptbausteinRoutineExtensions.cs index 7364acb79..a623be80d 100644 --- a/Shared/Extensions/AiPromptroutineExtensions.cs +++ b/Shared/Extensions/AiPromptbausteinRoutineExtensions.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; namespace BS.Shared.Extensions { - public static class AiPromptroutineExtensions + public static class AiPromptbausteinRoutineExtensions { - public static bool CanExecuteRoutine(this IAiPromptroutine routine) + public static bool CanExecuteRoutine(this IAiPromptbausteinRoutine routine) { if (routine?.Steps is null || !routine.Steps.Any()) return false; diff --git a/Shared/Interface/Feature/AICore/IAiPromptroutine.cs b/Shared/Interface/Feature/AICore/IAiPromptbausteinRoutine.cs similarity index 84% rename from Shared/Interface/Feature/AICore/IAiPromptroutine.cs rename to Shared/Interface/Feature/AICore/IAiPromptbausteinRoutine.cs index 512fc4121..fa27a45ca 100644 --- a/Shared/Interface/Feature/AICore/IAiPromptroutine.cs +++ b/Shared/Interface/Feature/AICore/IAiPromptbausteinRoutine.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BS.Shared.Interface.Feature.AICore { - public interface IAiPromptroutine + public interface IAiPromptbausteinRoutine { string Title { get; } string Description { get; } @@ -20,6 +20,6 @@ namespace BS.Shared.Interface.Feature.AICore AiActionType ActionType { get; } bool CanEdit { get; } - List Steps { get; } + List Steps { get; } } } diff --git a/Shared/Interface/Feature/AICore/IAiPromptroutineStep.cs b/Shared/Interface/Feature/AICore/IAiPromptbausteinRoutineStep.cs similarity index 88% rename from Shared/Interface/Feature/AICore/IAiPromptroutineStep.cs rename to Shared/Interface/Feature/AICore/IAiPromptbausteinRoutineStep.cs index 95176e815..d2a511158 100644 --- a/Shared/Interface/Feature/AICore/IAiPromptroutineStep.cs +++ b/Shared/Interface/Feature/AICore/IAiPromptbausteinRoutineStep.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace BS.Shared.Interface.Feature.AICore { - public interface IAiPromptroutineStep + public interface IAiPromptbausteinRoutineStep { int Position { get; } IAiPromptbausteinPrompt Reference { get; } diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 59e22d094..a0f5290cb 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -194,8 +194,8 @@ - - + + @@ -421,7 +421,7 @@ - + @@ -438,8 +438,8 @@ - - + +