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

Mok Diverse Bugfixes, SaveCollapsibleStatus + Passwort ändern + Sortierung Abwesenheiten

Browse Source
This commit is contained in:
Christian
2025-10-24 01:53:29 +02:00
parent cec4eea417
commit fb83a3d610
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BeWoPlanerMobil.sln
View File

@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.14.36408.4 d17.14
# Visual Studio Version 16
VisualStudioVersion = 16.0.31729.503
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoPlanerMobil", "BeWoPlanerMobil\BeWoPlanerMobil.csproj", "{284B02ED-114A-426C-9162-31BB6CF05589}"
EndProject
@@ -25,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HausDuelken", "ReportImp\Ha
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeidPartnerReports", "ReportImp\FeidPartnerReports\FeidPartnerReports.csproj", "{36E7D251-2F15-4589-81C2-6BDDC67F16AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaSMoenchengladbach", "ReportImp\PaSMoenchengladbach\PaSMoenchengladbach.csproj", "{EA3C4BE1-6128-4FC9-8194-3C4202233371}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -94,12 +94,12 @@ Global
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.DebugRemote|Any CPU.Build.0 = DebugRemote|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36E7D251-2F15-4589-81C2-6BDDC67F16AE}.Release|Any CPU.Build.0 = Release|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.Build.0 = Release|Any CPU
{EA3C4BE1-6128-4FC9-8194-3C4202233371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA3C4BE1-6128-4FC9-8194-3C4202233371}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA3C4BE1-6128-4FC9-8194-3C4202233371}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{EA3C4BE1-6128-4FC9-8194-3C4202233371}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{EA3C4BE1-6128-4FC9-8194-3C4202233371}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EA3C4BE1-6128-4FC9-8194-3C4202233371}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -108,6 +108,7 @@ Global
{FC9F4E38-977B-4877-9E05-D04068D3C807} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{ED3DBD24-B774-41E5-A856-99FF78D828A8} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{36E7D251-2F15-4589-81C2-6BDDC67F16AE} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
{EA3C4BE1-6128-4FC9-8194-3C4202233371} = {30DD24EE-2ED9-4E31-BCB5-AD995E8541BD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {75267284-7070-4045-9FC8-0FC3C56C1AD3}

10
BeWoPlanerMobil/Controllers/AbstractBaseController.cs
View File

@@ -154,6 +154,16 @@ namespace BeWoPlanerMobil.Controllers
public abstract string SaveCollapsibleStatus(bool isOpen, string identifier);
public string SaveCollapsibleStatusToModel(AbstractModel model, bool isOpen, string identifier)
{
if (model?.Collapsibles2IsShown != null)
{
model.Collapsibles2IsShown[identifier] = isOpen;
}
return LeerzeichenFuerGetMethoden;
}
public ActionResult Error()
{
#if DEBUG

4
BeWoPlanerMobil/Controllers/CustomerController.cs
View File

@@ -1443,9 +1443,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public override string SaveCollapsibleStatus(bool isOpen, string identifier)
{
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
}

4
BeWoPlanerMobil/Controllers/DevExpressSchedulerController.cs
View File

@@ -87,9 +87,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public override string SaveCollapsibleStatus(bool isOpen, string identifier)
{
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
}
}

4
BeWoPlanerMobil/Controllers/DevToolsController.cs
View File

@@ -63,9 +63,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public override string SaveCollapsibleStatus(bool isOpen, string identifier)
{
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
private Faker<AddressDC> _AddressFaker = new Faker<AddressDC>("de");

4
BeWoPlanerMobil/Controllers/MainController.cs
View File

@@ -5114,9 +5114,7 @@ namespace BeWoPlanerMobil.Controllers
return LeerzeichenFuerGetMethoden;
}
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
[Authorize]

9
BeWoPlanerMobil/Controllers/ReportController.cs
View File

@@ -1003,7 +1003,10 @@ namespace BeWoPlanerMobil.Controllers
}
var s = Model.QuittierungsbelegsReportSettings;
var report = Model.ReportCreator.CreateServiceOverviewReportNew(s.Month, s.Year, s.FilterEnum, s.CustomerOid, s.TeamOid, s.EmployeeOid, s.OrganisationOid, s.ServiceCategoryOid, s.StartDay, s.EndDay, false);
DateTime startDate = new DateTime(s.Year, s.Month, s.StartDay);
DateTime endDate = new DateTime(s.Year, s.Month, s.EndDay);
var report = Model.ReportCreator.CreateServiceOverviewReportNew(s.FilterEnum, s.CustomerOid, s.TeamOid, s.EmployeeOid, s.OrganisationOid, s.ServiceCategoryOid, startDate, endDate, false);
report.ExportOptions.PrintPreview.DefaultFileName = CreateFileName();
report.DisplayName = CreateFileName();
@@ -1377,9 +1380,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public override string SaveCollapsibleStatus(bool isOpen, string identifier)
{
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
}

4
BeWoPlanerMobil/Controllers/ReportViewerController.cs
View File

@@ -805,9 +805,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public override string SaveCollapsibleStatus(bool isOpen, string identifier)
{
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
}
}

4
BeWoPlanerMobil/Controllers/SchedulerController.cs
View File

@@ -1444,9 +1444,7 @@ namespace BeWoPlanerMobil.Controllers
[Authorize]
public override string SaveCollapsibleStatus(bool isOpen, string identifier)
{
Model.Collapsibles2IsShown[identifier] = isOpen;
return LeerzeichenFuerGetMethoden;
return SaveCollapsibleStatusToModel(Model, isOpen, identifier);
}
}
}

2
BeWoPlanerMobil/Views/Customer/CustomerAbsenceTimePartial.cshtml
View File

@@ -61,7 +61,7 @@
}
</script>
@foreach(var absenceTime in Model.SelectedCustomer.AbsenceTimes.OrderBy(at => at.Start))
@foreach(var absenceTime in Model.SelectedCustomer.AbsenceTimes.OrderByDescending(at => at.Start))
{
if(absenceTime.Start is null)
{

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

@@ -60,7 +60,7 @@
function validatePasswordStrength() {
try{
(new window.MoKPasswordSecurity("pw-strength-feedback")).validatePassword($("#new-password").val());
(new MoKPasswordSecurity("pw-strength-feedback")).validatePassword($("#new-password").val());
} catch(error) {
window.showErrorPopup(error);
}