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-01-17 16:32:01 +01:00
parent 24bbed1d78 770dd80443
commit adece86cc0
892 changed files with 150017 additions and 183923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Service/ServiceImplementations/OperationsServiceImp.cs
View File

@@ -2505,6 +2505,22 @@ namespace BeWo.Service.ServiceImplementations
//pServiceRecordGroup.RoundedDuration = (decimal)originalEnde.Value.Subtract(originalStart.Value).TotalMinutes;
}
}
//Bug korrigieren, dass sich die Stunden nicht ändern, wenn in Start Sekunde > 0 und Stunde > 0 eingetragen ist, was eigentlich nicht sein darf. War aber bei einem Kunden HSH Netzwerk bei zwei Usern
if (srOrg.Start.HasValue && srOrg.Start.Value.Hour > 0 && srOrg.Start.Value.Second > 0)
{
var minuten = srDc.RoundedDuration;
if (srDc.DurationInStunden.HasValue && srDc.DurationInStunden.Value == ZeiterfassungsDauer.Stunden)
{
minuten *= 60;
}
if (srOrg.RoundedDuration == minuten) // Die Dauer wurde nicht geändert, also setze Start auf 00:01
{
srDc.Start = srDc.Start.Value.Date.AddSeconds(1);
srDc.End = srDc.Start.Value.AddMinutes((double)minuten);
}
}
}
}
@@ -6200,12 +6216,11 @@ namespace BeWo.Service.ServiceImplementations
}
}
// TODO: implementieren!
public void DeleteAppointmentsInInterval(bool pHasRightToSeeAllEmployeeAppointments, long pEmployeeOid, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomers, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments, Dictionary<UserRightType, bool> pUserRights)
{
try
{
var appointments2Delete = DAOFactory.SearchDAO.LoadFilteredAppointments(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, new DateTime(1, 1, 1), pIntervalEnd, pSelectedEmployees, pSelectedCustomers, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments, true);
var appointments2Delete = DAOFactory.SearchDAO.LoadFilteredAppointments(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, new DateTime(1, 1, 1), pIntervalEnd, pSelectedEmployees, pSelectedCustomers, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments, true, false);
DAOFactory.GenericDAO.Delete(appointments2Delete);
}
catch (Exception e)
@@ -6257,9 +6272,9 @@ namespace BeWo.Service.ServiceImplementations
public string GetMessageFromServerForDeletingAppointments(bool pHasRightToSeeAllEmployeeAppointments, long pEmployeeOid, DateTime pIntervalEnd, List<long> pSelectedEmployees, List<long> pSelectedCustomers, List<long> pSelectedResources, bool pEmployeesOnly, bool pCustomersOnly, bool pResourcesOnly, bool pPrivateAppointmentsOnly, bool pOnlyMyAppointments, Dictionary<UserRightType, bool> pUserRights)
{
var appointments2Delete = DAOFactory.SearchDAO.LoadFilteredAppointments(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, new DateTime(1, 1, 1), pIntervalEnd, pSelectedEmployees, pSelectedCustomers, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments, true);
var appointments2Delete = DAOFactory.SearchDAO.LoadFilteredAppointments(pHasRightToSeeAllEmployeeAppointments, pEmployeeOid, new DateTime(1, 1, 1), pIntervalEnd, pSelectedEmployees, pSelectedCustomers, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments, true, false);
var actualTextMessage = $"Achtung!&#x0a;&#x0a;Das Löschen von {appointments2Delete.Count} {(appointments2Delete.Count == 1 ? "Termin" : "Terminen")} bis zum {pIntervalEnd.ToShortDateString()} kann nicht rückgängig gemacht werden!&#x0a;";
var actualTextMessage = $"Achtung!&#x0a;&#x0a;Es werden ALLE Termine ALLER Klienten bis zum angegebenden Datum gelöscht.&#x0a;Das Löschen von {appointments2Delete.Count} {(appointments2Delete.Count == 1 ? "Termin" : "Terminen")} bis zum {pIntervalEnd.ToShortDateString()} kann nicht rückgängig gemacht werden!&#x0a;";
return $"<TextBlock xmlns =\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\" Grid.Row=\"0\" TextAlignment=\"Center\" FontWeight=\"Bold\" TextWrapping=\"Wrap\" Background=\"Transparent\" FontSize=\"14\" Margin=\"3\" Foreground=\"Red\" HorizontalAlignment=\"Center\" Text=\"{actualTextMessage}\"/>";
}
@@ -7726,7 +7741,9 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.GetVorlagentabelleDCs();
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetVorlagentabelleDCs();
}
catch (Exception ex)
{
@@ -7739,18 +7756,35 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.InsertTemplate(dc);
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.InsertTemplate(dc);
}
catch (Exception ex)
{
throw Utils.CreateBeWoFaultException(ex);
}
}
public List<PlatzhalterDC> GetPlatzhalterForTemplate(VorlagentabelleDC vt)
{
try
{
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetPlatzhalterForTemplate(vt);
}
catch (Exception ex)
{
throw Utils.CreateBeWoFaultException(ex);
}
}
public List<PlatzhalterDC> GetPlatzhalterForCustomer()
{
try
{
return VorlagenManager.GetPlatzhalterForCustomer();
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetPlatzhalterForCustomer();
}
catch (Exception ex)
{
@@ -7761,7 +7795,8 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.GetPlatzhalterForSupportConcept();
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetPlatzhalterForSupportConcept();
}
catch (Exception ex)
{
@@ -7772,7 +7807,8 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.GetPlatzhalterForEmployee();
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetPlatzhalterForEmployee();
}
catch (Exception ex)
{
@@ -7783,7 +7819,8 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.GetFolderById(oid);
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetFolderById(oid);
}
catch (Exception ex)
{
@@ -7794,7 +7831,8 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.GetVorlagentabelleById(oid);
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetVorlagentabelleById(oid);
}
catch (Exception ex)
{
@@ -7805,7 +7843,21 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.GetDokumentvorlagenInFolder(folderOid);
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetDokumentvorlagenInFolder(folderOid);
}
catch (Exception ex)
{
throw Utils.CreateBeWoFaultException(ex);
}
}
public List<DokumentvorlageDC> GetDokumentvorlagenForType(TableID objecTid)
{
try
{
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.GetDokumentvorlagenForType(objecTid);
}
catch (Exception ex)
{
@@ -7830,7 +7882,9 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
VorlagenManager.DeleteTemplates(vorlagen);
var vm = PluginLoader.FindClass<VorlagenManager>();
vm.DeleteTemplates(vorlagen);
}
catch (Exception e)
{
@@ -7854,7 +7908,8 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
return VorlagenManager.ReplacePlaceholdersInTemplate(template, objectOid, tableOid);
var vm = PluginLoader.FindClass<VorlagenManager>();
return vm.ReplacePlaceholdersInTemplate(template, objectOid, tableOid);
}
catch (Exception e)
{