diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index abc070b0b..15249bc5f 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.294 + 2.0.1.296 true publish.htm false true - 295 + 297 2.0.1.%2a false true @@ -221,7 +221,7 @@ DeveloperView.xaml - + CustomerWohneinheitenView.xaml @@ -379,7 +379,7 @@ Designer MSBuild:Compile - + MSBuild:Compile Designer diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index bf48c71a8..76223f6f4 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -57,7 +57,7 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.31"; + public static string ShortVersion = "3.32"; public static string Version => BeWoAppInfo.BeWoAppVersion.ToString(); public static int RenderTier = 0; diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index 167ff8fc3..7e2cb7c13 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -2226,8 +2226,6 @@ namespace BeWo.Scheduler.View //vm.Appointments.AddRange(ViewModel.ConvertAbsenceTimesToAppointments(employeeAbsenceTimes.Where(w => { return SelectedEmployees.Count == 0 || SelectedEmployees.Any(a => a.EmployeeOid == w.EmployeeOid); }), end, e, c)); } - Debug.WriteLine("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); - ViewModel.ActiveAppointmentViewModel = vm; ViewModel.SchedulerSettings = ViewModel.GetActiveSettings(); diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs index 3dc635d1f..309f77e8b 100644 --- a/BeWo/View/Detail/CustomerView.xaml.cs +++ b/BeWo/View/Detail/CustomerView.xaml.cs @@ -250,7 +250,11 @@ namespace BeWo.View.Detail ButtonNeuAusAktuellerVerordnung.Visibility = Visibility.Collapsed; ButtonNeueMedikamentenverordnung.Visibility = Visibility.Collapsed; } - + if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.WohnheimView_Wohneinheit_Belegung_Manage)) + { + tabitem_Wohnungsverwaltung.Visibility = Visibility.Collapsed; + } + var l = new List(); for (var i = 9; i >= 0; i--) { diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 16d56484a..8fd09928c 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ C:\Projects\Bewo\BeWo - Main\Host\Properties\PublishProfiles\FolderProfile.pubxml true - Release|Any CPU + Debug|Any CPU diff --git a/Model/Changes_alle_fuer_neue_db.txt b/Model/Changes_alle_fuer_neue_db.txt index d23514ac3..6195d3368 100644 --- a/Model/Changes_alle_fuer_neue_db.txt +++ b/Model/Changes_alle_fuer_neue_db.txt @@ -2088,10 +2088,6 @@ PRIMARY KEY (`Oid`) ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; - - -#------------------------------------------------------------------------------------------------------------------------------------------------------------ - ALTER TABLE `aiconversationmessage` CHANGE COLUMN `Message` `Message` LONGTEXT NULL DEFAULT NULL ; @@ -2122,7 +2118,7 @@ ALTER TABLE `aiconversation` CHANGE COLUMN `UIContext` `ActionType` INT NULL DEFAULT NULL ; UPDATE `aiconversation` -SET ActionType = 1; +SET ActionType = 1 WHERE OID > 0; CREATE TABLE `aipromptbausteinroutine2empfavorite` ( @@ -2135,8 +2131,9 @@ CREATE TABLE `aipromptbausteinroutine2empfavorite` ( ALTER TABLE `aipromptbausteinroutinestep` ADD COLUMN `RoutineOid` BIGINT NULL AFTER `PromptReferenceVersion`, -ADD INDEX `FK_AIPROMPTROUTINESTEP_ROUTINE_idx` (`RoutineOid` ASC) VISIBLE; -; +ADD INDEX `FK_AIPROMPTROUTINESTEP_ROUTINE_idx` (`RoutineOid` ASC); + + ALTER TABLE `aipromptbausteinroutinestep` ADD CONSTRAINT `FK_AIPROMPTROUTINESTEP_ROUTINE` FOREIGN KEY (`RoutineOid`) diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index d284eada3..4df70bdff 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -70,7 +70,7 @@ namespace BeWo.Service.Plugins //t = "5351926758"; // Viva a Vida //t = "2215396183"; // Diakonie Remscheid Lennep //t = "5157599087"; // SHG Schwerte - //t = "4526293996"; // Fortis + t = "4526293996"; // Fortis //t = "3647969417"; // Caritas Bottrop //t = "3057313346"; // SSB Mainz //t = "6246287823"; // BeWo Alsdorf @@ -442,7 +442,7 @@ namespace BeWo.Service.Plugins //t = "9999999999"; // Claude Stundenkontotest //t = "4341679073"; // Caritasverband für den Landkreis Aichach-Friedberg e.V. //t = "1996525562"; // HW Hilfswerk Inklusion und Teilhabe - t = "2348634192"; // Ravensburger Jugendhilfeverein e.V. + //t = "2348634192"; // Ravensburger Jugendhilfeverein e.V. return t; #else