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

Verweise aufgeräumt und Mok Bug bei Gruppenbuchungen gefixt

Browse Source
This commit is contained in:
Christian
2025-07-16 12:38:01 +02:00
parent 37527d3c45
commit 1697254048
5 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BeWoPlanerMobil/BeWoPlanerMobil.csproj
View File

@@ -234,7 +234,15 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web" />
@@ -756,7 +764,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<UseIIS>False</UseIIS>
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>

49
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -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<ServiceCategoryDC, List<ServiceDescriptionDC>>();
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))
{

6
BeWoPlanerMobil/Web.config
View File

@@ -299,13 +299,9 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

11
Data/Data.csproj
View File

@@ -184,8 +184,9 @@
<Reference Include="System.Reflection.Metadata, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.9.0.7\lib\net462\System.Reflection.Metadata.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -196,8 +197,10 @@
<Reference Include="System.Text.Encoding.CodePages, Version=9.0.0.7, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.9.0.7\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />

1
Service/Service.csproj
View File

@@ -198,7 +198,6 @@
<Reference Include="System.Text.Json, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.9.0.2\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>