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

Konflikte gelöst

Browse Source
This commit is contained in:
Lyndon Jetten
2025-08-15 10:12:07 +02:00
parent 3474d0f304 203a2c3717
commit 1a619ea48a
105 changed files with 3736 additions and 2035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
View File

@@ -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>

42
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -248,8 +248,8 @@ namespace BeWoPlanerMobil.Controllers
Model.SelectedSupportConceptListObject = Model.SupportConceptListObjects.FirstOrDefault(f => f.CostBearer2SupportConceptOid == -1) ?? Model.SupportConceptListObjects.First();
Model.SelectedCostBearerSupportConceptOid = -1;
Log.Info($"TEST Model.SupportConceptListObjects Oids = {Model.SelectedCostBearerSupportConceptOid}");
}
else
{
@@ -317,6 +317,7 @@ namespace BeWoPlanerMobil.Controllers
Model.MokSettings.SupportConceptExpirationLimitInMonths = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.HilfeplanAuslaufAuswahl, 3);
Model.MokSettings.AnzTageZeiterfassErfolgt = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.AnzTageZeiterfassErfolgt);
Model.MokSettings.AnzTageUnterschriftErfolgt = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.AnzTageUnterschriftErfolgt);
Model.MokSettings.MaxDaysEditServiceRecordsAllowed = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.MaxDaysEditServiceRecordsAllowed);
Model.MokSettings.TimeUntilUILock = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.TimeUntilUILock);
Model.MokSettings.ServiceRecordAllowChangeHours = UserSettingsUtils.GetSettingValueAsInteger(Model.Mandator.Settings, SettingsKeys.ServiceRecordAllowChangeHours);
@@ -363,13 +364,23 @@ namespace BeWoPlanerMobil.Controllers
var customerFilter = MobileUserSettingsUtils.GetSettingValueAsEnum(userSettings, SettingsKeys.CustomerFilterInZeiterfassung, CustomerFilterEnum.MyCustomer);
if (customerFilter != CustomerFilterEnum.MyCustomer && !Model.IsAllowedToSeeSupportConceptFilter)
if (user.CheckForAtLeastOneRight(new List<UserRightType> { UserRightType.ViewAll, UserRightType.SupportConcept_ViewAllSupportConcepts }))
{
//do nothing, darf alles sehen
}
else if (user.HasRight(UserRightType.SupportConcept_ViewMyTeams))
{
if (customerFilter == CustomerFilterEnum.All)
{
customerFilter = CustomerFilterEnum.MyCustomer;
}
}
else
{
customerFilter = CustomerFilterEnum.MyCustomer;
}
//if (Model.SelectedSupportConceptFilter == null)
Model.SelectedSupportConceptFilter = customerFilter;
Model.IsEndDateVisible = UserSettingsUtils.GetSettingValueAsBool(Model.Mandator.Settings, SettingsKeys.IsEndDateVisible);
@@ -1448,7 +1459,7 @@ namespace BeWoPlanerMobil.Controllers
if(!(sclo is null))
{
var sc = GetCompactSupportConcept(sclo.SupportConceptOid);
var sc = GetCompactSupportConcept(sclo.SupportConceptOid, selectedCostbearerScRelOid);
Model.NewServiceRecord.SupportConcept = sc;
@@ -2070,10 +2081,10 @@ namespace BeWoPlanerMobil.Controllers
}
newServiceRecord.Employee = emp;
newServiceRecord.SupportConcept = GetCompactSupportConcept(sc.SupportConceptOid);
newServiceRecord.CostBearer = sc.CostBearerList.ElementAt(0).Organisation;
newServiceRecord.Customer = sc.Customer;
newServiceRecord.CostBearer2SupportConceptOid = sc.CostBearerRelOids.ElementAt(0);
newServiceRecord.SupportConcept = GetCompactSupportConcept(sc.SupportConceptOid, newServiceRecord.CostBearer2SupportConceptOid);
}
}
}
@@ -2796,7 +2807,7 @@ namespace BeWoPlanerMobil.Controllers
{
if(supportConcept.SupportConceptOid != null)
{
checkServiceRecord.SupportConcept = GetCompactSupportConcept(supportConcept.SupportConceptOid);
checkServiceRecord.SupportConcept = GetCompactSupportConcept(supportConcept.SupportConceptOid, Model.SelectedCostBearerSupportConceptOid);
}
checkServiceRecord.Customer = supportConcept.Customer;
@@ -2906,7 +2917,7 @@ namespace BeWoPlanerMobil.Controllers
sr.Customer = serviceRecord.SupportConcept?.Customer;
var result = OperationsService.ValidateServiceRecord(sr, null, maxDaysEditSRsAllowed, employeeOids, costBearer2SupportConceptOids);
var node = CreateFlatSupportConceptItem(GetCompactSupportConcept(sr.SupportConcept.SupportConceptOid), null);
var node = CreateFlatSupportConceptItem(GetCompactSupportConcept(sr.SupportConcept.SupportConceptOid, sr.CostBearer2SupportConceptOid), null);
dateRangeString = node?.SupportConceptTreeNodeDC != null ? node.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC.DateRangeString : string.Empty;
validationResults.AddIfNotIn(new ServiceRecord2Validation(sr, result, dateRangeString));
@@ -2917,7 +2928,7 @@ namespace BeWoPlanerMobil.Controllers
{
if(Model.SelectedSupportConcept != null)
{
var node = CreateFlatSupportConceptItem(GetCompactSupportConcept(Model.SelectedSupportConcept.SupportConceptOid), null);
var node = CreateFlatSupportConceptItem(GetCompactSupportConcept(Model.SelectedSupportConcept.SupportConceptOid, Model.SelectedCostBearerSupportConceptOid), null);
dateRangeString = node?.SupportConceptTreeNodeDC != null ? node.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC.DateRangeString : "";
}
@@ -4027,7 +4038,7 @@ namespace BeWoPlanerMobil.Controllers
if (sclo != null)
{
var sc = GetCompactSupportConcept(sclo.SupportConceptOid);
var sc = GetCompactSupportConcept(sclo.SupportConceptOid, selectedCostbearer2SupportConceptRelOid);
Model.NewServiceRecord.SupportConcept = sc;
Model.NewServiceRecord.Customer = sc.Customer;
@@ -4117,16 +4128,23 @@ namespace BeWoPlanerMobil.Controllers
return ResetEditingMode();
}
private CompactSupportConceptDC GetCompactSupportConcept(long supportConceptOid)
private CompactSupportConceptDC GetCompactSupportConcept(long supportConceptOid, long? c2sOid)
{
CompactSupportConceptDC sc = null;
if (Model.SupportConcepts != null)
{
sc = Model.SupportConcepts.FirstOrDefault(s => s.SupportConceptOid == supportConceptOid);
sc = Model.SupportConcepts.FirstOrDefault(s => s.SupportConceptOid == supportConceptOid && s.CostBearerRelOids.Any(a => a == c2sOid));
}
if (sc == null)
{
sc = CustomerService.LoadCompactSupportConceptDC(supportConceptOid, Model.LoggedInEmployee.EmployeeOid);
if (c2sOid.HasValue && sc.CostBearerRelOids.Count > 1)
{
var oids2Remove = sc.CostBearerRelOids.Where(o => o != c2sOid.Value).ToList();
var cb2Remove = sc.CostBearerList.Where(c => c.CostBearer2SupportConceptOid != c2sOid.Value).ToList();
sc.CostBearerRelOids.RemoveRange(oids2Remove);
sc.CostBearerList.RemoveRange(cb2Remove);
}
}
return sc;

1
BeWoPlanerMobil/Util/MokSettings.cs
View File

@@ -6,6 +6,7 @@ namespace BeWoPlanerMobil.Util
{
public int SupportConceptExpirationLimitInMonths { get; set; }
public int AnzTageZeiterfassErfolgt { get; set; }
public int AnzTageUnterschriftErfolgt { get; set; }
public int MaxDaysEditServiceRecordsAllowed { get; set; }
public int ServiceRecordAllowChangeHours { get; set; }
public int TimeUntilUILock { get; set; }

6
BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml
View File

@@ -344,9 +344,7 @@
}
}
@if(Html.IsInDebugMode())
{
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
}
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
</div>
}

2
BeWoPlanerMobil/Views/Main/Main.cshtml
View File

@@ -179,7 +179,7 @@
if(Model.LastCreatedServiceRecordOid > 0)
{
<text>
window.clearLocalBeWoStorage();
//window.clearLocalBeWoStorage();
</text>
if(shouldShowSignaturePopup && Model.ShowSignature)

6
BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml
View File

@@ -314,9 +314,7 @@
<button type="submit" id="mb-reset-btn" class="btn btn-primary float-right" onclick="showSpinner()">Abbrechen</button>
}
@if(Html.IsInDebugMode())
{
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
}
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
</div>
}

6
BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml
View File

@@ -534,10 +534,8 @@
<button type="button" class="btn btn-primary float-right" id="reset-button" onclick="resetSingleBookingForm();">Abbrechen</button>
}
@if(Html.IsInDebugMode())
{
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
}
@Html.Partial("RestoreServiceRecordInputsPartial", Model)
</div>
}
</div>

2
BeWoPlanerMobil/Views/Shared/_Layout.cshtml
View File

@@ -53,7 +53,7 @@
<script type="text/javascript" src="@Scripts.Url("~/Scripts/moment/locale/de.js")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/mobileUtils.js?v=1.4")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/main.js?v=1.7")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/main.js?v=1.9")"></script>
<script type="text/javascript" src="@Scripts.Url("~/Scripts/ownSoft-Scripts/signature.js?v=1.5")"></script>
<link type="text/css" rel="stylesheet" href="@Url.Content("~/Scripts/bootstrap/bootstrap4-modal-fullscreen.min.css")" />