diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index 9c463ee73..7d6b5324d 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -234,7 +234,15 @@
..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
+
+ False
+ ..\Lib\System.Runtime.CompilerServices.Unsafe.dll
+
+
+ False
+ ..\Lib\System.Threading.Tasks.Extensions.dll
+
@@ -756,7 +764,7 @@
- True
+ False
False
8808
/
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 52e836da2..7d76cae62 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -248,13 +248,14 @@ namespace BeWoPlanerMobil.Controllers
Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == -1) ?? Model.SupportConceptListObjects.First();
Model.SelectedCostBearerSupportConceptOid = -1;
- Model.HasAnyRatingTypes = Model.HasRightToRateGoals && OperationsService.GetAllRatingTypes().Any();
+
}
else
{
Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == Model.SelectedCostBearerSupportConceptOid) ?? Model.SupportConceptListObjects.First();
}
+ Model.HasAnyRatingTypes = Model.HasRightToRateGoals && Model.GoalRatingTypes.Any();
if (Model.GroupBookingSelectedCostBearerSupportConceptOids.Count > 0)
{
@@ -420,6 +421,17 @@ namespace BeWoPlanerMobil.Controllers
{
Model.SelectedSupportConcept.Goals = infos[0].SupportConceptGoals;
}
+ if (Model.SupportConcepts != null)
+ {
+ foreach (var info in infos)
+ {
+ var sc = Model.SupportConcepts.FirstOrDefault(s => s.SupportConceptOid == info.SupportConceptOid);
+ if (sc != null)
+ {
+ sc.Goals = info.SupportConceptGoals;
+ }
+ }
+ }
}
@@ -1367,11 +1379,12 @@ namespace BeWoPlanerMobil.Controllers
}
}
- var sc = Model.SupportConcepts.FirstOrDefault(fod => fod.CostBearerRelOids.Any(a => a.Equals(selectedCostbearerScRelOid)));
+ var sclo = Model.SupportConceptListObjects.FirstOrDefault(a => a.Equals(selectedCostbearerScRelOid));
- if(!(sc is null))
+ if(!(sclo is null))
{
- Model.NewServiceRecord.SupportConcept = CustomerService.LoadCompactSupportConceptDC(sc.SupportConceptOid, Model.LoggedInEmployee.EmployeeOid);
+ var sc = CustomerService.LoadCompactSupportConceptDC(sclo.SupportConceptOid, Model.LoggedInEmployee.EmployeeOid);
+ Model.NewServiceRecord.SupportConcept = sc;
Model.NewServiceRecord.Customer = sc.Customer;
@@ -2045,7 +2058,7 @@ namespace BeWoPlanerMobil.Controllers
Model.Categories2Descriptions = new Dictionary>();
- if (infos.Count > 0)
+ if (infos != null && infos.Count > 0)
{
Model.Categories2Descriptions = CreateServiceCategory2ServiceDescription(infos);
}
@@ -3587,7 +3600,7 @@ namespace BeWoPlanerMobil.Controllers
}
else
{
- LoadServiceCategoriesToModel(null);
+ //LoadServiceCategoriesToModel(null);
}
return PartialView("GroupBookingSelectionPartial", Model);
@@ -3836,15 +3849,16 @@ namespace BeWoPlanerMobil.Controllers
Model.NewServiceRecord.Employee = Model.SelectedEmployee;
}
- var supportConcept = Model.SupportConcepts.FirstOrDefault(fod => fod.CostBearerRelOids.Any(a => a.Equals(selectedCostbearer2SupportConceptRelOid)));
+
+ var sclo = Model.SupportConceptListObjects.FirstOrDefault(a => a.Equals(selectedCostbearer2SupportConceptRelOid));
- if(supportConcept != null)
+ if (sclo != null)
{
- Model.NewServiceRecord.SupportConcept = CustomerService.LoadCompactSupportConceptDC(supportConcept.SupportConceptOid, Model.LoggedInEmployee.EmployeeOid);
-
- Model.NewServiceRecord.Customer = supportConcept.Customer;
+ var sc = CustomerService.LoadCompactSupportConceptDC(sclo.SupportConceptOid, Model.LoggedInEmployee.EmployeeOid);
+ Model.NewServiceRecord.SupportConcept = sc;
+ Model.NewServiceRecord.Customer = sc.Customer;
- var cb2ScRel = supportConcept.CostBearerList.FirstOrDefault();
+ var cb2ScRel = sc.CostBearerList.FirstOrDefault();
Model.NewServiceRecord.CostBearer = cb2ScRel.Organisation;
var intervall = Model.NewServiceRecord.CostBearer.ActualMinuteIntervall;
@@ -4190,7 +4204,7 @@ namespace BeWoPlanerMobil.Controllers
}
else
{
- LoadServiceCategoriesToModel(null);
+ //LoadServiceCategoriesToModel(null);
}
return PartialView("MultiBookingSelectionPartial", Model);
@@ -4316,7 +4330,7 @@ namespace BeWoPlanerMobil.Controllers
var list = GetSelectedGroupBookingSupportConcepts();
-
+ LoadSupportConceptThings(null, false);
var supportConcept2Remove = list.FirstOrDefault(f => f.CostBearerRelOids.Any(a => a == c2sOid));
@@ -4340,6 +4354,11 @@ namespace BeWoPlanerMobil.Controllers
Model.GroupBookingSelectedCostBearerSupportConceptOids.Remove(c2sOid);
+ var c2s2Remove = Model.GroupBookingSelectedCostBearerSupportConcepts.FirstOrDefault(c => c.CostBearer2SupportConceptOid == c2sOid);
+ if (c2s2Remove != null)
+ {
+ Model.GroupBookingSelectedCostBearerSupportConcepts.Remove(c2s2Remove);
+ }
//Model.GroupBookingSelectedSupportConcepts.Remove(supportConcept2Remove);
//Model.SelectedConceptCostBearerRelations.Remove(relation2Remove);
@@ -4349,7 +4368,7 @@ namespace BeWoPlanerMobil.Controllers
Model.GroupBookingSelectedGroupOfPeopleOids = groups.Where(group => group.GroupOfPeopleOid.HasValue).Select(group => group.GroupOfPeopleOid.Value).ToList();
- LoadServiceCategoriesToModel(null);
+ LoadSupportConceptThings(null, true);
if (Model.SelectedServiceCategory != null && !Model.Categories2Descriptions.Keys.Contains(Model.SelectedServiceCategory))
{
diff --git a/BeWoPlanerMobil/Web.config b/BeWoPlanerMobil/Web.config
index c89379aa5..fda7f1161 100644
--- a/BeWoPlanerMobil/Web.config
+++ b/BeWoPlanerMobil/Web.config
@@ -299,13 +299,9 @@
-
-
-
-
-
+
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 4da10f828..57e2edea1 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -184,8 +184,9 @@
..\packages\System.Reflection.Metadata.9.0.7\lib\net462\System.Reflection.Metadata.dll
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
+
+ False
+ ..\Lib\System.Runtime.CompilerServices.Unsafe.dll
3.0
@@ -196,8 +197,10 @@
..\packages\System.Text.Encoding.CodePages.9.0.7\lib\net462\System.Text.Encoding.CodePages.dll
-
-
+
+ False
+ ..\Lib\System.Threading.Tasks.Extensions.dll
+
diff --git a/Service/Service.csproj b/Service/Service.csproj
index bf1e96479..150d9ee5a 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -198,7 +198,6 @@
..\packages\System.Text.Json.9.0.2\lib\net462\System.Text.Json.dll
-
..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll