Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

2025-07-15 15:25:31 +02:00
parent 0a5b21a108 a870512fd7
commit 2f4dd8a5a5
24 changed files with 709 additions and 629 deletions
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -43,12 +43,12 @@
    <TargetCulture>de-DE</TargetCulture>
    <ProductName>BeWoPlaner</ProductName>
    <PublisherName>ownSoft GmbH</PublisherName>
-    <MinimumRequiredVersion>2.0.1.268</MinimumRequiredVersion>
+    <MinimumRequiredVersion>2.0.1.270</MinimumRequiredVersion>
    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
    <WebPage>publish.htm</WebPage>
    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
    <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>270</ApplicationRevision>
+    <ApplicationRevision>271</ApplicationRevision>
    <ApplicationVersion>2.0.1.%2a</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -58,7 +58,7 @@ namespace BeWo

 		public static string ShortVersion = "3.26";

-		public static string Version = "Version 3.26";
+		public static string Version = "Version 3.26.2";

 		public static int RenderTier = 0;
 		public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());
--- a/BeWo/View/Detail/SupportConceptView.xaml.cs
+++ b/BeWo/View/Detail/SupportConceptView.xaml.cs
@@ -1972,6 +1972,13 @@ namespace BeWo.View.Detail
            {
                var rating = link.Tag as RatingVM;

+                e.Handled = true;
+
+                if (rating.IsNew)
+                {
+                    MessageBox.Show("Dieser Datensatz muss zuerst gespeichert werden, bevor Sie ihn drucken können.", "Erst speichern bitte", MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
                if (rating != null && rating.DataContract.RatingOid.HasValue)
                {
                    var url = BeWoApp.SiteOfOrigin + "/ReportView.aspx"
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -304,6 +304,10 @@
    <Compile Include="Controllers\ReportViewerController.cs" />
    <Compile Include="Controllers\SchedulerController.cs" />
    <Compile Include="Models\AbstractModel.cs" />
+    <Compile Include="Models\MokZiel.cs" />
+    <Compile Include="Models\MokSupportConceptListObject.cs" />
+    <Compile Include="Models\MokMandator.cs" />
+    <Compile Include="Models\MokServiceRecord.cs" />
    <Compile Include="Models\SchedulerSessionModel.cs" />
    <Compile Include="Models\MainSessionModel.cs" />
    <Compile Include="Models\ReportSessionModel .cs" />
@@ -318,8 +322,6 @@
    <Compile Include="Models\ReportViewerModel.cs" />
    <Compile Include="Models\SchedulerModel.cs" />
    <Compile Include="Util\DcToMokMapper.cs" />
-    <Compile Include="Util\MokServiceRecord.cs" />
-    <Compile Include="Util\MokMandator.cs" />
    <Compile Include="Util\MokSettings.cs" />
    <Compile Include="Util\AppointmentListItem.cs" />
    <Compile Include="Util\BeWoLoginState.cs" />
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <ProjectView>ProjectFiles</ProjectView>
    <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
--- a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs
+++ b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs
@@ -117,6 +117,11 @@ namespace BeWoPlanerMobil.Controllers

        public static int TimeoutLimit => System.Web.HttpContext.Current.Session.Timeout;

+        public bool IsUserLoggedIn()
+        {
+            return MobileSessionFacade.IsUserLoggedIn();
+        }
+
        [Authorize]
        public ActionResult UpdateApplicationSettings(string pKey, string pValue)
        {
--- a/BeWoPlanerMobil/Controllers/CustomerController.cs
+++ b/BeWoPlanerMobil/Controllers/CustomerController.cs
@@ -120,7 +120,7 @@ namespace BeWoPlanerMobil.Controllers
                Model.ReportTypes = new List<CustomerReportType> { CustomerReportType.Medikamentenliste, CustomerReportType.Bedarfsmedikation, CustomerReportType.Historie };
            }

-            Model.AllAbsenceReasons = Model.HasRightToViewCustomerAbsenceTimes ? CustomerService.GetAllAbsenceReasons() : new List<AbsenceReasonDC>();
+            Model.AllAbsenceReasons = Model.HasRightToViewCustomerAbsenceTimes ? CustomerService.GetAllAbsenceReasons().Where(a => !a.Sichtbarkeit.HasValue || a.Sichtbarkeit.Value == AbsenceReasonVisibilityType.All || a.Sichtbarkeit.Value == AbsenceReasonVisibilityType.Customer).ToList()  : new List<AbsenceReasonDC>();

            
            
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
--- a/BeWoPlanerMobil/Models/MainModel.cs
+++ b/BeWoPlanerMobil/Models/MainModel.cs
@@ -69,7 +69,11 @@ namespace BeWoPlanerMobil.Models
                MainSessionModel.TransferringAppointmentOid = value;
            }
        }
-        public bool IsInTransferMode { get; set; }
+        public bool IsInTransferMode
+        {
+            get => MainSessionModel.IsInTransferMode;
+            set => MainSessionModel.IsInTransferMode = value;
+        }

        public List<SelectListItem> SupportConceptFilter
        {
@@ -247,9 +251,12 @@ namespace BeWoPlanerMobil.Models
            set => MainSessionModel.SelectedSupportConceptOid = value;
        }

-        public SupportConceptDC SelectedSupportConcept { get; set; }
-        
-		public int Zeitraum { get; set; }
+        public CompactSupportConceptDC SelectedSupportConcept { get; set; }
+
+        public MokSupportConceptListObject SelectedSupportConceptListObject { get; set; }
+
+
+        public int Zeitraum { get; set; }

        public int ErrorWert { get; set; }

@@ -261,7 +268,7 @@ namespace BeWoPlanerMobil.Models
            set => MainSessionModel.LastCreatedServiceRecordOid = value;
        }

-        public List<SupportConceptDC> SupportConcepts { get; set; }
+        public List<CompactSupportConceptDC> SupportConcepts { get; set; }

        public List<TextModuleDC> Textbausteine { get; set; } = new List<TextModuleDC>();

@@ -290,13 +297,11 @@ namespace BeWoPlanerMobil.Models
            set => MainSessionModel.SelectedGoalOids = value;
        }
        
-        private List<ValueListEntryDC> _SelectedGoals;
-
-        public List<ValueListEntryDC> SelectedGoals
+        
+        public IList<MokZiel> SelectedGoals
        {
-            get => _SelectedGoals ?? new List<ValueListEntryDC>();
-
-            set => _SelectedGoals = value;
+            get => MainSessionModel.SelectedGoals;
+            set => MainSessionModel.SelectedGoals = value;
        }

        private string GetRatingName(ValueListEntryDC ratedValueListEntry)
@@ -310,60 +315,17 @@ namespace BeWoPlanerMobil.Models

 		public long? ServiceRecordOidToDelete { get; set; }

-	    

-        public IEnumerable<CostBearer2SupportConceptRelListObject> SupportConceptListObjects
+        public IList<MokSupportConceptListObject> SupportConceptListObjects
        {
-            get
-            {
-                var allCostBearerRelations = new List<CostBearer2SupportConceptRelListObject> {new CostBearer2SupportConceptRelListObject("Hilfeplan auswählen", "", -1, false, false), new CostBearer2SupportConceptRelListObject("Ohne Hilfeplan", "", -2, false, false) };
-                BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = MokSettings.SupportConceptExpirationLimitInMonths;
-                foreach (var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
-                {
-                    allCostBearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now.Date).Select(
-                        cb => new CostBearer2SupportConceptRelListObject(
-                            $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}", 
-                            $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}", 
-                            cb.CostBearer2SupportConceptOid.Value, 
-                            cb.SupportConcept.IsAboutToExpire,
-                            cb.SupportConcept.ExpiresIn3MonthOrLess))
-                    );
-                }
-                return allCostBearerRelations;
-            }
+            get => MainSessionModel.SupportConceptListObjects;
+            set => MainSessionModel.SupportConceptListObjects = value;
        }

-        public CostBearer2SupportConceptRelListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
+        public IList<MokSupportConceptListObject> SupportConceptListObjectsForGroupBooking { get; set; }

-        public List<long> SelectedConceptCostBearerRelationOids { get { return MainSessionModel.SelectedConceptCostBearerRelations; } set { MainSessionModel.SelectedConceptCostBearerRelations = value; } }

-        public List<SupportConceptCostBearerRelDC> SelectedConceptCostBearerRelations { get; set; } = new List<SupportConceptCostBearerRelDC>();
-
-        public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, GroupBookingSelectedGroupOfPeopleOids);
-
-        public IEnumerable<CostBearer2SupportConceptRelListObject> SupportConceptListObjectsForGroupBooking
-        {
-            get
-            {
-                var allCostbearerRelations = new List<CostBearer2SupportConceptRelListObject>();
-
-                foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
-                {
-                    allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now).Select(
-                        cb => new CostBearer2SupportConceptRelListObject(
-                            $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}", 
-                            $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}", 
-                            cb.CostBearer2SupportConceptOid.Value, 
-                            cb.SupportConcept.IsAboutToExpire, 
-                            cb.SupportConcept.ExpiresIn3MonthOrLess))
-                    );
-                }
-
-                return allCostbearerRelations;
-            }
-        }
-
-	    public IEnumerable<SelectListItem> GroupOfPeopleListItems
+        public IEnumerable<SelectListItem> GroupOfPeopleListItems
 	    {
 	        get
 	        {
@@ -386,9 +348,9 @@ namespace BeWoPlanerMobil.Models

 	    public List<GroupOfPeopleDC> GroupsOfPeople { get; set; } = new List<GroupOfPeopleDC>();

-        public List<long> GroupBookingSelectedGroupOfPeopleOids { get; set; } = new List<long>();
+        public List<long> GroupBookingSelectedGroupOfPeopleOids { get { return MainSessionModel.GroupBookingSelectedGroupOfPeopleOids; } set { MainSessionModel.GroupBookingSelectedGroupOfPeopleOids = value; } }

-		public IEnumerable<SelectListItem> EmployeeListItems
+        public IEnumerable<SelectListItem> EmployeeListItems
 		{
 			get
 			{
@@ -403,27 +365,15 @@ namespace BeWoPlanerMobil.Models

        public int NumberOfDokuTypes => Dokutypes?.Length ?? 0;

-        public static DateTime? GetEndDateOfSupportConcept(SupportConceptDC pSupportConcept)
-	    {
-            DateTime? maxDate = null;

-	        foreach(var relation in pSupportConcept.CostBearerRelations)
-	        {
-	            var end = relation.ApprovedEndDate ?? relation.RequestedEndDate;
-	            
-                if(maxDate is null || end != null && end.Value > maxDate.Value)
-	            {
-	                maxDate = end;
-	            }
-	        }
+        //public List<long> GroupBookingSelectedSupportConceptOids { get { return MainSessionModel.GroupBookingSelectedSupportConceptOids; } set { MainSessionModel.GroupBookingSelectedSupportConceptOids = value; } }
+        //public List<CompactSupportConceptDC> GroupBookingSelectedSupportConcepts { get; set; } = new List<CompactSupportConceptDC>();

-	        return maxDate;
-        }
+	    public List<long> GroupBookingSelectedCostBearerSupportConceptOids { get { return MainSessionModel.GroupBookingSelectedCostBearerSupportConceptOids; } set { MainSessionModel.GroupBookingSelectedCostBearerSupportConceptOids = value; } }

-        public List<long> GroupBookingSelectedSupportConceptOids { get { return MainSessionModel.GroupBookingSelectedSupportConceptOids; } set { MainSessionModel.GroupBookingSelectedSupportConceptOids = value; } }
-        public List<SupportConceptDC> GroupBookingSelectedSupportConcepts { get; set; } = new List<SupportConceptDC>();
+        public List<SupportConceptCostBearerRelDC> GroupBookingSelectedCostBearerSupportConcepts { get; set; } = new List<SupportConceptCostBearerRelDC>();

-	    public List<long> GroupBookingSelectedCostbearerRelOids { get { return MainSessionModel.GroupBookingSelectedCostbearerRelOids; } set { MainSessionModel.GroupBookingSelectedCostbearerRelOids = value; } }
+        public GroupBookingSelectionObject GroupBookingSelectionObject => new GroupBookingSelectionObject(GroupBookingSelectedCostBearerSupportConcepts, GroupBookingSelectedGroupOfPeopleOids);

        public List<long> GroupBookingSelectedEmployeeOids { get { return MainSessionModel.GroupBookingSelectedEmployeeOids; } set { MainSessionModel.GroupBookingSelectedEmployeeOids = value; } }
        public List<CompactEmployeeDC> GroupBookingSelectedEmployees { get; set; } = new List<CompactEmployeeDC>();
@@ -439,10 +389,12 @@ namespace BeWoPlanerMobil.Models
 	            
 	            if(!MainSessionModel.IsInGroupBookingMode)
 	            {
-	                GroupBookingSelectedSupportConcepts?.Clear();
+	                GroupBookingSelectedCostBearerSupportConceptOids?.Clear();
+                    GroupBookingSelectedCostBearerSupportConcepts.Clear();
+                    GroupBookingSelectedEmployeeOids.Clear();
 	                GroupBookingSelectedEmployees?.Clear();
-                    GroupBookingSelectedSupportConceptOids?.Clear();
-                    GroupBookingSelectedEmployeeOids?.Clear();
+                    GroupBookingSelectedGroupOfPeopleOids.Clear();
+                    //GroupBookingSelectedSupportConcept?.Clear();
                }
            }
 	    }
@@ -519,14 +471,26 @@ namespace BeWoPlanerMobil.Models
            var start = serviceRecord.Start.Value;
            var end = serviceRecord.End.Value;
            var gruppenInfo = string.Empty;
+            var dauerInfo = string.Empty;
            var signatureToken = serviceRecord.SignatureOid.HasValue && isForServiceRecordsList ? "✔" : string.Empty;

+            var dauer = (end - start).TotalMinutes;
+            if (serviceRecord.DurationInStunden.HasValue && serviceRecord.DurationInStunden == ZeiterfassungsDauer.Stunden)
+            {
+                dauer /= 60;
+                dauerInfo = $" ({dauer:0.0#} h)";
+            }
+            else
+            {
+                dauerInfo = $" ({dauer:0.##} min.)";
+            }
            if (serviceRecord.GroupOid.HasValue)
            {
-                gruppenInfo = $"Gruppe ({serviceRecord.GroupPersonCount} Teilnehmer, {serviceRecord.GroupEmployeeCount} Betreuer) Dauer: {(end - start).TotalMinutes}  {signatureToken}";
+                gruppenInfo = $" Gruppe ({serviceRecord.GroupPersonCount} Teilnehmer, {serviceRecord.GroupEmployeeCount} Betreuer)";
            }
+           

-            return $"{GetServiceRecordTimeString(serviceRecord)} {gruppenInfo} {signatureToken}";
+            return $"{GetServiceRecordTimeString(serviceRecord)}{gruppenInfo}{dauerInfo}  {signatureToken}";
        }

        public static string GetServiceRecordTimeString(ServiceRecordDC serviceRecord)
@@ -803,42 +767,7 @@ namespace BeWoPlanerMobil.Models
        [Display(Name = "Mehrfachbuchung")]
        public bool IsInMultiBookingMode { get { return MainSessionModel.IsInMultiBookingMode; } set { MainSessionModel.IsInMultiBookingMode = value; } }

-        public List<long> MultiBookingSelectedSupportConceptOids { get { return MainSessionModel.MultiBookingSelectedSupportConceptOids; } set { MainSessionModel.MultiBookingSelectedSupportConceptOids = value; } }
-
-        public List<SupportConceptDC> MultiBookingSelectedSupportConcepts { get; set; } = new List<SupportConceptDC>();
-
-        public List<long> MultiBookingSelectedGroupOfPeopleOids { get { return MainSessionModel.MultiBookingSelectedGroupOfPeopleOids; } set { MainSessionModel.MultiBookingSelectedGroupOfPeopleOids = value; } }
-
-        //public List<SupportConceptCostBearerRelDC> MultiBookingSelectedConceptCostBearerRelations { get; set; }
-
-        public GroupBookingSelectionObject MultiBookingSelectionObject => new GroupBookingSelectionObject(SelectedConceptCostBearerRelations, MultiBookingSelectedGroupOfPeopleOids);
-
-        public List<long> MultiBookingSelectedCostbearerRelOids { get { return MainSessionModel.MultiBookingSelectedCostbearerRelOids; } set { MainSessionModel.MultiBookingSelectedCostbearerRelOids = value; } }
-
-        public List<long> MultiBookingSelectedEmployeeOids { get { return MainSessionModel.MultiBookingSelectedEmployeeOids; } set { MainSessionModel.MultiBookingSelectedEmployeeOids = value; } }
-        public List<CompactEmployeeDC> MultiBookingSelectedEmployees { get; set; } = new List<CompactEmployeeDC>();
-
-        public List<CostBearer2SupportConceptRelListObject> MultiBookingSupportConceptListObjects
-        {
-            get
-            {
-                var allCostbearerRelations = new List<CostBearer2SupportConceptRelListObject>();
-
-                foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
-                {
-                    allCostbearerRelations.AddRange(sc.CostBearerRelations.Where(w => ShowExpiredSupportConcepts || w.EndDate is null || w.EndDate.Value >= DateTime.Now).Select(
-                        cb => new CostBearer2SupportConceptRelListObject(
-                            $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
-                            $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}",
-                            cb.CostBearer2SupportConceptOid.Value,
-                            cb.SupportConcept.IsAboutToExpire,
-                            cb.SupportConcept.ExpiresIn3MonthOrLess))
-                    );
-                }
-
-                return allCostbearerRelations;
-            }
-        }
+        

        #endregion

@@ -915,62 +844,4 @@ namespace BeWoPlanerMobil.Models
            CostBearer2SupportConceptOid = costBearer2SupportConceptOid;
        }
    }
-
-    public class CostBearer2SupportConceptRelListObject
-    {
-        public string NameAndDateOfBirth { get; }
-
-        public string SupportConceptTimeSpan { get; }
-
-        public long CostBearer2SupportConceptOid { get;  }
-
-        public string CostBearer2SupportConceptOidName { get; }
-
-        public bool IsAboutToExpire { get; }
-        public bool ExpiresInThreeMonthsOrLess { get; }
-
-
-        public CostBearer2SupportConceptRelListObject(string pNameAndDateOfBirth, string pSupportConceptTimeSpan, long pCostBearer2SupportConceptOid, bool isAboutToExpire, bool expiresIn3MonthOrLess)
-        {
-            NameAndDateOfBirth = pNameAndDateOfBirth;
-            SupportConceptTimeSpan = pSupportConceptTimeSpan;
-            CostBearer2SupportConceptOid = pCostBearer2SupportConceptOid;
-
-            CostBearer2SupportConceptOidName = String.Format("OidHolder_{0}", CostBearer2SupportConceptOid);
-
-            IsAboutToExpire = isAboutToExpire;
-            ExpiresInThreeMonthsOrLess = expiresIn3MonthOrLess;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (!(obj is CostBearer2SupportConceptRelListObject))
-            {
-                return false;
-            }
-
-            var obj2 = (CostBearer2SupportConceptRelListObject) obj;
-
-            return Equals(CostBearer2SupportConceptOid, obj2.CostBearer2SupportConceptOid);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                const int hashingBase = (int)2166136261;
-                const int hashingMultiplier = 16777619;
-
-                var hash = hashingBase;
-
-                hash = (hash * hashingMultiplier) ^ (NameAndDateOfBirth?.GetHashCode() ?? 0);
-                hash = (hash * hashingMultiplier) ^ (SupportConceptTimeSpan?.GetHashCode() ?? 0);
-                hash = (hash * hashingMultiplier) ^ (CostBearer2SupportConceptOid.GetHashCode());
-                hash = (hash * hashingMultiplier) ^ IsAboutToExpire.GetHashCode();
-                hash = (hash * hashingMultiplier) ^ ExpiresInThreeMonthsOrLess.GetHashCode();
-
-                return hash;
-            }
-        }
-    }
 }
--- a/BeWoPlanerMobil/Models/MainSessionModel.cs
+++ b/BeWoPlanerMobil/Models/MainSessionModel.cs
@@ -20,24 +20,23 @@ namespace BeWoPlanerMobil.Models
        public long? SelectedServiceRecordOid { get; internal set; }
        public long? SelectedEmployeeOid { get; internal set; }
        public NullableDateTimeSpan SelectedZeitraum { get; internal set; }
-        public List<long> SelectedConceptCostBearerRelations { get; internal set; }
+        public List<long> GroupBookingSelectedCostBearerSupportConceptOids { get; internal set; }
        public List<long> GroupBookingSelectedSupportConceptOids { get; internal set; }
        public List<long> GroupBookingSelectedEmployeeOids { get; internal set; }
-        public List<long> GroupBookingSelectedCostbearerRelOids { get; internal set; }
+        public List<long> GroupBookingSelectedGroupOfPeopleOids { get; internal set; }
        public bool IsInGroupBookingMode { get; internal set; }
+        public bool IsInMultiBookingMode { get; internal set; }
        public bool IsInEditingMode { get; internal set; }
        public long? PreviouslySelectedEmployeeOid { get; internal set; }
        public long? PreviouslySelectedSupportConceptOid { get; internal set; }
        public long? PreviouslySelectedCostbearer2SupportConceptOid { get; internal set; }
-        public bool IsInMultiBookingMode { get; internal set; }
-        public List<long> MultiBookingSelectedSupportConceptOids { get; internal set; }
-        public List<long> MultiBookingSelectedGroupOfPeopleOids { get; internal set; }
-        public List<long> MultiBookingSelectedCostbearerRelOids { get; internal set; }
-        public List<long> MultiBookingSelectedEmployeeOids { get; internal set; }
        public int CurrentPage { get; internal set; }
        public List<long> SelectedGoalOids { get; internal set; }
        public long LastCreatedServiceRecordOid { get; internal set; }
        public long? TransferringAppointmentOid { get; internal set; }
+        public IList<MokSupportConceptListObject> SupportConceptListObjects { get; internal set; }
+        public bool IsInTransferMode { get; internal set; }
+        public IList<MokZiel> SelectedGoals { get; internal set; }

        public void ResetValues()
        {
@@ -54,14 +53,16 @@ namespace BeWoPlanerMobil.Models
            SelectedEmployeeOid = null;
            SelectedZeitraum = null;

-            SelectedConceptCostBearerRelations = new List<long>();
+            GroupBookingSelectedCostBearerSupportConceptOids = new List<long>();
            GroupBookingSelectedSupportConceptOids = new List<long>();
            GroupBookingSelectedEmployeeOids = new List<long>();
-            GroupBookingSelectedCostbearerRelOids = new List<long>();
-            MultiBookingSelectedSupportConceptOids = new List<long>();
-            MultiBookingSelectedGroupOfPeopleOids = new List<long>();
-            MultiBookingSelectedCostbearerRelOids = new List<long>();
-            MultiBookingSelectedEmployeeOids = new List<long>();
+            GroupBookingSelectedGroupOfPeopleOids = new List<long>();
+
+            //GroupBookingSelectedCostbearerRelOids = new List<long>();
+            //MultiBookingSelectedSupportConceptOids = new List<long>();
+
+            //MultiBookingSelectedCostbearerRelOids = new List<long>();
+            //MultiBookingSelectedEmployeeOids = new List<long>();

            SelectedGoalOids = new List<long>();

@@ -72,11 +73,14 @@ namespace BeWoPlanerMobil.Models
            IsInGroupBookingMode = false;
            IsInEditingMode = false;
            IsInMultiBookingMode = false;
+            IsInTransferMode = false;

            CurrentPage = 0;
            LastCreatedServiceRecordOid = 0;

            TransferringAppointmentOid = null;
+            SupportConceptListObjects = new List<MokSupportConceptListObject>();
+            SelectedGoals = new List<MokZiel>();
        }
    }
 }
--- a/BeWoPlanerMobil/Models/MokMandator.cs
+++ b/BeWoPlanerMobil/Models/MokMandator.cs
@@ -4,7 +4,7 @@ using System;
 using System.Runtime.Serialization;
 using System.Windows.Media;

-namespace BeWoPlanerMobil.Util
+namespace BeWoPlanerMobil.Models
 {
 	[Serializable]
 	public class MokMandator
--- a/BeWoPlanerMobil/Models/MokServiceRecord.cs
+++ b/BeWoPlanerMobil/Models/MokServiceRecord.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Windows.Media;

-namespace BeWoPlanerMobil.Util
+namespace BeWoPlanerMobil.Models
 {
 	[Serializable]
    public class MokServiceRecord
--- a/BeWoPlanerMobil/Models/MokSupportConceptListObject.cs
+++ b/BeWoPlanerMobil/Models/MokSupportConceptListObject.cs
@@ -0,0 +1,67 @@
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.DataContracts.Invoicing;
+using System;
+using System.Runtime.Serialization;
+using System.Windows.Media;
+
+namespace BeWoPlanerMobil.Models
+{
+	[Serializable]
+	public class MokSupportConceptListObject
+	{
+        public string NameAndDateOfBirth { get; set; }
+
+        public string SupportConceptTimeSpan { get; set; }
+
+        public long SupportConceptOid { get; }
+
+        public long CostBearer2SupportConceptOid { get; }
+
+        public string CostBearer2SupportConceptOidName { get; }
+
+        public bool IsAboutToExpire { get; }
+        public bool ExpiresInThreeMonthsOrLess { get; }
+
+
+        public MokSupportConceptListObject(long supportConceptOid, long costBearer2SupportConceptOid, bool isAboutToExpire, bool expiresIn3MonthOrLess)
+        {
+            SupportConceptOid = supportConceptOid;
+            CostBearer2SupportConceptOid = costBearer2SupportConceptOid;
+            CostBearer2SupportConceptOidName = String.Format("OidHolder_{0}", CostBearer2SupportConceptOid);
+
+            IsAboutToExpire = isAboutToExpire;
+            ExpiresInThreeMonthsOrLess = expiresIn3MonthOrLess;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (!(obj is MokSupportConceptListObject))
+            {
+                return false;
+            }
+
+            var obj2 = (MokSupportConceptListObject)obj;
+
+            return Equals(CostBearer2SupportConceptOid, obj2.CostBearer2SupportConceptOid);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                const int hashingBase = (int)2166136261;
+                const int hashingMultiplier = 16777619;
+
+                var hash = hashingBase;
+
+                hash = (hash * hashingMultiplier) ^ (NameAndDateOfBirth?.GetHashCode() ?? 0);
+                hash = (hash * hashingMultiplier) ^ (SupportConceptTimeSpan?.GetHashCode() ?? 0);
+                hash = (hash * hashingMultiplier) ^ (CostBearer2SupportConceptOid.GetHashCode());
+                hash = (hash * hashingMultiplier) ^ IsAboutToExpire.GetHashCode();
+                hash = (hash * hashingMultiplier) ^ ExpiresInThreeMonthsOrLess.GetHashCode();
+
+                return hash;
+            }
+        }
+    }
+}
--- a/BeWoPlanerMobil/Models/MokZiel.cs
+++ b/BeWoPlanerMobil/Models/MokZiel.cs
@@ -0,0 +1,53 @@
+using BS.Shared;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.DataContracts.Invoicing;
+using System;
+using System.Runtime.Serialization;
+using System.Windows.Media;
+
+namespace BeWoPlanerMobil.Models
+{
+	[Serializable]
+	public class MokZiel
+	{
+		public long? ValueListEntryOid { get; set; }
+
+        public long? ParentOid { get; set; }
+
+        public long? RatingTypeOid { get; set; }
+
+        public ValueListEntryType Type { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is MokZiel)
+            {
+                var y = (MokZiel)obj;
+                if (this.ValueListEntryOid == null && y.ValueListEntryOid == null)
+                {
+                    return this.GetHashCode() == y.GetHashCode();
+                }
+
+                if (this.ValueListEntryOid != null && y.ValueListEntryOid != null)
+                {
+                    return this.ValueListEntryOid == y.ValueListEntryOid;
+                }
+            }
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return this.ValueListEntryOid.HasValue ? this.GetType().Name.GetHashCode() ^ this.ValueListEntryOid.GetHashCode() : base.GetHashCode();
+        }
+
+        public override string ToString()
+        {
+            return this.DisplayName;
+        }
+
+    }
+}
--- a/BeWoPlanerMobil/Models/ReportViewerModel.cs
+++ b/BeWoPlanerMobil/Models/ReportViewerModel.cs
@@ -174,22 +174,25 @@ namespace BeWoPlanerMobil.Models

        public List<SupportConceptDC> SupportConcepts { get; set; }

-        public CostBearer2SupportConceptRelListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }
+        public MokSupportConceptListObject SelectedCostBearer2SupportConceptRelListObject { get; set; }

-        public IEnumerable<CostBearer2SupportConceptRelListObject> CostBearer2SupportConceptRelListObjects
+        public IEnumerable<MokSupportConceptListObject> CostBearer2SupportConceptRelListObjects
        {
            get
            {
-                var allCostBearerRelations = new List<CostBearer2SupportConceptRelListObject> { new CostBearer2SupportConceptRelListObject("Hilfeplan auswählen", "", 0, false, false) };
+                var allCostBearerRelations = new List<MokSupportConceptListObject> { new MokSupportConceptListObject(0, 0, false, false) { NameAndDateOfBirth = "Hilfeplan auswählen" } };
                foreach(var sc in SupportConcepts.OrderBy(sc => sc.Customer.LastName))
                {
                    allCostBearerRelations.AddRange(sc.CostBearerRelations.Select(
-                        cb => new CostBearer2SupportConceptRelListObject(
-                            $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
-                            $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}",
+                        cb => new MokSupportConceptListObject(
+                            sc.SupportConceptOid.Value,
                            cb.CostBearer2SupportConceptOid.Value,
                            cb.SupportConcept.IsAboutToExpire,
-                            cb.SupportConcept.ExpiresIn3MonthOrLess))
+                            cb.SupportConcept.ExpiresIn3MonthOrLess)
+                        {
+                            NameAndDateOfBirth = $"{sc.Customer.SimpleDescription} {(sc.Customer.DateOfBirth.HasValue ? "*" + sc.Customer.DateOfBirth.Value.ToString("dd.MM.yyyy") : string.Empty)}",
+                            SupportConceptTimeSpan = $"{cb.AuswahlBezeichnung} {cb.StartDate?.ToShortDateString().Remove(6, 2) ?? string.Empty}-{cb.EndDate?.ToShortDateString().Remove(6, 2) ?? string.Empty} {cb.CostBearer.Name}{GetIsNotApproved(cb)}"
+                        })
                    );
                }
                return allCostBearerRelations;
--- a/BeWoPlanerMobil/Service/MobileSessionFacade.cs
+++ b/BeWoPlanerMobil/Service/MobileSessionFacade.cs
@@ -6,7 +6,7 @@ using BeWo.Data.Entities;
 using BeWo.Service.DCEntityMapper;
 using BeWo.Service.ServiceContracts;
 using BeWo.Service.ServiceImplementations;
-using BeWoPlanerMobil.Util;
+using BeWoPlanerMobil.Models;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
--- a/BeWoPlanerMobil/Util/DcToMokMapper.cs
+++ b/BeWoPlanerMobil/Util/DcToMokMapper.cs
@@ -23,6 +23,24 @@ namespace BeWoPlanerMobil.Util
 			
        }

+		public static MokZiel CreateZiel(ValueListEntryDC dc)
+		{
+			return new MokZiel
+			{
+				ValueListEntryOid = dc.ValueListEntryOid,
+				RatingTypeOid = dc.RatingTypeOid,
+				Type = dc.Type,
+				DisplayName = dc.DisplayName,
+				ParentOid = dc.ParentOid
+			};
+
+		}
+
+		public static IList<MokZiel> CreateZiele(IEnumerable<ValueListEntryDC> dclist)
+		{
+			return dclist.Select(g => CreateZiel(g)).ToList();
+		}
+
 		public static MokServiceRecord CreateServiceRecord(ServiceRecordDC dc, ReportModel model)
 		{
 			var s = new MokServiceRecord
--- a/BeWoPlanerMobil/Views/Main/GroupBookingScCbRelList.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GroupBookingScCbRelList.cshtml
@@ -21,7 +21,7 @@
                    var timeSpanColorClass2 = cb2Sc.IsAboutToExpire ? "text-bewo-is-about-to-expire" : cb2Sc.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";


-                    var checkedValue = Model.SelectedConceptCostBearerRelations.Any(a => a.CostBearer2SupportConceptOid == cb2Sc.CostBearer2SupportConceptOid);
+                    var checkedValue = Model.GroupBookingSelectedCostBearerSupportConceptOids.Any(a => a == cb2Sc.CostBearer2SupportConceptOid);

                }

--- a/BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml
@@ -65,7 +65,7 @@
 </div>

@* Ziele *@
-@if((Model.GroupBookingSelectedSupportConcepts?.Any() ?? false) && Model.GroupBookingSelectedSupportConcepts.Any(sc => sc.Goals.Any()))
+@if((Model.GroupBookingSelectedCostBearerSupportConcepts?.Any() ?? false) && (Model.AllGoals?.Any() ?? false))
 {
    <div class="form-row my-0">
        <div class="col-md">
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -156,8 +156,8 @@
 		        "#betrag"
 	        ).prop("disabled", (isSupportConceptSelected ? false : true));

-	        if("@Model.IsInGroupBookingMode".toLowerCase() === "true") {
-		        const hasSelectedSupportConcepts = "@Model.SelectedConceptCostBearerRelations.Any()".toLowerCase() === "true";
+            if ("@Model.IsInGroupBookingMode".toLowerCase() === "true") {
+                const hasSelectedSupportConcepts = "@Model.GroupBookingSelectedCostBearerSupportConceptOids.Any()".toLowerCase() === "true";

 		        $(
 			        "#employees-button, " +
@@ -183,7 +183,7 @@
 	        $("#fehlerdetail-textarea").prop("disabled", false);

 			if ("@Model.IsInMultiBookingMode".toLowerCase() === "true") {
-				const isMultiBookingFormDisabled = "@Model.SelectedConceptCostBearerRelations.Any()".toLowerCase() === "false";
+				const isMultiBookingFormDisabled = "@Model.GroupBookingSelectedCostBearerSupportConceptOids.Any()".toLowerCase() === "false";

 		        window.toggleMultiBookingForm(isMultiBookingFormDisabled);
 	        }
@@ -449,7 +449,7 @@
            </div>
            <div class="modal-body">
                <div id="tree">
-                    @{ Html.RenderAction("LoadUpToDateTextModules"); }
+                    @{ Html.RenderPartial("TextModulePartial", Model); }
                </div>
            </div>
            <div class="modal-footer">
--- a/BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml
@@ -158,7 +158,7 @@

                @foreach(var employee in Model.EmployeesForGroupAndMultiBooking)
                {
-                    var checkedValue = Model.MultiBookingSelectedEmployees.Contains(employee) ? "checked=\"checked\"" : string.Empty;
+                    var checkedValue = Model.GroupBookingSelectedEmployees.Contains(employee) ? "checked=\"checked\"" : string.Empty;

                    <div class="custom-control custom-checkbox employee-text">
                        <input type="checkbox" @checkedValue class="custom-control-input" id="multi-employee-@employee.EmployeeOid" onchange="addEmployeeToMultiBooking()" value="@employee.EmployeeOid" />
--- a/BeWoPlanerMobil/Views/Main/MultiBookingScCbRelList.cshtml
+++ b/BeWoPlanerMobil/Views/Main/MultiBookingScCbRelList.cshtml
@@ -14,13 +14,13 @@

 <div class="tab-pane show active" role="tabpanel" id="multi-booking-supportconcepts">
    <ul class="list-group">
-        @foreach(var cb2Sc in Model.MultiBookingSupportConceptListObjects)
+        @foreach(var cb2Sc in Model.SupportConceptListObjectsForGroupBooking)
        {
            <li class="list-group-item">
                @{
                    var timeSpanColorClass2 = cb2Sc.IsAboutToExpire ? "text-bewo-is-about-to-expire" : cb2Sc.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";

-                    var checkedValue = Model.SelectedConceptCostBearerRelations.Any(a => a.CostBearer2SupportConceptOid.Equals(cb2Sc.CostBearer2SupportConceptOid));
+                    var checkedValue = Model.GroupBookingSelectedCostBearerSupportConceptOids.Any(a => a.Equals(cb2Sc.CostBearer2SupportConceptOid));
                }

                <div class="custom-control custom-checkbox custom-control-inline">
@@ -49,7 +49,7 @@
                @{
                    var wasSuccessful = long.TryParse(group.Value, out var groupOid);

-                    var shouldBeChecked = wasSuccessful ? Model.MultiBookingSelectedGroupOfPeopleOids.Contains(groupOid) : wasSuccessful;
+                    var shouldBeChecked = wasSuccessful ? Model.GroupBookingSelectedGroupOfPeopleOids.Contains(groupOid) : wasSuccessful;

                    var attribute = shouldBeChecked ? "checked=\"checked\"" : string.Empty;
                }
--- a/BeWoPlanerMobil/Views/Main/MultiBookingSelectionPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/MultiBookingSelectionPartial.cshtml
@@ -23,10 +23,10 @@
 <div class="form-row">
    <div class="col-md">
 	    <div class="form-group my-0">
-			@if(Model.MultiBookingSelectionObject.SelectedRelations.Any())
+			@if(Model.GroupBookingSelectionObject.SelectedRelations.Any())
 			{
 				<div class="list-group mt-2" id="mb-selected-cb2sc-list">
-					@foreach(var selectedCb2ScRelation in Model.MultiBookingSelectionObject.SelectedRelations)
+					@foreach(var selectedCb2ScRelation in Model.GroupBookingSelectionObject.SelectedRelations)
 					{
 						<div class="list-group-item bg-bewo-task-red" id="mb-relation-item-@selectedCb2ScRelation.Value">
 							<div class="row">
@@ -58,7 +58,7 @@
    <div class="col-md">
        <div class="form-group my-0">
            <button type="button" class="btn btn-bewo-employee btn-block mt-2" data-toggle="modal" data-target="#multi-booking-employee-selection-popup" id="multi-booking-employees-button">
-                Mitarbeiter hinzufügen <span class="badge badge-light text-primary" id="multi-booking-selected-employees-count-badge">@Model.MultiBookingSelectedEmployees.Count</span>
+                Mitarbeiter hinzufügen <span class="badge badge-light text-primary" id="multi-booking-selected-employees-count-badge">@Model.GroupBookingSelectedEmployees.Count</span>
            </button>
        </div>
    </div>
--- a/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
+++ b/BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
@@ -157,9 +157,9 @@
        {
            using (Html.BeginForm("SelectSupportConcept", "Main", FormMethod.Post, new { Id = "selectSupportConceptForm", onreset = "resetSingleBookingForm()" }))
            {
-                var selectedSuportConceptTimeSpanColorClass = Model.SelectedCostBearer2SupportConceptRelListObject.IsAboutToExpire
+                var selectedSuportConceptTimeSpanColorClass = Model.SelectedSupportConceptListObject.IsAboutToExpire
                    ? "text-bewo-is-about-to-expire"
-                    : Model.SelectedCostBearer2SupportConceptRelListObject.ExpiresInThreeMonthsOrLess
+                    : Model.SelectedSupportConceptListObject.ExpiresInThreeMonthsOrLess
                        ? "text-bewo-expires-in-three-months"
                        : "text-light";

@@ -172,14 +172,14 @@
                                <div class="list-group">
                                    <a href="#" class="list-group-item flex-column align-items-start no-underline bg-bewo-task-red" data-toggle="modal" data-target="#supportConceptList">
 	                                    <div class="d-flex">
-		                                    <h5 class="mb-1 text-light text-left" id="selectedSupportConceptCustomerInfo">@Model.SelectedCostBearer2SupportConceptRelListObject.NameAndDateOfBirth</h5>
+		                                    <h5 class="mb-1 text-light text-left" id="selectedSupportConceptCustomerInfo">@Model.SelectedSupportConceptListObject.NameAndDateOfBirth</h5>
 	                                    </div>
                                        @if(Model.SelectedCostBearerSupportConceptOid > 0)
 	                                    {
 		                                    <div class="dropdown-divider my-0 py-0"></div>
 	                                    }
                                        <p class="mb-1 text-left small @selectedSuportConceptTimeSpanColorClass" id="selectedSupportConceptInfo">
-                                            @Model.SelectedCostBearer2SupportConceptRelListObject.SupportConceptTimeSpan
+                                            @Model.SelectedSupportConceptListObject.SupportConceptTimeSpan
                                        </p>
                                    </a>
                                </div>
@@ -242,7 +242,7 @@
                </div>
                @* /Hilfeplanauswahlpopup *@

-                <input type="hidden" name="CostBearer2SupportConceptOid" id="CostBearer2SupportConceptOid" value="@Model.SelectedCostBearer2SupportConceptRelListObject.CostBearer2SupportConceptOid">
+                <input type="hidden" name="CostBearer2SupportConceptOid" id="CostBearer2SupportConceptOid" value="@Model.SelectedSupportConceptListObject.CostBearer2SupportConceptOid">
            }

            if(Model.IsCustomerAbsence)